From 7efb593975392efcc2b6f0fa19cb7705f49b00fa Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 8 Oct 2025 14:29:48 +0200 Subject: [PATCH 001/252] BridgeJS: Initial protocol support [fe09c4b1] Simplify export swift [b42bb7c1] WIP: Simplify protocol method generation [75e1ed37] BridgeJSLink simplification [b1fcc4d0] Cleanup [70aa0332] WIP: Final wrap [2f648eaf] WIP: Protocols simplification [f2f89b33] WIP: Fix for parameters in methods [6026fc1d] WIP: Test protocol methods with parameters --- .../JavaScript/BridgeJS.ExportSwift.json | 5 +- .../JavaScript/BridgeJS.ExportSwift.json | 5 +- .../Sources/BridgeJSCore/ExportSwift.swift | 422 +++++++++++++--- .../Sources/BridgeJSCore/ImportTS.swift | 4 + .../Sources/BridgeJSLink/BridgeJSLink.swift | 80 ++- .../Sources/BridgeJSLink/JSGlueGen.swift | 26 + .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 26 +- .../BridgeJSToolTests/Inputs/Protocol.swift | 41 ++ .../BridgeJSLinkTests/Protocol.Export.d.ts | 44 ++ .../BridgeJSLinkTests/Protocol.Export.js | 286 +++++++++++ .../__Snapshots__/ExportSwiftTests/Async.json | 5 +- .../ExportSwiftTests/DefaultParameters.json | 5 +- .../ExportSwiftTests/EnumAssociatedValue.json | 5 +- .../ExportSwiftTests/EnumCase.json | 5 +- .../ExportSwiftTests/EnumNamespace.json | 5 +- .../ExportSwiftTests/EnumRawType.json | 5 +- .../ExportSwiftTests/Namespaces.json | 5 +- .../ExportSwiftTests/Optionals.json | 5 +- .../ExportSwiftTests/PrimitiveParameters.json | 5 +- .../ExportSwiftTests/PrimitiveReturn.json | 5 +- .../ExportSwiftTests/PropertyTypes.json | 5 +- .../ExportSwiftTests/Protocol.json | 305 ++++++++++++ .../ExportSwiftTests/Protocol.swift | 174 +++++++ .../ExportSwiftTests/StaticFunctions.json | 5 +- .../ExportSwiftTests/StaticProperties.json | 5 +- .../ExportSwiftTests/StringParameter.json | 5 +- .../ExportSwiftTests/StringReturn.json | 5 +- .../ExportSwiftTests/SwiftClass.json | 5 +- .../ExportSwiftTests/Throws.json | 5 +- .../VoidParameterVoidReturn.json | 5 +- .../JavaScriptKit/BridgeJSInstrincics.swift | 65 +++ .../BridgeJS/Exporting-Swift-to-JavaScript.md | 1 + .../Exporting-Swift-Protocols.md | 209 ++++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 81 +++ .../Generated/BridgeJS.ExportSwift.swift | 285 +++++++++++ .../JavaScript/BridgeJS.ExportSwift.json | 465 +++++++++++++++++- Tests/prelude.mjs | 105 +++- 37 files changed, 2612 insertions(+), 107 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json index cbd7d10e4..cfec1d468 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -720,5 +720,8 @@ } } ], - "moduleName" : "Benchmarks" + "moduleName" : "Benchmarks", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json index 5ef85519c..3e00433ef 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -138,5 +138,8 @@ "functions" : [ ], - "moduleName" : "PlayBridgeJS" + "moduleName" : "PlayBridgeJS", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 00902ee97..9179a9668 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -24,6 +24,8 @@ public class ExportSwift { private var exportedFunctions: [ExportedFunction] = [] private var exportedClasses: [ExportedClass] = [] private var exportedEnums: [ExportedEnum] = [] + private var exportedProtocols: [ExportedProtocol] = [] + private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() private let enumCodegen: EnumCodegen = EnumCodegen() @@ -64,7 +66,8 @@ public class ExportSwift { moduleName: moduleName, functions: exportedFunctions, classes: exportedClasses, - enums: exportedEnums + enums: exportedEnums, + protocols: exportedProtocols ) ) } @@ -77,10 +80,13 @@ public class ExportSwift { /// The names of the exported enums, in the order they were written in the source file var exportedEnumNames: [String] = [] var exportedEnumByName: [String: ExportedEnum] = [:] + /// The names of the exported protocols, in the order they were written in the source file + var exportedProtocolNames: [String] = [] + var exportedProtocolByName: [String: ExportedProtocol] = [:] var errors: [DiagnosticError] = [] - /// Creates a unique key for a class by combining name and namespace - private func classKey(name: String, namespace: [String]?) -> String { + /// Creates a unique key by combining name and namespace + private func makeKey(name: String, namespace: [String]?) -> String { if let namespace = namespace, !namespace.isEmpty { return "\(namespace.joined(separator: ".")).\(name)" } else { @@ -88,19 +94,39 @@ public class ExportSwift { } } - /// Creates a unique key for an enum by combining name and namespace - private func enumKey(name: String, namespace: [String]?) -> String { - if let namespace = namespace, !namespace.isEmpty { - return "\(namespace.joined(separator: ".")).\(name)" - } else { - return name + struct NamespaceResolution { + let namespace: [String]? + let isValid: Bool + } + + /// Resolves and validates namespace from both @JS attribute and computed (nested) namespace + /// Returns the effective namespace and whether validation succeeded + private func resolveNamespace( + from jsAttribute: AttributeSyntax, + for node: some SyntaxProtocol, + declarationType: String + ) -> NamespaceResolution { + let attributeNamespace = extractNamespace(from: jsAttribute) + let computedNamespace = computeNamespace(for: node) + + if computedNamespace != nil && attributeNamespace != nil { + diagnose( + node: jsAttribute, + message: "Nested \(declarationType)s cannot specify their own namespace", + hint: + "Remove the namespace from @JS attribute - nested \(declarationType)s inherit namespace from parent" + ) + return NamespaceResolution(namespace: nil, isValid: false) } + + return NamespaceResolution(namespace: computedNamespace ?? attributeNamespace, isValid: true) } enum State { case topLevel case classBody(name: String, key: String) case enumBody(name: String, key: String) + case protocolBody(name: String, key: String) } struct StateStack { @@ -386,6 +412,42 @@ public class ExportSwift { return nil } + /// Shared parameter parsing logic used by functions, initializers, and protocol methods + private func parseParameters( + from parameterClause: FunctionParameterClauseSyntax, + allowDefaults: Bool = true + ) -> [Parameter] { + var parameters: [Parameter] = [] + + for param in parameterClause.parameters { + let resolvedType = self.parent.lookupType(for: param.type) + + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) + continue + } + + guard let type = resolvedType else { + diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) + continue + } + + let name = param.secondName?.text ?? param.firstName.text + let label = param.firstName.text + + let defaultValue: DefaultValue? + if allowDefaults { + defaultValue = extractDefaultValue(from: param.defaultValue, type: type) + } else { + defaultValue = nil + } + + parameters.append(Parameter(label: label, name: name, type: type, defaultValue: defaultValue)) + } + + return parameters + } + override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { guard node.attributes.hasJSAttribute() else { return .skipChildren @@ -427,6 +489,9 @@ public class ExportSwift { } } return .skipChildren + case .protocolBody(_, _): + // Protocol methods are handled in visitProtocolMethod during protocol parsing + return .skipChildren } } @@ -470,27 +535,7 @@ public class ExportSwift { ) } - var parameters: [Parameter] = [] - for param in node.signature.parameterClause.parameters { - let resolvedType = self.parent.lookupType(for: param.type) - - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { - diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) - continue - } - - guard let type = resolvedType else { - diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) - continue - } - - let name = param.secondName?.text ?? param.firstName.text - let label = param.firstName.text - - let defaultValue = extractDefaultValue(from: param.defaultValue, type: type) - - parameters.append(Parameter(label: label, name: name, type: type, defaultValue: defaultValue)) - } + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) let returnType: BridgeType if let returnClause = node.signature.returnClause { let resolvedType = self.parent.lookupType(for: returnClause.type) @@ -529,6 +574,8 @@ public class ExportSwift { let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true staticContext = isNamespaceEnum ? .namespaceEnum : .enumName(enumName) + case .protocolBody(_, _): + return nil } let classNameForABI: String? @@ -638,19 +685,7 @@ public class ExportSwift { ) } - var parameters: [Parameter] = [] - for param in node.signature.parameterClause.parameters { - guard let type = self.parent.lookupType(for: param.type) else { - diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) - continue - } - let name = param.secondName?.text ?? param.firstName.text - let label = param.firstName.text - - let defaultValue = extractDefaultValue(from: param.defaultValue, type: type) - - parameters.append(Parameter(label: label, name: name, type: type, defaultValue: defaultValue)) - } + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) guard let effects = collectEffects(signature: node.signature) else { return .skipChildren @@ -677,7 +712,7 @@ public class ExportSwift { let attributeNamespace = extractNamespace(from: jsAttribute) if attributeNamespace != nil { diagnose( - node: node.attributes.firstJSAttribute!, + node: jsAttribute, message: "Namespace parameter within @JS attribute is not supported for property declarations", hint: "Remove the namespace from @JS attribute. If you need dedicated namespace, consider using a nested enum or class instead." @@ -714,6 +749,9 @@ public class ExportSwift { case .topLevel: diagnose(node: node, message: "@JS var must be inside a @JS class or enum") return .skipChildren + case .protocolBody(_, _): + diagnose(node: node, message: "Properties are not supported in protocols") + return .skipChildren } // Process each binding (variable declaration) @@ -785,20 +823,10 @@ public class ExportSwift { return .skipChildren } - let attributeNamespace = extractNamespace(from: jsAttribute) - let computedNamespace = computeNamespace(for: node) - - if computedNamespace != nil && attributeNamespace != nil { - diagnose( - node: jsAttribute, - message: "Nested classes cannot specify their own namespace", - hint: "Remove the namespace from @JS attribute - nested classes inherit namespace from parent" - ) + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "class") + guard namespaceResult.isValid else { return .skipChildren } - - let effectiveNamespace = computedNamespace ?? attributeNamespace - let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( for: node, @@ -811,9 +839,9 @@ public class ExportSwift { constructor: nil, methods: [], properties: [], - namespace: effectiveNamespace + namespace: namespaceResult.namespace ) - let uniqueKey = classKey(name: name, namespace: effectiveNamespace) + let uniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) stateStack.push(state: .classBody(name: name, key: uniqueKey)) exportedClassByName[uniqueKey] = exportedClass @@ -829,10 +857,6 @@ public class ExportSwift { } override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind { - guard node.attributes.hasJSAttribute() else { - return .skipChildren - } - guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } @@ -844,19 +868,10 @@ public class ExportSwift { return Constants.supportedRawTypes.contains(typeName) }?.type.trimmedDescription - let attributeNamespace = extractNamespace(from: jsAttribute) - let computedNamespace = computeNamespace(for: node) - - if computedNamespace != nil && attributeNamespace != nil { - diagnose( - node: jsAttribute, - message: "Nested enums cannot specify their own namespace", - hint: "Remove the namespace from @JS attribute - nested enums inherit namespace from parent" - ) + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "enum") + guard namespaceResult.isValid else { return .skipChildren } - - let effectiveNamespace = computedNamespace ?? attributeNamespace let emitStyle = extractEnumStyle(from: jsAttribute) ?? .const let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( @@ -871,13 +886,13 @@ public class ExportSwift { explicitAccessControl: explicitAccessControl, cases: [], // Will be populated in visit(EnumCaseDeclSyntax) rawType: SwiftEnumRawType(rawType), - namespace: effectiveNamespace, + namespace: namespaceResult.namespace, emitStyle: emitStyle, staticMethods: [], staticProperties: [] ) - let enumUniqueKey = enumKey(name: name, namespace: effectiveNamespace) + let enumUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) exportedEnumByName[enumUniqueKey] = exportedEnum exportedEnumNames.append(enumUniqueKey) @@ -966,6 +981,100 @@ public class ExportSwift { stateStack.pop() } + override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let name = node.name.text + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "protocol") + guard namespaceResult.isValid else { + return .skipChildren + } + _ = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Protocol visibility must be at least internal" + ) + + var methods: [ExportedFunction] = [] + for member in node.memberBlock.members { + if let funcDecl = member.decl.as(FunctionDeclSyntax.self) { + if let exportedFunction = visitProtocolMethod( + node: funcDecl, + protocolName: name, + namespace: namespaceResult.namespace + ) { + methods.append(exportedFunction) + } + } + } + + let exportedProtocol = ExportedProtocol( + name: name, + methods: methods, + namespace: namespaceResult.namespace + ) + + let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + exportedProtocolByName[protocolUniqueKey] = exportedProtocol + exportedProtocolNames.append(protocolUniqueKey) + + parent.exportedProtocolNameByKey[protocolUniqueKey] = name + + return .skipChildren + } + + private func visitProtocolMethod( + node: FunctionDeclSyntax, + protocolName: String, + namespace: [String]? + ) -> ExportedFunction? { + let name = node.name.text + + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: false) + + let returnType: BridgeType + if let returnClause = node.signature.returnClause { + let resolvedType = self.parent.lookupType(for: returnClause.type) + + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + + guard let type = resolvedType else { + diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + returnType = type + } else { + returnType = .void + } + + let abiName = ABINameGenerator.generateABIName( + baseName: name, + namespace: namespace, + staticContext: nil, + operation: nil, + className: protocolName + ) + + guard let effects = collectEffects(signature: node.signature) else { + return nil + } + + return ExportedFunction( + name: name, + abiName: abiName, + parameters: parameters, + returnType: returnType, + effects: effects, + namespace: namespace, + staticContext: nil + ) + } + override func visit(_ node: EnumCaseDeclSyntax) -> SyntaxVisitorContinueKind { guard case .enumBody(_, let enumKey) = stateStack.current else { return .visitChildren @@ -1095,6 +1204,12 @@ public class ExportSwift { collector.exportedEnumByName[$0]! } ) + exportedProtocols.append( + contentsOf: collector.exportedProtocolNames.map { + collector.exportedProtocolByName[$0]! + } + ) + return collector.errors } @@ -1163,10 +1278,20 @@ public class ExportSwift { return primitiveType } + let protocolKey = typeName + if let protocolName = exportedProtocolNameByKey[protocolKey] { + return .swiftProtocol(protocolName) + } + guard let typeDecl = typeDeclResolver.resolve(type) else { return nil } + if typeDecl.is(ProtocolDeclSyntax.self) { + let swiftCallName = ExportSwift.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) + return .swiftProtocol(swiftCallName) + } + if let enumDecl = typeDecl.as(EnumDeclSyntax.self) { let swiftCallName = ExportSwift.computeSwiftCallName(for: enumDecl, itemName: enumDecl.name.text) let rawTypeString = enumDecl.inheritanceClause?.inheritedTypes.first { inheritedType in @@ -1220,11 +1345,18 @@ public class ExportSwift { func renderSwiftGlue() throws -> String? { var decls: [DeclSyntax] = [] - guard exportedFunctions.count > 0 || exportedClasses.count > 0 || exportedEnums.count > 0 else { + guard + exportedFunctions.count > 0 || exportedClasses.count > 0 || exportedEnums.count > 0 + || exportedProtocols.count > 0 + else { return nil } decls.append(Self.prelude) + for proto in exportedProtocols { + decls.append(try renderProtocolWrapper(protocol: proto)) + } + for enumDef in exportedEnums { switch enumDef.enumType { case .simple: @@ -1343,7 +1475,26 @@ public class ExportSwift { if returnType == .void { return CodeBlockItemSyntax(item: .init(ExpressionStmtSyntax(expression: callExpr))) } else { - return CodeBlockItemSyntax(item: .init(DeclSyntax("let ret = \(raw: callExpr)"))) + switch returnType { + case .swiftProtocol(let protocolName): + let wrapperName = "Any\(protocolName)" + return CodeBlockItemSyntax( + item: .init(DeclSyntax("let ret = \(raw: callExpr) as! \(raw: wrapperName)")) + ) + case .optional(let wrappedType): + if case .swiftProtocol(let protocolName) = wrappedType { + let wrapperName = "Any\(protocolName)" + return CodeBlockItemSyntax( + item: .init( + DeclSyntax("let ret = (\(raw: callExpr)).flatMap { $0 as? \(raw: wrapperName) }") + ) + ) + } else { + return CodeBlockItemSyntax(item: .init(DeclSyntax("let ret = \(raw: callExpr)"))) + } + default: + return CodeBlockItemSyntax(item: .init(DeclSyntax("let ret = \(raw: callExpr)"))) + } } } @@ -1356,7 +1507,20 @@ public class ExportSwift { if returnType == .void { append("\(raw: name)") } else { - append("let ret = \(raw: name)") + switch returnType { + case .swiftProtocol(let protocolName): + let wrapperName = "Any\(protocolName)" + append("let ret = \(raw: name) as! \(raw: wrapperName)") + case .optional(let wrappedType): + if case .swiftProtocol(let protocolName) = wrappedType { + let wrapperName = "Any\(protocolName)" + append("let ret = \(raw: name).flatMap { $0 as? \(raw: wrapperName) }") + } else { + append("let ret = \(raw: name)") + } + default: + append("let ret = \(raw: name)") + } } } @@ -1374,7 +1538,20 @@ public class ExportSwift { if returnType == .void { append("\(raw: selfExpr).\(raw: propertyName)") } else { - append("let ret = \(raw: selfExpr).\(raw: propertyName)") + switch returnType { + case .swiftProtocol(let protocolName): + let wrapperName = "Any\(protocolName)" + append("let ret = \(raw: selfExpr).\(raw: propertyName) as! \(raw: wrapperName)") + case .optional(let wrappedType): + if case .swiftProtocol(let protocolName) = wrappedType { + let wrapperName = "Any\(protocolName)" + append("let ret = \(raw: selfExpr).\(raw: propertyName).flatMap { $0 as? \(raw: wrapperName) }") + } else { + append("let ret = \(raw: selfExpr).\(raw: propertyName)") + } + default: + append("let ret = \(raw: selfExpr).\(raw: propertyName)") + } } } @@ -1930,6 +2107,90 @@ public class ExportSwift { } """ } + + /// Generates an AnyProtocol wrapper struct for a protocol + /// + /// Creates a struct that wraps a JSObject and implements protocol methods + /// by calling `@_extern(wasm)` functions that forward to JavaScript + func renderProtocolWrapper(protocol proto: ExportedProtocol) throws -> DeclSyntax { + let wrapperName = "Any\(proto.name)" + let protocolName = proto.name + + var methodDecls: [DeclSyntax] = [] + + for method in proto.methods { + var swiftParams: [String] = [] + for param in method.parameters { + let label = param.label ?? param.name + if label == param.name { + swiftParams.append("\(param.name): \(param.type.swiftType)") + } else { + swiftParams.append("\(label) \(param.name): \(param.type.swiftType)") + } + } + + var externParams: [String] = ["this: Int32"] + for param in method.parameters { + let loweringInfo = try param.type.loweringParameterInfo() + assert( + loweringInfo.loweredParameters.count == 1, + "Protocol parameters must lower to a single WASM type" + ) + let (_, wasmType) = loweringInfo.loweredParameters[0] + externParams.append("\(param.name): \(wasmType.swiftType)") + } + + var callArgs: [String] = ["this: Int32(bitPattern: jsObject.id)"] + for param in method.parameters { + callArgs.append("\(param.name): \(param.name).bridgeJSLowerParameter()") + } + + let returnTypeStr: String + let externReturnType: String + let callCode: DeclSyntax + + if method.returnType == .void { + returnTypeStr = "" + externReturnType = "" + callCode = """ + _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + """ + } else { + returnTypeStr = " -> \(method.returnType.swiftType)" + let liftingInfo = try method.returnType.liftingReturnInfo() + if let abiType = liftingInfo.valueToLift { + externReturnType = " -> \(abiType.swiftType)" + } else { + externReturnType = "" + } + callCode = """ + let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) + """ + } + let methodImplementation: DeclSyntax = """ + func \(raw: method.name)(\(raw: swiftParams.joined(separator: ", ")))\(raw: returnTypeStr) { + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: method.abiName)") + func _extern_\(raw: method.name)(\(raw: externParams.joined(separator: ", ")))\(raw: externReturnType) + \(raw: callCode) + } + """ + + methodDecls.append(methodImplementation) + } + + return """ + struct \(raw: wrapperName): \(raw: protocolName), _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + \(raw: methodDecls.map { $0.description }.joined(separator: "\n\n")) + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) + } + } + """ + } } fileprivate enum Constants { @@ -1994,6 +2255,7 @@ extension BridgeType { case .jsObject(nil): return "JSObject" case .jsObject(let name?): return name case .swiftHeapObject(let name): return name + case .swiftProtocol(let name): return "Any\(name)" case .void: return "Void" case .optional(let wrappedType): return "Optional<\(wrappedType.swiftType)>" case .caseEnum(let name): return name @@ -2029,6 +2291,7 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .swiftHeapObject: return .swiftHeapObject + case .swiftProtocol: return .jsObject case .void: return .void case .optional(let wrappedType): var optionalParams: [(name: String, type: WasmCoreType)] = [("isSome", .i32)] @@ -2081,6 +2344,7 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .swiftHeapObject: return .swiftHeapObject + case .swiftProtocol: return .jsObject case .void: return .void case .optional: return .optional case .caseEnum: return .caseEnum diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index abacddd0b..64e89d66b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -435,6 +435,8 @@ extension BridgeType { case .void: return .void case .swiftHeapObject: throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures") + case .swiftProtocol: + throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .optional: @@ -465,6 +467,8 @@ extension BridgeType { case .void: return .void case .swiftHeapObject: throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures") + case .swiftProtocol: + throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .optional: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 087cf17df..88f2af3d7 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -240,7 +240,9 @@ struct BridgeJSLink { enumPropertyPrinter.write("},") if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) ) @@ -300,6 +302,29 @@ struct BridgeJSLink { data.importObjectBuilders.append(importObjectBuilder) } + for skeleton in exportedSkeletons { + if !skeleton.protocols.isEmpty { + let importObjectBuilder: ImportObjectBuilder + if let existingBuilder = data.importObjectBuilders.first(where: { $0.moduleName == skeleton.moduleName } + ) { + importObjectBuilder = existingBuilder + } else { + importObjectBuilder = ImportObjectBuilder(moduleName: skeleton.moduleName) + data.importObjectBuilders.append(importObjectBuilder) + } + + for proto in skeleton.protocols { + for method in proto.methods { + try renderProtocolMethod( + importObjectBuilder: importObjectBuilder, + protocol: proto, + method: method + ) + } + } + } + } + return data } @@ -572,6 +597,22 @@ struct BridgeJSLink { """ let printer = CodeFragmentPrinter(header: header) printer.nextLine() + + for skeleton in exportedSkeletons { + for proto in skeleton.protocols { + printer.write("export interface \(proto.name) {") + printer.indent { + for method in proto.methods { + printer.write( + "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" + ) + } + } + printer.write("}") + printer.nextLine() + } + } + printer.write(lines: data.topLevelDtsEnumLines) // Generate Object types for const-style enums @@ -1468,7 +1509,9 @@ extension BridgeJSLink { if !property.isReadonly { // Generate setter - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) ) @@ -1539,7 +1582,9 @@ extension BridgeJSLink { if !property.isReadonly { // Generate setter - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) ) @@ -1704,7 +1749,9 @@ extension BridgeJSLink { // Generate static property setter if not readonly if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) ) @@ -1752,7 +1799,9 @@ extension BridgeJSLink { // Generate instance property setter if not readonly if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) setterThunkBuilder.lowerSelf() try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) @@ -2367,6 +2416,25 @@ extension BridgeJSLink { ) return (funcLines, []) } + + func renderProtocolMethod( + importObjectBuilder: ImportObjectBuilder, + protocol: ExportedProtocol, + method: ExportedFunction + ) throws { + let thunkBuilder = ImportedThunkBuilder() + thunkBuilder.liftSelf() + for param in method.parameters { + try thunkBuilder.liftParameter(param: param) + } + let returnExpr = try thunkBuilder.callMethod(name: method.name, returnType: method.returnType) + let funcLines = thunkBuilder.renderFunction( + name: method.abiName, + returnExpr: returnExpr, + returnType: method.returnType + ) + importObjectBuilder.assignToImportObject(name: method.abiName, function: funcLines) + } } struct BridgeJSLinkError: Error { @@ -2402,6 +2470,8 @@ extension BridgeType { return "\(name)Tag" case .namespaceEnum(let name): return name + case .swiftProtocol(let name): + return name } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9d0d91624..ef431432f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -297,6 +297,25 @@ struct IntrinsicJSFragment: Sendable { switch wrappedType { case .swiftHeapObject: return ["+\(isSomeVar)", "\(isSomeVar) ? \(value).pointer : 0"] + case .swiftProtocol: + return [ + "+\(isSomeVar)", + "\(isSomeVar) ? \(JSGlueVariableScope.reservedSwift).memory.retain(\(value)) : 0", + ] + case .jsObject: + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + } + printer.write("}") + cleanupCode.write("if (\(idVar) !== undefined) {") + cleanupCode.indent { + cleanupCode.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + } + cleanupCode.write("}") + return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0"] default: return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] } @@ -326,6 +345,9 @@ struct IntrinsicJSFragment: Sendable { case .string: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") + case .jsObject, .swiftProtocol: + printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") case .swiftHeapObject(let className): let pointerVar = scope.variable("pointer") printer.write( @@ -397,6 +419,7 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return .jsObjectLowerParameter case .swiftHeapObject: return .swiftHeapObjectLowerParameter + case .swiftProtocol: return .jsObjectLowerParameter case .void: return .void case .optional(let wrappedType): return try .optionalLowerParameter(wrappedType: wrappedType) @@ -422,6 +445,7 @@ struct IntrinsicJSFragment: Sendable { case .string: return .stringLiftReturn case .jsObject: return .jsObjectLiftReturn case .swiftHeapObject(let name): return .swiftHeapObjectLiftReturn(name) + case .swiftProtocol: return .jsObjectLiftReturn case .void: return .void case .optional(let wrappedType): return .optionalLiftReturn(wrappedType: wrappedType) case .caseEnum: return .identity @@ -455,6 +479,7 @@ struct IntrinsicJSFragment: Sendable { message: "Swift heap objects are not supported to be passed as parameters to imported JS functions: \(name)" ) + case .swiftProtocol: return .jsObjectLiftParameter case .void: throw BridgeJSLinkError( message: "Void can't appear in parameters of imported JS functions" @@ -494,6 +519,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Swift heap objects are not supported to be returned from imported JS functions" ) + case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .optional(let wrappedType): throw BridgeJSLinkError( diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 845957828..1a414b956 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -74,6 +74,7 @@ public enum BridgeType: Codable, Equatable, Sendable { case rawValueEnum(String, SwiftEnumRawType) case associatedValueEnum(String) case namespaceEnum(String) + case swiftProtocol(String) } public enum WasmCoreType: String, Codable, Sendable { @@ -269,6 +270,18 @@ public enum EnumType: String, Codable, Sendable { // MARK: - Exported Skeleton +public struct ExportedProtocol: Codable, Equatable { + public let name: String + public let methods: [ExportedFunction] + public let namespace: [String]? + + public init(name: String, methods: [ExportedFunction], namespace: [String]? = nil) { + self.name = name + self.methods = methods + self.namespace = namespace + } +} + public struct ExportedFunction: Codable, Equatable, Sendable { public var name: String public var abiName: String @@ -407,12 +420,20 @@ public struct ExportedSkeleton: Codable { public let functions: [ExportedFunction] public let classes: [ExportedClass] public let enums: [ExportedEnum] + public let protocols: [ExportedProtocol] - public init(moduleName: String, functions: [ExportedFunction], classes: [ExportedClass], enums: [ExportedEnum]) { + public init( + moduleName: String, + functions: [ExportedFunction], + classes: [ExportedClass], + enums: [ExportedEnum], + protocols: [ExportedProtocol] = [] + ) { self.moduleName = moduleName self.functions = functions self.classes = classes self.enums = enums + self.protocols = protocols } } @@ -514,6 +535,9 @@ extension BridgeType { return nil case .namespaceEnum: return nil + case .swiftProtocol: + // Protocols pass JSObject IDs as Int32 + return .i32 } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift new file mode 100644 index 000000000..f02133692 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -0,0 +1,41 @@ +import JavaScriptKit + +@JS protocol MyViewControllerDelegate { + func onSomethingHappened() + func onValueChanged(_ value: String) + func onCountUpdated(count: Int) -> Bool + func onLabelUpdated(_ prefix: String, _ suffix: String) + func isCountEven() -> Bool +} + +@JS class MyViewController { + @JS + var delegate: MyViewControllerDelegate + + @JS + var secondDelegate: MyViewControllerDelegate? + + @JS init(delegate: MyViewControllerDelegate) { + self.delegate = delegate + } + + @JS func triggerEvent() { + delegate.onSomethingHappened() + } + + @JS func updateValue(_ value: String) { + delegate.onValueChanged(value) + } + + @JS func updateCount(_ count: Int) -> Bool { + return delegate.onCountUpdated(count: count) + } + + @JS func updateLabel(_ prefix: String, _ suffix: String) { + delegate.onLabelUpdated(prefix, suffix) + } + + @JS func checkEvenCount() -> Bool { + return delegate.isCountEven() + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts new file mode 100644 index 000000000..0f5d0fb20 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -0,0 +1,44 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface MyViewControllerDelegate { + onSomethingHappened(): void; + onValueChanged(value: string): void; + onCountUpdated(count: number): boolean; + onLabelUpdated(prefix: string, suffix: string): void; + isCountEven(): boolean; +} + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface MyViewController extends SwiftHeapObject { + triggerEvent(): void; + updateValue(value: string): void; + updateCount(count: number): boolean; + updateLabel(prefix: string, suffix: string): void; + checkEvenCount(): boolean; + delegate: MyViewControllerDelegate; + secondDelegate: MyViewControllerDelegate | null; +} +export type Exports = { + MyViewController: { + new(delegate: MyViewControllerDelegate): MyViewController; + } +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js new file mode 100644 index 000000000..142c1cf0b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -0,0 +1,286 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + const bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_MyViewController_wrap"] = function(pointer) { + const obj = MyViewController.__construct(pointer); + return swift.memory.retain(obj); + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_MyViewControllerDelegate_onSomethingHappened"] = function bjs_MyViewControllerDelegate_onSomethingHappened(self) { + try { + swift.memory.getObject(self).onSomethingHappened(); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_onValueChanged"] = function bjs_MyViewControllerDelegate_onValueChanged(self, value) { + try { + const valueObject = swift.memory.getObject(value); + swift.memory.release(value); + swift.memory.getObject(self).onValueChanged(valueObject); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_onCountUpdated"] = function bjs_MyViewControllerDelegate_onCountUpdated(self, count) { + try { + let ret = swift.memory.getObject(self).onCountUpdated(count); + return ret ? 1 : 0; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_onLabelUpdated"] = function bjs_MyViewControllerDelegate_onLabelUpdated(self, prefix, suffix) { + try { + const prefixObject = swift.memory.getObject(prefix); + swift.memory.release(prefix); + const suffixObject = swift.memory.getObject(suffix); + swift.memory.release(suffix); + swift.memory.getObject(self).onLabelUpdated(prefixObject, suffixObject); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_isCountEven"] = function bjs_MyViewControllerDelegate_isCountEven(self) { + try { + let ret = swift.memory.getObject(self).isCountEven(); + return ret ? 1 : 0; + } catch (error) { + setException(error); + return 0 + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class MyViewController extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MyViewController_deinit, MyViewController.prototype); + } + + constructor(delegate) { + const ret = instance.exports.bjs_MyViewController_init(swift.memory.retain(delegate)); + return MyViewController.__construct(ret); + } + triggerEvent() { + instance.exports.bjs_MyViewController_triggerEvent(this.pointer); + } + updateValue(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_MyViewController_updateValue(this.pointer, valueId, valueBytes.length); + swift.memory.release(valueId); + } + updateCount(count) { + const ret = instance.exports.bjs_MyViewController_updateCount(this.pointer, count); + return ret !== 0; + } + updateLabel(prefix, suffix) { + const prefixBytes = textEncoder.encode(prefix); + const prefixId = swift.memory.retain(prefixBytes); + const suffixBytes = textEncoder.encode(suffix); + const suffixId = swift.memory.retain(suffixBytes); + instance.exports.bjs_MyViewController_updateLabel(this.pointer, prefixId, prefixBytes.length, suffixId, suffixBytes.length); + swift.memory.release(prefixId); + swift.memory.release(suffixId); + } + checkEvenCount() { + const ret = instance.exports.bjs_MyViewController_checkEvenCount(this.pointer); + return ret !== 0; + } + get delegate() { + const ret = instance.exports.bjs_MyViewController_delegate_get(this.pointer); + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } + set delegate(value) { + instance.exports.bjs_MyViewController_delegate_set(this.pointer, swift.memory.retain(value)); + } + get secondDelegate() { + instance.exports.bjs_MyViewController_secondDelegate_get(this.pointer); + const optResult = tmpRetString; + tmpRetString = undefined; + return optResult; + } + set secondDelegate(value) { + const isSome = value != null; + instance.exports.bjs_MyViewController_secondDelegate_set(this.pointer, +isSome, isSome ? swift.memory.retain(value) : 0); + } + } + return { + MyViewController, + }; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json index b9f863571..41696d635 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json @@ -174,5 +174,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index edfd4e577..05d71b5f8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -642,5 +642,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index 6a9cf04c0..c75e7d856 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -782,5 +782,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json index 1184b4b08..825b41050 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json @@ -306,5 +306,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 673cfcccb..0b94c1c5d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -396,5 +396,8 @@ "functions" : [ ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json index 334c8f055..b5da17265 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json @@ -1476,5 +1476,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json index 87684f133..dc6134526 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json @@ -172,5 +172,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json index aef4e8905..104b11d5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json @@ -689,5 +689,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json index 10638ebf3..e54d0ad53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json @@ -59,5 +59,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json index b1f89765b..99c5aff05 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json @@ -75,5 +75,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json index 8de3a12d4..946411036 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json @@ -350,5 +350,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json new file mode 100644 index 000000000..77327c454 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -0,0 +1,305 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_MyViewController_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "delegate", + "name" : "delegate", + "type" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_MyViewController_triggerEvent", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "triggerEvent", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateCount", + "parameters" : [ + { + "label" : "_", + "name" : "count", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateLabel", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_checkEvenCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEvenCount", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "MyViewController", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "delegate", + "type" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "secondDelegate", + "type" : { + "optional" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "swiftCallName" : "MyViewController" + } + ], + "enums" : [ + + ], + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_MyViewControllerDelegate_onSomethingHappened", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onSomethingHappened", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onValueChanged", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onValueChanged", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onCountUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onCountUpdated", + "parameters" : [ + { + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onLabelUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onLabelUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_isCountEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isCountEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "MyViewControllerDelegate" + } + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift new file mode 100644 index 000000000..6ac515c7d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -0,0 +1,174 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + func onSomethingHappened() { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") + func _extern_onSomethingHappened(this: Int32) + _extern_onSomethingHappened(this: Int32(bitPattern: jsObject.id)) + } + + func onValueChanged(_ value: String) { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") + func _extern_onValueChanged(this: Int32, value: Int32) + _extern_onValueChanged(this: Int32(bitPattern: jsObject.id), value: value.bridgeJSLowerParameter()) + } + + func onCountUpdated(count: Int) -> Bool { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") + func _extern_onCountUpdated(this: Int32, count: Int32) -> Int32 + let ret = _extern_onCountUpdated(this: Int32(bitPattern: jsObject.id), count: count.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(ret) + } + + func onLabelUpdated(_ prefix: String, _ suffix: String) { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") + func _extern_onLabelUpdated(this: Int32, prefix: Int32, suffix: Int32) + _extern_onLabelUpdated(this: Int32(bitPattern: jsObject.id), prefix: prefix.bridgeJSLowerParameter(), suffix: suffix.bridgeJSLowerParameter()) + } + + func isCountEven() -> Bool { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") + func _extern_isCountEven(this: Int32) -> Int32 + let ret = _extern_isCountEven(this: Int32(bitPattern: jsObject.id)) + return Bool.bridgeJSLiftReturn(ret) + } + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +@_expose(wasm, "bjs_MyViewController_init") +@_cdecl("bjs_MyViewController_init") +public func _bjs_MyViewController_init(delegate: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = MyViewController(delegate: AnyMyViewControllerDelegate.bridgeJSLiftParameter(delegate)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_triggerEvent") +@_cdecl("bjs_MyViewController_triggerEvent") +public func _bjs_MyViewController_triggerEvent(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).triggerEvent() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_updateValue") +@_cdecl("bjs_MyViewController_updateValue") +public func _bjs_MyViewController_updateValue(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).updateValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_updateCount") +@_cdecl("bjs_MyViewController_updateCount") +public func _bjs_MyViewController_updateCount(_self: UnsafeMutableRawPointer, count: Int32) -> Int32 { + #if arch(wasm32) + let ret = MyViewController.bridgeJSLiftParameter(_self).updateCount(_: Int.bridgeJSLiftParameter(count)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_updateLabel") +@_cdecl("bjs_MyViewController_updateLabel") +public func _bjs_MyViewController_updateLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).updateLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_checkEvenCount") +@_cdecl("bjs_MyViewController_checkEvenCount") +public func _bjs_MyViewController_checkEvenCount(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = MyViewController.bridgeJSLiftParameter(_self).checkEvenCount() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_delegate_get") +@_cdecl("bjs_MyViewController_delegate_get") +public func _bjs_MyViewController_delegate_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = MyViewController.bridgeJSLiftParameter(_self).delegate as! AnyMyViewControllerDelegate + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_delegate_set") +@_cdecl("bjs_MyViewController_delegate_set") +public func _bjs_MyViewController_delegate_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).delegate = AnyMyViewControllerDelegate.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_secondDelegate_get") +@_cdecl("bjs_MyViewController_secondDelegate_get") +public func _bjs_MyViewController_secondDelegate_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate.flatMap { + $0 as? AnyMyViewControllerDelegate + } + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_secondDelegate_set") +@_cdecl("bjs_MyViewController_secondDelegate_set") +public func _bjs_MyViewController_secondDelegate_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).secondDelegate = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_deinit") +@_cdecl("bjs_MyViewController_deinit") +public func _bjs_MyViewController_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension MyViewController: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_MyViewController_wrap") + func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_MyViewController_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index 8a73c1b8b..cbd0fa2b8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -322,5 +322,8 @@ "functions" : [ ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index 4808e5184..63de88b99 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -326,5 +326,8 @@ "functions" : [ ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json index 55972aa19..cf6b0025e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json @@ -57,5 +57,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json index 5d727c858..f34a04f9b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json @@ -24,5 +24,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json index 59b7f9ef9..fc99462b7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json @@ -132,5 +132,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json index 51d548e64..d85339150 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json @@ -24,5 +24,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json index f3f7abaa4..df3f5041f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json @@ -24,5 +24,8 @@ } } ], - "moduleName" : "TestModule" + "moduleName" : "TestModule", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index d8ddf8fd5..4742aa629 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -301,6 +301,21 @@ extension _JSBridgedClass { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } } +/// A protocol that Swift protocol wrappers exposed from JavaScript must conform to. +/// +/// The conformance is automatically synthesized by the BridgeJS code generator. +public protocol _BridgedSwiftProtocolWrapper { + var jsObject: JSObject { get } + static func bridgeJSLiftParameter(_ value: Int32) -> Self +} + +extension _BridgedSwiftProtocolWrapper { + // MARK: ExportSwift + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { + jsObject.bridgeJSLowerReturn() + } +} + /// A protocol that Swift enum types that do not have a payload can conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. @@ -603,6 +618,56 @@ extension Optional where Wrapped == JSObject { } } +extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { + // MARK: ImportTS + + @available( + *, + unavailable, + message: "Optional protocol types are not supported to be passed to imported JS functions" + ) + @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} + + @available( + *, + unavailable, + message: "Optional protocol types are not supported to be passed to imported JS functions" + ) + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ objectId: Int32) -> Wrapped? { + return nil + } + + // MARK: ExportSwift + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Wrapped? { + if isSome == 0 { + return nil + } else { + return Wrapped.bridgeJSLiftParameter(objectId) + } + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_return_optional_object") + func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) + #else + /// Write an optional protocol wrapper to reserved storage to be returned to JavaScript + func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) { + _onlyAvailableOnWasm() + } + #endif + + switch consume self { + case .none: + _swift_js_return_optional_object(0, 0) + case .some(let wrapper): + let retainedId = wrapper.bridgeJSLowerReturn() + _swift_js_return_optional_object(1, retainedId) + } + } +} + /// Optional support for Swift heap objects extension Optional where Wrapped: _BridgedSwiftHeapObject { // MARK: ImportTS diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md index 05be58faf..dbdfba785 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md @@ -66,6 +66,7 @@ This command will: - - - +- - - - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md new file mode 100644 index 000000000..802ff3aeb --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -0,0 +1,209 @@ +# Exporting Swift Protocols + +Learn how to expose Swift protocols to JavaScript as TypeScript interfaces. + +## Overview + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +BridgeJS allows you to export Swift protocols as TypeScript interfaces. JavaScript objects implementing these interfaces can be passed to Swift code, enabling protocol-oriented design across the Swift-JavaScript boundary. + +When you mark a protocol with `@JS`, BridgeJS generates: + +- A TypeScript interface with the protocol's method signatures +- A Swift wrapper struct (`Any{ProtocolName}`) that conforms to the protocol and bridges calls to JavaScript objects + +## Example: Counter Protocol + +Mark a Swift protocol with `@JS` to expose it: + +```swift +import JavaScriptKit + +@JS protocol Counter { + func increment(by amount: Int) + func reset() + func getValue() -> Int +} + +@JS class CounterManager { + var delegate: Counter + + @JS init(delegate: Counter) { + self.delegate = delegate + } + + @JS func incrementTwice() { + delegate.increment(by: 1) + delegate.increment(by: 1) + } + + @JS func getCurrentValue() -> Int { + return delegate.getValue() + } +} +``` + +In JavaScript: + +```javascript +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; +const { exports } = await init({}); + +// Implement the Counter protocol +const counterImpl = { + count: 0, + increment(amount) { + this.count += amount; + }, + reset() { + this.count = 0; + }, + getValue() { + return this.count; + } +}; + +// Pass the implementation to Swift +const manager = new exports.CounterManager(counterImpl); +manager.incrementTwice(); +console.log(manager.getCurrentValue()); // 2 +``` + +The generated TypeScript interface: + +```typescript +export interface Counter { + increment(amount: number): void; + reset(): void; + getValue(): number; +} + +export type Exports = { + CounterManager: { + new(delegate: Counter): CounterManager; + } +} +``` + +## Generated Wrapper + +BridgeJS generates a Swift wrapper struct for each `@JS` protocol. This wrapper holds a `JSObject` reference and forwards protocol method calls to the JavaScript implementation: + +```swift +struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + func increment(by amount: Int) { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") + func _extern_increment(this: Int32, amount: Int32) + _extern_increment( + this: Int32(bitPattern: jsObject.id), + amount: amount.bridgeJSLowerParameter() + ) + } + + func reset() { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_reset") + func _extern_reset(this: Int32) + _extern_reset(this: Int32(bitPattern: jsObject.id)) + } + + func getValue() -> Int { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_getValue") + func _extern_getValue(this: Int32) -> Int32 + let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} +``` + +## Swift Implementation + +You can also implement protocols in Swift and use them from JavaScript: + +```swift +@JS protocol Counter { + func increment(by amount: Int) + func reset() + func getValue() -> Int +} + +final class SwiftCounter: Counter { + private var count = 0 + + func increment(by amount: Int) { + count += amount + } + + func reset() { + count = 0 + } + + func getValue() -> Int { + return count + } +} + +@JS func createCounter() -> Counter { + return SwiftCounter() +} +``` + +From JavaScript: + +```javascript +const counter = exports.createCounter(); +counter.increment(5); +counter.increment(3); +console.log(counter.getValue()); // 8 +counter.reset(); +console.log(counter.getValue()); // 0 +``` + +## How It Works + +When you pass a JavaScript object implementing a protocol to Swift: + +1. **JavaScript Side**: The object is stored in JavaScriptKit's memory heap and its ID is passed as an `Int32` to Swift +2. **Swift Side**: BridgeJS creates an `Any{ProtocolName}` wrapper that holds a `JSObject` reference +3. **Method Calls**: Protocol method calls are forwarded through WASM to the JavaScript implementation +4. **Memory Management**: The `JSObject` reference keeps the JavaScript object alive using JavaScriptKit's retain/release system. When the Swift wrapper is deallocated, the JavaScript object is automatically released. + +## Supported Features + +| Swift Feature | Status | +|:--------------|:-------| +| Method requirements: `func method()` | ✅ | +| Method requirements with parameters | ✅ | +| Method requirements with return values | ✅ | +| Throwing method requirements: `func method() throws(JSException)` | ✅ | +| Async method requirements: `func method() async` | ✅ | +| Optional protocol methods | ❌ | +| Property requirements: `var property: Type { get }` | ❌ | +| Property requirements: `var property: Type { get set }` | ❌ | +| Associated types | ❌ | +| Protocol inheritance | ❌ | +| Protocol composition: `Protocol1 & Protocol2` | ❌ | +| Generics | ❌ | + +### Type Support for Protocol Method Parameters and Return Types + +Protocol method parameters and return values have more limited type support compared to regular exported Swift functions and classes. + +**Supported Types:** +- Primitives: `Bool`, `Int`, `Float`, `Double` +- `String` +- `JSObject` + +**Not Supported:** +- `@JS class` types +- `@JS enum` types (case, raw value, or associated value) +- `@JS protocol` types +- Optional types: `Int?`, `String?`, etc. + +> Note: For regular `@JS func` and `@JS class` exports (not within protocols), all these types including optionals, enums, and classes are fully supported. See and for more information. diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 3336801de..b6255a4ef 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -857,6 +857,87 @@ enum APIOptionalResult { "const:\(StaticPropertyHolder.staticConstant),var:\(StaticPropertyHolder.staticVariable),computed:\(StaticPropertyHolder.computedProperty),readonly:\(StaticPropertyHolder.readOnlyComputed)" } +// MARK: - Protocol Tests + +@JS protocol Counter { + func increment(by amount: Int) + func getValue() -> Int + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) + func getLabel() -> String + func isEven() -> Bool +} + +@JS class CounterManager { + + @JS var counter: Counter + @JS var backupCounter: Counter? + + @JS init(counter: Counter) { + self.counter = counter + self.backupCounter = nil + } + + @JS func incrementByAmount(_ amount: Int) { + counter.increment(by: amount) + } + + @JS func setCounterLabel(_ prefix: String, _ suffix: String) { + counter.setLabelElements(prefix, suffix) + } + + @JS func isCounterEven() -> Bool { + return counter.isEven() + } + + @JS func getCounterLabel() -> String { + return counter.getLabel() + } + + @JS func getCurrentValue() -> Int { + return counter.getValue() + } + + @JS func incrementBoth() { + counter.increment(by: 1) + backupCounter?.increment(by: 1) + } + + @JS func getBackupValue() -> Int? { + return backupCounter?.getValue() + } + + @JS func hasBackup() -> Bool { + return backupCounter != nil + } +} + +@JS class SwiftCounter: Counter { + private var value: Int = 0 + private var label: String = "" + + @JS init() {} + + @JS func increment(by amount: Int) { + value += amount + } + + @JS func getValue() -> Int { + return value + } + + @JS func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { + self.label = labelPrefix + labelSuffix + } + + @JS func getLabel() -> String { + return label + } + + @JS func isEven() -> Bool { + return value % 2 == 0 + } +} + class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 0eff4e0b7..1e22c2b09 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,6 +6,47 @@ @_spi(BridgeJS) import JavaScriptKit +struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + func increment(by amount: Int) { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_increment") + func _extern_increment(this: Int32, amount: Int32) + _extern_increment(this: Int32(bitPattern: jsObject.id), amount: amount.bridgeJSLowerParameter()) + } + + func getValue() -> Int { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getValue") + func _extern_getValue(this: Int32) -> Int32 + let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_setLabelElements") + func _extern_setLabelElements(this: Int32, labelPrefix: Int32, labelSuffix: Int32) + _extern_setLabelElements(this: Int32(bitPattern: jsObject.id), labelPrefix: labelPrefix.bridgeJSLowerParameter(), labelSuffix: labelSuffix.bridgeJSLowerParameter()) + } + + func getLabel() -> String { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getLabel") + func _extern_getLabel(this: Int32) -> Int32 + let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) + return String.bridgeJSLiftReturn(ret) + } + + func isEven() -> Bool { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_isEven") + func _extern_isEven(this: Int32) -> Int32 + let ret = _extern_isEven(this: Int32(bitPattern: jsObject.id)) + return Bool.bridgeJSLiftReturn(ret) + } + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -3242,4 +3283,248 @@ extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } +} + +@_expose(wasm, "bjs_CounterManager_init") +@_cdecl("bjs_CounterManager_init") +public func _bjs_CounterManager_init(counter: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = CounterManager(counter: AnyCounter.bridgeJSLiftParameter(counter)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_incrementByAmount") +@_cdecl("bjs_CounterManager_incrementByAmount") +public func _bjs_CounterManager_incrementByAmount(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { + #if arch(wasm32) + CounterManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_setCounterLabel") +@_cdecl("bjs_CounterManager_setCounterLabel") +public func _bjs_CounterManager_setCounterLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { + #if arch(wasm32) + CounterManager.bridgeJSLiftParameter(_self).setCounterLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_isCounterEven") +@_cdecl("bjs_CounterManager_isCounterEven") +public func _bjs_CounterManager_isCounterEven(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).isCounterEven() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_getCounterLabel") +@_cdecl("bjs_CounterManager_getCounterLabel") +public func _bjs_CounterManager_getCounterLabel(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).getCounterLabel() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_getCurrentValue") +@_cdecl("bjs_CounterManager_getCurrentValue") +public func _bjs_CounterManager_getCurrentValue(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).getCurrentValue() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_incrementBoth") +@_cdecl("bjs_CounterManager_incrementBoth") +public func _bjs_CounterManager_incrementBoth(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + CounterManager.bridgeJSLiftParameter(_self).incrementBoth() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_getBackupValue") +@_cdecl("bjs_CounterManager_getBackupValue") +public func _bjs_CounterManager_getBackupValue(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).getBackupValue() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_hasBackup") +@_cdecl("bjs_CounterManager_hasBackup") +public func _bjs_CounterManager_hasBackup(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).hasBackup() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_counter_get") +@_cdecl("bjs_CounterManager_counter_get") +public func _bjs_CounterManager_counter_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).counter as! AnyCounter + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_counter_set") +@_cdecl("bjs_CounterManager_counter_set") +public func _bjs_CounterManager_counter_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + CounterManager.bridgeJSLiftParameter(_self).counter = AnyCounter.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_backupCounter_get") +@_cdecl("bjs_CounterManager_backupCounter_get") +public func _bjs_CounterManager_backupCounter_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = CounterManager.bridgeJSLiftParameter(_self).backupCounter.flatMap { + $0 as? AnyCounter + } + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_backupCounter_set") +@_cdecl("bjs_CounterManager_backupCounter_set") +public func _bjs_CounterManager_backupCounter_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { + #if arch(wasm32) + CounterManager.bridgeJSLiftParameter(_self).backupCounter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_CounterManager_deinit") +@_cdecl("bjs_CounterManager_deinit") +public func _bjs_CounterManager_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension CounterManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_CounterManager_wrap") + func _bjs_CounterManager_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_CounterManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_CounterManager_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_SwiftCounter_init") +@_cdecl("bjs_SwiftCounter_init") +public func _bjs_SwiftCounter_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = SwiftCounter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_increment") +@_cdecl("bjs_SwiftCounter_increment") +public func _bjs_SwiftCounter_increment(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { + #if arch(wasm32) + SwiftCounter.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_getValue") +@_cdecl("bjs_SwiftCounter_getValue") +public func _bjs_SwiftCounter_getValue(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).getValue() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_setLabelElements") +@_cdecl("bjs_SwiftCounter_setLabelElements") +public func _bjs_SwiftCounter_setLabelElements(_self: UnsafeMutableRawPointer, labelPrefixBytes: Int32, labelPrefixLength: Int32, labelSuffixBytes: Int32, labelSuffixLength: Int32) -> Void { + #if arch(wasm32) + SwiftCounter.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_getLabel") +@_cdecl("bjs_SwiftCounter_getLabel") +public func _bjs_SwiftCounter_getLabel(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).getLabel() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_isEven") +@_cdecl("bjs_SwiftCounter_isEven") +public func _bjs_SwiftCounter_isEven(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).isEven() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_deinit") +@_cdecl("bjs_SwiftCounter_deinit") +public func _bjs_SwiftCounter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension SwiftCounter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftCounter_wrap") + func _bjs_SwiftCounter_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_SwiftCounter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftCounter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 9af2ee957..a6be6754a 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1162,6 +1162,352 @@ } ], "swiftCallName" : "StaticPropertyHolder" + }, + { + "constructor" : { + "abiName" : "bjs_CounterManager_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "counter", + "name" : "counter", + "type" : { + "swiftProtocol" : { + "_0" : "Counter" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_CounterManager_incrementByAmount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "incrementByAmount", + "parameters" : [ + { + "label" : "_", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_setCounterLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setCounterLabel", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_isCounterEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isCounterEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_getCounterLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getCounterLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_getCurrentValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getCurrentValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_incrementBoth", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "incrementBoth", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_CounterManager_getBackupValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getBackupValue", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_CounterManager_hasBackup", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "hasBackup", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "CounterManager", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "counter", + "type" : { + "swiftProtocol" : { + "_0" : "Counter" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "backupCounter", + "type" : { + "optional" : { + "_0" : { + "swiftProtocol" : { + "_0" : "Counter" + } + } + } + } + } + ], + "swiftCallName" : "CounterManager" + }, + { + "constructor" : { + "abiName" : "bjs_SwiftCounter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_SwiftCounter_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + { + "label" : "by", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_getValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_setLabelElements", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setLabelElements", + "parameters" : [ + { + "label" : "_", + "name" : "labelPrefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "labelSuffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_getLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_isEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "SwiftCounter", + "properties" : [ + + ], + "swiftCallName" : "SwiftCounter" } ], "enums" : [ @@ -5435,5 +5781,122 @@ } } ], - "moduleName" : "BridgeJSRuntimeTests" + "moduleName" : "BridgeJSRuntimeTests", + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_Counter_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + { + "label" : "by", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_Counter_getValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_Counter_setLabelElements", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setLabelElements", + "parameters" : [ + { + "label" : "_", + "name" : "labelPrefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "labelSuffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_Counter_getLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Counter_isEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "Counter" + } + ] } \ No newline at end of file diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 7f5610273..e2d0c9806 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -683,6 +683,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.testComplexInit(), "Hello, DefaultGreeter!"); const customGreeter = new exports.Greeter("CustomName"); assert.equal(exports.testComplexInit(customGreeter), "Hello, CustomName!"); + customGreeter.release(); const cd1 = new exports.ConstructorDefaults(); @@ -704,6 +705,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const cd5 = new exports.ConstructorDefaults("Test", 99, false, exports.Status.Loading); assert.equal(cd5.describe(), "Test:99:false:loading:nil"); cd5.release(); + + testProtocolSupport(exports); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ @@ -802,4 +805,104 @@ function setupTestGlobals(global) { sym: Symbol("s"), bi: BigInt(3) }; -} \ No newline at end of file +} + +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function testProtocolSupport(exports) { + let counterValue = 0; + let counterLabel = ""; + const jsCounter = { + increment(amount) { counterValue += amount; }, + getValue() { return counterValue; }, + setLabelElements(labelPrefix, labelSuffix) { counterLabel = labelPrefix + labelSuffix; }, + getLabel() { return counterLabel; }, + isEven() { return counterValue % 2 === 0; } + }; + + const manager = new exports.CounterManager(jsCounter); + manager.incrementByAmount(4); + assert.equal(manager.getCurrentValue(), 4); + + manager.setCounterLabel("Test", "Label"); + assert.equal(manager.getCounterLabel(), "TestLabel"); + assert.equal(jsCounter.getLabel(), "TestLabel"); + + assert.equal(manager.isCounterEven(), true); + manager.incrementByAmount(1); + assert.equal(manager.isCounterEven(), false); + assert.equal(jsCounter.isEven(), false); + + jsCounter.increment(3); + assert.equal(jsCounter.getValue(), 8); + manager.release(); + + const swiftCounter = new exports.SwiftCounter(); + const swiftManager = new exports.CounterManager(swiftCounter); + + swiftManager.incrementByAmount(10); + assert.equal(swiftManager.getCurrentValue(), 10); + + swiftManager.setCounterLabel("Swift", "Label"); + assert.equal(swiftManager.getCounterLabel(), "SwiftLabel"); + + swiftCounter.increment(5); + assert.equal(swiftCounter.getValue(), 15); + swiftManager.release(); + swiftCounter.release(); + + let optionalCounterValue = 100; + let optionalCounterLabel = "optional"; + const optionalCounter = { + increment(amount) { optionalCounterValue += amount; }, + getValue() { return optionalCounterValue; }, + setLabelElements(labelPrefix, labelSuffix) { optionalCounterLabel = labelPrefix + labelSuffix; }, + getLabel() { return optionalCounterLabel; }, + isEven() { return optionalCounterValue % 2 === 0; } + }; + + let mainCounterValue = 0; + let mainCounterLabel = "main"; + const mainCounter = { + increment(amount) { mainCounterValue += amount; }, + getValue() { return mainCounterValue; }, + setLabelElements(labelPrefix, labelSuffix) { mainCounterLabel = labelPrefix + labelSuffix; }, + getLabel() { return mainCounterLabel; }, + isEven() { return mainCounterValue % 2 === 0; } + }; + + const managerWithOptional = new exports.CounterManager(mainCounter); + + assert.equal(managerWithOptional.backupCounter, null); + assert.equal(managerWithOptional.hasBackup(), false); + assert.equal(managerWithOptional.getBackupValue(), null); + + managerWithOptional.backupCounter = optionalCounter; + assert.notEqual(managerWithOptional.backupCounter, null); + assert.equal(managerWithOptional.hasBackup(), true); + + managerWithOptional.incrementBoth(); + assert.equal(managerWithOptional.getCurrentValue(), 1); + assert.equal(managerWithOptional.getBackupValue(), 101); + + managerWithOptional.incrementBoth(); + assert.equal(managerWithOptional.getCurrentValue(), 2); + assert.equal(managerWithOptional.getBackupValue(), 102); + + managerWithOptional.backupCounter = null; + assert.equal(managerWithOptional.backupCounter, null); + assert.equal(managerWithOptional.hasBackup(), false); + + managerWithOptional.incrementBoth(); + assert.equal(managerWithOptional.getCurrentValue(), 3); + assert.equal(managerWithOptional.getBackupValue(), null); + + const swiftBackupCounter = new exports.SwiftCounter(); + swiftBackupCounter.increment(1); + managerWithOptional.backupCounter = swiftBackupCounter; + + assert.equal(managerWithOptional.hasBackup(), true); + assert.equal(managerWithOptional.getBackupValue(), 1); + + managerWithOptional.release(); + swiftBackupCounter.release(); +} From f60bfd699898fbb33d05a397286e255f31433c5d Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Sat, 18 Oct 2025 09:34:07 +0200 Subject: [PATCH 002/252] adds a --platform flag to js to control the target platform of the generated code --- Plugins/PackageToJS/Sources/PackageToJS.swift | 3 +++ .../PackageToJS/Sources/PackageToJSPlugin.swift | 3 +++ Plugins/PackageToJS/Templates/index.js | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index c486c327a..d969620ed 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -8,6 +8,8 @@ struct PackageToJS { var configuration: String? /// Name of the package (default: lowercased Package.swift name) var packageName: String? + /// Target platform for the generated JavaScript (default: browser) + var platform: String? /// Whether to explain the build plan (default: false) var explain: Bool = false /// Whether to print verbose output @@ -717,6 +719,7 @@ struct PackagingPlanner { "USE_WASI_CDN": options.useCDN, "HAS_BRIDGE": exportedSkeletons.count > 0 || importedSkeletons.count > 0, "HAS_IMPORTS": importedSkeletons.count > 0, + "TARGET_PLATFORM_NODE": options.platform == "node", ] let constantSubstitutions: [String: String] = [ "PACKAGE_TO_JS_MODULE_PATH": wasmFilename, diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index dc9958b97..054bc4724 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -446,6 +446,7 @@ extension PackageToJS.PackageOptions { let configuration: String? = (extractor.extractOption(named: "configuration") + extractor.extractSingleDashOption(named: "c")).last let packageName = extractor.extractOption(named: "package-name").last + let platform = extractor.extractOption(named: "platform").last let explain = extractor.extractFlag(named: "explain") let useCDN = extractor.extractFlag(named: "use-cdn") let verbose = extractor.extractFlag(named: "verbose") @@ -454,6 +455,7 @@ extension PackageToJS.PackageOptions { outputPath: outputPath, configuration: configuration, packageName: packageName, + platform: platform, explain: explain != 0, verbose: verbose != 0, useCDN: useCDN != 0, @@ -466,6 +468,7 @@ extension PackageToJS.PackageOptions { --output Path to the output directory (default: .build/plugins/PackageToJS/outputs/Package) -c, --configuration The build configuration to use (values: debug, release; default: debug) --package-name Name of the package (default: lowercased Package.swift name) + --platform Target platform for generated JavaScript (values: browser, node; default: browser) --use-cdn Whether to use CDN for dependency packages --enable-code-coverage Whether to enable code coverage collection --explain Whether to explain the build plan diff --git a/Plugins/PackageToJS/Templates/index.js b/Plugins/PackageToJS/Templates/index.js index f44dce480..e482b8d4c 100644 --- a/Plugins/PackageToJS/Templates/index.js +++ b/Plugins/PackageToJS/Templates/index.js @@ -1,9 +1,24 @@ // @ts-check import { instantiate } from './instantiate.js'; +/* #if TARGET_PLATFORM_NODE */ +import { defaultNodeSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/node.js'; +/* #else */ import { defaultBrowserSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/browser.js'; +/* #endif */ /** @type {import('./index.d').init} */ export async function init(_options) { +/* #if TARGET_PLATFORM_NODE */ + /** @type {import('./platforms/node.d.ts').DefaultNodeSetupOptions} */ + const options = _options || {}; + const instantiateOptions = await defaultNodeSetup({ + args: options.args, + onExit: options.onExit, +/* #if USE_SHARED_MEMORY */ + spawnWorker: options.spawnWorker || createDefaultWorkerFactory() +/* #endif */ + }); +/* #else */ /** @type {import('./index.d').Options} */ const options = _options || { /* #if HAS_IMPORTS */ @@ -24,5 +39,6 @@ export async function init(_options) { spawnWorker: createDefaultWorkerFactory() /* #endif */ }) +/* #endif */ return await instantiate(instantiateOptions); } From 4b7292430c6c3f7c25972355529edd588cfc28f9 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 19 Oct 2025 04:04:38 +0000 Subject: [PATCH 003/252] [PackageToJS] Fix flaky `timestampBasedRebuild` test by abstracting file system operations The mtime-based change detection is not very reliable in tests due to the coarse timestamp resolution of some file systems, especially on artificial file operations in tests that happen in quick succession. This change introduces an abstraction over file system operations in MiniMake, allowing tests to use an in-memory file system with precise control over modification times. https://apenwarr.ca/log/20181113 --- Plugins/PackageToJS/Sources/MiniMake.swift | 51 +++++++++--- Plugins/PackageToJS/Tests/MiniMakeTests.swift | 81 +++++++++++++++++-- 2 files changed, 112 insertions(+), 20 deletions(-) diff --git a/Plugins/PackageToJS/Sources/MiniMake.swift b/Plugins/PackageToJS/Sources/MiniMake.swift index 0004af6c0..663635b7c 100644 --- a/Plugins/PackageToJS/Sources/MiniMake.swift +++ b/Plugins/PackageToJS/Sources/MiniMake.swift @@ -93,14 +93,18 @@ struct MiniMake { private var tasks: [TaskKey: Task] /// Whether to explain why tasks are built private var shouldExplain: Bool + /// File system operations + private var fileSystem: MiniMakeFileSystem /// Prints progress of the build private var printProgress: ProgressPrinter.PrintProgress init( explain: Bool = false, + fileSystem: MiniMakeFileSystem = DefaultMiniMakeFileSystem(), printProgress: @escaping ProgressPrinter.PrintProgress ) { self.tasks = [:] + self.fileSystem = fileSystem self.shouldExplain = explain self.printProgress = printProgress } @@ -222,7 +226,7 @@ struct MiniMake { /// Cleans all outputs of all tasks func cleanEverything(scope: VariableScope) { for task in self.tasks.values { - try? FileManager.default.removeItem(at: scope.resolve(path: task.output)) + try? fileSystem.removeItem(at: scope.resolve(path: task.output)) } } @@ -234,26 +238,20 @@ struct MiniMake { return true } let outputURL = scope.resolve(path: task.output) - if !FileManager.default.fileExists(atPath: outputURL.path) { + if !fileSystem.fileExists(at: outputURL) { explain("Task \(task.output) should be built because it doesn't exist") return true } - let outputMtime = try? outputURL.resourceValues(forKeys: [.contentModificationDateKey]) - .contentModificationDate + let outputMtime = try? fileSystem.modificationDate(of: outputURL) return task.inputs.contains { input in let inputURL = scope.resolve(path: input) // Ignore directory modification times - var isDirectory: ObjCBool = false - let fileExists = FileManager.default.fileExists( - atPath: inputURL.path, - isDirectory: &isDirectory - ) - if fileExists && isDirectory.boolValue { + let (fileExists, isDirectory) = fileSystem.fileExists(at: inputURL) + if fileExists && isDirectory { return false } - let inputMtime = try? inputURL.resourceValues(forKeys: [.contentModificationDateKey] - ).contentModificationDate + let inputMtime = try? fileSystem.modificationDate(of: inputURL) let shouldBuild = outputMtime == nil || inputMtime == nil || outputMtime! < inputMtime! if shouldBuild { @@ -337,3 +335,32 @@ struct BuildPath: Encodable, Hashable, CustomStringConvertible { try container.encode(self.description) } } + +/// Abstraction over file system operations +protocol MiniMakeFileSystem { + func removeItem(at url: URL) throws + func fileExists(at url: URL) -> Bool + func fileExists(at url: URL) -> (exists: Bool, isDirectory: Bool) + func modificationDate(of url: URL) throws -> Date? +} + +/// Default implementation of MiniMakeFileSystem using FileManager +struct DefaultMiniMakeFileSystem: MiniMakeFileSystem { + func removeItem(at url: URL) throws { + try FileManager.default.removeItem(at: url) + } + + func fileExists(at url: URL) -> Bool { + FileManager.default.fileExists(atPath: url.path) + } + + func fileExists(at url: URL) -> (exists: Bool, isDirectory: Bool) { + var isDirectory: ObjCBool = false + let exists = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory) + return (exists, isDirectory.boolValue) + } + + func modificationDate(of url: URL) throws -> Date? { + try url.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate + } +} diff --git a/Plugins/PackageToJS/Tests/MiniMakeTests.swift b/Plugins/PackageToJS/Tests/MiniMakeTests.swift index c0bba29c7..140f28805 100644 --- a/Plugins/PackageToJS/Tests/MiniMakeTests.swift +++ b/Plugins/PackageToJS/Tests/MiniMakeTests.swift @@ -4,6 +4,67 @@ import Testing @testable import PackageToJS @Suite struct MiniMakeTests { + final class InMemoryFileSystem: MiniMakeFileSystem { + struct FileEntry { + var content: Data + var modificationDate: Date + var isDirectory: Bool + } + private var storage: [URL: FileEntry] = [:] + + struct MonotonicDateGenerator { + private var currentDate: Date + + init(startingFrom date: Date = Date()) { + self.currentDate = date + } + + mutating func next() -> Date { + currentDate = currentDate.addingTimeInterval(1) + return currentDate + } + } + var dateGenerator = MonotonicDateGenerator() + + // MARK: - MiniMakeFileSystem conformance + + func removeItem(at url: URL) throws { + storage.removeValue(forKey: url) + } + + func fileExists(at url: URL) -> Bool { + return storage[url] != nil + } + + func fileExists(at url: URL) -> (exists: Bool, isDirectory: Bool) { + if let entry = storage[url] { + return (true, entry.isDirectory) + } else { + return (false, false) + } + } + + func modificationDate(of url: URL) throws -> Date? { + return storage[url]?.modificationDate + } + + func writeFile(at url: URL, content: Data) { + storage[url] = FileEntry(content: content, modificationDate: dateGenerator.next(), isDirectory: false) + } + + // MARK: - Helpers for tests + + func touch(_ url: URL) { + let date = dateGenerator.next() + if var entry = storage[url] { + entry.modificationDate = date + storage[url] = entry + } else { + storage[url] = FileEntry(content: Data(), modificationDate: date, isDirectory: false) + } + } + } + // Test basic task management functionality @Test func basicTaskManagement() throws { try withTemporaryDirectory { tempDir, _ in @@ -114,7 +175,11 @@ import Testing // Test that rebuilds are controlled by timestamps @Test func timestampBasedRebuild() throws { try withTemporaryDirectory { tempDir, _ in - var make = MiniMake(printProgress: { _, _ in }) + let fs = InMemoryFileSystem() + var make = MiniMake( + fileSystem: fs, + printProgress: { _, _ in } + ) let prefix = BuildPath(prefix: "PREFIX") let scope = MiniMake.VariableScope(variables: [ "PREFIX": tempDir.path @@ -123,25 +188,25 @@ import Testing let output = prefix.appending(path: "output.txt") var buildCount = 0 - try "Initial".write(toFile: scope.resolve(path: input).path, atomically: true, encoding: .utf8) + // Create initial input file + fs.touch(scope.resolve(path: input)) let task = make.addTask(inputFiles: [input], output: output) { task, scope in buildCount += 1 - let content = try String(contentsOfFile: scope.resolve(path: task.inputs[0]).path, encoding: .utf8) - try content.write(toFile: scope.resolve(path: task.output).path, atomically: true, encoding: .utf8) + fs.touch(scope.resolve(path: task.output)) } // First build - try make.build(output: task, scope: scope) + #expect(throws: Never.self) { try make.build(output: task, scope: scope) } #expect(buildCount == 1, "First build should occur") // Second build without changes - try make.build(output: task, scope: scope) + #expect(throws: Never.self) { try make.build(output: task, scope: scope) } #expect(buildCount == 1, "No rebuild should occur if input is not modified") // Modify input and rebuild - try "Modified".write(toFile: scope.resolve(path: input).path, atomically: true, encoding: .utf8) - try make.build(output: task, scope: scope) + fs.touch(scope.resolve(path: input)) + #expect(throws: Never.self) { try make.build(output: task, scope: scope) } #expect(buildCount == 2, "Should rebuild when input is modified") } } From fa6e32199343618c048f65ef22e945f0e879a8f1 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Sun, 19 Oct 2025 10:32:09 +0200 Subject: [PATCH 004/252] Improve template code to better support node 1. Fixed missing type export (platforms/node.d.ts) - Exported DefaultNodeSetupOptions type that is referenced in index.js 2. Updated index.d.ts to support both platforms - Made init() function accept DefaultNodeSetupOptions for node platform - Made init() function accept Options for browser platform 3. Fixed conditional compilation in node.js - Wrapped getImports() in HAS_IMPORTS conditional (platforms/node.js) --- Plugins/PackageToJS/Templates/index.d.ts | 14 ++++++++++++++ Plugins/PackageToJS/Templates/platforms/node.d.ts | 6 ++++-- Plugins/PackageToJS/Templates/platforms/node.js | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Plugins/PackageToJS/Templates/index.d.ts b/Plugins/PackageToJS/Templates/index.d.ts index 757a88287..601f354be 100644 --- a/Plugins/PackageToJS/Templates/index.d.ts +++ b/Plugins/PackageToJS/Templates/index.d.ts @@ -1,4 +1,7 @@ import type { Exports, Imports, ModuleSource } from './instantiate.js' +/* #if TARGET_PLATFORM_NODE */ +import type { DefaultNodeSetupOptions } from './platforms/node.js' +/* #endif */ export type Options = { /** @@ -18,10 +21,21 @@ export type Options = { /** * Instantiate and initialize the module * +/* #if TARGET_PLATFORM_NODE */ + * This is a convenience function for Node.js environments. +/* #else */ * This is a convenience function for browser environments. +/* #endif */ * If you need a more flexible API, see `instantiate`. */ +/* #if TARGET_PLATFORM_NODE */ +export declare function init(options?: DefaultNodeSetupOptions): Promise<{ + instance: WebAssembly.Instance, + exports: Exports +}> +/* #else */ export declare function init(options?: Options): Promise<{ instance: WebAssembly.Instance, exports: Exports }> +/* #endif */ diff --git a/Plugins/PackageToJS/Templates/platforms/node.d.ts b/Plugins/PackageToJS/Templates/platforms/node.d.ts index 9d80205fc..f756c8efc 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.d.ts +++ b/Plugins/PackageToJS/Templates/platforms/node.d.ts @@ -1,7 +1,7 @@ import type { InstantiateOptions } from "../instantiate.js" import type { Worker } from "node:worker_threads" -export function defaultNodeSetup(options: { +export type DefaultNodeSetupOptions = { /* #if IS_WASI */ args?: string[], /* #endif */ @@ -9,6 +9,8 @@ export function defaultNodeSetup(options: { /* #if USE_SHARED_MEMORY */ spawnWorker: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker, /* #endif */ -}): Promise +} + +export function defaultNodeSetup(options: DefaultNodeSetupOptions): Promise export function createDefaultWorkerFactory(preludeScript: string): (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker diff --git a/Plugins/PackageToJS/Templates/platforms/node.js b/Plugins/PackageToJS/Templates/platforms/node.js index 4d29fc33f..ddd017154 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.js +++ b/Plugins/PackageToJS/Templates/platforms/node.js @@ -139,7 +139,9 @@ export async function defaultNodeSetup(options) { return { module, +/* #if HAS_IMPORTS */ getImports() { return {} }, +/* #endif */ /* #if IS_WASI */ wasi: Object.assign(wasi, { setInstance(instance) { From c3c342427d55be70ee3b464e6009acef728ffdc3 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Sun, 19 Oct 2025 10:32:48 +0200 Subject: [PATCH 005/252] Add devDependency @types/node so TypeScript can understand Node.js APIs --- Plugins/PackageToJS/Templates/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Plugins/PackageToJS/Templates/package.json b/Plugins/PackageToJS/Templates/package.json index a3e7074bb..0566b0b5e 100644 --- a/Plugins/PackageToJS/Templates/package.json +++ b/Plugins/PackageToJS/Templates/package.json @@ -9,5 +9,8 @@ }, "dependencies": { "@bjorn3/browser_wasi_shim": "0.3.0" + }, + "devDependencies": { + "@types/node": "^22.0.0" } } From eed636d73b00ed96604685b3fc3b290d46cd2691 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 08:01:54 +0200 Subject: [PATCH 006/252] run tscCheck on preprocessed templates test both browser and node platform variants --- .../PackageToJS/Tests/TemplatesTests.swift | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/Plugins/PackageToJS/Tests/TemplatesTests.swift b/Plugins/PackageToJS/Tests/TemplatesTests.swift index e885eb087..9e85c64ab 100644 --- a/Plugins/PackageToJS/Tests/TemplatesTests.swift +++ b/Plugins/PackageToJS/Tests/TemplatesTests.swift @@ -9,10 +9,47 @@ import Foundation .appendingPathComponent("Templates") /// `npx tsc -p Templates/tsconfig.json` - @Test func tscCheck() throws { + /// Test both node and browser platform variants + @Test(arguments: ["node", "browser"]) + func tscCheck(platform: String) throws { + // Create a temporary directory for preprocessed files + let tempDir = FileManager.default.temporaryDirectory + .appendingPathComponent("JavaScriptKit-tsc-\(platform)-\(UUID().uuidString)") + defer { + try? FileManager.default.removeItem(at: tempDir) + } + + // Copy entire templates folder to temp location + try FileManager.default.copyItem(at: Self.templatesPath, to: tempDir) + + // Setup preprocessing conditions + let conditions: [String: Bool] = [ + "USE_SHARED_MEMORY": false, + "IS_WASI": true, + "USE_WASI_CDN": false, + "HAS_BRIDGE": false, + "HAS_IMPORTS": platform == "browser", + "TARGET_PLATFORM_NODE": platform == "node", + ] + let preprocessOptions = PreprocessOptions(conditions: conditions, substitutions: [:]) + + // Preprocess all JS and TS files in-place + let enumerator = FileManager.default.enumerator(at: tempDir, includingPropertiesForKeys: nil) + while let fileURL = enumerator?.nextObject() as? URL { + guard !fileURL.hasDirectoryPath, + fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" else { + continue + } + + let content = try String(contentsOf: fileURL, encoding: .utf8) + let preprocessed = try preprocess(source: content, file: fileURL.path, options: preprocessOptions) + try preprocessed.write(to: fileURL, atomically: true, encoding: .utf8) + } + + // Run TypeScript on the preprocessed files let tsc = Process() tsc.executableURL = try which("npx") - tsc.arguments = ["tsc", "-p", Self.templatesPath.appending(path: "tsconfig.json").path] + tsc.arguments = ["tsc", "-p", tempDir.appending(path: "tsconfig.json").path] try tsc.run() tsc.waitUntilExit() #expect(tsc.terminationStatus == 0) From a1b912b9b29e78b828db78df34fb9c3a5a72fd50 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 08:23:30 +0200 Subject: [PATCH 007/252] update snapshot salts --- .../planBuild_debug.json | 24 +++++++------- .../planBuild_release.json | 24 +++++++------- .../planBuild_release_dwarf.json | 24 +++++++------- .../planBuild_release_name.json | 24 +++++++------- .../planBuild_release_no_optimize.json | 24 +++++++------- .../PackagingPlannerTests/planTestBuild.json | 32 +++++++++---------- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json index 13768da75..f09b0b44f 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json index ccfbc35cc..71801d180 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json @@ -62,7 +62,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -79,7 +79,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -96,7 +96,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -113,7 +113,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -143,7 +143,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json index 13768da75..f09b0b44f 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json index ccfbc35cc..71801d180 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json @@ -62,7 +62,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -79,7 +79,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -96,7 +96,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -113,7 +113,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -143,7 +143,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json index 13768da75..f09b0b44f 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json index 89425dc83..475f6726e 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json @@ -73,7 +73,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js" ], "output" : "$OUTPUT\/bin\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -89,7 +89,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -106,7 +106,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -123,7 +123,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -140,7 +140,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -169,7 +169,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT" ] @@ -196,7 +196,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -213,7 +213,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -230,7 +230,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -247,7 +247,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -264,7 +264,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -281,7 +281,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -298,7 +298,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -314,7 +314,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html" ], "output" : "$OUTPUT\/test.browser.html", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -329,7 +329,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts" ], "output" : "$OUTPUT\/test.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -344,7 +344,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js" ], "output" : "$OUTPUT\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" From 83b31fa305276bf9a8d502f5b00cab24f5000139 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 09:50:51 +0200 Subject: [PATCH 008/252] add Plugin/PackageToJS/Templates to bootstrap --- Makefile | 1 + .../PackageToJS/Templates/package-lock.json | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 Plugins/PackageToJS/Templates/package-lock.json diff --git a/Makefile b/Makefile index 5ac35ea57..4ae7ccaf6 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ SWIFT_SDK_ID ?= wasm32-unknown-wasi .PHONY: bootstrap bootstrap: npm ci + cd Plugins/PackageToJS/Templates && npm ci .PHONY: unittest unittest: diff --git a/Plugins/PackageToJS/Templates/package-lock.json b/Plugins/PackageToJS/Templates/package-lock.json new file mode 100644 index 000000000..a0a1b13a8 --- /dev/null +++ b/Plugins/PackageToJS/Templates/package-lock.json @@ -0,0 +1,41 @@ +{ + "name": "@PACKAGE_TO_JS_PACKAGE_NAME@", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@PACKAGE_TO_JS_PACKAGE_NAME@", + "version": "0.0.0", + "dependencies": { + "@bjorn3/browser_wasi_shim": "0.3.0" + }, + "devDependencies": { + "@types/node": "^22.0.0" + } + }, + "node_modules/@bjorn3/browser_wasi_shim": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.3.0.tgz", + "integrity": "sha512-FlRBYttPRLcWORzBe6g8nmYTafBkOEFeOqMYM4tAHJzFsQy4+xJA94z85a9BCs8S+Uzfh9LrkpII7DXr2iUVFg==", + "license": "MIT OR Apache-2.0" + }, + "node_modules/@types/node": { + "version": "22.18.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.11.tgz", + "integrity": "sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + } + } +} From 4e8bc2f1b11d1a1b54fb052395c897e9df30d397 Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 17:42:21 +0200 Subject: [PATCH 009/252] formatting --- Plugins/PackageToJS/Tests/TemplatesTests.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plugins/PackageToJS/Tests/TemplatesTests.swift b/Plugins/PackageToJS/Tests/TemplatesTests.swift index 9e85c64ab..c7b1ba6fb 100644 --- a/Plugins/PackageToJS/Tests/TemplatesTests.swift +++ b/Plugins/PackageToJS/Tests/TemplatesTests.swift @@ -37,7 +37,8 @@ import Foundation let enumerator = FileManager.default.enumerator(at: tempDir, includingPropertiesForKeys: nil) while let fileURL = enumerator?.nextObject() as? URL { guard !fileURL.hasDirectoryPath, - fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" else { + fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" + else { continue } From 76ee898ddb25807d0a62461b976eb435e5576d4d Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 22:00:51 +0200 Subject: [PATCH 010/252] model `platform` as enum --- Plugins/PackageToJS/Sources/PackageToJS.swift | 9 +++-- .../Sources/PackageToJSPlugin.swift | 33 ++++++++++++++----- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index d969620ed..a9fe6489e 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -2,6 +2,11 @@ import Foundation struct PackageToJS { struct PackageOptions { + enum Platform: String, CaseIterable { + case browser + case node + } + /// Path to the output directory var outputPath: String? /// The build configuration to use (default: debug) @@ -9,7 +14,7 @@ struct PackageToJS { /// Name of the package (default: lowercased Package.swift name) var packageName: String? /// Target platform for the generated JavaScript (default: browser) - var platform: String? + var platform: Platform = .browser /// Whether to explain the build plan (default: false) var explain: Bool = false /// Whether to print verbose output @@ -719,7 +724,7 @@ struct PackagingPlanner { "USE_WASI_CDN": options.useCDN, "HAS_BRIDGE": exportedSkeletons.count > 0 || importedSkeletons.count > 0, "HAS_IMPORTS": importedSkeletons.count > 0, - "TARGET_PLATFORM_NODE": options.platform == "node", + "TARGET_PLATFORM_NODE": options.platform == .node, ] let constantSubstitutions: [String: String] = [ "PACKAGE_TO_JS_MODULE_PATH": wasmFilename, diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 054bc4724..60ebec7e7 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -175,7 +175,7 @@ struct PackageToJSPlugin: CommandPlugin { } var extractor = ArgumentExtractor(arguments) - let buildOptions = PackageToJS.BuildOptions.parse(from: &extractor) + let buildOptions = try PackageToJS.BuildOptions.parse(from: &extractor) if extractor.remainingArguments.count > 0 { printStderr( @@ -239,7 +239,7 @@ struct PackageToJSPlugin: CommandPlugin { } var extractor = ArgumentExtractor(arguments) - let testOptions = PackageToJS.TestOptions.parse(from: &extractor) + let testOptions = try PackageToJS.TestOptions.parse(from: &extractor) if extractor.remainingArguments.count > 0 { printStderr( @@ -440,13 +440,28 @@ private func printStderr(_ message: String) { // MARK: - Options parsing +extension ArgumentExtractor { + mutating func extractPlatformOption(named name: String) throws -> PackageToJS.PackageOptions.Platform { + let stringValue : String? = self.extractOption(named: name).last + guard let stringValue else { + throw PackageToJSError("Missing value for option --\(name)") + } + guard let platform = PackageToJS.PackageOptions.Platform(rawValue: stringValue) else { + throw PackageToJSError( + "Invalid platform: \(stringValue), expected one of \(PackageToJS.PackageOptions.Platform.allCases.map(\.rawValue).joined(separator: ", "))" + ) + } + return platform + } +} + extension PackageToJS.PackageOptions { - static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.PackageOptions { + static func parse(from extractor: inout ArgumentExtractor) throws -> PackageToJS.PackageOptions { let outputPath = extractor.extractOption(named: "output").last let configuration: String? = (extractor.extractOption(named: "configuration") + extractor.extractSingleDashOption(named: "c")).last let packageName = extractor.extractOption(named: "package-name").last - let platform = extractor.extractOption(named: "platform").last + let platform = try extractor.extractPlatformOption(named: "platform") let explain = extractor.extractFlag(named: "explain") let useCDN = extractor.extractFlag(named: "use-cdn") let verbose = extractor.extractFlag(named: "verbose") @@ -468,7 +483,7 @@ extension PackageToJS.PackageOptions { --output Path to the output directory (default: .build/plugins/PackageToJS/outputs/Package) -c, --configuration The build configuration to use (values: debug, release; default: debug) --package-name Name of the package (default: lowercased Package.swift name) - --platform Target platform for generated JavaScript (values: browser, node; default: browser) + --platform Target platform for generated JavaScript (values: \(PackageToJS.PackageOptions.Platform.allCases.map(\.rawValue).joined(separator: ", ")); default: \(PackageToJS.PackageOptions.Platform.browser)) --use-cdn Whether to use CDN for dependency packages --enable-code-coverage Whether to enable code coverage collection --explain Whether to explain the build plan @@ -478,7 +493,7 @@ extension PackageToJS.PackageOptions { } extension PackageToJS.BuildOptions { - static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.BuildOptions { + static func parse(from extractor: inout ArgumentExtractor) throws -> PackageToJS.BuildOptions { let product = extractor.extractOption(named: "product").last let noOptimize = extractor.extractFlag(named: "no-optimize") let rawDebugInfoFormat = extractor.extractOption(named: "debug-info-format").last @@ -491,7 +506,7 @@ extension PackageToJS.BuildOptions { } debugInfoFormat = format } - let packageOptions = PackageToJS.PackageOptions.parse(from: &extractor) + let packageOptions = try PackageToJS.PackageOptions.parse(from: &extractor) return PackageToJS.BuildOptions( product: product, noOptimize: noOptimize != 0, @@ -529,7 +544,7 @@ extension PackageToJS.BuildOptions { } extension PackageToJS.TestOptions { - static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.TestOptions { + static func parse(from extractor: inout ArgumentExtractor) throws -> PackageToJS.TestOptions { let buildOnly = extractor.extractFlag(named: "build-only") let listTests = extractor.extractFlag(named: "list-tests") let filter = extractor.extractOption(named: "filter") @@ -537,7 +552,7 @@ extension PackageToJS.TestOptions { let environment = extractor.extractOption(named: "environment").last let inspect = extractor.extractFlag(named: "inspect") let extraNodeArguments = extractor.extractSingleDashOption(named: "Xnode") - let packageOptions = PackageToJS.PackageOptions.parse(from: &extractor) + let packageOptions = try PackageToJS.PackageOptions.parse(from: &extractor) var options = PackageToJS.TestOptions( buildOnly: buildOnly != 0, listTests: listTests != 0, From 27dadd9c6c280e4549d84ce26800d3dc94d3f18f Mon Sep 17 00:00:00 2001 From: Tobias Haeberle Date: Mon, 20 Oct 2025 22:43:45 +0200 Subject: [PATCH 011/252] use browser as default value for platform --- Plugins/PackageToJS/Sources/PackageToJSPlugin.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 60ebec7e7..e934279f6 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -442,10 +442,10 @@ private func printStderr(_ message: String) { extension ArgumentExtractor { mutating func extractPlatformOption(named name: String) throws -> PackageToJS.PackageOptions.Platform { - let stringValue : String? = self.extractOption(named: name).last - guard let stringValue else { - throw PackageToJSError("Missing value for option --\(name)") + guard let stringValue = self.extractOption(named: name).last else { + return .browser } + guard let platform = PackageToJS.PackageOptions.Platform(rawValue: stringValue) else { throw PackageToJSError( "Invalid platform: \(stringValue), expected one of \(PackageToJS.PackageOptions.Platform.allCases.map(\.rawValue).joined(separator: ", "))" From d4044cf3cc9d0024df6094b0a690e59b4bde1d83 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 21 Oct 2025 15:02:10 +0900 Subject: [PATCH 012/252] PackageToJS: Expose Playwright Launch Options in test harness --- Examples/Testing/README.md | 7 ++++++ .../run-tests-with-browser-options.mjs | 23 +++++++++++++++++++ Plugins/PackageToJS/Templates/test.d.ts | 7 ++++++ Plugins/PackageToJS/Templates/test.js | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Examples/Testing/run-tests-with-browser-options.mjs diff --git a/Examples/Testing/README.md b/Examples/Testing/README.md index 2f28357a6..ae1c68b6f 100644 --- a/Examples/Testing/README.md +++ b/Examples/Testing/README.md @@ -31,3 +31,10 @@ llvm-cov show -instr-profile=.build/plugins/PackageToJS/outputs/PackageTests/def ```console npx serve .build/coverage/html ``` +## Customize test harness + +See [./run-tests-with-browser-options.mjs](./run-tests-with-browser-options.mjs) for an example of customizing the test harness to run tests with specific browser options. + +```console +node run-tests-with-browser-options.mjs +``` diff --git a/Examples/Testing/run-tests-with-browser-options.mjs b/Examples/Testing/run-tests-with-browser-options.mjs new file mode 100644 index 000000000..9051c28c8 --- /dev/null +++ b/Examples/Testing/run-tests-with-browser-options.mjs @@ -0,0 +1,23 @@ +// Import the generated test harness function +import { testBrowser } from "./.build/plugins/PackageToJS/outputs/PackageTests/test.js" + +// Execute the test with custom browser options +async function runTest(args) { + const exitCode = await testBrowser({ + args: args, + playwright: { + browser: "chromium", + launchOptions: { + headless: false, + } + } + }); + if (exitCode !== 0) { + process.exit(exitCode); + } +} +// Run XCTest test suites +await runTest([]); +// Run Swift Testing test suites +await runTest(["--testing-library", "swift-testing"]); +process.exit(0); diff --git a/Plugins/PackageToJS/Templates/test.d.ts b/Plugins/PackageToJS/Templates/test.d.ts index 21383997b..03a064f28 100644 --- a/Plugins/PackageToJS/Templates/test.d.ts +++ b/Plugins/PackageToJS/Templates/test.d.ts @@ -9,8 +9,15 @@ export type SetupOptionsFn = ( export function testBrowser( options: { + /** Path to the prelude script to be injected before tests run */ preludeScript?: string, + /** Command-line arguments to pass to the test runner */ args?: string[], + /** Options for Playwright browser */ + playwright?: { + browser?: string, + launchOptions?: import("playwright").LaunchOptions + } } ): Promise diff --git a/Plugins/PackageToJS/Templates/test.js b/Plugins/PackageToJS/Templates/test.js index 518dacf20..19a1deac6 100644 --- a/Plugins/PackageToJS/Templates/test.js +++ b/Plugins/PackageToJS/Templates/test.js @@ -96,7 +96,7 @@ Please run the following command to install it: process.exit(1); } })(); - const browser = await playwright.chromium.launch(); + const browser = await playwright[options.playwright?.browser ?? "chromium"].launch(options.playwright?.launchOptions ?? {}); const context = await browser.newContext(); const page = await context.newPage(); From 395ca2471cf165beefd2bb2def116850cb24f41c Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 8 Oct 2025 14:29:48 +0200 Subject: [PATCH 013/252] BridgeJS: Basic support for properties in protocols --- .../Sources/BridgeJSCore/ExportSwift.swift | 221 ++++++++++++++++-- .../Sources/BridgeJSLink/BridgeJSLink.swift | 60 +++++ .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 25 +- .../BridgeJSToolTests/Inputs/Protocol.swift | 2 + .../BridgeJSLinkTests/Protocol.Export.d.ts | 2 + .../BridgeJSLinkTests/Protocol.Export.js | 25 ++ .../ExportSwiftTests/Protocol.swift | 23 ++ .../Exporting-Swift-Protocols.md | 17 -- .../BridgeJSRuntimeTests/ExportAPITests.swift | 11 +- .../Generated/BridgeJS.ExportSwift.swift | 63 +++++ .../JavaScript/BridgeJS.ExportSwift.json | 41 +++- Tests/prelude.mjs | 29 ++- 12 files changed, 470 insertions(+), 49 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 9179a9668..01a8343e7 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -749,9 +749,8 @@ public class ExportSwift { case .topLevel: diagnose(node: node, message: "@JS var must be inside a @JS class or enum") return .skipChildren - case .protocolBody(_, _): - diagnose(node: node, message: "Properties are not supported in protocols") - return .skipChildren + case .protocolBody(let protocolName, let protocolKey): + return visitProtocolProperty(node: node, protocolName: protocolName, protocolKey: protocolKey) } // Process each binding (variable declaration) @@ -775,23 +774,8 @@ public class ExportSwift { // Check if property is readonly let isLet = node.bindingSpecifier.tokenKind == .keyword(.let) - let isGetterOnly = node.bindings.contains(where: { - switch $0.accessorBlock?.accessors { - case .accessors(let accessors): - // Has accessors - check if it only has a getter (no setter, willSet, or didSet) - return !accessors.contains(where: { accessor in - let tokenKind = accessor.accessorSpecifier.tokenKind - return tokenKind == .keyword(.set) || tokenKind == .keyword(.willSet) - || tokenKind == .keyword(.didSet) - }) - case .getter: - // Has only a getter block - return true - case nil: - // No accessor block - this is a stored property, not readonly - return false - } - }) + let isGetterOnly = node.bindings.contains(where: { self.hasOnlyGetter($0.accessorBlock) }) + let isReadonly = isLet || isGetterOnly let exportedProperty = ExportedProperty( @@ -997,6 +981,17 @@ public class ExportSwift { message: "Protocol visibility must be at least internal" ) + let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + + exportedProtocolByName[protocolUniqueKey] = ExportedProtocol( + name: name, + methods: [], + properties: [], + namespace: namespaceResult.namespace + ) + + stateStack.push(state: .protocolBody(name: name, key: protocolUniqueKey)) + var methods: [ExportedFunction] = [] for member in node.memberBlock.members { if let funcDecl = member.decl.as(FunctionDeclSyntax.self) { @@ -1007,18 +1002,22 @@ public class ExportSwift { ) { methods.append(exportedFunction) } + } else if let varDecl = member.decl.as(VariableDeclSyntax.self) { + _ = visitProtocolProperty(node: varDecl, protocolName: name, protocolKey: protocolUniqueKey) } } let exportedProtocol = ExportedProtocol( name: name, methods: methods, + properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [], namespace: namespaceResult.namespace ) - - let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + exportedProtocolByName[protocolUniqueKey] = exportedProtocol exportedProtocolNames.append(protocolUniqueKey) + + stateStack.pop() parent.exportedProtocolNameByKey[protocolUniqueKey] = name @@ -1075,6 +1074,89 @@ public class ExportSwift { ) } + private func visitProtocolProperty( + node: VariableDeclSyntax, + protocolName: String, + protocolKey: String + ) -> SyntaxVisitorContinueKind { + for binding in node.bindings { + guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { + diagnose(node: binding.pattern, message: "Complex patterns not supported for protocol properties") + continue + } + + let propertyName = pattern.identifier.text + + guard let typeAnnotation = binding.typeAnnotation else { + diagnose(node: binding, message: "Protocol property must have explicit type annotation") + continue + } + + guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { + diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) + continue + } + + if case .optional = propertyType { + diagnose( + node: typeAnnotation.type, + message: "Optional properties are not yet supported in protocols" + ) + continue + } + + guard let accessorBlock = binding.accessorBlock else { + diagnose( + node: binding, + message: "Protocol property must specify { get } or { get set }", + hint: "Add { get } for readonly or { get set } for readwrite property" + ) + continue + } + + let isReadonly = hasOnlyGetter(accessorBlock) + + let exportedProperty = ExportedProtocolProperty( + name: propertyName, + type: propertyType, + isReadonly: isReadonly + ) + + if var currentProtocol = exportedProtocolByName[protocolKey] { + var properties = currentProtocol.properties + properties.append(exportedProperty) + + currentProtocol = ExportedProtocol( + name: currentProtocol.name, + methods: currentProtocol.methods, + properties: properties, + namespace: currentProtocol.namespace + ) + exportedProtocolByName[protocolKey] = currentProtocol + } + } + + return .skipChildren + } + + private func hasOnlyGetter(_ accessorBlock: AccessorBlockSyntax?) -> Bool { + switch accessorBlock?.accessors { + case .accessors(let accessors): + // Has accessors - check if it only has a getter (no setter, willSet, or didSet) + return !accessors.contains(where: { accessor in + let tokenKind = accessor.accessorSpecifier.tokenKind + return tokenKind == .keyword(.set) || tokenKind == .keyword(.willSet) + || tokenKind == .keyword(.didSet) + }) + case .getter: + // Has only a getter block + return true + case nil: + // No accessor block - this is a stored property, not readonly + return false + } + } + override func visit(_ node: EnumCaseDeclSyntax) -> SyntaxVisitorContinueKind { guard case .enumBody(_, let enumKey) = stateStack.current else { return .visitChildren @@ -2179,11 +2261,24 @@ public class ExportSwift { methodDecls.append(methodImplementation) } + var propertyDecls: [DeclSyntax] = [] + + for property in proto.properties { + let propertyImpl = try renderProtocolProperty( + property: property, + protocolName: protocolName, + moduleName: moduleName + ) + propertyDecls.append(propertyImpl) + } + + let allDecls = (methodDecls + propertyDecls).map { $0.description }.joined(separator: "\n\n") + return """ struct \(raw: wrapperName): \(raw: protocolName), _BridgedSwiftProtocolWrapper { let jsObject: JSObject - \(raw: methodDecls.map { $0.description }.joined(separator: "\n\n")) + \(raw: allDecls) static func bridgeJSLiftParameter(_ value: Int32) -> Self { return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -2191,6 +2286,86 @@ public class ExportSwift { } """ } + + private func renderProtocolProperty( + property: ExportedProtocolProperty, + protocolName: String, + moduleName: String + ) throws -> DeclSyntax { + let getterAbiName = ABINameGenerator.generateABIName( + baseName: property.name, + namespace: nil, + staticContext: nil, + operation: "get", + className: protocolName + ) + let setterAbiName = ABINameGenerator.generateABIName( + baseName: property.name, + namespace: nil, + staticContext: nil, + operation: "set", + className: protocolName + ) + + // Generate getter + let liftingInfo = try property.type.liftingReturnInfo() + let getterReturnType: String + let getterCallCode: String + + if let abiType = liftingInfo.valueToLift { + getterReturnType = " -> \(abiType.swiftType)" + getterCallCode = """ + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return \(property.type.swiftType).bridgeJSLiftReturn(ret) + """ + } else { + // For String and other types that use tmpRetString + getterReturnType = "" + getterCallCode = """ + _extern_get(this: Int32(bitPattern: jsObject.id)) + return \(property.type.swiftType).bridgeJSLiftReturn() + """ + } + + if property.isReadonly { + // Readonly property - only getter + return """ + var \(raw: property.name): \(raw: property.type.swiftType) { + get { + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") + func _extern_get(this: Int32)\(raw: getterReturnType) + \(raw: getterCallCode) + } + } + """ + } else { + // Readwrite property - getter and setter + let loweringInfo = try property.type.loweringParameterInfo() + assert( + loweringInfo.loweredParameters.count == 1, + "Protocol property setters must lower to a single WASM parameter" + ) + + let (paramName, wasmType) = loweringInfo.loweredParameters[0] + let setterParams = "this: Int32, \(paramName): \(wasmType.swiftType)" + let setterCallArgs = "this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter()" + + return """ + var \(raw: property.name): \(raw: property.type.swiftType) { + get { + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") + func _extern_get(this: Int32)\(raw: getterReturnType) + \(raw: getterCallCode) + } + set { + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: setterAbiName)") + func _extern_set(\(raw: setterParams)) + _extern_set(\(raw: setterCallArgs)) + } + } + """ + } + } } fileprivate enum Constants { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 88f2af3d7..1a182457f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -314,6 +314,13 @@ struct BridgeJSLink { } for proto in skeleton.protocols { + for property in proto.properties { + try renderProtocolProperty( + importObjectBuilder: importObjectBuilder, + protocol: proto, + property: property + ) + } for method in proto.methods { try renderProtocolMethod( importObjectBuilder: importObjectBuilder, @@ -607,6 +614,13 @@ struct BridgeJSLink { "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" ) } + for property in proto.properties { + let propertySignature = + property.isReadonly + ? "readonly \(property.name): \(property.type.tsType);" + : "\(property.name): \(property.type.tsType);" + printer.write(propertySignature) + } } printer.write("}") printer.nextLine() @@ -2417,6 +2431,52 @@ extension BridgeJSLink { return (funcLines, []) } + func renderProtocolProperty( + importObjectBuilder: ImportObjectBuilder, + protocol: ExportedProtocol, + property: ExportedProtocolProperty + ) throws { + let getterAbiName = ABINameGenerator.generateABIName( + baseName: property.name, + namespace: nil, + staticContext: nil, + operation: "get", + className: `protocol`.name + ) + + let getterThunkBuilder = ImportedThunkBuilder() + getterThunkBuilder.liftSelf() + let returnExpr = try getterThunkBuilder.callPropertyGetter(name: property.name, returnType: property.type) + let getterLines = getterThunkBuilder.renderFunction( + name: getterAbiName, + returnExpr: returnExpr, + returnType: property.type + ) + importObjectBuilder.assignToImportObject(name: getterAbiName, function: getterLines) + + if !property.isReadonly { + let setterAbiName = ABINameGenerator.generateABIName( + baseName: property.name, + namespace: nil, + staticContext: nil, + operation: "set", + className: `protocol`.name + ) + let setterThunkBuilder = ImportedThunkBuilder() + setterThunkBuilder.liftSelf() + try setterThunkBuilder.liftParameter( + param: Parameter(label: nil, name: "value", type: property.type) + ) + setterThunkBuilder.callPropertySetter(name: property.name, returnType: property.type) + let setterLines = setterThunkBuilder.renderFunction( + name: setterAbiName, + returnExpr: nil, + returnType: .void + ) + importObjectBuilder.assignToImportObject(name: setterAbiName, function: setterLines) + } + } + func renderProtocolMethod( importObjectBuilder: ImportObjectBuilder, protocol: ExportedProtocol, diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 1a414b956..3cf34554a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -270,14 +270,37 @@ public enum EnumType: String, Codable, Sendable { // MARK: - Exported Skeleton +public struct ExportedProtocolProperty: Codable, Equatable, Sendable { + public let name: String + public let type: BridgeType + public let isReadonly: Bool + + public init( + name: String, + type: BridgeType, + isReadonly: Bool + ) { + self.name = name + self.type = type + self.isReadonly = isReadonly + } +} + public struct ExportedProtocol: Codable, Equatable { public let name: String public let methods: [ExportedFunction] + public let properties: [ExportedProtocolProperty] public let namespace: [String]? - public init(name: String, methods: [ExportedFunction], namespace: [String]? = nil) { + public init( + name: String, + methods: [ExportedFunction], + properties: [ExportedProtocolProperty] = [], + namespace: [String]? = nil + ) { self.name = name self.methods = methods + self.properties = properties self.namespace = namespace } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index f02133692..54ca6abf7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -1,6 +1,8 @@ import JavaScriptKit @JS protocol MyViewControllerDelegate { + var eventCount: Int { get set } + var delegateName: String { get } func onSomethingHappened() func onValueChanged(_ value: String) func onCountUpdated(count: Int) -> Bool diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index 0f5d0fb20..a6d1125eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -10,6 +10,8 @@ export interface MyViewControllerDelegate { onCountUpdated(count: number): boolean; onLabelUpdated(prefix: string, suffix: string): void; isCountEven(): boolean; + eventCount: number; + readonly delegateName: string; } /// Represents a Swift heap object like a class instance or an actor instance. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 142c1cf0b..847787d5c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -147,6 +147,31 @@ export async function createInstantiator(options, swift) { return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_MyViewControllerDelegate_eventCount_get"] = function bjs_MyViewControllerDelegate_eventCount_get(self) { + try { + let ret = swift.memory.getObject(self).eventCount; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_eventCount_get"] = function bjs_MyViewControllerDelegate_eventCount_get(self, value) { + try { + swift.memory.getObject(self).eventCount = value; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_delegateName_get"] = function bjs_MyViewControllerDelegate_delegateName_get(self) { + try { + let ret = swift.memory.getObject(self).delegateName; + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } TestModule["bjs_MyViewControllerDelegate_onSomethingHappened"] = function bjs_MyViewControllerDelegate_onSomethingHappened(self) { try { swift.memory.getObject(self).onSomethingHappened(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 6ac515c7d..0e5304673 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -41,6 +41,29 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Bool.bridgeJSLiftReturn(ret) } + var eventCount: Int { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var delegateName: String { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return String.bridgeJSLiftReturn(ret) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 802ff3aeb..8e1aa8a9a 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -190,20 +190,3 @@ When you pass a JavaScript object implementing a protocol to Swift: | Protocol inheritance | ❌ | | Protocol composition: `Protocol1 & Protocol2` | ❌ | | Generics | ❌ | - -### Type Support for Protocol Method Parameters and Return Types - -Protocol method parameters and return values have more limited type support compared to regular exported Swift functions and classes. - -**Supported Types:** -- Primitives: `Bool`, `Int`, `Float`, `Double` -- `String` -- `JSObject` - -**Not Supported:** -- `@JS class` types -- `@JS enum` types (case, raw value, or associated value) -- `@JS protocol` types -- Optional types: `Int?`, `String?`, etc. - -> Note: For regular `@JS func` and `@JS class` exports (not within protocols), all these types including optionals, enums, and classes are fully supported. See and for more information. diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index b6255a4ef..b49dca59d 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -860,6 +860,8 @@ enum APIOptionalResult { // MARK: - Protocol Tests @JS protocol Counter { + var count: Int { get set } + var name: String { get } func increment(by amount: Int) func getValue() -> Int func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) @@ -912,17 +914,18 @@ enum APIOptionalResult { } @JS class SwiftCounter: Counter { - private var value: Int = 0 + @JS var count: Int = 0 + @JS let name: String = "SwiftCounter" private var label: String = "" @JS init() {} @JS func increment(by amount: Int) { - value += amount + count += amount } @JS func getValue() -> Int { - return value + return count } @JS func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { @@ -934,7 +937,7 @@ enum APIOptionalResult { } @JS func isEven() -> Bool { - return value % 2 == 0 + return count % 2 == 0 } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 1e22c2b09..3ee75a189 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -19,7 +19,11 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getValue") func _extern_getValue(this: Int32) -> Int32 let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) +<<<<<<< HEAD return Int.bridgeJSLiftReturn(ret) +======= + return Int.bridgeJSLiftReturn(ret) +>>>>>>> f19c8b06 (WIP: Initial protocol support) } func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { @@ -32,7 +36,11 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getLabel") func _extern_getLabel(this: Int32) -> Int32 let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) +<<<<<<< HEAD return String.bridgeJSLiftReturn(ret) +======= + return String.bridgeJSLiftReturn(ret) +>>>>>>> f19c8b06 (WIP: Initial protocol support) } func isEven() -> Bool { @@ -42,6 +50,29 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { return Bool.bridgeJSLiftReturn(ret) } + var count: Int { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var name: String { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_name_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return String.bridgeJSLiftReturn(ret) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) } @@ -3509,6 +3540,38 @@ public func _bjs_SwiftCounter_isEven(_self: UnsafeMutableRawPointer) -> Int32 { #endif } +@_expose(wasm, "bjs_SwiftCounter_count_get") +@_cdecl("bjs_SwiftCounter_count_get") +public func _bjs_SwiftCounter_count_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).count + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_count_set") +@_cdecl("bjs_SwiftCounter_count_set") +public func _bjs_SwiftCounter_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + SwiftCounter.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_name_get") +@_cdecl("bjs_SwiftCounter_name_get") +public func _bjs_SwiftCounter_name_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).name + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftCounter_deinit") @_cdecl("bjs_SwiftCounter_deinit") public func _bjs_SwiftCounter_deinit(pointer: UnsafeMutableRawPointer) { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index a6be6754a..49afbd693 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1505,7 +1505,26 @@ ], "name" : "SwiftCounter", "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + } ], "swiftCallName" : "SwiftCounter" } @@ -5896,7 +5915,27 @@ } } ], - "name" : "Counter" + "name" : "Counter", + "properties" : [ + { + "isReadonly" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] } ] } \ No newline at end of file diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index e2d0c9806..ab3f44770 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -812,7 +812,9 @@ function testProtocolSupport(exports) { let counterValue = 0; let counterLabel = ""; const jsCounter = { - increment(amount) { counterValue += amount; }, + count: 0, + name: "JSCounter", + increment(amount) { counterValue += amount; this.count += amount; }, getValue() { return counterValue; }, setLabelElements(labelPrefix, labelSuffix) { counterLabel = labelPrefix + labelSuffix; }, getLabel() { return counterLabel; }, @@ -820,8 +822,13 @@ function testProtocolSupport(exports) { }; const manager = new exports.CounterManager(jsCounter); + + assert.equal(jsCounter.count, 0); + assert.equal(jsCounter.name, "JSCounter"); + manager.incrementByAmount(4); assert.equal(manager.getCurrentValue(), 4); + assert.equal(jsCounter.count, 4); manager.setCounterLabel("Test", "Label"); assert.equal(manager.getCounterLabel(), "TestLabel"); @@ -839,21 +846,33 @@ function testProtocolSupport(exports) { const swiftCounter = new exports.SwiftCounter(); const swiftManager = new exports.CounterManager(swiftCounter); + assert.equal(swiftCounter.count, 0); + assert.equal(swiftCounter.name, "SwiftCounter"); + swiftManager.incrementByAmount(10); assert.equal(swiftManager.getCurrentValue(), 10); + assert.equal(swiftCounter.count, 10); swiftManager.setCounterLabel("Swift", "Label"); assert.equal(swiftManager.getCounterLabel(), "SwiftLabel"); swiftCounter.increment(5); assert.equal(swiftCounter.getValue(), 15); + assert.equal(swiftCounter.count, 15); + + swiftCounter.count = 100; + assert.equal(swiftCounter.count, 100); + assert.equal(swiftCounter.getValue(), 100); + swiftManager.release(); swiftCounter.release(); let optionalCounterValue = 100; let optionalCounterLabel = "optional"; const optionalCounter = { - increment(amount) { optionalCounterValue += amount; }, + count: 100, + name: "OptionalCounter", + increment(amount) { optionalCounterValue += amount; this.count += amount; }, getValue() { return optionalCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { optionalCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return optionalCounterLabel; }, @@ -863,7 +882,9 @@ function testProtocolSupport(exports) { let mainCounterValue = 0; let mainCounterLabel = "main"; const mainCounter = { - increment(amount) { mainCounterValue += amount; }, + count: 0, + name: "MainCounter", + increment(amount) { mainCounterValue += amount; this.count += amount; }, getValue() { return mainCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { mainCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return mainCounterLabel; }, @@ -902,6 +923,8 @@ function testProtocolSupport(exports) { assert.equal(managerWithOptional.hasBackup(), true); assert.equal(managerWithOptional.getBackupValue(), 1); + assert.equal(swiftBackupCounter.count, 1); + assert.equal(swiftBackupCounter.name, "SwiftCounter"); managerWithOptional.release(); swiftBackupCounter.release(); From 731a047d0c616c24cd3e92165bdc0876feb03b69 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 14 Oct 2025 17:39:46 +0200 Subject: [PATCH 014/252] BridgeJS: Naive implementation for swiftheapobject BridgeJS: Improve SwiftHeapObject handling in import side --- .../Sources/BridgeJSCore/ExportSwift.swift | 8 +- .../Sources/BridgeJSCore/ImportTS.swift | 32 +++- .../Sources/BridgeJSLink/BridgeJSLink.swift | 16 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 47 ++++-- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 6 + .../BridgeJSToolTests/Inputs/Protocol.swift | 18 +++ .../BridgeJSLinkTests/Protocol.Export.d.ts | 10 ++ .../BridgeJSLinkTests/Protocol.Export.js | 46 +++++- .../ExportSwiftTests/Protocol.json | 143 +++++++++++++++++- .../ExportSwiftTests/Protocol.swift | 85 +++++++++++ .../JavaScriptKit/BridgeJSInstrincics.swift | 16 +- .../Exporting-Swift-Protocols.md | 67 +++++++- .../BridgeJSRuntimeTests/ExportAPITests.swift | 10 ++ .../Generated/BridgeJS.ExportSwift.swift | 38 ++++- .../JavaScript/BridgeJS.ExportSwift.json | 84 ++++++++++ Tests/prelude.mjs | 32 +++- 16 files changed, 614 insertions(+), 44 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 01a8343e7..2d5f2d412 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -2213,7 +2213,7 @@ public class ExportSwift { var externParams: [String] = ["this: Int32"] for param in method.parameters { - let loweringInfo = try param.type.loweringParameterInfo() + let loweringInfo = try param.type.loweringParameterInfo(context: .protocolExport) assert( loweringInfo.loweredParameters.count == 1, "Protocol parameters must lower to a single WASM type" @@ -2239,7 +2239,7 @@ public class ExportSwift { """ } else { returnTypeStr = " -> \(method.returnType.swiftType)" - let liftingInfo = try method.returnType.liftingReturnInfo() + let liftingInfo = try method.returnType.liftingReturnInfo(context: .protocolExport) if let abiType = liftingInfo.valueToLift { externReturnType = " -> \(abiType.swiftType)" } else { @@ -2308,7 +2308,7 @@ public class ExportSwift { ) // Generate getter - let liftingInfo = try property.type.liftingReturnInfo() + let liftingInfo = try property.type.liftingReturnInfo(context: .protocolExport) let getterReturnType: String let getterCallCode: String @@ -2340,7 +2340,7 @@ public class ExportSwift { """ } else { // Readwrite property - getter and setter - let loweringInfo = try property.type.loweringParameterInfo() + let loweringInfo = try property.type.loweringParameterInfo(context: .protocolExport) assert( loweringInfo.loweredParameters.count == 1, "Protocol property setters must lower to a single WASM parameter" diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 64e89d66b..ac8ab03e2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -424,7 +424,7 @@ extension BridgeType { static let void = LoweringParameterInfo(loweredParameters: []) } - func loweringParameterInfo() throws -> LoweringParameterInfo { + func loweringParameterInfo(context: BridgeContext = .importTS) throws -> LoweringParameterInfo { switch self { case .bool: return .bool case .int: return .int @@ -433,8 +433,18 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .void: return .void - case .swiftHeapObject: - throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures") + case .swiftHeapObject(let className): + switch context { + case .importTS: + throw BridgeJSCoreError( + """ + swiftHeapObject '\(className)' is not supported in TypeScript imports. + Swift classes can only be used in @JS protocols where Swift owns the instance. + """ + ) + case .protocolExport: + return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) + } case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: @@ -456,7 +466,7 @@ extension BridgeType { static let void = LiftingReturnInfo(valueToLift: nil) } - func liftingReturnInfo() throws -> LiftingReturnInfo { + func liftingReturnInfo(context: BridgeContext = .importTS) throws -> LiftingReturnInfo { switch self { case .bool: return .bool case .int: return .int @@ -465,8 +475,18 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .void: return .void - case .swiftHeapObject: - throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures") + case .swiftHeapObject(let className): + switch context { + case .importTS: + throw BridgeJSCoreError( + """ + swiftHeapObject '\(className)' cannot be returned from imported TypeScript functions. + JavaScript cannot create Swift heap objects. + """ + ) + case .protocolExport: + return LiftingReturnInfo(valueToLift: .pointer) + } case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 1a182457f..9f85dbcf1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1856,13 +1856,15 @@ extension BridgeJSLink { let body: CodeFragmentPrinter let scope: JSGlueVariableScope let cleanupCode: CodeFragmentPrinter + let context: BridgeContext var parameterNames: [String] = [] var parameterForwardings: [String] = [] - init() { + init(context: BridgeContext = .importTS) { self.body = CodeFragmentPrinter() self.scope = JSGlueVariableScope() self.cleanupCode = CodeFragmentPrinter() + self.context = context } func liftSelf() { @@ -1870,7 +1872,7 @@ extension BridgeJSLink { } func liftParameter(param: Parameter) throws { - let liftingFragment = try IntrinsicJSFragment.liftParameter(type: param.type) + let liftingFragment = try IntrinsicJSFragment.liftParameter(type: param.type, context: context) assert( liftingFragment.parameters.count >= 1, "Lifting fragment should have at least one parameter to lift" @@ -1927,7 +1929,7 @@ extension BridgeJSLink { } private func call(callExpr: String, returnType: BridgeType) throws -> String? { - let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType) + let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context) let returnExpr: String? if loweringFragment.parameters.count == 0 { body.write("\(callExpr);") @@ -1947,7 +1949,7 @@ extension BridgeJSLink { func callConstructor(name: String) throws -> String? { let call = "new imports.\(name)(\(parameterForwardings.joined(separator: ", ")))" let type: BridgeType = .jsObject(name) - let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: type) + let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: type, context: context) return try lowerReturnValue(returnType: type, returnExpr: call, loweringFragment: loweringFragment) } @@ -2444,7 +2446,7 @@ extension BridgeJSLink { className: `protocol`.name ) - let getterThunkBuilder = ImportedThunkBuilder() + let getterThunkBuilder = ImportedThunkBuilder(context: .protocolExport) getterThunkBuilder.liftSelf() let returnExpr = try getterThunkBuilder.callPropertyGetter(name: property.name, returnType: property.type) let getterLines = getterThunkBuilder.renderFunction( @@ -2462,7 +2464,7 @@ extension BridgeJSLink { operation: "set", className: `protocol`.name ) - let setterThunkBuilder = ImportedThunkBuilder() + let setterThunkBuilder = ImportedThunkBuilder(context: .protocolExport) setterThunkBuilder.liftSelf() try setterThunkBuilder.liftParameter( param: Parameter(label: nil, name: "value", type: property.type) @@ -2482,7 +2484,7 @@ extension BridgeJSLink { protocol: ExportedProtocol, method: ExportedFunction ) throws { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(context: .protocolExport) thunkBuilder.liftSelf() for param in method.parameters { try thunkBuilder.liftParameter(param: param) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ef431432f..b7adcb670 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -219,6 +219,20 @@ struct IntrinsicJSFragment: Sendable { } ) } + static func swiftHeapObjectLiftParameter(_ name: String) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["pointer"], + printCode: { arguments, scope, printer, cleanupCode in + return ["\(name).__construct(\(arguments[0]))"] + } + ) + } + static let swiftHeapObjectLowerReturn = IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + return ["\(arguments[0]).pointer"] + } + ) static func associatedEnumLowerParameter(enumBase: String) -> IntrinsicJSFragment { IntrinsicJSFragment( @@ -468,17 +482,23 @@ struct IntrinsicJSFragment: Sendable { // MARK: - ImportedJS /// Returns a fragment that lifts Wasm core values to JS values for parameters - static func liftParameter(type: BridgeType) throws -> IntrinsicJSFragment { + /// + /// - Parameters: + /// - type: The bridge type to lift + /// - context: The bridge context (defaults to .importTS for backward compatibility) + static func liftParameter(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity case .bool: return .boolLiftParameter case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter case .swiftHeapObject(let name): - throw BridgeJSLinkError( - message: - "Swift heap objects are not supported to be passed as parameters to imported JS functions: \(name)" - ) + guard context == .protocolExport else { + throw BridgeJSLinkError( + message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" + ) + } + return .swiftHeapObjectLiftParameter(name) case .swiftProtocol: return .jsObjectLiftParameter case .void: throw BridgeJSLinkError( @@ -509,16 +529,23 @@ struct IntrinsicJSFragment: Sendable { } /// Returns a fragment that lowers a JS value to Wasm core values for return values - static func lowerReturn(type: BridgeType) throws -> IntrinsicJSFragment { + /// + /// - Parameters: + /// - type: The bridge type to lower + /// - context: The bridge context (defaults to .importTS for backward compatibility) + static func lowerReturn(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity case .bool: return .boolLowerReturn case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn - case .swiftHeapObject: - throw BridgeJSLinkError( - message: "Swift heap objects are not supported to be returned from imported JS functions" - ) + case .swiftHeapObject(let name): + guard context == .protocolExport else { + throw BridgeJSLinkError( + message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" + ) + } + return .swiftHeapObjectLowerReturn case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .optional(let wrappedType): diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 3cf34554a..504cd68a2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -67,6 +67,12 @@ public struct ABINameGenerator { // MARK: - Types +/// Context for bridge operations that determines which types are valid +public enum BridgeContext: Sendable { + case importTS + case protocolExport +} + public enum BridgeType: Codable, Equatable, Sendable { case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void indirect case optional(BridgeType) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index 54ca6abf7..901b64335 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -1,5 +1,17 @@ import JavaScriptKit +@JS class Helper { + @JS var value: Int + + @JS init(value: Int) { + self.value = value + } + + @JS func increment() { + value += 1 + } +} + @JS protocol MyViewControllerDelegate { var eventCount: Int { get set } var delegateName: String { get } @@ -8,6 +20,8 @@ import JavaScriptKit func onCountUpdated(count: Int) -> Bool func onLabelUpdated(_ prefix: String, _ suffix: String) func isCountEven() -> Bool + func onHelperUpdated(_ helper: Helper) + func createHelper() -> Helper } @JS class MyViewController { @@ -40,4 +54,8 @@ import JavaScriptKit @JS func checkEvenCount() -> Bool { return delegate.isCountEven() } + + @JS func sendHelper(_ helper: Helper) { + delegate.onHelperUpdated(helper) + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index a6d1125eb..6ff2f6f8f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -10,6 +10,8 @@ export interface MyViewControllerDelegate { onCountUpdated(count: number): boolean; onLabelUpdated(prefix: string, suffix: string): void; isCountEven(): boolean; + onHelperUpdated(helper: Helper): void; + createHelper(): Helper; eventCount: number; readonly delegateName: string; } @@ -21,16 +23,24 @@ export interface SwiftHeapObject { /// Note: Calling this method will release the heap object and it will no longer be accessible. release(): void; } +export interface Helper extends SwiftHeapObject { + increment(): void; + value: number; +} export interface MyViewController extends SwiftHeapObject { triggerEvent(): void; updateValue(value: string): void; updateCount(count: number): boolean; updateLabel(prefix: string, suffix: string): void; checkEvenCount(): boolean; + sendHelper(helper: Helper): void; delegate: MyViewControllerDelegate; secondDelegate: MyViewControllerDelegate | null; } export type Exports = { + Helper: { + new(value: number): Helper; + } MyViewController: { new(delegate: MyViewControllerDelegate): MyViewController; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 847787d5c..d49b9b8f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -142,6 +142,10 @@ export async function createInstantiator(options, swift) { if (!importObject["TestModule"]) { importObject["TestModule"] = {}; } + importObject["TestModule"]["bjs_Helper_wrap"] = function(pointer) { + const obj = Helper.__construct(pointer); + return swift.memory.retain(obj); + }; importObject["TestModule"]["bjs_MyViewController_wrap"] = function(pointer) { const obj = MyViewController.__construct(pointer); return swift.memory.retain(obj); @@ -156,7 +160,7 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_MyViewControllerDelegate_eventCount_get"] = function bjs_MyViewControllerDelegate_eventCount_get(self, value) { + TestModule["bjs_MyViewControllerDelegate_eventCount_set"] = function bjs_MyViewControllerDelegate_eventCount_set(self, value) { try { swift.memory.getObject(self).eventCount = value; } catch (error) { @@ -217,6 +221,22 @@ export async function createInstantiator(options, swift) { return 0 } } + TestModule["bjs_MyViewControllerDelegate_onHelperUpdated"] = function bjs_MyViewControllerDelegate_onHelperUpdated(self, helper) { + try { + swift.memory.getObject(self).onHelperUpdated(Helper.__construct(helper)); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_createHelper"] = function bjs_MyViewControllerDelegate_createHelper(self) { + try { + let ret = swift.memory.getObject(self).createHelper(); + return ret.pointer; + } catch (error) { + setException(error); + return 0 + } + } }, setInstance: (i) => { instance = i; @@ -248,6 +268,26 @@ export async function createInstantiator(options, swift) { this.deinit(this.pointer); } } + class Helper extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Helper_deinit, Helper.prototype); + } + + constructor(value) { + const ret = instance.exports.bjs_Helper_init(value); + return Helper.__construct(ret); + } + increment() { + instance.exports.bjs_Helper_increment(this.pointer); + } + get value() { + const ret = instance.exports.bjs_Helper_value_get(this.pointer); + return ret; + } + set value(value) { + instance.exports.bjs_Helper_value_set(this.pointer, value); + } + } class MyViewController extends SwiftHeapObject { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MyViewController_deinit, MyViewController.prototype); @@ -283,6 +323,9 @@ export async function createInstantiator(options, swift) { const ret = instance.exports.bjs_MyViewController_checkEvenCount(this.pointer); return ret !== 0; } + sendHelper(helper) { + instance.exports.bjs_MyViewController_sendHelper(this.pointer, helper.pointer); + } get delegate() { const ret = instance.exports.bjs_MyViewController_delegate_get(this.pointer); const ret1 = swift.memory.getObject(ret); @@ -304,6 +347,7 @@ export async function createInstantiator(options, swift) { } } return { + Helper, MyViewController, }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index 77327c454..6d8a2545a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -1,5 +1,59 @@ { "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Helper_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Helper_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "Helper", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Helper" + }, { "constructor" : { "abiName" : "bjs_MyViewController_init", @@ -136,6 +190,31 @@ "returnType" : { "bool" : { + } + } + }, + { + "abiName" : "bjs_MyViewController_sendHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sendHelper", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + ], + "returnType" : { + "void" : { + } } } @@ -297,9 +376,71 @@ } } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onHelperUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onHelperUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createHelper", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } } ], - "name" : "MyViewControllerDelegate" + "name" : "MyViewControllerDelegate", + "properties" : [ + { + "isReadonly" : false, + "name" : "eventCount", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "name" : "delegateName", + "type" : { + "string" : { + + } + } + } + ] } ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 0e5304673..dbb78e3f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -41,6 +41,19 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Bool.bridgeJSLiftReturn(ret) } + func onHelperUpdated(_ helper: Helper) { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") + func _extern_onHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) + _extern_onHelperUpdated(this: Int32(bitPattern: jsObject.id), helper: helper.bridgeJSLowerParameter()) + } + + func createHelper() -> Helper { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") + func _extern_createHelper(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_createHelper(this: Int32(bitPattern: jsObject.id)) + return Helper.bridgeJSLiftReturn(ret) + } + var eventCount: Int { get { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") @@ -69,6 +82,68 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } } +@_expose(wasm, "bjs_Helper_init") +@_cdecl("bjs_Helper_init") +public func _bjs_Helper_init(value: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Helper(value: Int.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Helper_increment") +@_cdecl("bjs_Helper_increment") +public func _bjs_Helper_increment(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Helper.bridgeJSLiftParameter(_self).increment() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Helper_value_get") +@_cdecl("bjs_Helper_value_get") +public func _bjs_Helper_value_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = Helper.bridgeJSLiftParameter(_self).value + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Helper_value_set") +@_cdecl("bjs_Helper_value_set") +public func _bjs_Helper_value_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + Helper.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Helper_deinit") +@_cdecl("bjs_Helper_deinit") +public func _bjs_Helper_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Helper: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_Helper_wrap") + func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_Helper_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + @_expose(wasm, "bjs_MyViewController_init") @_cdecl("bjs_MyViewController_init") public func _bjs_MyViewController_init(delegate: Int32) -> UnsafeMutableRawPointer { @@ -132,6 +207,16 @@ public func _bjs_MyViewController_checkEvenCount(_self: UnsafeMutableRawPointer) #endif } +@_expose(wasm, "bjs_MyViewController_sendHelper") +@_cdecl("bjs_MyViewController_sendHelper") +public func _bjs_MyViewController_sendHelper(_self: UnsafeMutableRawPointer, helper: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + MyViewController.bridgeJSLiftParameter(_self).sendHelper(_: Helper.bridgeJSLiftParameter(helper)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_MyViewController_delegate_get") @_cdecl("bjs_MyViewController_delegate_get") public func _bjs_MyViewController_delegate_get(_self: UnsafeMutableRawPointer) -> Int32 { diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index 4742aa629..b33257757 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -268,14 +268,14 @@ public protocol _BridgedSwiftHeapObject: AnyObject {} extension _BridgedSwiftHeapObject { // MARK: ImportTS - @available(*, unavailable, message: "Swift heap objects are not supported to be passed to imported JS functions") - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Void {} - @available( - *, - unavailable, - message: "Swift heap objects are not supported to be returned from imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Void {} + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + // For protocol parameters, we pass the unretained pointer since JS already has a reference + return Unmanaged.passUnretained(self).toOpaque() + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Self { + // For protocol returns, take an unretained value since JS manages the lifetime + return Unmanaged.fromOpaque(pointer).takeUnretainedValue() + } // MARK: ExportSwift @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 8e1aa8a9a..b70b5c023 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -21,6 +21,8 @@ Mark a Swift protocol with `@JS` to expose it: import JavaScriptKit @JS protocol Counter { + var count: Int { get set } + var name: String { get } func increment(by amount: Int) func reset() func getValue() -> Int @@ -41,6 +43,14 @@ import JavaScriptKit @JS func getCurrentValue() -> Int { return delegate.getValue() } + + @JS func getCounterName() -> String { + return delegate.name + } + + @JS func setCountValue(_ value: Int) { + delegate.count = value + } } ``` @@ -53,6 +63,7 @@ const { exports } = await init({}); // Implement the Counter protocol const counterImpl = { count: 0, + name: "JSCounter", increment(amount) { this.count += amount; }, @@ -68,12 +79,17 @@ const counterImpl = { const manager = new exports.CounterManager(counterImpl); manager.incrementTwice(); console.log(manager.getCurrentValue()); // 2 +console.log(manager.getCounterName()); // "JSCounter" +manager.setCountValue(10); +console.log(counterImpl.count); // 10 ``` The generated TypeScript interface: ```typescript export interface Counter { + count: number; + readonly name: string; increment(amount: number): void; reset(): void; getValue(): number; @@ -94,6 +110,27 @@ BridgeJS generates a Swift wrapper struct for each `@JS` protocol. This wrapper struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { let jsObject: JSObject + var count: Int { + get { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var name: String { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_name_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return String.bridgeJSLiftReturn() + } + func increment(by amount: Int) { @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") func _extern_increment(this: Int32, amount: Int32) @@ -128,13 +165,16 @@ You can also implement protocols in Swift and use them from JavaScript: ```swift @JS protocol Counter { + var count: Int { get set } + var name: String { get } func increment(by amount: Int) func reset() func getValue() -> Int } final class SwiftCounter: Counter { - private var count = 0 + var count = 0 + let name = "SwiftCounter" func increment(by amount: Int) { count += amount @@ -158,9 +198,13 @@ From JavaScript: ```javascript const counter = exports.createCounter(); +console.log(counter.name); // "SwiftCounter" counter.increment(5); counter.increment(3); console.log(counter.getValue()); // 8 +console.log(counter.count); // 8 +counter.count = 100; +console.log(counter.getValue()); // 100 counter.reset(); console.log(counter.getValue()); // 0 ``` @@ -183,10 +227,27 @@ When you pass a JavaScript object implementing a protocol to Swift: | Method requirements with return values | ✅ | | Throwing method requirements: `func method() throws(JSException)` | ✅ | | Async method requirements: `func method() async` | ✅ | +| Property requirements: `var property: Type { get }` | ✅ | +| Property requirements: `var property: Type { get set }` | ✅ | | Optional protocol methods | ❌ | -| Property requirements: `var property: Type { get }` | ❌ | -| Property requirements: `var property: Type { get set }` | ❌ | | Associated types | ❌ | | Protocol inheritance | ❌ | | Protocol composition: `Protocol1 & Protocol2` | ❌ | | Generics | ❌ | + +### Type Support for Protocol Properties and Method Parameters + +Protocol properties and method parameters have more limited type support compared to regular exported Swift functions and classes. This is because protocols bridge Swift implementations to JavaScript objects using the TypeScript import mechanism. + +**Supported Types:** +- Primitives: `Bool`, `Int`, `Float`, `Double` +- `String` +- `JSObject` + +**Not Supported:** +- `@JS class` types +- `@JS enum` types (case, raw value, or associated value) +- `@JS protocol` types +- Optional types: `Int?`, `String?`, etc. + +> Note: For regular `@JS func` and `@JS class` exports (not within protocols), all these types including optionals, enums, and classes are fully supported. See and for more information. diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index b49dca59d..1cdea545c 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -867,6 +867,8 @@ enum APIOptionalResult { func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) func getLabel() -> String func isEven() -> Bool + func processGreeter(_ greeter: Greeter) -> String + func createGreeter() -> Greeter } @JS class CounterManager { @@ -939,6 +941,14 @@ enum APIOptionalResult { @JS func isEven() -> Bool { return count % 2 == 0 } + + @JS func processGreeter(_ greeter: Greeter) -> String { + return "SwiftCounter processed: \(greeter.greet())" + } + + @JS func createGreeter() -> Greeter { + return Greeter(name: "CounterGreeter") + } } class ExportAPITests: XCTestCase { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 3ee75a189..026c1f322 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -50,6 +50,20 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { return Bool.bridgeJSLiftReturn(ret) } + func processGreeter(_ greeter: Greeter) -> String { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_processGreeter") + func _extern_processGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 + let ret = _extern_processGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(ret) + } + + func createGreeter() -> Greeter { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_createGreeter") + func _extern_createGreeter(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_createGreeter(this: Int32(bitPattern: jsObject.id)) + return Greeter.bridgeJSLiftReturn(ret) + } + var count: Int { get { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") @@ -58,7 +72,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { return Int.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_set") func _extern_set(this: Int32, value: Int32) _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } @@ -3540,6 +3554,28 @@ public func _bjs_SwiftCounter_isEven(_self: UnsafeMutableRawPointer) -> Int32 { #endif } +@_expose(wasm, "bjs_SwiftCounter_processGreeter") +@_cdecl("bjs_SwiftCounter_processGreeter") +public func _bjs_SwiftCounter_processGreeter(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_createGreeter") +@_cdecl("bjs_SwiftCounter_createGreeter") +public func _bjs_SwiftCounter_createGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).createGreeter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftCounter_count_get") @_cdecl("bjs_SwiftCounter_count_get") public func _bjs_SwiftCounter_count_get(_self: UnsafeMutableRawPointer) -> Int32 { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 49afbd693..79b0884b9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1501,6 +1501,48 @@ } } + }, + { + "abiName" : "bjs_SwiftCounter_processGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_createGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createGreeter", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } } ], "name" : "SwiftCounter", @@ -5913,6 +5955,48 @@ } } + }, + { + "abiName" : "bjs_Counter_processGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Counter_createGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createGreeter", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } } ], "name" : "Counter", diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index ab3f44770..f5bbc3556 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -818,7 +818,9 @@ function testProtocolSupport(exports) { getValue() { return counterValue; }, setLabelElements(labelPrefix, labelSuffix) { counterLabel = labelPrefix + labelSuffix; }, getLabel() { return counterLabel; }, - isEven() { return counterValue % 2 === 0; } + isEven() { return counterValue % 2 === 0; }, + processGreeter(greeter) { return `JSCounter processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("JSCounterGreeter"); } }; const manager = new exports.CounterManager(jsCounter); @@ -864,6 +866,26 @@ function testProtocolSupport(exports) { assert.equal(swiftCounter.count, 100); assert.equal(swiftCounter.getValue(), 100); + const testGreeter = new exports.Greeter("TestUser"); + const jsResult = jsCounter.processGreeter(testGreeter); + assert.equal(jsResult, "JSCounter processed: Hello, TestUser!"); + + const swiftResult = swiftCounter.processGreeter(testGreeter); + assert.equal(swiftResult, "SwiftCounter processed: Hello, TestUser!"); + + // Test swiftHeapObject return from protocol methods + const jsCreatedGreeter = jsCounter.createGreeter(); + assert.equal(jsCreatedGreeter.name, "JSCounterGreeter"); + assert.equal(jsCreatedGreeter.greet(), "Hello, JSCounterGreeter!"); + jsCreatedGreeter.release(); + + const swiftCreatedGreeter = swiftCounter.createGreeter(); + assert.equal(swiftCreatedGreeter.name, "CounterGreeter"); + assert.equal(swiftCreatedGreeter.greet(), "Hello, CounterGreeter!"); + swiftCreatedGreeter.release(); + + testGreeter.release(); + swiftManager.release(); swiftCounter.release(); @@ -876,7 +898,9 @@ function testProtocolSupport(exports) { getValue() { return optionalCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { optionalCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return optionalCounterLabel; }, - isEven() { return optionalCounterValue % 2 === 0; } + isEven() { return optionalCounterValue % 2 === 0; }, + processGreeter(greeter) { return `OptionalCounter processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("OptionalCounterGreeter"); } }; let mainCounterValue = 0; @@ -888,7 +912,9 @@ function testProtocolSupport(exports) { getValue() { return mainCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { mainCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return mainCounterLabel; }, - isEven() { return mainCounterValue % 2 === 0; } + isEven() { return mainCounterValue % 2 === 0; }, + processGreeter(greeter) { return `MainCounter processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("MainCounterGreeter"); } }; const managerWithOptional = new exports.CounterManager(mainCounter); From d59368a35382da9bb8f1a42a0ad0a1d5206e62f3 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 15 Oct 2025 12:42:58 +0200 Subject: [PATCH 015/252] BridgeJS: Support for Optional for properties / method parameters / method return types in protocol --- .../Sources/BridgeJSCore/ExportSwift.swift | 74 ++++--- .../Sources/BridgeJSCore/ImportTS.swift | 23 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 3 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 196 +++++++++++++++++- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 2 +- .../BridgeJSToolTests/Inputs/Protocol.swift | 9 +- .../BridgeJSLinkTests/Protocol.Export.d.ts | 3 + .../BridgeJSLinkTests/Protocol.Export.js | 44 ++++ .../ExportSwiftTests/Protocol.json | 63 ++++++ .../ExportSwiftTests/Protocol.swift | 27 +++ .../JavaScriptKit/BridgeJSInstrincics.swift | 49 +++-- .../Exporting-Swift-Protocols.md | 41 ++-- .../BridgeJSRuntimeTests/ExportAPITests.swift | 20 +- .../Generated/BridgeJS.ExportSwift.swift | 71 +++++++ .../JavaScript/BridgeJS.ExportSwift.json | 127 ++++++++++++ Tests/prelude.mjs | 44 +++- 16 files changed, 708 insertions(+), 88 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 2d5f2d412..526b25626 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -982,16 +982,16 @@ public class ExportSwift { ) let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) - + exportedProtocolByName[protocolUniqueKey] = ExportedProtocol( name: name, methods: [], properties: [], namespace: namespaceResult.namespace ) - + stateStack.push(state: .protocolBody(name: name, key: protocolUniqueKey)) - + var methods: [ExportedFunction] = [] for member in node.memberBlock.members { if let funcDecl = member.decl.as(FunctionDeclSyntax.self) { @@ -1013,10 +1013,10 @@ public class ExportSwift { properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [], namespace: namespaceResult.namespace ) - + exportedProtocolByName[protocolUniqueKey] = exportedProtocol exportedProtocolNames.append(protocolUniqueKey) - + stateStack.pop() parent.exportedProtocolNameByKey[protocolUniqueKey] = name @@ -1097,14 +1097,6 @@ public class ExportSwift { continue } - if case .optional = propertyType { - diagnose( - node: typeAnnotation.type, - message: "Optional properties are not yet supported in protocols" - ) - continue - } - guard let accessorBlock = binding.accessorBlock else { diagnose( node: binding, @@ -1125,7 +1117,7 @@ public class ExportSwift { if var currentProtocol = exportedProtocolByName[protocolKey] { var properties = currentProtocol.properties properties.append(exportedProperty) - + currentProtocol = ExportedProtocol( name: currentProtocol.name, methods: currentProtocol.methods, @@ -2240,15 +2232,34 @@ public class ExportSwift { } else { returnTypeStr = " -> \(method.returnType.swiftType)" let liftingInfo = try method.returnType.liftingReturnInfo(context: .protocolExport) - if let abiType = liftingInfo.valueToLift { + + if case .optional = method.returnType { + if let abiType = liftingInfo.valueToLift { + externReturnType = " -> \(abiType.swiftType)" + callCode = """ + let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) + """ + } else { + externReturnType = "" + callCode = """ + _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() + """ + } + } else if let abiType = liftingInfo.valueToLift { externReturnType = " -> \(abiType.swiftType)" + callCode = """ + let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) + """ } else { externReturnType = "" + callCode = """ + _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() + """ } - callCode = """ - let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) - """ } let methodImplementation: DeclSyntax = """ func \(raw: method.name)(\(raw: swiftParams.joined(separator: ", ")))\(raw: returnTypeStr) { @@ -2286,7 +2297,7 @@ public class ExportSwift { } """ } - + private func renderProtocolProperty( property: ExportedProtocolProperty, protocolName: String, @@ -2306,27 +2317,27 @@ public class ExportSwift { operation: "set", className: protocolName ) - + // Generate getter let liftingInfo = try property.type.liftingReturnInfo(context: .protocolExport) let getterReturnType: String let getterCallCode: String - + if let abiType = liftingInfo.valueToLift { getterReturnType = " -> \(abiType.swiftType)" getterCallCode = """ - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) - return \(property.type.swiftType).bridgeJSLiftReturn(ret) - """ + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return \(property.type.swiftType).bridgeJSLiftReturn(ret) + """ } else { // For String and other types that use tmpRetString getterReturnType = "" getterCallCode = """ - _extern_get(this: Int32(bitPattern: jsObject.id)) - return \(property.type.swiftType).bridgeJSLiftReturn() - """ + _extern_get(this: Int32(bitPattern: jsObject.id)) + return \(property.type.swiftType).bridgeJSLiftReturn() + """ } - + if property.isReadonly { // Readonly property - only getter return """ @@ -2345,11 +2356,11 @@ public class ExportSwift { loweringInfo.loweredParameters.count == 1, "Protocol property setters must lower to a single WASM parameter" ) - + let (paramName, wasmType) = loweringInfo.loweredParameters[0] let setterParams = "this: Int32, \(paramName): \(wasmType.swiftType)" let setterCallArgs = "this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter()" - + return """ var \(raw: property.name): \(raw: property.type.swiftType) { get { @@ -2542,6 +2553,7 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") } } + } extension DeclModifierSyntax { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index ac8ab03e2..52ff813aa 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -449,8 +449,13 @@ extension BridgeType { throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .optional: - throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + case .optional(let wrappedType): + switch context { + case .importTS: + throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + case .protocolExport: + return try wrappedType.loweringParameterInfo(context: context) + } } } @@ -492,7 +497,19 @@ extension BridgeType { case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .optional: - throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + switch context { + case .importTS: + throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + case .protocolExport: + // For Optional, return the length (or -1 for null) + if case .optional(.string) = self { + return .string + } + if case .optional(.swiftHeapObject) = self { + return LiftingReturnInfo(valueToLift: .pointer) + } + return LiftingReturnInfo(valueToLift: nil) + } } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 9f85dbcf1..4445ddeb6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1883,6 +1883,7 @@ extension BridgeJSLink { valuesToLift = [scope.variable(param.name)] } else { valuesToLift = liftingFragment.parameters.map { scope.variable(param.name + $0.capitalizedFirstLetter) } + parameterNames.append(contentsOf: valuesToLift) } let liftedValues = liftingFragment.printCode(valuesToLift, scope, body, cleanupCode) assert(liftedValues.count == 1, "Lifting fragment should produce exactly one value") @@ -2455,7 +2456,7 @@ extension BridgeJSLink { returnType: property.type ) importObjectBuilder.assignToImportObject(name: getterAbiName, function: getterLines) - + if !property.isReadonly { let setterAbiName = ABINameGenerator.generateABIName( baseName: property.name, diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index b7adcb670..1e92b09a4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -263,6 +263,70 @@ struct IntrinsicJSFragment: Sendable { ) } + static func optionalLiftParameter(wrappedType: BridgeType, context: BridgeContext) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["isSome", "wrappedValue"], + printCode: { arguments, scope, printer, cleanupCode in + let isSome = arguments[0] + let wrappedValue = arguments[1] + + let resultExpr: String + switch wrappedType { + case .int, .float, .double, .caseEnum: + resultExpr = "\(isSome) ? \(wrappedValue) : null" + + case .bool: + resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : null" + + case .string: + let objectLabel = scope.variable("obj") + printer.write("let \(objectLabel);") + printer.write("if (\(isSome)) {") + printer.indent { + printer.write( + "\(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") + } + printer.write("}") + resultExpr = "\(isSome) ? \(objectLabel) : null" + + case .swiftHeapObject(let name): + resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : null" + + case .jsObject: + resultExpr = + "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : null" + + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + let objectLabel = scope.variable("obj") + printer.write("let \(objectLabel);") + printer.write("if (\(isSome)) {") + printer.indent { + printer.write( + "\(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") + } + printer.write("}") + resultExpr = "\(isSome) ? \(objectLabel) : null" + case .bool: + resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : null" + default: + resultExpr = "\(isSome) ? \(wrappedValue) : null" + } + + default: + resultExpr = "\(isSome) ? \(wrappedValue) : null" + } + + return [resultExpr] + } + ) + } + static func optionalLowerParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], @@ -423,6 +487,114 @@ struct IntrinsicJSFragment: Sendable { ) } + static func optionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + switch wrappedType { + case .bool, .int, .float, .double, .string, .swiftHeapObject, .jsObject, .swiftProtocol, .caseEnum, + .rawValueEnum: + break + case .void, .optional, .associatedValueEnum, .namespaceEnum: + throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") + } + + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + + printer.write("const \(isSomeVar) = \(value) != null;") + + switch wrappedType { + case .bool: + printer.write( + "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + case .int, .caseEnum: + printer.write( + "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" + ) + case .float: + printer.write( + "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + case .double: + printer.write( + "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" + ) + case .string: + let bytesVar = scope.variable("bytes") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) + printer.write("bjs[\"swift_js_return_optional_string\"](1, \(bytesVar), \(bytesVar).length);") + printer.write("return \(bytesVar).length;") + } + printer.write("} else {") + printer.indent { + printer.write("bjs[\"swift_js_return_optional_string\"](0, 0, 0);") + printer.write("return -1;") + } + printer.write("}") + + case .swiftHeapObject: + printer.write("return \(isSomeVar) ? \(value).pointer : 0;") + case .jsObject, .swiftProtocol: + let idVar = scope.variable("id") + printer.write("let \(idVar) = 0;") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + } + printer.write("}") + printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + let bytesVar = scope.variable("bytes") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) + printer.write( + "bjs[\"swift_js_return_optional_string\"](1, \(bytesVar), \(bytesVar).length);" + ) + printer.write("return \(bytesVar).length;") + } + printer.write("} else {") + printer.indent { + printer.write("bjs[\"swift_js_return_optional_string\"](0, 0, 0);") + printer.write("return -1;") + } + printer.write("}") + case .bool: + printer.write( + "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + case .float: + printer.write( + "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + case .double: + printer.write( + "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" + ) + default: + printer.write( + "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" + ) + } + default: + () + } + + return [] + } + ) + } + // MARK: - ExportSwift /// Returns a fragment that lowers a JS value to Wasm core values for parameters @@ -505,9 +677,15 @@ struct IntrinsicJSFragment: Sendable { message: "Void can't appear in parameters of imported JS functions" ) case .optional(let wrappedType): - throw BridgeJSLinkError( - message: "Optional types are not supported for imported JS functions: \(wrappedType)" - ) + switch context { + case .importTS: + throw BridgeJSLinkError( + message: "Optional types are not supported for imported JS functions: \(wrappedType)" + ) + case .protocolExport: + // Protocol exports support Optional - use existing optionalLiftParameter fragment + return try .optionalLiftParameter(wrappedType: wrappedType, context: context) + } case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -549,9 +727,15 @@ struct IntrinsicJSFragment: Sendable { case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .optional(let wrappedType): - throw BridgeJSLinkError( - message: "Optional types are not supported for imported JS functions: \(wrappedType)" - ) + switch context { + case .importTS: + throw BridgeJSLinkError( + message: "Optional types are not supported for imported JS functions: \(wrappedType)" + ) + case .protocolExport: + // Protocol exports support Optional - use side channel approach for return values + return try .optionalLowerReturn(wrappedType: wrappedType) + } case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 504cd68a2..233e79038 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -280,7 +280,7 @@ public struct ExportedProtocolProperty: Codable, Equatable, Sendable { public let name: String public let type: BridgeType public let isReadonly: Bool - + public init( name: String, type: BridgeType, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index 901b64335..63a6d9acb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -2,11 +2,11 @@ import JavaScriptKit @JS class Helper { @JS var value: Int - + @JS init(value: Int) { self.value = value } - + @JS func increment() { value += 1 } @@ -15,6 +15,7 @@ import JavaScriptKit @JS protocol MyViewControllerDelegate { var eventCount: Int { get set } var delegateName: String { get } + var optionalName: String? { get set } func onSomethingHappened() func onValueChanged(_ value: String) func onCountUpdated(count: Int) -> Bool @@ -22,6 +23,8 @@ import JavaScriptKit func isCountEven() -> Bool func onHelperUpdated(_ helper: Helper) func createHelper() -> Helper + func onOptionalHelperUpdated(_ helper: Helper?) + func createOptionalHelper() -> Helper? } @JS class MyViewController { @@ -54,7 +57,7 @@ import JavaScriptKit @JS func checkEvenCount() -> Bool { return delegate.isCountEven() } - + @JS func sendHelper(_ helper: Helper) { delegate.onHelperUpdated(helper) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index 6ff2f6f8f..2d4899793 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -12,8 +12,11 @@ export interface MyViewControllerDelegate { isCountEven(): boolean; onHelperUpdated(helper: Helper): void; createHelper(): Helper; + onOptionalHelperUpdated(helper: Helper | null): void; + createOptionalHelper(): Helper | null; eventCount: number; readonly delegateName: string; + optionalName: string | null; } /// Represents a Swift heap object like a class instance or an actor instance. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index d49b9b8f2..1d9329c3e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -176,6 +176,34 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_MyViewControllerDelegate_optionalName_get"] = function bjs_MyViewControllerDelegate_optionalName_get(self) { + try { + let ret = swift.memory.getObject(self).optionalName; + const isSome = ret != null; + if (isSome) { + const bytes = textEncoder.encode(ret); + bjs["swift_js_return_optional_string"](1, bytes, bytes.length); + return bytes.length; + } else { + bjs["swift_js_return_optional_string"](0, 0, 0); + return -1; + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_optionalName_set"] = function bjs_MyViewControllerDelegate_optionalName_set(self, valueIsSome, valueWrappedValue) { + try { + let obj; + if (valueIsSome) { + obj = swift.memory.getObject(valueWrappedValue); + swift.memory.release(valueWrappedValue); + } + swift.memory.getObject(self).optionalName = valueIsSome ? obj : null; + } catch (error) { + setException(error); + } + } TestModule["bjs_MyViewControllerDelegate_onSomethingHappened"] = function bjs_MyViewControllerDelegate_onSomethingHappened(self) { try { swift.memory.getObject(self).onSomethingHappened(); @@ -237,6 +265,22 @@ export async function createInstantiator(options, swift) { return 0 } } + TestModule["bjs_MyViewControllerDelegate_onOptionalHelperUpdated"] = function bjs_MyViewControllerDelegate_onOptionalHelperUpdated(self, helperIsSome, helperWrappedValue) { + try { + swift.memory.getObject(self).onOptionalHelperUpdated(helperIsSome ? Helper.__construct(helperWrappedValue) : null); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_createOptionalHelper"] = function bjs_MyViewControllerDelegate_createOptionalHelper(self) { + try { + let ret = swift.memory.getObject(self).createOptionalHelper(); + const isSome = ret != null; + return isSome ? ret.pointer : 0; + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index 6d8a2545a..30abfc91c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -418,6 +418,56 @@ "_0" : "Helper" } } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onOptionalHelperUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onOptionalHelperUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createOptionalHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalHelper", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + } } ], "name" : "MyViewControllerDelegate", @@ -439,6 +489,19 @@ } } + }, + { + "isReadonly" : false, + "name" : "optionalName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } } ] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index dbb78e3f2..ea1d71eab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -54,6 +54,19 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Helper.bridgeJSLiftReturn(ret) } + func onOptionalHelperUpdated(_ helper: Optional) { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") + func _extern_onOptionalHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) + _extern_onOptionalHelperUpdated(this: Int32(bitPattern: jsObject.id), helper: helper.bridgeJSLowerParameter()) + } + + func createOptionalHelper() -> Optional { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") + func _extern_createOptionalHelper(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_createOptionalHelper(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + var eventCount: Int { get { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") @@ -77,6 +90,20 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } } + var optionalName: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) } diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index b33257757..5a8f7f014 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -538,11 +538,23 @@ extension Optional where Wrapped == Int { extension Optional where Wrapped == String { // MARK: ImportTS - @available(*, unavailable, message: "Optional String type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return 0 + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available(*, unavailable, message: "Optional String type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32) -> String? { return nil } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ length: Int32) -> String? { + // JavaScript returns -1 for null, or the byte length if present + // The actual string is already in tmpRetString side channel + if length < 0 { + return nil + } + return String.bridgeJSLiftReturn(length) + } // MARK: ExportSwift @@ -671,19 +683,24 @@ extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { /// Optional support for Swift heap objects extension Optional where Wrapped: _BridgedSwiftHeapObject { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional Swift heap objects are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + switch consume self { + case .none: + // Return null pointer for nil + return UnsafeMutableRawPointer(bitPattern: 0).unsafelyUnwrapped + case .some(let value): + // Pass unretained pointer since JS will manage the lifetime + return Unmanaged.passUnretained(value).toOpaque() + } + } - @available( - *, - unavailable, - message: "Optional Swift heap objects are not supported to be returned from imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ pointer: UnsafeMutableRawPointer) -> Void { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Wrapped? + { + if pointer == UnsafeMutableRawPointer(bitPattern: 0) { + return nil + } else { + return Wrapped.bridgeJSLiftReturn(pointer) + } } // MARK: ExportSwift diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index b70b5c023..b6672a0aa 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -23,6 +23,7 @@ import JavaScriptKit @JS protocol Counter { var count: Int { get set } var name: String { get } + var label: String? { get set } func increment(by amount: Int) func reset() func getValue() -> Int @@ -51,6 +52,10 @@ import JavaScriptKit @JS func setCountValue(_ value: Int) { delegate.count = value } + + @JS func updateLabel(_ newLabel: String?) { + delegate.label = newLabel + } } ``` @@ -64,6 +69,7 @@ const { exports } = await init({}); const counterImpl = { count: 0, name: "JSCounter", + label: "Default Label", increment(amount) { this.count += amount; }, @@ -82,6 +88,11 @@ console.log(manager.getCurrentValue()); // 2 console.log(manager.getCounterName()); // "JSCounter" manager.setCountValue(10); console.log(counterImpl.count); // 10 + +manager.updateLabel("Custom Label"); +console.log(counterImpl.label); // "Custom Label" +manager.updateLabel(null); +console.log(counterImpl.label); // null ``` The generated TypeScript interface: @@ -90,6 +101,7 @@ The generated TypeScript interface: export interface Counter { count: number; readonly name: string; + label: string | null; increment(amount: number): void; reset(): void; getValue(): number; @@ -222,32 +234,17 @@ When you pass a JavaScript object implementing a protocol to Swift: | Swift Feature | Status | |:--------------|:-------| -| Method requirements: `func method()` | ✅ | -| Method requirements with parameters | ✅ | -| Method requirements with return values | ✅ | -| Throwing method requirements: `func method() throws(JSException)` | ✅ | -| Async method requirements: `func method() async` | ✅ | -| Property requirements: `var property: Type { get }` | ✅ | -| Property requirements: `var property: Type { get set }` | ✅ | +| Method requirements: `func foo(_ param: String?) -> FooClass?` | ✅ | +| Property requirements: `var property: Type { get }` / `var property: Type { get set }` | ✅ | +| Optional parameters / return values in methods | ✅ | +| Optional properties | ✅ | | Optional protocol methods | ❌ | | Associated types | ❌ | | Protocol inheritance | ❌ | | Protocol composition: `Protocol1 & Protocol2` | ❌ | | Generics | ❌ | -### Type Support for Protocol Properties and Method Parameters - -Protocol properties and method parameters have more limited type support compared to regular exported Swift functions and classes. This is because protocols bridge Swift implementations to JavaScript objects using the TypeScript import mechanism. - -**Supported Types:** -- Primitives: `Bool`, `Int`, `Float`, `Double` -- `String` -- `JSObject` - -**Not Supported:** -- `@JS class` types -- `@JS enum` types (case, raw value, or associated value) -- `@JS protocol` types -- Optional types: `Int?`, `String?`, etc. +**Type Limitations:** +- `@JS enum` types are not supported in protocol signatures (use raw values or separate parameters instead) -> Note: For regular `@JS func` and `@JS class` exports (not within protocols), all these types including optionals, enums, and classes are fully supported. See and for more information. +> Note: Protocol type support matches that of regular `@JS func` and `@JS class` exports. See and for more information. diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 1cdea545c..019565515 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -862,6 +862,7 @@ enum APIOptionalResult { @JS protocol Counter { var count: Int { get set } var name: String { get } + var optionalTag: String? { get set } func increment(by amount: Int) func getValue() -> Int func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) @@ -869,6 +870,8 @@ enum APIOptionalResult { func isEven() -> Bool func processGreeter(_ greeter: Greeter) -> String func createGreeter() -> Greeter + func processOptionalGreeter(_ greeter: Greeter?) -> String + func createOptionalGreeter() -> Greeter? } @JS class CounterManager { @@ -918,6 +921,7 @@ enum APIOptionalResult { @JS class SwiftCounter: Counter { @JS var count: Int = 0 @JS let name: String = "SwiftCounter" + @JS var optionalTag: String? = nil private var label: String = "" @JS init() {} @@ -941,14 +945,26 @@ enum APIOptionalResult { @JS func isEven() -> Bool { return count % 2 == 0 } - + @JS func processGreeter(_ greeter: Greeter) -> String { return "SwiftCounter processed: \(greeter.greet())" } - + @JS func createGreeter() -> Greeter { return Greeter(name: "CounterGreeter") } + + @JS func processOptionalGreeter(_ greeter: Greeter?) -> String { + if let greeter = greeter { + return "SwiftCounter processed optional: \(greeter.greet())" + } else { + return "SwiftCounter received nil" + } + } + + @JS func createOptionalGreeter() -> Greeter? { + return Greeter(name: "OptionalCounterGreeter") + } } class ExportAPITests: XCTestCase { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 026c1f322..55cde9577 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -64,6 +64,20 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { return Greeter.bridgeJSLiftReturn(ret) } + func processOptionalGreeter(_ greeter: Optional) -> String { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_processOptionalGreeter") + func _extern_processOptionalGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 + let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(ret) + } + + func createOptionalGreeter() -> Optional { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_createOptionalGreeter") + func _extern_createOptionalGreeter(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_createOptionalGreeter(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + var count: Int { get { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") @@ -87,6 +101,20 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { } } + var optionalTag: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_optionalTag_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_optionalTag_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) } @@ -3576,6 +3604,28 @@ public func _bjs_SwiftCounter_createGreeter(_self: UnsafeMutableRawPointer) -> U #endif } +@_expose(wasm, "bjs_SwiftCounter_processOptionalGreeter") +@_cdecl("bjs_SwiftCounter_processOptionalGreeter") +public func _bjs_SwiftCounter_processOptionalGreeter(_self: UnsafeMutableRawPointer, greeterIsSome: Int32, greeterValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_createOptionalGreeter") +@_cdecl("bjs_SwiftCounter_createOptionalGreeter") +public func _bjs_SwiftCounter_createOptionalGreeter(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).createOptionalGreeter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftCounter_count_get") @_cdecl("bjs_SwiftCounter_count_get") public func _bjs_SwiftCounter_count_get(_self: UnsafeMutableRawPointer) -> Int32 { @@ -3608,6 +3658,27 @@ public func _bjs_SwiftCounter_name_get(_self: UnsafeMutableRawPointer) -> Void { #endif } +@_expose(wasm, "bjs_SwiftCounter_optionalTag_get") +@_cdecl("bjs_SwiftCounter_optionalTag_get") +public func _bjs_SwiftCounter_optionalTag_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftCounter.bridgeJSLiftParameter(_self).optionalTag + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftCounter_optionalTag_set") +@_cdecl("bjs_SwiftCounter_optionalTag_set") +public func _bjs_SwiftCounter_optionalTag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + SwiftCounter.bridgeJSLiftParameter(_self).optionalTag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftCounter_deinit") @_cdecl("bjs_SwiftCounter_deinit") public func _bjs_SwiftCounter_deinit(pointer: UnsafeMutableRawPointer) { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 79b0884b9..f97beee6b 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1543,6 +1543,56 @@ "_0" : "Greeter" } } + }, + { + "abiName" : "bjs_SwiftCounter_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftCounter_createOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalGreeter", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } } ], "name" : "SwiftCounter", @@ -1566,6 +1616,20 @@ } } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalTag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } } ], "swiftCallName" : "SwiftCounter" @@ -5997,6 +6061,56 @@ "_0" : "Greeter" } } + }, + { + "abiName" : "bjs_Counter_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Counter_createOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalGreeter", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } } ], "name" : "Counter", @@ -6018,6 +6132,19 @@ } } + }, + { + "isReadonly" : false, + "name" : "optionalTag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } } ] } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index f5bbc3556..73bc7279f 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -814,13 +814,18 @@ function testProtocolSupport(exports) { const jsCounter = { count: 0, name: "JSCounter", + optionalTag: null, increment(amount) { counterValue += amount; this.count += amount; }, getValue() { return counterValue; }, setLabelElements(labelPrefix, labelSuffix) { counterLabel = labelPrefix + labelSuffix; }, getLabel() { return counterLabel; }, isEven() { return counterValue % 2 === 0; }, processGreeter(greeter) { return `JSCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("JSCounterGreeter"); } + createGreeter() { return new exports.Greeter("JSCounterGreeter"); }, + processOptionalGreeter(greeter) { + return greeter ? `JSCounter processed optional: ${greeter.greet()}` : "JSCounter received null"; + }, + createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); } }; const manager = new exports.CounterManager(jsCounter); @@ -884,6 +889,29 @@ function testProtocolSupport(exports) { assert.equal(swiftCreatedGreeter.greet(), "Hello, CounterGreeter!"); swiftCreatedGreeter.release(); + const optGreeterTest = new exports.Greeter("OptionalTest"); + assert.equal(jsCounter.processOptionalGreeter(optGreeterTest), "JSCounter processed optional: Hello, OptionalTest!"); + assert.equal(jsCounter.processOptionalGreeter(null), "JSCounter received null"); + assert.equal(swiftCounter.processOptionalGreeter(optGreeterTest), "SwiftCounter processed optional: Hello, OptionalTest!"); + assert.equal(swiftCounter.processOptionalGreeter(null), "SwiftCounter received nil"); + optGreeterTest.release(); + + const jsOptGreeter = jsCounter.createOptionalGreeter(); + assert.notEqual(jsOptGreeter, null); + assert.equal(jsOptGreeter.name, "JSOptionalGreeter"); + jsOptGreeter.release(); + + const swiftOptGreeter = swiftCounter.createOptionalGreeter(); + assert.notEqual(swiftOptGreeter, null); + assert.equal(swiftOptGreeter.name, "OptionalCounterGreeter"); + swiftOptGreeter.release(); + + assert.equal(jsCounter.optionalTag, null); + jsCounter.optionalTag = "test-tag"; + assert.equal(jsCounter.optionalTag, "test-tag"); + jsCounter.optionalTag = null; + assert.equal(jsCounter.optionalTag, null); + testGreeter.release(); swiftManager.release(); @@ -894,13 +922,18 @@ function testProtocolSupport(exports) { const optionalCounter = { count: 100, name: "OptionalCounter", + optionalTag: "optional-tag", increment(amount) { optionalCounterValue += amount; this.count += amount; }, getValue() { return optionalCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { optionalCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return optionalCounterLabel; }, isEven() { return optionalCounterValue % 2 === 0; }, processGreeter(greeter) { return `OptionalCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("OptionalCounterGreeter"); } + createGreeter() { return new exports.Greeter("OptionalCounterGreeter"); }, + processOptionalGreeter(greeter) { + return greeter ? `OptionalCounter processed optional: ${greeter.greet()}` : "OptionalCounter received null"; + }, + createOptionalGreeter() { return null; } }; let mainCounterValue = 0; @@ -908,13 +941,18 @@ function testProtocolSupport(exports) { const mainCounter = { count: 0, name: "MainCounter", + optionalTag: null, increment(amount) { mainCounterValue += amount; this.count += amount; }, getValue() { return mainCounterValue; }, setLabelElements(labelPrefix, labelSuffix) { mainCounterLabel = labelPrefix + labelSuffix; }, getLabel() { return mainCounterLabel; }, isEven() { return mainCounterValue % 2 === 0; }, processGreeter(greeter) { return `MainCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("MainCounterGreeter"); } + createGreeter() { return new exports.Greeter("MainCounterGreeter"); }, + processOptionalGreeter(greeter) { + return greeter ? `MainCounter processed optional: ${greeter.greet()}` : "MainCounter received null"; + }, + createOptionalGreeter() { return new exports.Greeter("MainOptionalGreeter"); } }; const managerWithOptional = new exports.CounterManager(mainCounter); From 128f696dc6e275d76c20afcd55dd8a790c54d458 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 15 Oct 2025 15:54:07 +0200 Subject: [PATCH 016/252] BridgeJS: Protocol support for enum values (all types + optionals) BridgeJS: Final refinings to enum support and revisiting tests --- .../Sources/BridgeJSCore/ExportSwift.swift | 153 +++-- .../Sources/BridgeJSCore/ImportTS.swift | 71 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 75 +- .../BridgeJSToolTests/Inputs/Protocol.swift | 15 + .../BridgeJSLinkTests/Protocol.Export.d.ts | 27 + .../BridgeJSLinkTests/Protocol.Export.js | 122 ++++ .../EnumAssociatedValue.swift | 254 ++++++- .../ExportSwiftTests/Protocol.json | 147 ++++ .../ExportSwiftTests/Protocol.swift | 107 +++ .../ExportSwiftTests/StaticFunctions.swift | 31 +- .../JavaScriptKit/BridgeJSInstrincics.swift | 212 +++--- .../BridgeJSRuntimeTests/ExportAPITests.swift | 64 +- .../Generated/BridgeJS.ExportSwift.swift | 643 +++++++++++++----- .../JavaScript/BridgeJS.ExportSwift.json | 197 ++++-- Tests/prelude.mjs | 223 +++--- 15 files changed, 1830 insertions(+), 511 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 526b25626..7aa4503fa 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1751,13 +1751,13 @@ public class ExportSwift { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> \(raw: typeName) { - return \(raw: typeName)(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> \(raw: typeName) { return \(raw: typeName)(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -1774,13 +1774,32 @@ public class ExportSwift { func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName return """ - extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { + extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(raw: typeName) { switch caseId { \(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n")) default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)") } } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + \(raw: generateLowerParameterSwitchCases(enumDef: enumDef).joined(separator: "\n")) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> \(raw: typeName) { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { + return _bridgeJSLiftFromCaseId(caseId) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { @@ -1849,6 +1868,80 @@ public class ExportSwift { return cases } + /// Generates code to push associated value payloads to side channels + /// This helper is reused by both lowerParameter and lowerReturn to avoid duplication + private func generatePayloadPushingCode( + associatedValues: [AssociatedValue] + ) -> [String] { + var bodyLines: [String] = [] + for (index, associatedValue) in associatedValues.enumerated() { + let paramName = associatedValue.label ?? "param\(index)" + switch associatedValue.type { + case .string: + bodyLines.append("var __bjs_\(paramName) = \(paramName)") + bodyLines.append("__bjs_\(paramName).withUTF8 { ptr in") + bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") + bodyLines.append("}") + case .int: + bodyLines.append("_swift_js_push_int(Int32(\(paramName)))") + case .bool: + bodyLines.append("_swift_js_push_int(\(paramName) ? 1 : 0)") + case .float: + bodyLines.append("_swift_js_push_f32(\(paramName))") + case .double: + bodyLines.append("_swift_js_push_f64(\(paramName))") + case .optional(let wrappedType): + bodyLines.append("let __bjs_isSome_\(paramName) = \(paramName) != nil") + bodyLines.append("if let __bjs_unwrapped_\(paramName) = \(paramName) {") + switch wrappedType { + case .string: + bodyLines.append("var __bjs_str_\(paramName) = __bjs_unwrapped_\(paramName)") + bodyLines.append("__bjs_str_\(paramName).withUTF8 { ptr in") + bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") + bodyLines.append("}") + case .int: + bodyLines.append("_swift_js_push_int(Int32(__bjs_unwrapped_\(paramName)))") + case .bool: + bodyLines.append("_swift_js_push_int(__bjs_unwrapped_\(paramName) ? 1 : 0)") + case .float: + bodyLines.append("_swift_js_push_f32(__bjs_unwrapped_\(paramName))") + case .double: + bodyLines.append("_swift_js_push_f64(__bjs_unwrapped_\(paramName))") + default: + bodyLines.append( + "preconditionFailure(\"BridgeJS: unsupported optional wrapped type in generated code\")" + ) + } + bodyLines.append("}") + bodyLines.append("_swift_js_push_int(__bjs_isSome_\(paramName) ? 1 : 0)") + default: + bodyLines.append( + "preconditionFailure(\"BridgeJS: unsupported associated value type in generated code\")" + ) + } + } + return bodyLines + } + + private func generateLowerParameterSwitchCases(enumDef: ExportedEnum) -> [String] { + var cases: [String] = [] + for (caseIndex, enumCase) in enumDef.cases.enumerated() { + if enumCase.associatedValues.isEmpty { + cases.append("case .\(enumCase.name):") + cases.append("return Int32(\(caseIndex))") + } else { + let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) + let pattern = enumCase.associatedValues.enumerated() + .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } + .joined(separator: ", ") + cases.append("case .\(enumCase.name)(\(pattern)):") + cases.append(contentsOf: payloadCode) + cases.append("return Int32(\(caseIndex))") + } + } + return cases + } + private func generateReturnSwitchCases(enumDef: ExportedEnum) -> [String] { var cases: [String] = [] for (caseIndex, enumCase) in enumDef.cases.enumerated() { @@ -1856,59 +1949,13 @@ public class ExportSwift { cases.append("case .\(enumCase.name):") cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") } else { - var bodyLines: [String] = [] - bodyLines.append("_swift_js_push_tag(Int32(\(caseIndex)))") - for (index, associatedValue) in enumCase.associatedValues.enumerated() { - let paramName = associatedValue.label ?? "param\(index)" - switch associatedValue.type { - case .string: - bodyLines.append("var __bjs_\(paramName) = \(paramName)") - bodyLines.append("__bjs_\(paramName).withUTF8 { ptr in") - bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") - bodyLines.append("}") - case .int: - bodyLines.append("_swift_js_push_int(Int32(\(paramName)))") - case .bool: - bodyLines.append("_swift_js_push_int(\(paramName) ? 1 : 0)") - case .float: - bodyLines.append("_swift_js_push_f32(\(paramName))") - case .double: - bodyLines.append("_swift_js_push_f64(\(paramName))") - case .optional(let wrappedType): - bodyLines.append("let __bjs_isSome_\(paramName) = \(paramName) != nil") - bodyLines.append("if let __bjs_unwrapped_\(paramName) = \(paramName) {") - switch wrappedType { - case .string: - bodyLines.append("var __bjs_str_\(paramName) = __bjs_unwrapped_\(paramName)") - bodyLines.append("__bjs_str_\(paramName).withUTF8 { ptr in") - bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") - bodyLines.append("}") - case .int: - bodyLines.append("_swift_js_push_int(Int32(__bjs_unwrapped_\(paramName)))") - case .bool: - bodyLines.append("_swift_js_push_int(__bjs_unwrapped_\(paramName) ? 1 : 0)") - case .float: - bodyLines.append("_swift_js_push_f32(__bjs_unwrapped_\(paramName))") - case .double: - bodyLines.append("_swift_js_push_f64(__bjs_unwrapped_\(paramName))") - default: - bodyLines.append( - "preconditionFailure(\"BridgeJS: unsupported optional wrapped type in generated code\")" - ) - } - bodyLines.append("}") - bodyLines.append("_swift_js_push_int(__bjs_isSome_\(paramName) ? 1 : 0)") - default: - bodyLines.append( - "preconditionFailure(\"BridgeJS: unsupported associated value type in generated code\")" - ) - } - } let pattern = enumCase.associatedValues.enumerated() .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } .joined(separator: ", ") cases.append("case .\(enumCase.name)(\(pattern)):") - cases.append(contentsOf: bodyLines) + cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") + let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) + cases.append(contentsOf: payloadCode) } } return cases diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 52ff813aa..26e22e873 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -447,14 +447,41 @@ extension BridgeType { } case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") - case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: - throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .caseEnum: + switch context { + case .importTS: + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .protocolExport: + return LoweringParameterInfo(loweredParameters: [("value", .i32)]) + } + case .rawValueEnum(_, let rawType): + switch context { + case .importTS: + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .protocolExport: + let wasmType = rawType == .string ? WasmCoreType.i32 : (rawType.wasmCoreType ?? .i32) + return LoweringParameterInfo(loweredParameters: [("value", wasmType)]) + } + case .associatedValueEnum: + switch context { + case .importTS: + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .protocolExport: + return LoweringParameterInfo(loweredParameters: [("caseId", .i32)]) + } + case .namespaceEnum: + throw BridgeJSCoreError("Namespace enums cannot be used as parameters") case .optional(let wrappedType): switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") case .protocolExport: - return try wrappedType.loweringParameterInfo(context: context) + let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) + guard wrappedInfo.loweredParameters.count == 1 else { + throw BridgeJSCoreError("Optional wrapped type must lower to single parameter") + } + let (_, wrappedWasmType) = wrappedInfo.loweredParameters[0] + return LoweringParameterInfo(loweredParameters: [("value", wrappedWasmType)]) } } } @@ -494,22 +521,38 @@ extension BridgeType { } case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") - case .caseEnum, .rawValueEnum, .associatedValueEnum, .namespaceEnum: - throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .optional: + case .caseEnum: switch context { case .importTS: - throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .protocolExport: + return LiftingReturnInfo(valueToLift: .i32) + } + case .rawValueEnum(_, let rawType): + switch context { + case .importTS: + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + case .protocolExport: + let wasmType = rawType == .string ? WasmCoreType.i32 : (rawType.wasmCoreType ?? .i32) + return LiftingReturnInfo(valueToLift: wasmType) + } + case .associatedValueEnum: + switch context { + case .importTS: + throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .protocolExport: - // For Optional, return the length (or -1 for null) - if case .optional(.string) = self { - return .string - } - if case .optional(.swiftHeapObject) = self { - return LiftingReturnInfo(valueToLift: .pointer) - } return LiftingReturnInfo(valueToLift: nil) } + case .namespaceEnum: + throw BridgeJSCoreError("Namespace enums cannot be used as return values") + case .optional(let wrappedType): + switch context { + case .importTS: + throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") + case .protocolExport: + let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) + return wrappedInfo + } } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 1e92b09a4..453974716 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -490,9 +490,9 @@ struct IntrinsicJSFragment: Sendable { static func optionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { switch wrappedType { case .bool, .int, .float, .double, .string, .swiftHeapObject, .jsObject, .swiftProtocol, .caseEnum, - .rawValueEnum: + .rawValueEnum, .associatedValueEnum: break - case .void, .optional, .associatedValueEnum, .namespaceEnum: + case .void, .optional, .namespaceEnum: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") } @@ -586,6 +586,23 @@ struct IntrinsicJSFragment: Sendable { "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" ) } + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("cleanup") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + printer.write("bjs[\"swift_js_return_optional_int\"](1, \(caseIdVar));") + } + printer.write("} else {") + printer.indent { + printer.write("bjs[\"swift_js_return_optional_int\"](0, 0);") + } + printer.write("}") default: () } @@ -693,11 +710,27 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLiftParameter default: return .identity } - case .associatedValueEnum(let string): - throw BridgeJSLinkError( - message: - "Associated value enums are not supported to be passed as parameters to imported JS functions: \(string)" - ) + case .associatedValueEnum(let fullName): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: + "Associated value enums are not supported to be passed as parameters to imported JS functions: \(fullName)" + ) + case .protocolExport: + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["caseId"], + printCode: { arguments, scope, printer, cleanupCode in + let caseId = arguments[0] + let resultVar = scope.variable("enumValue") + printer.write( + "const \(resultVar) = enumHelpers.\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + return [resultVar] + } + ) + } case .namespaceEnum(let string): throw BridgeJSLinkError( message: @@ -743,10 +776,30 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLowerReturn default: return .identity } - case .associatedValueEnum(let string): - throw BridgeJSLinkError( - message: "Associated value enums are not supported to be returned from imported JS functions: \(string)" - ) + case .associatedValueEnum(let fullName): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: + "Associated value enums are not supported to be returned from imported JS functions: \(fullName)" + ) + case .protocolExport: + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("cleanup") + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + printer.write("return \(caseIdVar);") + return [] + } + ) + } case .namespaceEnum(let string): throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from imported JS functions: \(string)" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index 63a6d9acb..9f2556e98 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -1,5 +1,15 @@ import JavaScriptKit +@JS enum ExampleEnum: String { + case test = "test" + case test2 = "test2" +} + +@JS enum Result { + case success(String) + case failure(Int) +} + @JS class Helper { @JS var value: Int @@ -16,6 +26,8 @@ import JavaScriptKit var eventCount: Int { get set } var delegateName: String { get } var optionalName: String? { get set } + var myEnum: ExampleEnum { get set } + var result: Result? { get set } func onSomethingHappened() func onValueChanged(_ value: String) func onCountUpdated(count: Int) -> Bool @@ -25,6 +37,9 @@ import JavaScriptKit func createHelper() -> Helper func onOptionalHelperUpdated(_ helper: Helper?) func createOptionalHelper() -> Helper? + func createEnum() -> ExampleEnum + func handleResult(_ result: Result) + func getResult() -> Result } @JS class MyViewController { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index 2d4899793..9e64ddff9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -14,11 +14,36 @@ export interface MyViewControllerDelegate { createHelper(): Helper; onOptionalHelperUpdated(helper: Helper | null): void; createOptionalHelper(): Helper | null; + createEnum(): ExampleEnumTag; + handleResult(result: ResultTag): void; + getResult(): ResultTag; eventCount: number; readonly delegateName: string; optionalName: string | null; + myEnum: ExampleEnumTag; + result: ResultTag | null; } +export const ExampleEnumValues: { + readonly Test: "test"; + readonly Test2: "test2"; +}; +export type ExampleEnumTag = typeof ExampleEnumValues[keyof typeof ExampleEnumValues]; + +export const ResultValues: { + readonly Tag: { + readonly Success: 0; + readonly Failure: 1; + }; +}; + +export type ResultTag = + { tag: typeof ResultValues.Tag.Success; param0: string } | { tag: typeof ResultValues.Tag.Failure; param0: number } + +export type ExampleEnumObject = typeof ExampleEnumValues; + +export type ResultObject = typeof ResultValues; + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. @@ -47,6 +72,8 @@ export type Exports = { MyViewController: { new(delegate: MyViewControllerDelegate): MyViewController; } + ExampleEnum: ExampleEnumObject + Result: ResultObject } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 1d9329c3e..8aa18d391 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -4,6 +4,57 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export const ExampleEnumValues = { + Test: "test", + Test2: "test2", +}; + +export const ResultValues = { + Tag: { + Success: 0, + Failure: 1, + }, +}; + +const __bjs_createResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ResultValues.Tag.Success, cleanup }; + } + case ResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: ResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + } + }, + raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + const tag = tmpRetTag | 0; + switch (tag) { + case ResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: ResultValues.Tag.Success, param0: string }; + } + case ResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: ResultValues.Tag.Failure, param0: int }; + } + default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + } + } + }); +}; export async function createInstantiator(options, swift) { let instance; let memory; @@ -26,6 +77,7 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + const enumHelpers = {}; return { /** @@ -204,6 +256,45 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_MyViewControllerDelegate_myEnum_get"] = function bjs_MyViewControllerDelegate_myEnum_get(self) { + try { + let ret = swift.memory.getObject(self).myEnum; + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_myEnum_set"] = function bjs_MyViewControllerDelegate_myEnum_set(self, value) { + try { + const valueObject = swift.memory.getObject(value); + swift.memory.release(value); + swift.memory.getObject(self).myEnum = valueObject; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) { + try { + let ret = swift.memory.getObject(self).result; + const isSome = ret != null; + if (isSome) { + const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + bjs["swift_js_return_optional_int"](1, caseId); + } else { + bjs["swift_js_return_optional_int"](0, 0); + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, valueIsSome, valueWrappedValue) { + try { + swift.memory.getObject(self).result = valueIsSome ? valueWrappedValue : null; + } catch (error) { + setException(error); + } + } TestModule["bjs_MyViewControllerDelegate_onSomethingHappened"] = function bjs_MyViewControllerDelegate_onSomethingHappened(self) { try { swift.memory.getObject(self).onSomethingHappened(); @@ -281,11 +372,40 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_MyViewControllerDelegate_createEnum"] = function bjs_MyViewControllerDelegate_createEnum(self) { + try { + let ret = swift.memory.getObject(self).createEnum(); + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_handleResult"] = function bjs_MyViewControllerDelegate_handleResult(self, result) { + try { + const enumValue = enumHelpers.Result.raise(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + swift.memory.getObject(self).handleResult(enumValue); + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_getResult"] = function bjs_MyViewControllerDelegate_getResult(self) { + try { + let ret = swift.memory.getObject(self).getResult(); + const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + return caseId; + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; memory = instance.exports.memory; + const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + enumHelpers.Result = ResultHelpers; + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -393,6 +513,8 @@ export async function createInstantiator(options, swift) { return { Helper, MyViewController, + ExampleEnum: ExampleEnumValues, + Result: ResultValues, }; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index 008eeda0d..ce952ca9d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -7,7 +7,9 @@ @_spi(BridgeJS) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -26,6 +28,44 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + case .flag(let param0): + _swift_js_push_int(param0 ? 1 : 0) + return Int32(2) + case .rate(let param0): + _swift_js_push_f32(param0) + return Int32(3) + case .precise(let param0): + _swift_js_push_f64(param0) + return Int32(4) + case .info: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -53,7 +93,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -72,6 +114,72 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .error(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + case .status(let param0, let param1, let param2): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(Int32(param1)) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(2) + case .coordinates(let param0, let param1, let param2): + _swift_js_push_f64(param0) + _swift_js_push_f64(param1) + _swift_js_push_f64(param2) + return Int32(3) + case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(param1 ? 1 : 0) + _swift_js_push_int(Int32(param2)) + _swift_js_push_int(Int32(param3)) + _swift_js_push_f64(param4) + _swift_js_push_f64(param5) + var __bjs_param6 = param6 + __bjs_param6.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param7 = param7 + __bjs_param7.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param8 = param8 + __bjs_param8.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(4) + case .info: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> ComplexResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -127,7 +235,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -140,6 +250,45 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + case .status(let param0, let param1, let param2): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(Int32(param1)) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(2) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Utilities.Result { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -168,7 +317,9 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> NetworkingResult { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -179,6 +330,37 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> NetworkingResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> NetworkingResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -199,7 +381,9 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { } extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -212,6 +396,66 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + var __bjs_str_param0 = __bjs_unwrapped_param0 + __bjs_str_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .failure(let param0, let param1): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + return Int32(1) + case .status(let param0, let param1, let param2): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + } + _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + let __bjs_isSome_param2 = param2 != nil + if let __bjs_unwrapped_param2 = param2 { + var __bjs_str_param2 = __bjs_unwrapped_param2 + __bjs_str_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + return Int32(2) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIOptionalResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index 30abfc91c..bddcf2aa2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -250,7 +250,71 @@ } ], "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "test", + "rawValue" : "test" + }, + { + "associatedValues" : [ + + ], + "name" : "test2", + "rawValue" : "test2" + } + ], + "emitStyle" : "const", + "name" : "ExampleEnum", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "ExampleEnum" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "Result", + "staticMethods" : [ + + ], + "staticProperties" : [ + ], + "swiftCallName" : "Result" + } ], "functions" : [ @@ -468,6 +532,66 @@ } } } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createEnum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createEnum", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_handleResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_getResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } } ], "name" : "MyViewControllerDelegate", @@ -502,6 +626,29 @@ } } } + }, + { + "isReadonly" : false, + "name" : "myEnum", + "type" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + }, + { + "isReadonly" : false, + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + } + } } ] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index ea1d71eab..8bd37e8e2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -67,6 +67,26 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Optional.bridgeJSLiftReturn(ret) } + func createEnum() -> ExampleEnum { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") + func _extern_createEnum(this: Int32) -> Int32 + let ret = _extern_createEnum(this: Int32(bitPattern: jsObject.id)) + return ExampleEnum.bridgeJSLiftReturn(ret) + } + + func handleResult(_ result: Result) { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") + func _extern_handleResult(this: Int32, result: Int32) + _extern_handleResult(this: Int32(bitPattern: jsObject.id), result: result.bridgeJSLowerParameter()) + } + + func getResult() -> Result { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") + func _extern_getResult(this: Int32) + _extern_getResult(this: Int32(bitPattern: jsObject.id)) + return Result.bridgeJSLiftReturn() + } + var eventCount: Int { get { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") @@ -104,11 +124,98 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } } + var myEnum: ExampleEnum { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_myEnum_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return ExampleEnum.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_myEnum_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var result: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn() + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) } } +extension ExampleEnum: _BridgedSwiftEnumNoPayload { +} + +extension Result: _BridgedSwiftAssociatedValueEnum { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Result { + switch caseId { + case 0: + return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + case 1: + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + default: + fatalError("Unknown Result case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Result { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Result { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .success(let param0): + _swift_js_push_tag(Int32(0)) + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + case .failure(let param0): + _swift_js_push_tag(Int32(1)) + _swift_js_push_int(Int32(param0)) + } + } +} + @_expose(wasm, "bjs_Helper_init") @_cdecl("bjs_Helper_init") public func _bjs_Helper_init(value: Int32) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 4e301151a..a26d5ea1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -53,7 +53,9 @@ public func _bjs_Calculator_static_square(value: Int32) -> Int32 { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + // MARK: Private Helper + + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -64,6 +66,33 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index 5a8f7f014..be6e7b472 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -325,6 +325,11 @@ public protocol _BridgedSwiftEnumNoPayload {} /// /// The conformance is automatically synthesized by the BridgeJS code generator. public protocol _BridgedSwiftCaseEnum { + // MARK: ImportTS + @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 + @_spi(BridgeJS) static func bridgeJSLiftReturn(_ value: Int32) -> Self + + // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter(_ value: Int32) -> Self @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Int32 } @@ -332,7 +337,12 @@ public protocol _BridgedSwiftCaseEnum { /// A protocol that Swift associated value enum types conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftAssociatedValueEnum { +public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVoidType { + // MARK: ImportTS + @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 + @_spi(BridgeJS) static func bridgeJSLiftReturn() -> Self + + // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter(_ caseId: Int32) -> Self @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void } @@ -340,8 +350,9 @@ public protocol _BridgedSwiftAssociatedValueEnum { extension _BridgedSwiftEnumNoPayload where Self: RawRepresentable, RawValue == String { // MARK: ImportTS @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { rawValue.bridgeJSLowerParameter() } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ bytesCount: Int32) -> Self { - Self(rawValue: .bridgeJSLiftReturn(bytesCount))! + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ id: Int32) -> Self { + Self(rawValue: .bridgeJSLiftReturn(id))! } // MARK: ExportSwift @@ -823,20 +834,21 @@ extension Optional where Wrapped == Double { extension Optional where Wrapped: _BridgedSwiftCaseEnum { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional case enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return -1 // Sentinel for nil + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional case enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { - return nil + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { + if value == -1 { + return nil + } else { + return Wrapped.bridgeJSLiftReturn(value) + } } // MARK: ExportSwift @@ -890,19 +902,23 @@ extension Optional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional String raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return 0 // Sentinel for nil + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional String raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32) -> Wrapped? { return nil } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ length: Int32) -> Wrapped? { + if length == 0 { + return nil + } else { + let rawValue = String.bridgeJSLiftReturn(length) + return Wrapped(rawValue: rawValue) + } + } // MARK: ExportSwift @@ -924,20 +940,21 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional Int raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return -1 // Sentinel for nil + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional Int raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { - return nil + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { + if value == -1 { + return nil + } else { + return Wrapped(rawValue: Int(value)) + } } // MARK: ExportSwift @@ -956,20 +973,21 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional Bool raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return -1 // Sentinel for nil + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional Bool raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { - return nil + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { + if value == -1 { + return nil + } else { + return Wrapped(rawValue: value != 0) + } } // MARK: ExportSwift @@ -988,20 +1006,21 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional Float raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Float32 { + switch consume self { + case .none: + return Float32.nan // Sentinel for nil (NaN) + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional Float raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Float32) -> Wrapped? { - return nil + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Float32) -> Wrapped? { + if value.isNaN { + return nil + } else { + return Wrapped(rawValue: Float(value)) + } } // MARK: ExportSwift @@ -1020,20 +1039,21 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional Double raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Float64 { + switch consume self { + case .none: + return Float64.nan // Sentinel for nil (NaN) + case .some(let value): + return value.bridgeJSLowerParameter() + } + } - @available( - *, - unavailable, - message: "Optional Double raw value enum types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Float64) -> Wrapped? { - return nil + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Float64) -> Wrapped? { + if value.isNaN { + return nil + } else { + return Wrapped(rawValue: Double(value)) + } } // MARK: ExportSwift @@ -1053,21 +1073,27 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { // MARK: ImportTS - @available( - *, - unavailable, - message: "Optional associated value enums are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void { - fatalError("Optional associated value enum bridgeJSLowerParameter is not supported for ImportTS") + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return -1 // Sentinel for nil + case .some(let value): + return value.bridgeJSLowerParameter() + } } - @available( - *, - unavailable, - message: "Optional associated value enums are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ caseId: Int32) -> Wrapped? { return nil } + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Wrapped? { + // Read tag from side channel + let tag = _swift_js_pop_param_int32() + if tag == -1 { + return nil + } else { + // Put tag back for the wrapped type's liftReturn to consume + _swift_js_push_int(tag) + return Wrapped.bridgeJSLiftReturn() + } + } // MARK: ExportSwift diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 019565515..168a8c6ee 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -859,10 +859,11 @@ enum APIOptionalResult { // MARK: - Protocol Tests -@JS protocol Counter { +@JS protocol DataProcessor { var count: Int { get set } var name: String { get } var optionalTag: String? { get set } + var apiResult: APIResult? { get set } func increment(by amount: Int) func getValue() -> Int func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) @@ -872,56 +873,59 @@ enum APIOptionalResult { func createGreeter() -> Greeter func processOptionalGreeter(_ greeter: Greeter?) -> String func createOptionalGreeter() -> Greeter? + func handleAPIResult(_ result: APIResult) + func getAPIResult() -> APIResult } -@JS class CounterManager { +@JS class DataProcessorManager { - @JS var counter: Counter - @JS var backupCounter: Counter? + @JS var processor: DataProcessor + @JS var backupProcessor: DataProcessor? - @JS init(counter: Counter) { - self.counter = counter - self.backupCounter = nil + @JS init(processor: DataProcessor) { + self.processor = processor + self.backupProcessor = nil } @JS func incrementByAmount(_ amount: Int) { - counter.increment(by: amount) + processor.increment(by: amount) } - @JS func setCounterLabel(_ prefix: String, _ suffix: String) { - counter.setLabelElements(prefix, suffix) + @JS func setProcessorLabel(_ prefix: String, _ suffix: String) { + processor.setLabelElements(prefix, suffix) } - @JS func isCounterEven() -> Bool { - return counter.isEven() + @JS func isProcessorEven() -> Bool { + return processor.isEven() } - @JS func getCounterLabel() -> String { - return counter.getLabel() + @JS func getProcessorLabel() -> String { + return processor.getLabel() } @JS func getCurrentValue() -> Int { - return counter.getValue() + return processor.getValue() } @JS func incrementBoth() { - counter.increment(by: 1) - backupCounter?.increment(by: 1) + processor.increment(by: 1) + backupProcessor?.increment(by: 1) } @JS func getBackupValue() -> Int? { - return backupCounter?.getValue() + return backupProcessor?.getValue() } @JS func hasBackup() -> Bool { - return backupCounter != nil + return backupProcessor != nil } } -@JS class SwiftCounter: Counter { +@JS class SwiftDataProcessor: DataProcessor { @JS var count: Int = 0 - @JS let name: String = "SwiftCounter" + @JS let name: String = "SwiftDataProcessor" @JS var optionalTag: String? = nil + @JS var apiResult: APIResult? = nil private var label: String = "" @JS init() {} @@ -947,23 +951,31 @@ enum APIOptionalResult { } @JS func processGreeter(_ greeter: Greeter) -> String { - return "SwiftCounter processed: \(greeter.greet())" + return "SwiftProcessor processed: \(greeter.greet())" } @JS func createGreeter() -> Greeter { - return Greeter(name: "CounterGreeter") + return Greeter(name: "ProcessorGreeter") } @JS func processOptionalGreeter(_ greeter: Greeter?) -> String { if let greeter = greeter { - return "SwiftCounter processed optional: \(greeter.greet())" + return "SwiftProcessor processed optional: \(greeter.greet())" } else { - return "SwiftCounter received nil" + return "SwiftProcessor received nil" } } @JS func createOptionalGreeter() -> Greeter? { - return Greeter(name: "OptionalCounterGreeter") + return Greeter(name: "OptionalProcessorGreeter") + } + + @JS func handleAPIResult(_ result: APIResult) { + self.apiResult = result + } + + @JS func getAPIResult() -> APIResult { + return apiResult ?? .failure(0) } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 55cde9577..58938a945 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,17 +6,17 @@ @_spi(BridgeJS) import JavaScriptKit -struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { +struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject func increment(by amount: Int) { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_increment") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") func _extern_increment(this: Int32, amount: Int32) _extern_increment(this: Int32(bitPattern: jsObject.id), amount: amount.bridgeJSLowerParameter()) } func getValue() -> Int { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getValue") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") func _extern_getValue(this: Int32) -> Int32 let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) <<<<<<< HEAD @@ -27,13 +27,13 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { } func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_setLabelElements") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") func _extern_setLabelElements(this: Int32, labelPrefix: Int32, labelSuffix: Int32) _extern_setLabelElements(this: Int32(bitPattern: jsObject.id), labelPrefix: labelPrefix.bridgeJSLowerParameter(), labelSuffix: labelSuffix.bridgeJSLowerParameter()) } func getLabel() -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_getLabel") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") func _extern_getLabel(this: Int32) -> Int32 let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) <<<<<<< HEAD @@ -44,49 +44,62 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { } func isEven() -> Bool { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_isEven") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") func _extern_isEven(this: Int32) -> Int32 let ret = _extern_isEven(this: Int32(bitPattern: jsObject.id)) return Bool.bridgeJSLiftReturn(ret) } func processGreeter(_ greeter: Greeter) -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_processGreeter") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") func _extern_processGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 let ret = _extern_processGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(ret) } func createGreeter() -> Greeter { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_createGreeter") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") func _extern_createGreeter(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createGreeter(this: Int32(bitPattern: jsObject.id)) return Greeter.bridgeJSLiftReturn(ret) } func processOptionalGreeter(_ greeter: Optional) -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_processOptionalGreeter") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") func _extern_processOptionalGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(ret) } func createOptionalGreeter() -> Optional { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_createOptionalGreeter") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") func _extern_createOptionalGreeter(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createOptionalGreeter(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } + func handleAPIResult(_ result: APIResult) { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") + func _extern_handleAPIResult(this: Int32, result: Int32) + _extern_handleAPIResult(this: Int32(bitPattern: jsObject.id), result: result.bridgeJSLowerParameter()) + } + + func getAPIResult() -> APIResult { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") + func _extern_getAPIResult(this: Int32) + _extern_getAPIResult(this: Int32(bitPattern: jsObject.id)) + return APIResult.bridgeJSLiftReturn() + } + var count: Int { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_get") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") func _extern_get(this: Int32) -> Int32 let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) return Int.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_count_set") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") func _extern_set(this: Int32, value: Int32) _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } @@ -94,7 +107,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { var name: String { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_name_get") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") func _extern_get(this: Int32) -> Int32 let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) return String.bridgeJSLiftReturn(ret) @@ -103,20 +116,34 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { var optionalTag: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_optionalTag_get") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") func _extern_get(this: Int32) -> Int32 let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Counter_optionalTag_set") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var apiResult: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn() + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") func _extern_set(this: Int32, value: Int32) _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } static func bridgeJSLiftParameter(_ value: Int32) -> Self { - return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) + return AnyDataProcessor(jsObject: JSObject(id: UInt32(bitPattern: value))) } } @@ -125,13 +152,13 @@ extension Direction: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction { - return Direction(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction { return Direction(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -168,13 +195,13 @@ extension Status: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Status { - return Status(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Status { return Status(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -213,13 +240,13 @@ extension TSDirection: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> TSDirection { - return TSDirection(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> TSDirection { return TSDirection(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -259,13 +286,13 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Networking.API.Method { - return Networking.API.Method(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Networking.API.Method { return Networking.API.Method(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -308,13 +335,13 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedMethod { - return Internal.SupportedMethod(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedMethod { return Internal.SupportedMethod(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -339,7 +366,7 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -358,6 +385,44 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + case .flag(let param0): + _swift_js_push_int(param0 ? 1 : 0) + return Int32(2) + case .rate(let param0): + _swift_js_push_f32(param0) + return Int32(3) + case .precise(let param0): + _swift_js_push_f64(param0) + return Int32(4) + case .info: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -385,7 +450,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -406,6 +471,80 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .error(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + case .location(let param0, let param1, let param2): + _swift_js_push_f64(param0) + _swift_js_push_f64(param1) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(2) + case .status(let param0, let param1, let param2): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(Int32(param1)) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(3) + case .coordinates(let param0, let param1, let param2): + _swift_js_push_f64(param0) + _swift_js_push_f64(param1) + _swift_js_push_f64(param2) + return Int32(4) + case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(param1 ? 1 : 0) + _swift_js_push_int(Int32(param2)) + _swift_js_push_int(Int32(param3)) + _swift_js_push_f64(param4) + _swift_js_push_f64(param5) + var __bjs_param6 = param6 + __bjs_param6.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param7 = param7 + __bjs_param7.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param8 = param8 + __bjs_param8.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(5) + case .info: + return Int32(6) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> ComplexResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -469,7 +608,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -482,6 +621,45 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + case .status(let param0, let param1, let param2): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(Int32(param1)) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(2) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Utilities.Result { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -510,7 +688,7 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> API.NetworkingResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> API.NetworkingResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -521,6 +699,37 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> API.NetworkingResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> API.NetworkingResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -541,7 +750,7 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { } extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -554,6 +763,66 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + var __bjs_str_param0 = __bjs_unwrapped_param0 + __bjs_str_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .failure(let param0, let param1): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + return Int32(1) + case .status(let param0, let param1, let param2): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + } + _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + let __bjs_isSome_param2 = param2 != nil + if let __bjs_unwrapped_param2 = param2 { + var __bjs_str_param2 = __bjs_unwrapped_param2 + __bjs_str_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + return Int32(2) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIOptionalResult { + let caseId = _swift_js_pop_param_int32() + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -607,13 +876,13 @@ extension StaticCalculator: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticCalculator { - return StaticCalculator(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticCalculator { return StaticCalculator(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -664,13 +933,13 @@ extension StaticPropertyEnum: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticPropertyEnum { - return StaticPropertyEnum(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticPropertyEnum { return StaticPropertyEnum(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -3358,129 +3627,129 @@ extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { } } -@_expose(wasm, "bjs_CounterManager_init") -@_cdecl("bjs_CounterManager_init") -public func _bjs_CounterManager_init(counter: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_DataProcessorManager_init") +@_cdecl("bjs_DataProcessorManager_init") +public func _bjs_DataProcessorManager_init(processor: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = CounterManager(counter: AnyCounter.bridgeJSLiftParameter(counter)) + let ret = DataProcessorManager(processor: AnyDataProcessor.bridgeJSLiftParameter(processor)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_incrementByAmount") -@_cdecl("bjs_CounterManager_incrementByAmount") -public func _bjs_CounterManager_incrementByAmount(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_incrementByAmount") +@_cdecl("bjs_DataProcessorManager_incrementByAmount") +public func _bjs_DataProcessorManager_incrementByAmount(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { #if arch(wasm32) - CounterManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) + DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_setCounterLabel") -@_cdecl("bjs_CounterManager_setCounterLabel") -public func _bjs_CounterManager_setCounterLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_setProcessorLabel") +@_cdecl("bjs_DataProcessorManager_setProcessorLabel") +public func _bjs_DataProcessorManager_setProcessorLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { #if arch(wasm32) - CounterManager.bridgeJSLiftParameter(_self).setCounterLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_isCounterEven") -@_cdecl("bjs_CounterManager_isCounterEven") -public func _bjs_CounterManager_isCounterEven(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_DataProcessorManager_isProcessorEven") +@_cdecl("bjs_DataProcessorManager_isProcessorEven") +public func _bjs_DataProcessorManager_isProcessorEven(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).isCounterEven() + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_getCounterLabel") -@_cdecl("bjs_CounterManager_getCounterLabel") -public func _bjs_CounterManager_getCounterLabel(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_getProcessorLabel") +@_cdecl("bjs_DataProcessorManager_getProcessorLabel") +public func _bjs_DataProcessorManager_getProcessorLabel(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).getCounterLabel() + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_getCurrentValue") -@_cdecl("bjs_CounterManager_getCurrentValue") -public func _bjs_CounterManager_getCurrentValue(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_DataProcessorManager_getCurrentValue") +@_cdecl("bjs_DataProcessorManager_getCurrentValue") +public func _bjs_DataProcessorManager_getCurrentValue(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).getCurrentValue() + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_incrementBoth") -@_cdecl("bjs_CounterManager_incrementBoth") -public func _bjs_CounterManager_incrementBoth(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_incrementBoth") +@_cdecl("bjs_DataProcessorManager_incrementBoth") +public func _bjs_DataProcessorManager_incrementBoth(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - CounterManager.bridgeJSLiftParameter(_self).incrementBoth() + DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_getBackupValue") -@_cdecl("bjs_CounterManager_getBackupValue") -public func _bjs_CounterManager_getBackupValue(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_getBackupValue") +@_cdecl("bjs_DataProcessorManager_getBackupValue") +public func _bjs_DataProcessorManager_getBackupValue(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).getBackupValue() + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_hasBackup") -@_cdecl("bjs_CounterManager_hasBackup") -public func _bjs_CounterManager_hasBackup(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_DataProcessorManager_hasBackup") +@_cdecl("bjs_DataProcessorManager_hasBackup") +public func _bjs_DataProcessorManager_hasBackup(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).hasBackup() + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).hasBackup() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_counter_get") -@_cdecl("bjs_CounterManager_counter_get") -public func _bjs_CounterManager_counter_get(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_DataProcessorManager_processor_get") +@_cdecl("bjs_DataProcessorManager_processor_get") +public func _bjs_DataProcessorManager_processor_get(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).counter as! AnyCounter + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).processor as! AnyDataProcessor return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_counter_set") -@_cdecl("bjs_CounterManager_counter_set") -public func _bjs_CounterManager_counter_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_processor_set") +@_cdecl("bjs_DataProcessorManager_processor_set") +public func _bjs_DataProcessorManager_processor_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { #if arch(wasm32) - CounterManager.bridgeJSLiftParameter(_self).counter = AnyCounter.bridgeJSLiftParameter(value) + DataProcessorManager.bridgeJSLiftParameter(_self).processor = AnyDataProcessor.bridgeJSLiftParameter(value) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_backupCounter_get") -@_cdecl("bjs_CounterManager_backupCounter_get") -public func _bjs_CounterManager_backupCounter_get(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_get") +@_cdecl("bjs_DataProcessorManager_backupProcessor_get") +public func _bjs_DataProcessorManager_backupProcessor_get(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = CounterManager.bridgeJSLiftParameter(_self).backupCounter.flatMap { - $0 as? AnyCounter + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor.flatMap { + $0 as? AnyDataProcessor } return ret.bridgeJSLowerReturn() #else @@ -3488,213 +3757,255 @@ public func _bjs_CounterManager_backupCounter_get(_self: UnsafeMutableRawPointer #endif } -@_expose(wasm, "bjs_CounterManager_backupCounter_set") -@_cdecl("bjs_CounterManager_backupCounter_set") -public func _bjs_CounterManager_backupCounter_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +@_expose(wasm, "bjs_DataProcessorManager_backupProcessor_set") +@_cdecl("bjs_DataProcessorManager_backupProcessor_set") +public func _bjs_DataProcessorManager_backupProcessor_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { #if arch(wasm32) - CounterManager.bridgeJSLiftParameter(_self).backupCounter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_CounterManager_deinit") -@_cdecl("bjs_CounterManager_deinit") -public func _bjs_CounterManager_deinit(pointer: UnsafeMutableRawPointer) { - Unmanaged.fromOpaque(pointer).release() +@_expose(wasm, "bjs_DataProcessorManager_deinit") +@_cdecl("bjs_DataProcessorManager_deinit") +public func _bjs_DataProcessorManager_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() } -extension CounterManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { +extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_CounterManager_wrap") - func _bjs_CounterManager_wrap(_: UnsafeMutableRawPointer) -> Int32 + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap") + func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 #else - func _bjs_CounterManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { + func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif - return .object(JSObject(id: UInt32(bitPattern: _bjs_CounterManager_wrap(Unmanaged.passRetained(self).toOpaque())))) + return .object(JSObject(id: UInt32(bitPattern: _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque())))) } } -@_expose(wasm, "bjs_SwiftCounter_init") -@_cdecl("bjs_SwiftCounter_init") -public func _bjs_SwiftCounter_init() -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_SwiftDataProcessor_init") +@_cdecl("bjs_SwiftDataProcessor_init") +public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SwiftCounter() + let ret = SwiftDataProcessor() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_increment") -@_cdecl("bjs_SwiftCounter_increment") -public func _bjs_SwiftCounter_increment(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_increment") +@_cdecl("bjs_SwiftDataProcessor_increment") +public func _bjs_SwiftDataProcessor_increment(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { #if arch(wasm32) - SwiftCounter.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount)) + SwiftDataProcessor.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_getValue") -@_cdecl("bjs_SwiftCounter_getValue") -public func _bjs_SwiftCounter_getValue(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_SwiftDataProcessor_getValue") +@_cdecl("bjs_SwiftDataProcessor_getValue") +public func _bjs_SwiftDataProcessor_getValue(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).getValue() + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_setLabelElements") -@_cdecl("bjs_SwiftCounter_setLabelElements") -public func _bjs_SwiftCounter_setLabelElements(_self: UnsafeMutableRawPointer, labelPrefixBytes: Int32, labelPrefixLength: Int32, labelSuffixBytes: Int32, labelSuffixLength: Int32) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_setLabelElements") +@_cdecl("bjs_SwiftDataProcessor_setLabelElements") +public func _bjs_SwiftDataProcessor_setLabelElements(_self: UnsafeMutableRawPointer, labelPrefixBytes: Int32, labelPrefixLength: Int32, labelSuffixBytes: Int32, labelSuffixLength: Int32) -> Void { #if arch(wasm32) - SwiftCounter.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength)) + SwiftDataProcessor.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_getLabel") -@_cdecl("bjs_SwiftCounter_getLabel") -public func _bjs_SwiftCounter_getLabel(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_getLabel") +@_cdecl("bjs_SwiftDataProcessor_getLabel") +public func _bjs_SwiftDataProcessor_getLabel(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).getLabel() + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getLabel() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_isEven") -@_cdecl("bjs_SwiftCounter_isEven") -public func _bjs_SwiftCounter_isEven(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_SwiftDataProcessor_isEven") +@_cdecl("bjs_SwiftDataProcessor_isEven") +public func _bjs_SwiftDataProcessor_isEven(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).isEven() + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).isEven() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_processGreeter") -@_cdecl("bjs_SwiftCounter_processGreeter") -public func _bjs_SwiftCounter_processGreeter(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_processGreeter") +@_cdecl("bjs_SwiftDataProcessor_processGreeter") +public func _bjs_SwiftDataProcessor_processGreeter(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter)) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_createGreeter") -@_cdecl("bjs_SwiftCounter_createGreeter") -public func _bjs_SwiftCounter_createGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_SwiftDataProcessor_createGreeter") +@_cdecl("bjs_SwiftDataProcessor_createGreeter") +public func _bjs_SwiftDataProcessor_createGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).createGreeter() + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createGreeter() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_processOptionalGreeter") -@_cdecl("bjs_SwiftCounter_processOptionalGreeter") -public func _bjs_SwiftCounter_processOptionalGreeter(_self: UnsafeMutableRawPointer, greeterIsSome: Int32, greeterValue: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_processOptionalGreeter") +@_cdecl("bjs_SwiftDataProcessor_processOptionalGreeter") +public func _bjs_SwiftDataProcessor_processOptionalGreeter(_self: UnsafeMutableRawPointer, greeterIsSome: Int32, greeterValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue)) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_createOptionalGreeter") -@_cdecl("bjs_SwiftCounter_createOptionalGreeter") -public func _bjs_SwiftCounter_createOptionalGreeter(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_createOptionalGreeter") +@_cdecl("bjs_SwiftDataProcessor_createOptionalGreeter") +public func _bjs_SwiftDataProcessor_createOptionalGreeter(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).createOptionalGreeter() + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createOptionalGreeter() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_count_get") -@_cdecl("bjs_SwiftCounter_count_get") -public func _bjs_SwiftCounter_count_get(_self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult") +@_cdecl("bjs_SwiftDataProcessor_handleAPIResult") +public func _bjs_SwiftDataProcessor_handleAPIResult(_self: UnsafeMutableRawPointer, result: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: APIResult.bridgeJSLiftParameter(result)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult") +@_cdecl("bjs_SwiftDataProcessor_getAPIResult") +public func _bjs_SwiftDataProcessor_getAPIResult(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).count + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getAPIResult() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_count_set") -@_cdecl("bjs_SwiftCounter_count_set") -public func _bjs_SwiftCounter_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_count_get") +@_cdecl("bjs_SwiftDataProcessor_count_get") +public func _bjs_SwiftDataProcessor_count_get(_self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - SwiftCounter.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).count + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_name_get") -@_cdecl("bjs_SwiftCounter_name_get") -public func _bjs_SwiftCounter_name_get(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_count_set") +@_cdecl("bjs_SwiftDataProcessor_count_set") +public func _bjs_SwiftDataProcessor_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).name + SwiftDataProcessor.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_name_get") +@_cdecl("bjs_SwiftDataProcessor_name_get") +public func _bjs_SwiftDataProcessor_name_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_optionalTag_get") -@_cdecl("bjs_SwiftCounter_optionalTag_get") -public func _bjs_SwiftCounter_optionalTag_get(_self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_get") +@_cdecl("bjs_SwiftDataProcessor_optionalTag_get") +public func _bjs_SwiftDataProcessor_optionalTag_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_set") +@_cdecl("bjs_SwiftDataProcessor_optionalTag_set") +public func _bjs_SwiftDataProcessor_optionalTag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_get") +@_cdecl("bjs_SwiftDataProcessor_apiResult_get") +public func _bjs_SwiftDataProcessor_apiResult_get(_self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftCounter.bridgeJSLiftParameter(_self).optionalTag + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_optionalTag_set") -@_cdecl("bjs_SwiftCounter_optionalTag_set") -public func _bjs_SwiftCounter_optionalTag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_apiResult_set") +@_cdecl("bjs_SwiftDataProcessor_apiResult_set") +public func _bjs_SwiftDataProcessor_apiResult_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueCaseId: Int32) -> Void { #if arch(wasm32) - SwiftCounter.bridgeJSLiftParameter(_self).optionalTag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftCounter_deinit") -@_cdecl("bjs_SwiftCounter_deinit") -public func _bjs_SwiftCounter_deinit(pointer: UnsafeMutableRawPointer) { - Unmanaged.fromOpaque(pointer).release() +@_expose(wasm, "bjs_SwiftDataProcessor_deinit") +@_cdecl("bjs_SwiftDataProcessor_deinit") +public func _bjs_SwiftDataProcessor_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() } -extension SwiftCounter: ConvertibleToJSValue, _BridgedSwiftHeapObject { +extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftCounter_wrap") - func _bjs_SwiftCounter_wrap(_: UnsafeMutableRawPointer) -> Int32 + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap") + func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 #else - func _bjs_SwiftCounter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif - return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftCounter_wrap(Unmanaged.passRetained(self).toOpaque())))) + return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) } } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index f97beee6b..cc3807494 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1165,7 +1165,7 @@ }, { "constructor" : { - "abiName" : "bjs_CounterManager_init", + "abiName" : "bjs_DataProcessorManager_init", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1173,11 +1173,11 @@ }, "parameters" : [ { - "label" : "counter", - "name" : "counter", + "label" : "processor", + "name" : "processor", "type" : { "swiftProtocol" : { - "_0" : "Counter" + "_0" : "DataProcessor" } } } @@ -1185,7 +1185,7 @@ }, "methods" : [ { - "abiName" : "bjs_CounterManager_incrementByAmount", + "abiName" : "bjs_DataProcessorManager_incrementByAmount", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1210,13 +1210,13 @@ } }, { - "abiName" : "bjs_CounterManager_setCounterLabel", + "abiName" : "bjs_DataProcessorManager_setProcessorLabel", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "setCounterLabel", + "name" : "setProcessorLabel", "parameters" : [ { "label" : "_", @@ -1244,13 +1244,13 @@ } }, { - "abiName" : "bjs_CounterManager_isCounterEven", + "abiName" : "bjs_DataProcessorManager_isProcessorEven", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "isCounterEven", + "name" : "isProcessorEven", "parameters" : [ ], @@ -1261,13 +1261,13 @@ } }, { - "abiName" : "bjs_CounterManager_getCounterLabel", + "abiName" : "bjs_DataProcessorManager_getProcessorLabel", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "getCounterLabel", + "name" : "getProcessorLabel", "parameters" : [ ], @@ -1278,7 +1278,7 @@ } }, { - "abiName" : "bjs_CounterManager_getCurrentValue", + "abiName" : "bjs_DataProcessorManager_getCurrentValue", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1295,7 +1295,7 @@ } }, { - "abiName" : "bjs_CounterManager_incrementBoth", + "abiName" : "bjs_DataProcessorManager_incrementBoth", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1312,7 +1312,7 @@ } }, { - "abiName" : "bjs_CounterManager_getBackupValue", + "abiName" : "bjs_DataProcessorManager_getBackupValue", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1333,7 +1333,7 @@ } }, { - "abiName" : "bjs_CounterManager_hasBackup", + "abiName" : "bjs_DataProcessorManager_hasBackup", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1350,38 +1350,38 @@ } } ], - "name" : "CounterManager", + "name" : "DataProcessorManager", "properties" : [ { "isReadonly" : false, "isStatic" : false, - "name" : "counter", + "name" : "processor", "type" : { "swiftProtocol" : { - "_0" : "Counter" + "_0" : "DataProcessor" } } }, { "isReadonly" : false, "isStatic" : false, - "name" : "backupCounter", + "name" : "backupProcessor", "type" : { "optional" : { "_0" : { "swiftProtocol" : { - "_0" : "Counter" + "_0" : "DataProcessor" } } } } } ], - "swiftCallName" : "CounterManager" + "swiftCallName" : "DataProcessorManager" }, { "constructor" : { - "abiName" : "bjs_SwiftCounter_init", + "abiName" : "bjs_SwiftDataProcessor_init", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1393,7 +1393,7 @@ }, "methods" : [ { - "abiName" : "bjs_SwiftCounter_increment", + "abiName" : "bjs_SwiftDataProcessor_increment", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1418,7 +1418,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_getValue", + "abiName" : "bjs_SwiftDataProcessor_getValue", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1435,7 +1435,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_setLabelElements", + "abiName" : "bjs_SwiftDataProcessor_setLabelElements", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1469,7 +1469,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_getLabel", + "abiName" : "bjs_SwiftDataProcessor_getLabel", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1486,7 +1486,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_isEven", + "abiName" : "bjs_SwiftDataProcessor_isEven", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1503,7 +1503,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_processGreeter", + "abiName" : "bjs_SwiftDataProcessor_processGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1528,7 +1528,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_createGreeter", + "abiName" : "bjs_SwiftDataProcessor_createGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1545,7 +1545,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_processOptionalGreeter", + "abiName" : "bjs_SwiftDataProcessor_processOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1574,7 +1574,7 @@ } }, { - "abiName" : "bjs_SwiftCounter_createOptionalGreeter", + "abiName" : "bjs_SwiftDataProcessor_createOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -1593,9 +1593,51 @@ } } } + }, + { + "abiName" : "bjs_SwiftDataProcessor_handleAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_getAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAPIResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } ], - "name" : "SwiftCounter", + "name" : "SwiftDataProcessor", "properties" : [ { "isReadonly" : false, @@ -1630,9 +1672,23 @@ } } } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } } ], - "swiftCallName" : "SwiftCounter" + "swiftCallName" : "SwiftDataProcessor" } ], "enums" : [ @@ -5911,7 +5967,7 @@ { "methods" : [ { - "abiName" : "bjs_Counter_increment", + "abiName" : "bjs_DataProcessor_increment", "effects" : { "isAsync" : false, "isStatic" : false, @@ -5936,7 +5992,7 @@ } }, { - "abiName" : "bjs_Counter_getValue", + "abiName" : "bjs_DataProcessor_getValue", "effects" : { "isAsync" : false, "isStatic" : false, @@ -5953,7 +6009,7 @@ } }, { - "abiName" : "bjs_Counter_setLabelElements", + "abiName" : "bjs_DataProcessor_setLabelElements", "effects" : { "isAsync" : false, "isStatic" : false, @@ -5987,7 +6043,7 @@ } }, { - "abiName" : "bjs_Counter_getLabel", + "abiName" : "bjs_DataProcessor_getLabel", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6004,7 +6060,7 @@ } }, { - "abiName" : "bjs_Counter_isEven", + "abiName" : "bjs_DataProcessor_isEven", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6021,7 +6077,7 @@ } }, { - "abiName" : "bjs_Counter_processGreeter", + "abiName" : "bjs_DataProcessor_processGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6046,7 +6102,7 @@ } }, { - "abiName" : "bjs_Counter_createGreeter", + "abiName" : "bjs_DataProcessor_createGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6063,7 +6119,7 @@ } }, { - "abiName" : "bjs_Counter_processOptionalGreeter", + "abiName" : "bjs_DataProcessor_processOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6092,7 +6148,7 @@ } }, { - "abiName" : "bjs_Counter_createOptionalGreeter", + "abiName" : "bjs_DataProcessor_createOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, @@ -6111,9 +6167,51 @@ } } } + }, + { + "abiName" : "bjs_DataProcessor_handleAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_getAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAPIResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } ], - "name" : "Counter", + "name" : "DataProcessor", "properties" : [ { "isReadonly" : false, @@ -6145,6 +6243,19 @@ } } } + }, + { + "isReadonly" : false, + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } } ] } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 73bc7279f..cb67a6a70 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -809,160 +809,185 @@ function setupTestGlobals(global) { /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testProtocolSupport(exports) { - let counterValue = 0; - let counterLabel = ""; - const jsCounter = { + let processorValue = 0; + let processorLabel = ""; + let apiResultValue = null; + const jsProcessor = { count: 0, - name: "JSCounter", + name: "JSProcessor", optionalTag: null, - increment(amount) { counterValue += amount; this.count += amount; }, - getValue() { return counterValue; }, - setLabelElements(labelPrefix, labelSuffix) { counterLabel = labelPrefix + labelSuffix; }, - getLabel() { return counterLabel; }, - isEven() { return counterValue % 2 === 0; }, - processGreeter(greeter) { return `JSCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("JSCounterGreeter"); }, + apiResult: null, + increment(amount) { processorValue += amount; this.count += amount; }, + getValue() { return processorValue; }, + setLabelElements(labelPrefix, labelSuffix) { processorLabel = labelPrefix + labelSuffix; }, + getLabel() { return processorLabel; }, + isEven() { return processorValue % 2 === 0; }, + processGreeter(greeter) { return `JSProcessor processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("JSProcessorGreeter"); }, processOptionalGreeter(greeter) { - return greeter ? `JSCounter processed optional: ${greeter.greet()}` : "JSCounter received null"; + return greeter ? `JSProcessor processed optional: ${greeter.greet()}` : "JSProcessor received null"; }, - createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); } + createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); }, + handleAPIResult(result) { apiResultValue = result; }, + getAPIResult() { return apiResultValue; } }; - const manager = new exports.CounterManager(jsCounter); + const manager = new exports.DataProcessorManager(jsProcessor); - assert.equal(jsCounter.count, 0); - assert.equal(jsCounter.name, "JSCounter"); + assert.equal(jsProcessor.count, 0); + assert.equal(jsProcessor.name, "JSProcessor"); manager.incrementByAmount(4); assert.equal(manager.getCurrentValue(), 4); - assert.equal(jsCounter.count, 4); + assert.equal(jsProcessor.count, 4); - manager.setCounterLabel("Test", "Label"); - assert.equal(manager.getCounterLabel(), "TestLabel"); - assert.equal(jsCounter.getLabel(), "TestLabel"); + manager.setProcessorLabel("Test", "Label"); + assert.equal(manager.getProcessorLabel(), "TestLabel"); + assert.equal(jsProcessor.getLabel(), "TestLabel"); - assert.equal(manager.isCounterEven(), true); + assert.equal(manager.isProcessorEven(), true); manager.incrementByAmount(1); - assert.equal(manager.isCounterEven(), false); - assert.equal(jsCounter.isEven(), false); + assert.equal(manager.isProcessorEven(), false); + assert.equal(jsProcessor.isEven(), false); - jsCounter.increment(3); - assert.equal(jsCounter.getValue(), 8); + jsProcessor.increment(3); + assert.equal(jsProcessor.getValue(), 8); manager.release(); - const swiftCounter = new exports.SwiftCounter(); - const swiftManager = new exports.CounterManager(swiftCounter); + const swiftProcessor = new exports.SwiftDataProcessor(); + const swiftManager = new exports.DataProcessorManager(swiftProcessor); - assert.equal(swiftCounter.count, 0); - assert.equal(swiftCounter.name, "SwiftCounter"); + assert.equal(swiftProcessor.count, 0); + assert.equal(swiftProcessor.name, "SwiftDataProcessor"); swiftManager.incrementByAmount(10); assert.equal(swiftManager.getCurrentValue(), 10); - assert.equal(swiftCounter.count, 10); + assert.equal(swiftProcessor.count, 10); - swiftManager.setCounterLabel("Swift", "Label"); - assert.equal(swiftManager.getCounterLabel(), "SwiftLabel"); + swiftManager.setProcessorLabel("Swift", "Label"); + assert.equal(swiftManager.getProcessorLabel(), "SwiftLabel"); - swiftCounter.increment(5); - assert.equal(swiftCounter.getValue(), 15); - assert.equal(swiftCounter.count, 15); + swiftProcessor.increment(5); + assert.equal(swiftProcessor.getValue(), 15); + assert.equal(swiftProcessor.count, 15); - swiftCounter.count = 100; - assert.equal(swiftCounter.count, 100); - assert.equal(swiftCounter.getValue(), 100); + swiftProcessor.count = 100; + assert.equal(swiftProcessor.count, 100); + assert.equal(swiftProcessor.getValue(), 100); const testGreeter = new exports.Greeter("TestUser"); - const jsResult = jsCounter.processGreeter(testGreeter); - assert.equal(jsResult, "JSCounter processed: Hello, TestUser!"); + const jsResult = jsProcessor.processGreeter(testGreeter); + assert.equal(jsResult, "JSProcessor processed: Hello, TestUser!"); - const swiftResult = swiftCounter.processGreeter(testGreeter); - assert.equal(swiftResult, "SwiftCounter processed: Hello, TestUser!"); + const swiftResult = swiftProcessor.processGreeter(testGreeter); + assert.equal(swiftResult, "SwiftProcessor processed: Hello, TestUser!"); // Test swiftHeapObject return from protocol methods - const jsCreatedGreeter = jsCounter.createGreeter(); - assert.equal(jsCreatedGreeter.name, "JSCounterGreeter"); - assert.equal(jsCreatedGreeter.greet(), "Hello, JSCounterGreeter!"); + const jsCreatedGreeter = jsProcessor.createGreeter(); + assert.equal(jsCreatedGreeter.name, "JSProcessorGreeter"); + assert.equal(jsCreatedGreeter.greet(), "Hello, JSProcessorGreeter!"); jsCreatedGreeter.release(); - const swiftCreatedGreeter = swiftCounter.createGreeter(); - assert.equal(swiftCreatedGreeter.name, "CounterGreeter"); - assert.equal(swiftCreatedGreeter.greet(), "Hello, CounterGreeter!"); + const swiftCreatedGreeter = swiftProcessor.createGreeter(); + assert.equal(swiftCreatedGreeter.name, "ProcessorGreeter"); + assert.equal(swiftCreatedGreeter.greet(), "Hello, ProcessorGreeter!"); swiftCreatedGreeter.release(); const optGreeterTest = new exports.Greeter("OptionalTest"); - assert.equal(jsCounter.processOptionalGreeter(optGreeterTest), "JSCounter processed optional: Hello, OptionalTest!"); - assert.equal(jsCounter.processOptionalGreeter(null), "JSCounter received null"); - assert.equal(swiftCounter.processOptionalGreeter(optGreeterTest), "SwiftCounter processed optional: Hello, OptionalTest!"); - assert.equal(swiftCounter.processOptionalGreeter(null), "SwiftCounter received nil"); + assert.equal(jsProcessor.processOptionalGreeter(optGreeterTest), "JSProcessor processed optional: Hello, OptionalTest!"); + assert.equal(jsProcessor.processOptionalGreeter(null), "JSProcessor received null"); + assert.equal(swiftProcessor.processOptionalGreeter(optGreeterTest), "SwiftProcessor processed optional: Hello, OptionalTest!"); + assert.equal(swiftProcessor.processOptionalGreeter(null), "SwiftProcessor received nil"); optGreeterTest.release(); - const jsOptGreeter = jsCounter.createOptionalGreeter(); + const jsOptGreeter = jsProcessor.createOptionalGreeter(); assert.notEqual(jsOptGreeter, null); assert.equal(jsOptGreeter.name, "JSOptionalGreeter"); jsOptGreeter.release(); - const swiftOptGreeter = swiftCounter.createOptionalGreeter(); + const swiftOptGreeter = swiftProcessor.createOptionalGreeter(); assert.notEqual(swiftOptGreeter, null); - assert.equal(swiftOptGreeter.name, "OptionalCounterGreeter"); + assert.equal(swiftOptGreeter.name, "OptionalProcessorGreeter"); swiftOptGreeter.release(); - assert.equal(jsCounter.optionalTag, null); - jsCounter.optionalTag = "test-tag"; - assert.equal(jsCounter.optionalTag, "test-tag"); - jsCounter.optionalTag = null; - assert.equal(jsCounter.optionalTag, null); + assert.equal(jsProcessor.optionalTag, null); + jsProcessor.optionalTag = "test-tag"; + assert.equal(jsProcessor.optionalTag, "test-tag"); + jsProcessor.optionalTag = null; + assert.equal(jsProcessor.optionalTag, null); + + const successResult = { tag: exports.Result.Tag.Success, param0: "Operation completed" }; + const failureResult = { tag: exports.Result.Tag.Failure, param0: 500 }; + + jsProcessor.handleAPIResult(successResult); + assert.deepEqual(jsProcessor.getAPIResult(), successResult); + + jsProcessor.handleAPIResult(failureResult); + assert.deepEqual(jsProcessor.getAPIResult(), failureResult); + + assert.equal(jsProcessor.apiResult, null); + jsProcessor.apiResult = successResult; + assert.deepEqual(jsProcessor.apiResult, successResult); + jsProcessor.apiResult = null; + assert.equal(jsProcessor.apiResult, null); testGreeter.release(); swiftManager.release(); - swiftCounter.release(); + swiftProcessor.release(); - let optionalCounterValue = 100; - let optionalCounterLabel = "optional"; - const optionalCounter = { + let optionalProcessorValue = 100; + let optionalProcessorLabel = "optional"; + const optionalProcessor = { count: 100, - name: "OptionalCounter", + name: "OptionalProcessor", optionalTag: "optional-tag", - increment(amount) { optionalCounterValue += amount; this.count += amount; }, - getValue() { return optionalCounterValue; }, - setLabelElements(labelPrefix, labelSuffix) { optionalCounterLabel = labelPrefix + labelSuffix; }, - getLabel() { return optionalCounterLabel; }, - isEven() { return optionalCounterValue % 2 === 0; }, - processGreeter(greeter) { return `OptionalCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("OptionalCounterGreeter"); }, + apiResult: null, + increment(amount) { optionalProcessorValue += amount; this.count += amount; }, + getValue() { return optionalProcessorValue; }, + setLabelElements(labelPrefix, labelSuffix) { optionalProcessorLabel = labelPrefix + labelSuffix; }, + getLabel() { return optionalProcessorLabel; }, + isEven() { return optionalProcessorValue % 2 === 0; }, + processGreeter(greeter) { return `OptionalProcessor processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("OptionalProcessorGreeter"); }, processOptionalGreeter(greeter) { - return greeter ? `OptionalCounter processed optional: ${greeter.greet()}` : "OptionalCounter received null"; + return greeter ? `OptionalProcessor processed optional: ${greeter.greet()}` : "OptionalProcessor received null"; }, - createOptionalGreeter() { return null; } + createOptionalGreeter() { return null; }, + handleAPIResult(result) { }, + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } }; - let mainCounterValue = 0; - let mainCounterLabel = "main"; - const mainCounter = { + let mainProcessorValue = 0; + let mainProcessorLabel = "main"; + const mainProcessor = { count: 0, - name: "MainCounter", + name: "MainProcessor", optionalTag: null, - increment(amount) { mainCounterValue += amount; this.count += amount; }, - getValue() { return mainCounterValue; }, - setLabelElements(labelPrefix, labelSuffix) { mainCounterLabel = labelPrefix + labelSuffix; }, - getLabel() { return mainCounterLabel; }, - isEven() { return mainCounterValue % 2 === 0; }, - processGreeter(greeter) { return `MainCounter processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("MainCounterGreeter"); }, + apiResult: null, + increment(amount) { mainProcessorValue += amount; this.count += amount; }, + getValue() { return mainProcessorValue; }, + setLabelElements(labelPrefix, labelSuffix) { mainProcessorLabel = labelPrefix + labelSuffix; }, + getLabel() { return mainProcessorLabel; }, + isEven() { return mainProcessorValue % 2 === 0; }, + processGreeter(greeter) { return `MainProcessor processed: ${greeter.greet()}`; }, + createGreeter() { return new exports.Greeter("MainProcessorGreeter"); }, processOptionalGreeter(greeter) { - return greeter ? `MainCounter processed optional: ${greeter.greet()}` : "MainCounter received null"; + return greeter ? `MainProcessor processed optional: ${greeter.greet()}` : "MainProcessor received null"; }, - createOptionalGreeter() { return new exports.Greeter("MainOptionalGreeter"); } + createOptionalGreeter() { return new exports.Greeter("MainOptionalGreeter"); }, + handleAPIResult(result) { }, + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } }; - const managerWithOptional = new exports.CounterManager(mainCounter); + const managerWithOptional = new exports.DataProcessorManager(mainProcessor); - assert.equal(managerWithOptional.backupCounter, null); + assert.equal(managerWithOptional.backupProcessor, null); assert.equal(managerWithOptional.hasBackup(), false); assert.equal(managerWithOptional.getBackupValue(), null); - managerWithOptional.backupCounter = optionalCounter; - assert.notEqual(managerWithOptional.backupCounter, null); + managerWithOptional.backupProcessor = optionalProcessor; + assert.notEqual(managerWithOptional.backupProcessor, null); assert.equal(managerWithOptional.hasBackup(), true); managerWithOptional.incrementBoth(); @@ -973,23 +998,23 @@ function testProtocolSupport(exports) { assert.equal(managerWithOptional.getCurrentValue(), 2); assert.equal(managerWithOptional.getBackupValue(), 102); - managerWithOptional.backupCounter = null; - assert.equal(managerWithOptional.backupCounter, null); + managerWithOptional.backupProcessor = null; + assert.equal(managerWithOptional.backupProcessor, null); assert.equal(managerWithOptional.hasBackup(), false); managerWithOptional.incrementBoth(); assert.equal(managerWithOptional.getCurrentValue(), 3); assert.equal(managerWithOptional.getBackupValue(), null); - const swiftBackupCounter = new exports.SwiftCounter(); - swiftBackupCounter.increment(1); - managerWithOptional.backupCounter = swiftBackupCounter; + const swiftBackupProcessor = new exports.SwiftDataProcessor(); + swiftBackupProcessor.increment(1); + managerWithOptional.backupProcessor = swiftBackupProcessor; assert.equal(managerWithOptional.hasBackup(), true); assert.equal(managerWithOptional.getBackupValue(), 1); - assert.equal(swiftBackupCounter.count, 1); - assert.equal(swiftBackupCounter.name, "SwiftCounter"); + assert.equal(swiftBackupProcessor.count, 1); + assert.equal(swiftBackupProcessor.name, "SwiftDataProcessor"); managerWithOptional.release(); - swiftBackupCounter.release(); + swiftBackupProcessor.release(); } From e7e1b79b683b400209876d6ae254afa466ae62df Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 16 Oct 2025 14:06:22 +0200 Subject: [PATCH 017/252] BridgeJS: Fix for side channelling values on properties getters / setters --- .../Generated/BridgeJS.ExportSwift.swift | 114 +++- .../Sources/BridgeJSCore/ExportSwift.swift | 134 +++-- .../Sources/BridgeJSCore/ImportTS.swift | 24 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 92 ++++ .../Sources/BridgeJSLink/JSGlueGen.swift | 173 +++--- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 4 +- .../BridgeJSToolTests/Inputs/Protocol.swift | 23 +- .../ArrayParameter.Import.js | 35 ++ .../BridgeJSLinkTests/Async.Export.js | 35 ++ .../BridgeJSLinkTests/Async.Import.js | 35 ++ .../DefaultParameters.Export.js | 35 ++ .../EnumAssociatedValue.Export.js | 35 ++ .../BridgeJSLinkTests/EnumCase.Export.js | 35 ++ .../BridgeJSLinkTests/EnumNamespace.Export.js | 35 ++ .../BridgeJSLinkTests/EnumRawType.Export.js | 35 ++ .../BridgeJSLinkTests/Interface.Import.js | 35 ++ .../InvalidPropertyNames.Import.js | 35 ++ .../MultipleImportedTypes.Import.js | 35 ++ .../BridgeJSLinkTests/Namespaces.Export.js | 35 ++ .../BridgeJSLinkTests/Optionals.Export.js | 35 ++ .../PrimitiveParameters.Export.js | 35 ++ .../PrimitiveParameters.Import.js | 35 ++ .../PrimitiveReturn.Export.js | 35 ++ .../PrimitiveReturn.Import.js | 35 ++ .../BridgeJSLinkTests/PropertyTypes.Export.js | 35 ++ .../BridgeJSLinkTests/Protocol.Export.d.ts | 31 +- .../BridgeJSLinkTests/Protocol.Export.js | 181 ++++++- .../StaticFunctions.Export.js | 35 ++ .../StaticProperties.Export.js | 35 ++ .../StringParameter.Export.js | 35 ++ .../StringParameter.Import.js | 35 ++ .../BridgeJSLinkTests/StringReturn.Export.js | 35 ++ .../BridgeJSLinkTests/StringReturn.Import.js | 35 ++ .../BridgeJSLinkTests/SwiftClass.Export.js | 35 ++ .../TS2SkeletonLike.Import.js | 35 ++ .../BridgeJSLinkTests/Throws.Export.js | 35 ++ .../BridgeJSLinkTests/TypeAlias.Import.js | 35 ++ .../TypeScriptClass.Import.js | 35 ++ .../VoidParameterVoidReturn.Export.js | 35 ++ .../VoidParameterVoidReturn.Import.js | 35 ++ .../ExportSwiftTests/DefaultParameters.swift | 4 +- .../EnumAssociatedValue.swift | 25 +- .../ExportSwiftTests/EnumCase.swift | 16 +- .../ExportSwiftTests/EnumNamespace.swift | 8 +- .../ExportSwiftTests/Protocol.json | 143 ++++- .../ExportSwiftTests/Protocol.swift | 175 ++++++- .../ExportSwiftTests/StaticFunctions.swift | 9 +- .../ExportSwiftTests/StaticProperties.swift | 4 +- .../JavaScriptKit/BridgeJSInstrincics.swift | 461 ++++++++++------ .../Exporting-Swift-Protocols.md | 5 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 70 ++- .../Generated/BridgeJS.ExportSwift.swift | 408 +++++++++++++-- .../JavaScript/BridgeJS.ExportSwift.json | 494 +++++++++++++++++- Tests/prelude.mjs | 319 ++++++----- 54 files changed, 3417 insertions(+), 585 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift index d02d0fae8..ab0cbb197 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift @@ -7,7 +7,7 @@ @_spi(BridgeJS) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -26,6 +26,43 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + case .flag(let param0): + _swift_js_push_int(param0 ? 1 : 0) + return Int32(2) + case .rate(let param0): + _swift_js_push_f32(param0) + return Int32(3) + case .precise(let param0): + _swift_js_push_f64(param0) + return Int32(4) + case .info: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): @@ -53,7 +90,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) @@ -74,6 +111,79 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .error(let param0, let param1): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(param1)) + return Int32(1) + case .location(let param0, let param1, let param2): + _swift_js_push_f64(param0) + _swift_js_push_f64(param1) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(2) + case .status(let param0, let param1, let param2): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(Int32(param1)) + var __bjs_param2 = param2 + __bjs_param2.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(3) + case .coordinates(let param0, let param1, let param2): + _swift_js_push_f64(param0) + _swift_js_push_f64(param1) + _swift_js_push_f64(param2) + return Int32(4) + case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): + _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_int(param1 ? 1 : 0) + _swift_js_push_int(Int32(param2)) + _swift_js_push_int(Int32(param3)) + _swift_js_push_f64(param4) + _swift_js_push_f64(param5) + var __bjs_param6 = param6 + __bjs_param6.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param7 = param7 + __bjs_param7.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_param8 = param8 + __bjs_param8.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(5) + case .info: + return Int32(6) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { + return _bridgeJSLiftFromCaseId(caseId) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 7aa4503fa..4cdc8a3bc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -588,7 +588,6 @@ public class ExportSwift { baseName: name, namespace: finalNamespace, staticContext: isStatic ? staticContext : nil, - operation: nil, className: classNameForABI ) @@ -1054,8 +1053,6 @@ public class ExportSwift { let abiName = ABINameGenerator.generateABIName( baseName: name, namespace: namespace, - staticContext: nil, - operation: nil, className: protocolName ) @@ -1167,6 +1164,8 @@ public class ExportSwift { } else { var numericExpr = element.rawValue?.value var isNegative = false + + // Check for prefix operator (for negative numbers) if let prefixExpr = numericExpr?.as(PrefixOperatorExprSyntax.self), prefixExpr.operator.text == "-" { @@ -1790,8 +1789,7 @@ public class ExportSwift { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> \(raw: typeName) { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(raw: typeName) { return _bridgeJSLiftFromCaseId(caseId) } @@ -1868,8 +1866,6 @@ public class ExportSwift { return cases } - /// Generates code to push associated value payloads to side channels - /// This helper is reused by both lowerParameter and lowerReturn to avoid duplication private func generatePayloadPushingCode( associatedValues: [AssociatedValue] ) -> [String] { @@ -2229,10 +2225,8 @@ public class ExportSwift { """ } - /// Generates an AnyProtocol wrapper struct for a protocol - /// /// Creates a struct that wraps a JSObject and implements protocol methods - /// by calling `@_extern(wasm)` functions that forward to JavaScript + /// by calling `@_extern(wasm)` functions that forward to JavaScript via JSObject ID func renderProtocolWrapper(protocol proto: ExportedProtocol) throws -> DeclSyntax { let wrapperName = "Any\(proto.name)" let protocolName = proto.name @@ -2253,57 +2247,73 @@ public class ExportSwift { var externParams: [String] = ["this: Int32"] for param in method.parameters { let loweringInfo = try param.type.loweringParameterInfo(context: .protocolExport) - assert( - loweringInfo.loweredParameters.count == 1, - "Protocol parameters must lower to a single WASM type" - ) - let (_, wasmType) = loweringInfo.loweredParameters[0] - externParams.append("\(param.name): \(wasmType.swiftType)") + for (paramName, wasmType) in loweringInfo.loweredParameters { + let fullParamName = + loweringInfo.loweredParameters.count > 1 + ? "\(param.name)\(paramName.capitalizedFirstLetter)" : param.name + externParams.append("\(fullParamName): \(wasmType.swiftType)") + } } + var preCallStatements: [String] = [] var callArgs: [String] = ["this: Int32(bitPattern: jsObject.id)"] for param in method.parameters { - callArgs.append("\(param.name): \(param.name).bridgeJSLowerParameter()") + let loweringInfo = try param.type.loweringParameterInfo(context: .protocolExport) + if case .optional = param.type, loweringInfo.loweredParameters.count > 1 { + let isSomeName = "\(param.name)\(loweringInfo.loweredParameters[0].name.capitalizedFirstLetter)" + let wrappedName = "\(param.name)\(loweringInfo.loweredParameters[1].name.capitalizedFirstLetter)" + preCallStatements.append( + "let (\(isSomeName), \(wrappedName)) = \(param.name).bridgeJSLowerParameterWithPresence()" + ) + callArgs.append("\(isSomeName): \(isSomeName)") + callArgs.append("\(wrappedName): \(wrappedName)") + } else { + callArgs.append("\(param.name): \(param.name).bridgeJSLowerParameter()") + } } let returnTypeStr: String let externReturnType: String let callCode: DeclSyntax + let preCallCode = preCallStatements.isEmpty ? "" : preCallStatements.joined(separator: "\n") + "\n" + if method.returnType == .void { returnTypeStr = "" externReturnType = "" callCode = """ - _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) """ } else { returnTypeStr = " -> \(method.returnType.swiftType)" - let liftingInfo = try method.returnType.liftingReturnInfo(context: .protocolExport) + let liftingInfo = try method.returnType.liftingReturnInfo( + context: .protocolExport + ) if case .optional = method.returnType { if let abiType = liftingInfo.valueToLift { externReturnType = " -> \(abiType.swiftType)" callCode = """ - let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + \(raw: preCallCode)let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) """ } else { externReturnType = "" callCode = """ - _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() """ } } else if let abiType = liftingInfo.valueToLift { externReturnType = " -> \(abiType.swiftType)" callCode = """ - let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + \(raw: preCallCode)let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) """ } else { externReturnType = "" callCode = """ - _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) + \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() """ } @@ -2352,73 +2362,106 @@ public class ExportSwift { ) throws -> DeclSyntax { let getterAbiName = ABINameGenerator.generateABIName( baseName: property.name, - namespace: nil, - staticContext: nil, operation: "get", className: protocolName ) let setterAbiName = ABINameGenerator.generateABIName( baseName: property.name, - namespace: nil, - staticContext: nil, operation: "set", className: protocolName ) - // Generate getter + let usesSideChannel: Bool + if case .optional(let wrappedType) = property.type { + switch wrappedType { + case .string: + usesSideChannel = true + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + usesSideChannel = true + default: + usesSideChannel = true + } + case .int, .float, .double: + usesSideChannel = true + case .bool, .caseEnum, .associatedValueEnum, .swiftHeapObject: + usesSideChannel = false + default: + usesSideChannel = false + } + } else { + usesSideChannel = false + } + let liftingInfo = try property.type.liftingReturnInfo(context: .protocolExport) let getterReturnType: String - let getterCallCode: String + let getterBody: String - if let abiType = liftingInfo.valueToLift { + if usesSideChannel { + // Optional case/raw enums use side-channel reading (Void return) + getterReturnType = "" + getterBody = """ + _extern_get(this: Int32(bitPattern: jsObject.id)) + return \(property.type.swiftType).bridgeJSLiftReturnFromSideChannel() + """ + } else if let abiType = liftingInfo.valueToLift { getterReturnType = " -> \(abiType.swiftType)" - getterCallCode = """ + getterBody = """ let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) return \(property.type.swiftType).bridgeJSLiftReturn(ret) """ } else { - // For String and other types that use tmpRetString getterReturnType = "" - getterCallCode = """ + getterBody = """ _extern_get(this: Int32(bitPattern: jsObject.id)) return \(property.type.swiftType).bridgeJSLiftReturn() """ } if property.isReadonly { - // Readonly property - only getter return """ var \(raw: property.name): \(raw: property.type.swiftType) { get { @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") func _extern_get(this: Int32)\(raw: getterReturnType) - \(raw: getterCallCode) + \(raw: getterBody) } } """ } else { - // Readwrite property - getter and setter let loweringInfo = try property.type.loweringParameterInfo(context: .protocolExport) - assert( - loweringInfo.loweredParameters.count == 1, - "Protocol property setters must lower to a single WASM parameter" - ) - let (paramName, wasmType) = loweringInfo.loweredParameters[0] - let setterParams = "this: Int32, \(paramName): \(wasmType.swiftType)" - let setterCallArgs = "this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter()" + let setterParams = + (["this: Int32"] + loweringInfo.loweredParameters.map { "\($0.name): \($0.type.swiftType)" }).joined( + separator: ", " + ) + + let setterBody: String + if case .optional = property.type, loweringInfo.loweredParameters.count > 1 { + let isSomeParam = loweringInfo.loweredParameters[0].name + let wrappedParam = loweringInfo.loweredParameters[1].name + setterBody = """ + let (\(isSomeParam), \(wrappedParam)) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), \(isSomeParam): \(isSomeParam), \(wrappedParam): \(wrappedParam)) + """ + } else { + let paramName = loweringInfo.loweredParameters[0].name + setterBody = + "_extern_set(this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter())" + } return """ var \(raw: property.name): \(raw: property.type.swiftType) { get { @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") func _extern_get(this: Int32)\(raw: getterReturnType) - \(raw: getterCallCode) + \(raw: getterBody) } set { @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: setterAbiName)") func _extern_set(\(raw: setterParams)) - _extern_set(\(raw: setterCallArgs)) + \(raw: setterBody) } } """ @@ -2600,7 +2643,6 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") } } - } extension DeclModifierSyntax { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 26e22e873..4589817d1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -459,8 +459,8 @@ extension BridgeType { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .protocolExport: - let wasmType = rawType == .string ? WasmCoreType.i32 : (rawType.wasmCoreType ?? .i32) - return LoweringParameterInfo(loweredParameters: [("value", wasmType)]) + // For protocol export we return .i32 for String raw value type instead of nil + return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) } case .associatedValueEnum: switch context { @@ -477,11 +477,9 @@ extension BridgeType { throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") case .protocolExport: let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) - guard wrappedInfo.loweredParameters.count == 1 else { - throw BridgeJSCoreError("Optional wrapped type must lower to single parameter") - } - let (_, wrappedWasmType) = wrappedInfo.loweredParameters[0] - return LoweringParameterInfo(loweredParameters: [("value", wrappedWasmType)]) + var params = [("isSome", WasmCoreType.i32)] + params.append(contentsOf: wrappedInfo.loweredParameters) + return LoweringParameterInfo(loweredParameters: params) } } } @@ -498,7 +496,9 @@ extension BridgeType { static let void = LiftingReturnInfo(valueToLift: nil) } - func liftingReturnInfo(context: BridgeContext = .importTS) throws -> LiftingReturnInfo { + func liftingReturnInfo( + context: BridgeContext = .importTS + ) throws -> LiftingReturnInfo { switch self { case .bool: return .bool case .int: return .int @@ -533,15 +533,15 @@ extension BridgeType { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .protocolExport: - let wasmType = rawType == .string ? WasmCoreType.i32 : (rawType.wasmCoreType ?? .i32) - return LiftingReturnInfo(valueToLift: wasmType) + // For protocol export we return .i32 for String raw value type instead of nil + return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) } case .associatedValueEnum: switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") case .protocolExport: - return LiftingReturnInfo(valueToLift: nil) + return LiftingReturnInfo(valueToLift: .i32) } case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as return values") @@ -551,7 +551,7 @@ extension BridgeType { throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") case .protocolExport: let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) - return wrappedInfo + return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 4445ddeb6..6abfd3057 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -589,6 +589,61 @@ struct BridgeJSLink { printer.write("}") } printer.write("}") + printer.write("bjs[\"swift_js_get_optional_int_presence\"] = function() {") + printer.indent { + printer.write("return \(JSGlueVariableScope.reservedStorageToReturnOptionalInt) != null ? 1 : 0;") + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_int_value\"] = function() {") + printer.indent { + printer.write("const value = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = undefined;") + printer.write("return value;") + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_string\"] = function() {") + printer.indent { + printer.write("const str = \(JSGlueVariableScope.reservedStorageToReturnString);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") + printer.write("if (str == null) {") + printer.indent { + printer.write("return -1;") + } + printer.write("} else {") + printer.indent { + printer.write("const bytes = \(JSGlueVariableScope.reservedTextEncoder).encode(str);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = bytes;") + printer.write("return bytes.length;") + } + printer.write("}") + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_float_presence\"] = function() {") + printer.indent { + printer.write("return \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) != null ? 1 : 0;") + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_float_value\"] = function() {") + printer.indent { + printer.write("const value = \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = undefined;") + printer.write("return value;") + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_double_presence\"] = function() {") + printer.indent { + printer.write( + "return \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) != null ? 1 : 0;" + ) + } + printer.write("}") + printer.write("bjs[\"swift_js_get_optional_double_value\"] = function() {") + printer.indent { + printer.write("const value = \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = undefined;") + printer.write("return value;") + } + printer.write("}") } } return printer @@ -1962,6 +2017,43 @@ extension BridgeJSLink { } func callPropertyGetter(name: String, returnType: BridgeType) throws -> String? { + if context == .protocolExport, case .optional(let wrappedType) = returnType { + let usesSideChannel: Bool + switch wrappedType { + case .string, .int, .float, .double, .jsObject, .swiftProtocol: + usesSideChannel = true + case .rawValueEnum: + usesSideChannel = true + case .bool, .caseEnum, .swiftHeapObject, .associatedValueEnum: + usesSideChannel = false + default: + usesSideChannel = false + } + + if usesSideChannel { + let resultVar = scope.variable("ret") + body.write( + "let \(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name);" + ) + + switch wrappedType { + case .string, .rawValueEnum(_, .string): + body.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(resultVar);") + case .int, .rawValueEnum(_, .int): + body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(resultVar);") + case .float, .rawValueEnum(_, .float): + body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(resultVar);") + case .double, .rawValueEnum(_, .double): + body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(resultVar);") + case .jsObject, .swiftProtocol: + body.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(resultVar);") + default: + break + } + return nil // Side-channel types return nil (no direct return value) + } + } + return try call( callExpr: "\(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name)", returnType: returnType diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 453974716..9cdf9d72b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -263,21 +263,19 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLiftParameter(wrappedType: BridgeType, context: BridgeContext) throws -> IntrinsicJSFragment { + static func optionalLiftParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["isSome", "wrappedValue"], printCode: { arguments, scope, printer, cleanupCode in let isSome = arguments[0] let wrappedValue = arguments[1] - let resultExpr: String + switch wrappedType { case .int, .float, .double, .caseEnum: resultExpr = "\(isSome) ? \(wrappedValue) : null" - case .bool: resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : null" - case .string: let objectLabel = scope.variable("obj") printer.write("let \(objectLabel);") @@ -290,14 +288,11 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") resultExpr = "\(isSome) ? \(objectLabel) : null" - case .swiftHeapObject(let name): resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : null" - case .jsObject: resultExpr = "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : null" - case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -317,7 +312,18 @@ struct IntrinsicJSFragment: Sendable { default: resultExpr = "\(isSome) ? \(wrappedValue) : null" } - + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let enumVar = scope.variable("enumValue") + printer.write("let \(enumVar);") + printer.write("if (\(isSome)) {") + printer.indent { + printer.write( + "\(enumVar) = enumHelpers.\(base).raise(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + } + printer.write("}") + resultExpr = "\(isSome) ? \(enumVar) : null" default: resultExpr = "\(isSome) ? \(wrappedValue) : null" } @@ -371,6 +377,9 @@ struct IntrinsicJSFragment: Sendable { cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return ["+\(isSomeVar)", "\(isSomeVar) ? \(caseIdVar) : 0"] + case .rawValueEnum: + // Raw value enums with optional - falls through to handle based on raw type + return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] default: switch wrappedType { case .swiftHeapObject: @@ -489,11 +498,9 @@ struct IntrinsicJSFragment: Sendable { static func optionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { switch wrappedType { - case .bool, .int, .float, .double, .string, .swiftHeapObject, .jsObject, .swiftProtocol, .caseEnum, - .rawValueEnum, .associatedValueEnum: - break case .void, .optional, .namespaceEnum: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") + default: break } return IntrinsicJSFragment( @@ -501,7 +508,6 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let value = arguments[0] let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null;") switch wrappedType { @@ -509,10 +515,12 @@ struct IntrinsicJSFragment: Sendable { printer.write( "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" ) - case .int, .caseEnum: + case .int: printer.write( "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" ) + case .caseEnum: + printer.write("return \(isSomeVar) ? (\(value) | 0) : -1;") case .float: printer.write( "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" @@ -537,9 +545,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("return -1;") } printer.write("}") - - case .swiftHeapObject: - printer.write("return \(isSomeVar) ? \(value).pointer : 0;") case .jsObject, .swiftProtocol: let idVar = scope.variable("id") printer.write("let \(idVar) = 0;") @@ -561,30 +566,31 @@ struct IntrinsicJSFragment: Sendable { printer.write( "bjs[\"swift_js_return_optional_string\"](1, \(bytesVar), \(bytesVar).length);" ) - printer.write("return \(bytesVar).length;") } printer.write("} else {") printer.indent { printer.write("bjs[\"swift_js_return_optional_string\"](0, 0, 0);") - printer.write("return -1;") } printer.write("}") - case .bool: - printer.write( - "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - case .float: - printer.write( - "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - case .double: - printer.write( - "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" - ) default: - printer.write( - "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" - ) + switch rawType { + case .bool: + printer.write( + "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + case .float: + printer.write( + "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + case .double: + printer.write( + "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" + ) + default: + printer.write( + "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" + ) + } } case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName @@ -595,14 +601,14 @@ struct IntrinsicJSFragment: Sendable { printer.write( "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - printer.write("bjs[\"swift_js_return_optional_int\"](1, \(caseIdVar));") + printer.write("return \(caseIdVar);") } printer.write("} else {") printer.indent { - printer.write("bjs[\"swift_js_return_optional_int\"](0, 0);") + printer.write("return -1;") } printer.write("}") + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") default: () } @@ -671,10 +677,6 @@ struct IntrinsicJSFragment: Sendable { // MARK: - ImportedJS /// Returns a fragment that lifts Wasm core values to JS values for parameters - /// - /// - Parameters: - /// - type: The bridge type to lift - /// - context: The bridge context (defaults to .importTS for backward compatibility) static func liftParameter(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity @@ -682,12 +684,14 @@ struct IntrinsicJSFragment: Sendable { case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter case .swiftHeapObject(let name): - guard context == .protocolExport else { + switch context { + case .importTS: throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) + case .protocolExport: + return .swiftHeapObjectLiftParameter(name) } - return .swiftHeapObjectLiftParameter(name) case .swiftProtocol: return .jsObjectLiftParameter case .void: throw BridgeJSLinkError( @@ -700,8 +704,7 @@ struct IntrinsicJSFragment: Sendable { message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) case .protocolExport: - // Protocol exports support Optional - use existing optionalLiftParameter fragment - return try .optionalLiftParameter(wrappedType: wrappedType, context: context) + return try .optionalLiftParameter(wrappedType: wrappedType) } case .caseEnum: return .identity case .rawValueEnum(_, let rawType): @@ -740,10 +743,6 @@ struct IntrinsicJSFragment: Sendable { } /// Returns a fragment that lowers a JS value to Wasm core values for return values - /// - /// - Parameters: - /// - type: The bridge type to lower - /// - context: The bridge context (defaults to .importTS for backward compatibility) static func lowerReturn(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity @@ -751,12 +750,14 @@ struct IntrinsicJSFragment: Sendable { case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn case .swiftHeapObject(let name): - guard context == .protocolExport else { + switch context { + case .importTS: throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) + case .protocolExport: + return .swiftHeapObjectLowerReturn } - return .swiftHeapObjectLowerReturn case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .optional(let wrappedType): @@ -784,21 +785,7 @@ struct IntrinsicJSFragment: Sendable { "Associated value enums are not supported to be returned from imported JS functions: \(fullName)" ) case .protocolExport: - let base = fullName.components(separatedBy: ".").last ?? fullName - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in - let value = arguments[0] - let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("cleanup") - printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" - ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - printer.write("return \(caseIdVar);") - return [] - } - ) + return associatedValueLowerReturn(fullName: fullName) } case .namespaceEnum(let string): throw BridgeJSLinkError( @@ -809,6 +796,23 @@ struct IntrinsicJSFragment: Sendable { // MARK: - Enums Payload Fragments + static func associatedValueLowerReturn(fullName: String) -> IntrinsicJSFragment { + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("cleanup") + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + printer.write("return \(caseIdVar);") + return [] + } + ) + } /// Fragment for generating an entire associated value enum helper static func associatedValueEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( @@ -1118,26 +1122,27 @@ struct IntrinsicJSFragment: Sendable { cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") } cleanup.write("}") + case .int: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .bool: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .float: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .double: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") default: - switch wrappedType { - case .int: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - case .bool: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - case .float: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - case .double: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" - ) - default: () - } printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 233e79038..c9a602751 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -9,8 +9,8 @@ public struct ABINameGenerator { /// Generates ABI name using standardized namespace + context pattern public static func generateABIName( baseName: String, - namespace: [String]?, - staticContext: StaticContext?, + namespace: [String]? = nil, + staticContext: StaticContext? = nil, operation: String? = nil, className: String? = nil ) -> String { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index 9f2556e98..689f4a355 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -1,5 +1,12 @@ import JavaScriptKit +@JS enum Direction { + case north + case south + case east + case west +} + @JS enum ExampleEnum: String { case test = "test" case test2 = "test2" @@ -10,6 +17,12 @@ import JavaScriptKit case failure(Int) } +@JS enum Priority: Int { + case low = -1 + case medium = 0 + case high = 1 +} + @JS class Helper { @JS var value: Int @@ -26,8 +39,14 @@ import JavaScriptKit var eventCount: Int { get set } var delegateName: String { get } var optionalName: String? { get set } - var myEnum: ExampleEnum { get set } - var result: Result? { get set } + var optionalRawEnum: ExampleEnum? { get set } + var rawStringEnum: ExampleEnum { get set } + var result: Result { get set } + var optionalResult: Result? { get set } + var direction: Direction { get set } + var directionOptional: Direction? { get set } + var priority: Priority { get set } + var priorityOptional: Priority? { get set } func onSomethingHappened() func onValueChanged(_ value: String) func onCountUpdated(count: Int) -> Bool diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index 7295699a6..c9485c396 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkArray"] = function bjs_checkArray(a) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index 92f10f94e..a763e45f5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 74fb30c53..b5537ddcb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_asyncReturnVoid"] = function bjs_asyncReturnVoid() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index dac7bdfcd..a2b070028 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -144,6 +144,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index ea0aef157..b6518d71f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -622,6 +622,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 9cbed9a23..04eda0631 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -162,6 +162,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index b934456f3..9e645a67d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -182,6 +182,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 6b56108a4..15b03a4b0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -213,6 +213,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index cead874b3..51921ddc3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_returnAnimatable"] = function bjs_returnAnimatable() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index f469072f2..b6694c06b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createArrayBuffer"] = function bjs_createArrayBuffer() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 116933d71..3253d17d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createDatabaseConnection"] = function bjs_createDatabaseConnection(config) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 5044b4b16..89dd90235 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index f67a06e8d..319556b90 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index eea05ba15..17e1a1e5f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 882e633ec..e8d18b98e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check(a, b) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 7c20fa15f..c7efcf0d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 481cc4951..24fa28a0e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkNumber"] = function bjs_checkNumber() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index bbfbb0ac7..bc9748d8f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index 9e64ddff9..b7fddd42e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -20,10 +20,24 @@ export interface MyViewControllerDelegate { eventCount: number; readonly delegateName: string; optionalName: string | null; - myEnum: ExampleEnumTag; - result: ResultTag | null; + optionalRawEnum: ExampleEnumTag | null; + rawStringEnum: ExampleEnumTag; + result: ResultTag; + optionalResult: ResultTag | null; + direction: DirectionTag; + directionOptional: DirectionTag | null; + priority: PriorityTag; + priorityOptional: PriorityTag | null; } +export const DirectionValues: { + readonly North: 0; + readonly South: 1; + readonly East: 2; + readonly West: 3; +}; +export type DirectionTag = typeof DirectionValues[keyof typeof DirectionValues]; + export const ExampleEnumValues: { readonly Test: "test"; readonly Test2: "test2"; @@ -40,10 +54,21 @@ export const ResultValues: { export type ResultTag = { tag: typeof ResultValues.Tag.Success; param0: string } | { tag: typeof ResultValues.Tag.Failure; param0: number } +export const PriorityValues: { + readonly Low: -1; + readonly Medium: 0; + readonly High: 1; +}; +export type PriorityTag = typeof PriorityValues[keyof typeof PriorityValues]; + +export type DirectionObject = typeof DirectionValues; + export type ExampleEnumObject = typeof ExampleEnumValues; export type ResultObject = typeof ResultValues; +export type PriorityObject = typeof PriorityValues; + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. @@ -72,8 +97,10 @@ export type Exports = { MyViewController: { new(delegate: MyViewControllerDelegate): MyViewController; } + Direction: DirectionObject ExampleEnum: ExampleEnumObject Result: ResultObject + Priority: PriorityObject } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 8aa18d391..2740c7c20 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -4,6 +4,13 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export const DirectionValues = { + North: 0, + South: 1, + East: 2, + West: 3, +}; + export const ExampleEnumValues = { Test: "test", Test2: "test2", @@ -55,6 +62,12 @@ const __bjs_createResultValuesHelpers = () => { } }); }; +export const PriorityValues = { + Low: -1, + Medium: 0, + High: 1, +}; + export async function createInstantiator(options, swift) { let instance; let memory; @@ -190,6 +203,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -231,15 +279,7 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_optionalName_get"] = function bjs_MyViewControllerDelegate_optionalName_get(self) { try { let ret = swift.memory.getObject(self).optionalName; - const isSome = ret != null; - if (isSome) { - const bytes = textEncoder.encode(ret); - bjs["swift_js_return_optional_string"](1, bytes, bytes.length); - return bytes.length; - } else { - bjs["swift_js_return_optional_string"](0, 0, 0); - return -1; - } + tmpRetString = ret; } catch (error) { setException(error); } @@ -256,20 +296,40 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_myEnum_get"] = function bjs_MyViewControllerDelegate_myEnum_get(self) { + TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_get"] = function bjs_MyViewControllerDelegate_optionalRawEnum_get(self) { try { - let ret = swift.memory.getObject(self).myEnum; + let ret = swift.memory.getObject(self).optionalRawEnum; + tmpRetString = ret; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_set"] = function bjs_MyViewControllerDelegate_optionalRawEnum_set(self, valueIsSome, valueWrappedValue) { + try { + let obj; + if (valueIsSome) { + obj = swift.memory.getObject(valueWrappedValue); + swift.memory.release(valueWrappedValue); + } + swift.memory.getObject(self).optionalRawEnum = valueIsSome ? obj : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_rawStringEnum_get"] = function bjs_MyViewControllerDelegate_rawStringEnum_get(self) { + try { + let ret = swift.memory.getObject(self).rawStringEnum; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_myEnum_set"] = function bjs_MyViewControllerDelegate_myEnum_set(self, value) { + TestModule["bjs_MyViewControllerDelegate_rawStringEnum_set"] = function bjs_MyViewControllerDelegate_rawStringEnum_set(self, value) { try { const valueObject = swift.memory.getObject(value); swift.memory.release(value); - swift.memory.getObject(self).myEnum = valueObject; + swift.memory.getObject(self).rawStringEnum = valueObject; } catch (error) { setException(error); } @@ -277,20 +337,104 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) { try { let ret = swift.memory.getObject(self).result; + const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + return caseId; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { + try { + const enumValue = enumHelpers.Result.raise(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + swift.memory.getObject(self).result = enumValue; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_optionalResult_get"] = function bjs_MyViewControllerDelegate_optionalResult_get(self) { + try { + let ret = swift.memory.getObject(self).optionalResult; const isSome = ret != null; if (isSome) { const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); - bjs["swift_js_return_optional_int"](1, caseId); + return caseId; } else { - bjs["swift_js_return_optional_int"](0, 0); + return -1; } } catch (error) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_MyViewControllerDelegate_optionalResult_set"] = function bjs_MyViewControllerDelegate_optionalResult_set(self, valueIsSome, valueWrappedValue) { + try { + let enumValue; + if (valueIsSome) { + enumValue = enumHelpers.Result.raise(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + } + swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_direction_get"] = function bjs_MyViewControllerDelegate_direction_get(self) { + try { + let ret = swift.memory.getObject(self).direction; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_direction_set"] = function bjs_MyViewControllerDelegate_direction_set(self, value) { + try { + swift.memory.getObject(self).direction = value; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_directionOptional_get"] = function bjs_MyViewControllerDelegate_directionOptional_get(self) { + try { + let ret = swift.memory.getObject(self).directionOptional; + const isSome = ret != null; + return isSome ? (ret | 0) : -1; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_directionOptional_set"] = function bjs_MyViewControllerDelegate_directionOptional_set(self, valueIsSome, valueWrappedValue) { + try { + swift.memory.getObject(self).directionOptional = valueIsSome ? valueWrappedValue : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_priority_get"] = function bjs_MyViewControllerDelegate_priority_get(self) { + try { + let ret = swift.memory.getObject(self).priority; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_priority_set"] = function bjs_MyViewControllerDelegate_priority_set(self, value) { + try { + swift.memory.getObject(self).priority = value; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_priorityOptional_get"] = function bjs_MyViewControllerDelegate_priorityOptional_get(self) { + try { + let ret = swift.memory.getObject(self).priorityOptional; + tmpRetOptionalInt = ret; + } catch (error) { + setException(error); + } + } + TestModule["bjs_MyViewControllerDelegate_priorityOptional_set"] = function bjs_MyViewControllerDelegate_priorityOptional_set(self, valueIsSome, valueWrappedValue) { try { - swift.memory.getObject(self).result = valueIsSome ? valueWrappedValue : null; + swift.memory.getObject(self).priorityOptional = valueIsSome ? valueWrappedValue : null; } catch (error) { setException(error); } @@ -367,7 +511,6 @@ export async function createInstantiator(options, swift) { try { let ret = swift.memory.getObject(self).createOptionalHelper(); const isSome = ret != null; - return isSome ? ret.pointer : 0; } catch (error) { setException(error); } @@ -513,8 +656,10 @@ export async function createInstantiator(options, swift) { return { Helper, MyViewController, + Direction: DirectionValues, ExampleEnum: ExampleEnumValues, Result: ResultValues, + Priority: PriorityValues, }; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 44ad0a93e..6fa84a4fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -190,6 +190,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index eb1c5ad1d..29060b938 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -143,6 +143,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index b7d4b5053..a9f4bcd7b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index bc109fc91..4f6e1dae4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString(a) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 08eef7e03..2d9a848f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index 11d304468..80d4fcd90 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 0a545a0e2..395057d81 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 453d5f76a..a1d39cd28 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createTS2Skeleton"] = function bjs_createTS2Skeleton() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index af17ab147..f2e0bfc9c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 9ba7cf60e..7c4438b08 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkSimple"] = function bjs_checkSimple(a) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 98fb575d8..49b0b3310 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_Greeter_init"] = function bjs_Greeter_init(name) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index d2716dfa9..a0f6f0dd4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 4b4c75eaa..bd1d9bfba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -138,6 +138,41 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = pointer; } } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index fd382c0ac..675f7bfb0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -11,13 +11,13 @@ extension Status: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Status { - return Status(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Status { return Status(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index ce952ca9d..0c70fe5cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -7,8 +7,6 @@ @_spi(BridgeJS) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: @@ -55,8 +53,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -93,8 +90,6 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: @@ -169,8 +164,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> ComplexResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -235,8 +229,6 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: @@ -278,8 +270,7 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Utilities.Result { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Utilities.Result { return _bridgeJSLiftFromCaseId(caseId) } @@ -317,8 +308,6 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: @@ -350,8 +339,7 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> NetworkingResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> NetworkingResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -381,8 +369,6 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { } extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: @@ -445,8 +431,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIOptionalResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { return _bridgeJSLiftFromCaseId(caseId) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift index 4a1be41e6..06bfa86af 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift @@ -11,13 +11,13 @@ extension Direction: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction { - return Direction(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction { return Direction(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -54,13 +54,13 @@ extension Status: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Status { - return Status(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Status { return Status(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -93,13 +93,13 @@ extension TSDirection: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> TSDirection { - return TSDirection(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> TSDirection { return TSDirection(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -136,13 +136,13 @@ extension PublicStatus: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> PublicStatus { - return PublicStatus(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> PublicStatus { return PublicStatus(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index daa5577a5..ca201f3d9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -11,13 +11,13 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Networking.API.Method { - return Networking.API.Method(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Networking.API.Method { return Networking.API.Method(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -60,13 +60,13 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedMethod { - return Internal.SupportedMethod(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedMethod { return Internal.SupportedMethod(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index bddcf2aa2..46b96429d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -250,6 +250,43 @@ } ], "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction" + }, { "cases" : [ { @@ -314,6 +351,41 @@ ], "swiftCallName" : "Result" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "low", + "rawValue" : "-1" + }, + { + "associatedValues" : [ + + ], + "name" : "medium", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "high", + "rawValue" : "1" + } + ], + "emitStyle" : "const", + "name" : "Priority", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Priority" } ], "functions" : [ @@ -629,7 +701,21 @@ }, { "isReadonly" : false, - "name" : "myEnum", + "name" : "optionalRawEnum", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "rawStringEnum", "type" : { "rawValueEnum" : { "_0" : "ExampleEnum", @@ -640,6 +726,15 @@ { "isReadonly" : false, "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + }, + { + "isReadonly" : false, + "name" : "optionalResult", "type" : { "optional" : { "_0" : { @@ -649,6 +744,52 @@ } } } + }, + { + "isReadonly" : false, + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "isReadonly" : false, + "name" : "directionOptional", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "priority", + "type" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int" + } + } + }, + { + "isReadonly" : false, + "name" : "priorityOptional", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int" + } + } + } + } } ] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 8bd37e8e2..d68ef81d0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -56,8 +56,9 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto func onOptionalHelperUpdated(_ helper: Optional) { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") - func _extern_onOptionalHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) - _extern_onOptionalHelperUpdated(this: Int32(bitPattern: jsObject.id), helper: helper.bridgeJSLowerParameter()) + func _extern_onOptionalHelperUpdated(this: Int32, helperIsSome: Int32, helperPointer: UnsafeMutableRawPointer) + let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameterWithPresence() + _extern_onOptionalHelperUpdated(this: Int32(bitPattern: jsObject.id), helperIsSome: helperIsSome, helperPointer: helperPointer) } func createOptionalHelper() -> Optional { @@ -82,9 +83,9 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto func getResult() -> Result { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") - func _extern_getResult(this: Int32) - _extern_getResult(this: Int32(bitPattern: jsObject.id)) - return Result.bridgeJSLiftReturn() + func _extern_getResult(this: Int32) -> Int32 + let ret = _extern_getResult(this: Int32(bitPattern: jsObject.id)) + return Result.bridgeJSLiftReturn(ret) } var eventCount: Int { @@ -113,56 +114,186 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto var optionalName: Optional { get { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) - return Optional.bridgeJSLiftReturn(ret) + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() } set { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var optionalRawEnum: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } - var myEnum: ExampleEnum { + var rawStringEnum: ExampleEnum { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_myEnum_get") + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") func _extern_get(this: Int32) -> Int32 let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) return ExampleEnum.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_myEnum_set") + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") func _extern_set(this: Int32, value: Int32) _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } - var result: Optional { + var result: Result { get { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) - return Optional.bridgeJSLiftReturn() + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Result.bridgeJSLiftReturn(ret) } set { @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") + func _extern_set(this: Int32, caseId: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), caseId: newValue.bridgeJSLowerParameter()) + } + } + + var optionalResult: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") + func _extern_set(this: Int32, isSome: Int32, caseId: Int32) + let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + } + } + + var direction: Direction { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Direction.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + var directionOptional: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var priority: Priority { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Priority.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") func _extern_set(this: Int32, value: Int32) _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } + var priorityOptional: Optional { + get { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) } } +extension Direction: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction { + return Direction(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .north + case 1: + self = .south + case 2: + self = .east + case 3: + self = .west + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .north: + return 0 + case .south: + return 1 + case .east: + return 2 + case .west: + return 3 + } + } +} + extension ExampleEnum: _BridgedSwiftEnumNoPayload { } extension Result: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Result { switch caseId { case 0: @@ -190,8 +321,7 @@ extension Result: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Result { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Result { return _bridgeJSLiftFromCaseId(caseId) } @@ -216,6 +346,9 @@ extension Result: _BridgedSwiftAssociatedValueEnum { } } +extension Priority: _BridgedSwiftEnumNoPayload { +} + @_expose(wasm, "bjs_Helper_init") @_cdecl("bjs_Helper_init") public func _bjs_Helper_init(value: Int32) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index a26d5ea1c..7aa91b915 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -11,13 +11,13 @@ extension Calculator: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Calculator { - return Calculator(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Calculator { return Calculator(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { @@ -53,8 +53,6 @@ public func _bjs_Calculator_static_square(value: Int32) -> Int32 { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - // MARK: Private Helper - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: @@ -82,8 +80,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { return _bridgeJSLiftFromCaseId(caseId) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift index 6edd0c8f3..72d561a00 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift @@ -11,13 +11,13 @@ extension PropertyEnum: _BridgedSwiftCaseEnum { return bridgeJSRawValue } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> PropertyEnum { - return PropertyEnum(bridgeJSRawValue: value)! + return bridgeJSLiftParameter(value) } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> PropertyEnum { return PropertyEnum(bridgeJSRawValue: value)! } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSRawValue + return bridgeJSLowerParameter() } private init?(bridgeJSRawValue: Int32) { diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index be6e7b472..9c97583cb 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -77,6 +77,10 @@ import _CJavaScriptKit // - `func bridgeJSLiftParameter(_ ...) -> <#TargetType#>`: lift the given Wasm core type parameters to a higher-level type // - `func bridgeJSLowerReturn() -> <#WasmCoreType#>`: lower the given higher-level return value to a Wasm core type // +// Optional types (ExportSwift only) additionally define: +// - `func bridgeJSLowerParameterWithPresence()`: lower optional as (isSome, value) tuple for protocol setters/parameters +// - `func bridgeJSLiftReturnFromSideChannel()`: lift optional from side-channel storage for protocol property getters +// // See JSGlueGen.swift in BridgeJSLink for JS-side lowering/lifting implementation. /// A protocol that Swift types that can appear as parameters or return values on @@ -340,7 +344,7 @@ public protocol _BridgedSwiftCaseEnum { public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVoidType { // MARK: ImportTS @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 - @_spi(BridgeJS) static func bridgeJSLiftReturn() -> Self + @_spi(BridgeJS) static func bridgeJSLiftReturn(_ caseId: Int32) -> Self // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter(_ caseId: Int32) -> Self @@ -464,21 +468,25 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif -// MARK: Optional Type Support - extension Optional where Wrapped == Bool { // MARK: ImportTS @available(*, unavailable, message: "Optional Bool type is not supported to be passed to imported JS functions") @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - @available(*, unavailable, message: "Optional Bool type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Int32) -> Bool? { - return nil - } - // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Bool? { if isSome == 0 { return nil @@ -487,6 +495,19 @@ extension Optional where Wrapped == Bool { } } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Bool? { + switch value { + case -1: + return nil + case 0: + return false + case 1: + return true + default: + return nil // Treat invalid values as null + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_bool") @@ -507,18 +528,25 @@ extension Optional where Wrapped == Bool { } } -/// Optional support for Int extension Optional where Wrapped == Int { // MARK: ImportTS @available(*, unavailable, message: "Optional Int type is not supported to be passed to imported JS functions") @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} - @available(*, unavailable, message: "Optional Int type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Int32) -> Int? { return nil } - // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Int? { if isSome == 0 { return nil @@ -527,6 +555,29 @@ extension Optional where Wrapped == Int { } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Int? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_presence") + func _swift_js_get_optional_int_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_value") + func _swift_js_get_optional_int_value() -> Int32 + #else + func _swift_js_get_optional_int_presence() -> Int32 { + _onlyAvailableOnWasm() + } + func _swift_js_get_optional_int_value() -> Int32 { + _onlyAvailableOnWasm() + } + #endif + + let isSome = _swift_js_get_optional_int_presence() + if isSome == 0 { + return nil + } else { + return Int.bridgeJSLiftReturn(_swift_js_get_optional_int_value()) + } + } + @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_int") @@ -547,34 +598,43 @@ extension Optional where Wrapped == Int { } } extension Optional where Wrapped == String { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { switch consume self { case .none: - return 0 - case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ length: Int32) -> String? { - // JavaScript returns -1 for null, or the byte length if present - // The actual string is already in tmpRetString side channel - if length < 0 { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ bytes: Int32, _ count: Int32) -> String? + { + if isSome == 0 { return nil + } else { + return String.bridgeJSLiftParameter(bytes, count) } - return String.bridgeJSLiftReturn(length) } - // MARK: ExportSwift + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> String? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_string") + func _swift_js_get_optional_string() -> Int32 + #else + func _swift_js_get_optional_string() -> Int32 { + _onlyAvailableOnWasm() + } + #endif - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ bytes: Int32, _ count: Int32) -> String? - { - if isSome == 0 { + let length = _swift_js_get_optional_string() + if length < 0 { return nil } else { - return String.bridgeJSLiftParameter(bytes, count) + return String.bridgeJSLiftReturn(length) } } @@ -600,18 +660,19 @@ extension Optional where Wrapped == String { } } extension Optional where Wrapped == JSObject { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional JSObject type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} + // MARK: ExportSwift - @available(*, unavailable, message: "Optional JSObject type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ objectId: Int32) -> JSObject? { - return nil + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } } - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> JSObject? { if isSome == 0 { return nil @@ -642,24 +703,6 @@ extension Optional where Wrapped == JSObject { } extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { - // MARK: ImportTS - - @available( - *, - unavailable, - message: "Optional protocol types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} - - @available( - *, - unavailable, - message: "Optional protocol types are not supported to be passed to imported JS functions" - ) - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ objectId: Int32) -> Wrapped? { - return nil - } - // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Wrapped? { @@ -705,6 +748,17 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, pointer: UnsafeMutableRawPointer + ) { + switch consume self { + case .none: + return (isSome: 0, pointer: UnsafeMutableRawPointer(bitPattern: 0)!) + case .some(let value): + return (isSome: 1, pointer: value.bridgeJSLowerParameter()) + } + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Wrapped? { if pointer == UnsafeMutableRawPointer(bitPattern: 0) { @@ -753,11 +807,6 @@ extension Optional where Wrapped == Float { @available(*, unavailable, message: "Optional Float type is not supported to be passed to imported JS functions") @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - @available(*, unavailable, message: "Optional Float type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Float32) -> Float? { - return nil - } - // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Float? { @@ -768,6 +817,29 @@ extension Optional where Wrapped == Float { } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Float? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_presence") + func _swift_js_get_optional_float_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_value") + func _swift_js_get_optional_float_value() -> Float32 + #else + func _swift_js_get_optional_float_presence() -> Int32 { + _onlyAvailableOnWasm() + } + func _swift_js_get_optional_float_value() -> Float32 { + _onlyAvailableOnWasm() + } + #endif + + let isSome = _swift_js_get_optional_float_presence() + if isSome == 0 { + return nil + } else { + return Float.bridgeJSLiftReturn(_swift_js_get_optional_float_value()) + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_float") @@ -795,11 +867,6 @@ extension Optional where Wrapped == Double { @available(*, unavailable, message: "Optional Double type is not supported to be passed to imported JS functions") @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - @available(*, unavailable, message: "Optional Double type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ isSome: Int32, _ wrappedValue: Float64) -> Double? { - return nil - } - // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Double? { @@ -810,6 +877,29 @@ extension Optional where Wrapped == Double { } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Double? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_presence") + func _swift_js_get_optional_double_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_value") + func _swift_js_get_optional_double_value() -> Float64 + #else + func _swift_js_get_optional_double_presence() -> Int32 { + _onlyAvailableOnWasm() + } + func _swift_js_get_optional_double_value() -> Float64 { + _onlyAvailableOnWasm() + } + #endif + + let isSome = _swift_js_get_optional_double_presence() + if isSome == 0 { + return nil + } else { + return Double.bridgeJSLiftReturn(_swift_js_get_optional_double_value()) + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_double") @@ -832,32 +922,30 @@ extension Optional where Wrapped == Double { /// Optional support for case enums extension Optional where Wrapped: _BridgedSwiftCaseEnum { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, value: Int32) { switch consume self { case .none: - return -1 // Sentinel for nil + return (isSome: 0, value: 0) case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 1, value: value.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { - if value == -1 { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { + if isSome == 0 { return nil } else { - return Wrapped.bridgeJSLiftReturn(value) + return Wrapped.bridgeJSLiftParameter(wrappedValue) } } - // MARK: ExportSwift - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { - if isSome == 0 { + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { + if value == -1 { return nil } else { - return Wrapped.bridgeJSLiftParameter(wrappedValue) + return Wrapped.bridgeJSLiftReturn(value) } } @@ -900,28 +988,19 @@ extension Optional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { // MARK: Optional Raw Value Enum Support extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { switch consume self { case .none: - return 0 // Sentinel for nil - case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ length: Int32) -> Wrapped? { - if length == 0 { - return nil - } else { - let rawValue = String.bridgeJSLiftReturn(length) - return Wrapped(rawValue: rawValue) - } - } - - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter( _ isSome: Int32, _ bytes: Int32, @@ -931,6 +1010,25 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_string") + func _swift_js_get_optional_string() -> Int32 + #else + func _swift_js_get_optional_string() -> Int32 { + _onlyAvailableOnWasm() + } + #endif + + let length = _swift_js_get_optional_string() + if length < 0 { + return nil + } else { + let rawValue = String.bridgeJSLiftReturn(length) + return Wrapped(rawValue: rawValue) + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { let optionalRawValue: String? = self?.rawValue optionalRawValue.bridgeJSLowerReturn() @@ -938,58 +1036,52 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { - // MARK: ImportTS - - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + // MARK: ExportSwift + @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, value: Int32) { switch consume self { case .none: - return -1 // Sentinel for nil + return (isSome: 0, value: 0) case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 1, value: value.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { - if value == -1 { - return nil - } else { - return Wrapped(rawValue: Int(value)) - } - } - - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { let optionalRawValue = Int?.bridgeJSLiftParameter(isSome, wrappedValue) return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - let optionalRawValue: Int? = self?.rawValue - optionalRawValue.bridgeJSLowerReturn() - } -} - -extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { - // MARK: ImportTS - - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { - switch consume self { - case .none: - return -1 // Sentinel for nil - case .some(let value): - return value.bridgeJSLowerParameter() + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_presence") + func _swift_js_get_optional_int_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_value") + func _swift_js_get_optional_int_value() -> Int32 + #else + func _swift_js_get_optional_int_presence() -> Int32 { + _onlyAvailableOnWasm() } - } + func _swift_js_get_optional_int_value() -> Int32 { + _onlyAvailableOnWasm() + } + #endif - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { - if value == -1 { + let isSome = _swift_js_get_optional_int_presence() + if isSome == 0 { return nil } else { - return Wrapped(rawValue: value != 0) + let rawValue = _swift_js_get_optional_int_value() + return Wrapped(rawValue: Int(rawValue)) } } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + let optionalRawValue: Int? = self?.rawValue + optionalRawValue.bridgeJSLowerReturn() + } +} + +extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { @@ -1004,31 +1096,46 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Float32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Float32 + ) { switch consume self { case .none: - return Float32.nan // Sentinel for nil (NaN) - case .some(let value): - return value.bridgeJSLowerParameter() - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Float32) -> Wrapped? { - if value.isNaN { - return nil - } else { - return Wrapped(rawValue: Float(value)) + return (isSome: 0, value: 0.0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) } } - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Wrapped? { let optionalRawValue = Float?.bridgeJSLiftParameter(isSome, wrappedValue) return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_presence") + func _swift_js_get_optional_float_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_value") + func _swift_js_get_optional_float_value() -> Float32 + #else + func _swift_js_get_optional_float_presence() -> Int32 { + _onlyAvailableOnWasm() + } + func _swift_js_get_optional_float_value() -> Float32 { + _onlyAvailableOnWasm() + } + #endif + + let isSome = _swift_js_get_optional_float_presence() + if isSome == 0 { + return nil + } else { + let rawValue = _swift_js_get_optional_float_value() + return Wrapped(rawValue: Float(rawValue)) + } + } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { let optionalRawValue: Float? = self?.rawValue @@ -1037,32 +1144,48 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Float64 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Float64 + ) { switch consume self { case .none: - return Float64.nan // Sentinel for nil (NaN) - case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 0, value: 0.0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Float64) -> Wrapped? { - if value.isNaN { - return nil - } else { - return Wrapped(rawValue: Double(value)) - } - } - - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Wrapped? { let optionalRawValue = Double?.bridgeJSLiftParameter(isSome, wrappedValue) return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_presence") + func _swift_js_get_optional_double_presence() -> Int32 + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_value") + func _swift_js_get_optional_double_value() -> Float64 + #else + func _swift_js_get_optional_double_presence() -> Int32 { + _onlyAvailableOnWasm() + } + func _swift_js_get_optional_double_value() -> Float64 { + _onlyAvailableOnWasm() + } + #endif + + let isSome = _swift_js_get_optional_double_presence() + if isSome == 0 { + return nil + } else { + let rawValue = _swift_js_get_optional_double_value() + return Wrapped(rawValue: Double(rawValue)) + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { let optionalRawValue: Double? = self?.rawValue optionalRawValue.bridgeJSLowerReturn() @@ -1072,36 +1195,30 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres // MARK: Optional Associated Value Enum Support extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { - // MARK: ImportTS + // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, caseId: Int32) { switch consume self { case .none: - return -1 // Sentinel for nil + return (isSome: 0, caseId: 0) case .some(let value): - return value.bridgeJSLowerParameter() + return (isSome: 1, caseId: value.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Wrapped? { - // Read tag from side channel - let tag = _swift_js_pop_param_int32() - if tag == -1 { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Wrapped? { + if isSome == 0 { return nil } else { - // Put tag back for the wrapped type's liftReturn to consume - _swift_js_push_int(tag) - return Wrapped.bridgeJSLiftReturn() + return Wrapped.bridgeJSLiftParameter(caseId) } } - // MARK: ExportSwift - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Wrapped? { - if isSome == 0 { + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Wrapped? { + if caseId == -1 { return nil } else { - return Wrapped.bridgeJSLiftParameter(caseId) + return Wrapped.bridgeJSLiftReturn(caseId) } } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index b6672a0aa..4dba78c38 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -244,7 +244,4 @@ When you pass a JavaScript object implementing a protocol to Swift: | Protocol composition: `Protocol1 & Protocol2` | ❌ | | Generics | ❌ | -**Type Limitations:** -- `@JS enum` types are not supported in protocol signatures (use raw values or separate parameters instead) - -> Note: Protocol type support matches that of regular `@JS func` and `@JS class` exports. See and for more information. +> Note: Protocol type support matches that of regular `@JS func` and `@JS class` exports. See , , and for more information. diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 168a8c6ee..97ebcfd2e 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -863,7 +863,13 @@ enum APIOptionalResult { var count: Int { get set } var name: String { get } var optionalTag: String? { get set } + var optionalCount: Int? { get set } + var direction: Direction? { get set } + var optionalTheme: Theme? { get set } + var httpStatus: HttpStatus? { get set } var apiResult: APIResult? { get set } + var helper: Greeter { get set } + var optionalHelper: Greeter? { get set } func increment(by amount: Int) func getValue() -> Int func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) @@ -873,8 +879,8 @@ enum APIOptionalResult { func createGreeter() -> Greeter func processOptionalGreeter(_ greeter: Greeter?) -> String func createOptionalGreeter() -> Greeter? - func handleAPIResult(_ result: APIResult) - func getAPIResult() -> APIResult + func handleAPIResult(_ result: APIResult?) + func getAPIResult() -> APIResult? } @JS class DataProcessorManager { @@ -919,13 +925,67 @@ enum APIOptionalResult { @JS func hasBackup() -> Bool { return backupProcessor != nil } + + @JS func getProcessorOptionalTag() -> String? { + return processor.optionalTag + } + + @JS func setProcessorOptionalTag(_ tag: String?) { + processor.optionalTag = tag + } + + @JS func getProcessorOptionalCount() -> Int? { + return processor.optionalCount + } + + @JS func setProcessorOptionalCount(_ count: Int?) { + processor.optionalCount = count + } + + @JS func getProcessorDirection() -> Direction? { + return processor.direction + } + + @JS func setProcessorDirection(_ direction: Direction?) { + processor.direction = direction + } + + @JS func getProcessorTheme() -> Theme? { + return processor.optionalTheme + } + + @JS func setProcessorTheme(_ theme: Theme?) { + processor.optionalTheme = theme + } + + @JS func getProcessorHttpStatus() -> HttpStatus? { + return processor.httpStatus + } + + @JS func setProcessorHttpStatus(_ status: HttpStatus?) { + processor.httpStatus = status + } + + @JS func getProcessorAPIResult() -> APIResult? { + return processor.getAPIResult() + } + + @JS func setProcessorAPIResult(_ apiResult: APIResult?) { + processor.handleAPIResult(apiResult) + } } @JS class SwiftDataProcessor: DataProcessor { @JS var count: Int = 0 @JS let name: String = "SwiftDataProcessor" @JS var optionalTag: String? = nil + @JS var optionalCount: Int? = nil + @JS var direction: Direction? = nil + @JS var optionalTheme: Theme? = nil + @JS var httpStatus: HttpStatus? = nil @JS var apiResult: APIResult? = nil + @JS var helper: Greeter = Greeter(name: "DefaultHelper") + @JS var optionalHelper: Greeter? = nil private var label: String = "" @JS init() {} @@ -970,12 +1030,12 @@ enum APIOptionalResult { return Greeter(name: "OptionalProcessorGreeter") } - @JS func handleAPIResult(_ result: APIResult) { + @JS func handleAPIResult(_ result: APIResult?) { self.apiResult = result } - @JS func getAPIResult() -> APIResult { - return apiResult ?? .failure(0) + @JS func getAPIResult() -> APIResult? { + return apiResult } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 58938a945..350ef7ae6 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -19,11 +19,7 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") func _extern_getValue(this: Int32) -> Int32 let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) -<<<<<<< HEAD return Int.bridgeJSLiftReturn(ret) -======= - return Int.bridgeJSLiftReturn(ret) ->>>>>>> f19c8b06 (WIP: Initial protocol support) } func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { @@ -36,11 +32,7 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") func _extern_getLabel(this: Int32) -> Int32 let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) -<<<<<<< HEAD return String.bridgeJSLiftReturn(ret) -======= - return String.bridgeJSLiftReturn(ret) ->>>>>>> f19c8b06 (WIP: Initial protocol support) } func isEven() -> Bool { @@ -66,8 +58,9 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { func processOptionalGreeter(_ greeter: Optional) -> String { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") - func _extern_processOptionalGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 - let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) + func _extern_processOptionalGreeter(this: Int32, greeterIsSome: Int32, greeterPointer: UnsafeMutableRawPointer) -> Int32 + let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameterWithPresence() + let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeterIsSome: greeterIsSome, greeterPointer: greeterPointer) return String.bridgeJSLiftReturn(ret) } @@ -78,17 +71,18 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { return Optional.bridgeJSLiftReturn(ret) } - func handleAPIResult(_ result: APIResult) { + func handleAPIResult(_ result: Optional) { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") - func _extern_handleAPIResult(this: Int32, result: Int32) - _extern_handleAPIResult(this: Int32(bitPattern: jsObject.id), result: result.bridgeJSLowerParameter()) + func _extern_handleAPIResult(this: Int32, resultIsSome: Int32, resultCaseId: Int32) + let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameterWithPresence() + _extern_handleAPIResult(this: Int32(bitPattern: jsObject.id), resultIsSome: resultIsSome, resultCaseId: resultCaseId) } - func getAPIResult() -> APIResult { + func getAPIResult() -> Optional { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") - func _extern_getAPIResult(this: Int32) - _extern_getAPIResult(this: Int32(bitPattern: jsObject.id)) - return APIResult.bridgeJSLiftReturn() + func _extern_getAPIResult(this: Int32) -> Int32 + let ret = _extern_getAPIResult(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) } var count: Int { @@ -117,28 +111,119 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { var optionalTag: Optional { get { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var optionalCount: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var direction: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") func _extern_get(this: Int32) -> Int32 let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) - return Optional.bridgeJSLiftReturn(ret) + return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } - var apiResult: Optional { + var optionalTheme: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") func _extern_get(this: Int32) _extern_get(this: Int32(bitPattern: jsObject.id)) - return Optional.bridgeJSLiftReturn() + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var httpStatus: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") + func _extern_get(this: Int32) + _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturnFromSideChannel() + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") + func _extern_set(this: Int32, isSome: Int32, value: Int32) + let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + } + } + + var apiResult: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) } set { @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + func _extern_set(this: Int32, isSome: Int32, caseId: Int32) + let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + } + } + + var helper: Greeter { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") + func _extern_get(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Greeter.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") + func _extern_set(this: Int32, pointer: UnsafeMutableRawPointer) + _extern_set(this: Int32(bitPattern: jsObject.id), pointer: newValue.bridgeJSLowerParameter()) + } + } + + var optionalHelper: Optional { + get { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") + func _extern_get(this: Int32) -> UnsafeMutableRawPointer + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Optional.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") + func _extern_set(this: Int32, isSome: Int32, pointer: UnsafeMutableRawPointer) + let (isSome, pointer) = newValue.bridgeJSLowerParameterWithPresence() + _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, pointer: pointer) } } @@ -412,8 +497,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -534,8 +618,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> ComplexResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -649,8 +732,7 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> Utilities.Result { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Utilities.Result { return _bridgeJSLiftFromCaseId(caseId) } @@ -719,8 +801,7 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> API.NetworkingResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> API.NetworkingResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -812,8 +893,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn() -> APIOptionalResult { - let caseId = _swift_js_pop_param_int32() + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { return _bridgeJSLiftFromCaseId(caseId) } @@ -3723,6 +3803,132 @@ public func _bjs_DataProcessorManager_hasBackup(_self: UnsafeMutableRawPointer) #endif } +@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalTag") +@_cdecl("bjs_DataProcessorManager_getProcessorOptionalTag") +public func _bjs_DataProcessorManager_getProcessorOptionalTag(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalTag() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalTag") +@_cdecl("bjs_DataProcessorManager_setProcessorOptionalTag") +public func _bjs_DataProcessorManager_setProcessorOptionalTag(_self: UnsafeMutableRawPointer, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalTag(_: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalCount") +@_cdecl("bjs_DataProcessorManager_getProcessorOptionalCount") +public func _bjs_DataProcessorManager_getProcessorOptionalCount(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalCount() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalCount") +@_cdecl("bjs_DataProcessorManager_setProcessorOptionalCount") +public func _bjs_DataProcessorManager_setProcessorOptionalCount(_self: UnsafeMutableRawPointer, countIsSome: Int32, countValue: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalCount(_: Optional.bridgeJSLiftParameter(countIsSome, countValue)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_getProcessorDirection") +@_cdecl("bjs_DataProcessorManager_getProcessorDirection") +public func _bjs_DataProcessorManager_getProcessorDirection(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorDirection() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorDirection") +@_cdecl("bjs_DataProcessorManager_setProcessorDirection") +public func _bjs_DataProcessorManager_setProcessorDirection(_self: UnsafeMutableRawPointer, directionIsSome: Int32, directionValue: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorDirection(_: Optional.bridgeJSLiftParameter(directionIsSome, directionValue)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_getProcessorTheme") +@_cdecl("bjs_DataProcessorManager_getProcessorTheme") +public func _bjs_DataProcessorManager_getProcessorTheme(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorTheme() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorTheme") +@_cdecl("bjs_DataProcessorManager_setProcessorTheme") +public func _bjs_DataProcessorManager_setProcessorTheme(_self: UnsafeMutableRawPointer, themeIsSome: Int32, themeBytes: Int32, themeLength: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorTheme(_: Optional.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_getProcessorHttpStatus") +@_cdecl("bjs_DataProcessorManager_getProcessorHttpStatus") +public func _bjs_DataProcessorManager_getProcessorHttpStatus(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorHttpStatus() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorHttpStatus") +@_cdecl("bjs_DataProcessorManager_setProcessorHttpStatus") +public func _bjs_DataProcessorManager_setProcessorHttpStatus(_self: UnsafeMutableRawPointer, statusIsSome: Int32, statusValue: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorHttpStatus(_: Optional.bridgeJSLiftParameter(statusIsSome, statusValue)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_getProcessorAPIResult") +@_cdecl("bjs_DataProcessorManager_getProcessorAPIResult") +public func _bjs_DataProcessorManager_getProcessorAPIResult(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_setProcessorAPIResult") +@_cdecl("bjs_DataProcessorManager_setProcessorAPIResult") +public func _bjs_DataProcessorManager_setProcessorAPIResult(_self: UnsafeMutableRawPointer, apiResultIsSome: Int32, apiResultCaseId: Int32) -> Void { + #if arch(wasm32) + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_DataProcessorManager_processor_get") @_cdecl("bjs_DataProcessorManager_processor_get") public func _bjs_DataProcessorManager_processor_get(_self: UnsafeMutableRawPointer) -> Int32 { @@ -3897,9 +4103,9 @@ public func _bjs_SwiftDataProcessor_createOptionalGreeter(_self: UnsafeMutableRa @_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult") @_cdecl("bjs_SwiftDataProcessor_handleAPIResult") -public func _bjs_SwiftDataProcessor_handleAPIResult(_self: UnsafeMutableRawPointer, result: Int32) -> Void { +public func _bjs_SwiftDataProcessor_handleAPIResult(_self: UnsafeMutableRawPointer, resultIsSome: Int32, resultCaseId: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: APIResult.bridgeJSLiftParameter(result)) + SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) #else fatalError("Only available on WebAssembly") #endif @@ -3969,6 +4175,90 @@ public func _bjs_SwiftDataProcessor_optionalTag_set(_self: UnsafeMutableRawPoint #endif } +@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_get") +@_cdecl("bjs_SwiftDataProcessor_optionalCount_get") +public func _bjs_SwiftDataProcessor_optionalCount_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_set") +@_cdecl("bjs_SwiftDataProcessor_optionalCount_set") +public func _bjs_SwiftDataProcessor_optionalCount_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_direction_get") +@_cdecl("bjs_SwiftDataProcessor_direction_get") +public func _bjs_SwiftDataProcessor_direction_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).direction + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_direction_set") +@_cdecl("bjs_SwiftDataProcessor_direction_set") +public func _bjs_SwiftDataProcessor_direction_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).direction = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_get") +@_cdecl("bjs_SwiftDataProcessor_optionalTheme_get") +public func _bjs_SwiftDataProcessor_optionalTheme_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_set") +@_cdecl("bjs_SwiftDataProcessor_optionalTheme_set") +public func _bjs_SwiftDataProcessor_optionalTheme_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_get") +@_cdecl("bjs_SwiftDataProcessor_httpStatus_get") +public func _bjs_SwiftDataProcessor_httpStatus_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_set") +@_cdecl("bjs_SwiftDataProcessor_httpStatus_set") +public func _bjs_SwiftDataProcessor_httpStatus_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftDataProcessor_apiResult_get") @_cdecl("bjs_SwiftDataProcessor_apiResult_get") public func _bjs_SwiftDataProcessor_apiResult_get(_self: UnsafeMutableRawPointer) -> Void { @@ -3990,6 +4280,48 @@ public func _bjs_SwiftDataProcessor_apiResult_set(_self: UnsafeMutableRawPointer #endif } +@_expose(wasm, "bjs_SwiftDataProcessor_helper_get") +@_cdecl("bjs_SwiftDataProcessor_helper_get") +public func _bjs_SwiftDataProcessor_helper_get(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).helper + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_helper_set") +@_cdecl("bjs_SwiftDataProcessor_helper_set") +public func _bjs_SwiftDataProcessor_helper_set(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).helper = Greeter.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_get") +@_cdecl("bjs_SwiftDataProcessor_optionalHelper_get") +public func _bjs_SwiftDataProcessor_optionalHelper_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_set") +@_cdecl("bjs_SwiftDataProcessor_optionalHelper_set") +public func _bjs_SwiftDataProcessor_optionalHelper_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_SwiftDataProcessor_deinit") @_cdecl("bjs_SwiftDataProcessor_deinit") public func _bjs_SwiftDataProcessor_deinit(pointer: UnsafeMutableRawPointer) { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index cc3807494..c0e0a4a80 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -1346,6 +1346,310 @@ "returnType" : { "bool" : { + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorOptionalTag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorOptionalTag", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorOptionalTag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorOptionalTag", + "parameters" : [ + { + "label" : "_", + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorOptionalCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorOptionalCount", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorOptionalCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorOptionalCount", + "parameters" : [ + { + "label" : "_", + "name" : "count", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorDirection", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorTheme", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorHttpStatus", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorAPIResult", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "void" : { + } } } @@ -1607,8 +1911,12 @@ "label" : "_", "name" : "result", "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } } } @@ -1631,8 +1939,12 @@ ], "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } } } @@ -1673,6 +1985,64 @@ } } }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalTheme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "httpStatus", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, { "isReadonly" : false, "isStatic" : false, @@ -1686,6 +2056,30 @@ } } } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalHelper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } } ], "swiftCallName" : "SwiftDataProcessor" @@ -6181,8 +6575,12 @@ "label" : "_", "name" : "result", "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } } } @@ -6205,8 +6603,12 @@ ], "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } } } } @@ -6244,6 +6646,60 @@ } } }, + { + "isReadonly" : false, + "name" : "optionalCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "optionalTheme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "httpStatus", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, { "isReadonly" : false, "name" : "apiResult", @@ -6256,6 +6712,28 @@ } } } + }, + { + "isReadonly" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "name" : "optionalHelper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } } ] } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index cb67a6a70..10c390af8 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -811,12 +811,19 @@ function setupTestGlobals(global) { function testProtocolSupport(exports) { let processorValue = 0; let processorLabel = ""; - let apiResultValue = null; + let lastAPIResult = null; const jsProcessor = { count: 0, name: "JSProcessor", optionalTag: null, - apiResult: null, + direction: null, + optionalTheme: null, + httpStatus: null, + get apiResult() { return lastAPIResult; }, + set apiResult(value) { lastAPIResult = value; }, + helper: new exports.Greeter("JSHelper"), + optionalHelper: null, + optionalCount: null, increment(amount) { processorValue += amount; this.count += amount; }, getValue() { return processorValue; }, setLabelElements(labelPrefix, labelSuffix) { processorLabel = labelPrefix + labelSuffix; }, @@ -828,154 +835,213 @@ function testProtocolSupport(exports) { return greeter ? `JSProcessor processed optional: ${greeter.greet()}` : "JSProcessor received null"; }, createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); }, - handleAPIResult(result) { apiResultValue = result; }, - getAPIResult() { return apiResultValue; } + handleAPIResult(result) { lastAPIResult = result; }, + getAPIResult() { return lastAPIResult; } }; - const manager = new exports.DataProcessorManager(jsProcessor); - - assert.equal(jsProcessor.count, 0); - assert.equal(jsProcessor.name, "JSProcessor"); - - manager.incrementByAmount(4); - assert.equal(manager.getCurrentValue(), 4); + const successResult = { tag: exports.Result.Tag.Success, param0: "Operation completed" }; + const failureResult = { tag: exports.Result.Tag.Failure, param0: 500 }; + + const jsManager = new exports.DataProcessorManager(jsProcessor); + + jsManager.incrementByAmount(4); + assert.equal(jsManager.getCurrentValue(), 4); assert.equal(jsProcessor.count, 4); - manager.setProcessorLabel("Test", "Label"); - assert.equal(manager.getProcessorLabel(), "TestLabel"); - assert.equal(jsProcessor.getLabel(), "TestLabel"); + jsManager.setProcessorLabel("Test", "Label"); + assert.equal(jsManager.getProcessorLabel(), "TestLabel"); + + assert.equal(jsManager.isProcessorEven(), true); + jsManager.incrementByAmount(1); + assert.equal(jsManager.isProcessorEven(), false); + + assert.equal(jsManager.getProcessorOptionalTag(), null); + jsManager.setProcessorOptionalTag("test-tag"); + assert.equal(jsManager.getProcessorOptionalTag(), "test-tag"); + jsManager.setProcessorOptionalTag("another-tag"); + assert.equal(jsManager.getProcessorOptionalTag(), "another-tag"); + jsManager.setProcessorOptionalTag(null); + assert.equal(jsManager.getProcessorOptionalTag(), null); + + // Test direct property access for optionalTag + jsProcessor.optionalTag = "direct-tag"; + assert.equal(jsManager.getProcessorOptionalTag(), "direct-tag"); + assert.equal(jsProcessor.optionalTag, "direct-tag"); + jsProcessor.optionalTag = null; + assert.equal(jsManager.getProcessorOptionalTag(), null); + assert.equal(jsProcessor.optionalTag, null); - assert.equal(manager.isProcessorEven(), true); - manager.incrementByAmount(1); - assert.equal(manager.isProcessorEven(), false); - assert.equal(jsProcessor.isEven(), false); + assert.equal(jsManager.getProcessorDirection(), null); + jsManager.setProcessorDirection(exports.Direction.North); + assert.equal(jsManager.getProcessorDirection(), exports.Direction.North); + jsManager.setProcessorDirection(exports.Direction.East); + assert.equal(jsManager.getProcessorDirection(), exports.Direction.East); + jsManager.setProcessorDirection(null); + assert.equal(jsManager.getProcessorDirection(), null); + + assert.equal(jsManager.getProcessorTheme(), null); + jsManager.setProcessorTheme(exports.Theme.Light); + assert.equal(jsManager.getProcessorTheme(), exports.Theme.Light); + jsManager.setProcessorTheme(exports.Theme.Dark); + assert.equal(jsManager.getProcessorTheme(), exports.Theme.Dark); + jsManager.setProcessorTheme(null); + assert.equal(jsManager.getProcessorTheme(), null); + + assert.equal(jsManager.getProcessorHttpStatus(), null); + jsManager.setProcessorHttpStatus(exports.HttpStatus.Ok); + assert.equal(jsManager.getProcessorHttpStatus(), exports.HttpStatus.Ok); + jsManager.setProcessorHttpStatus(exports.HttpStatus.NotFound); + assert.equal(jsManager.getProcessorHttpStatus(), exports.HttpStatus.NotFound); + jsManager.setProcessorHttpStatus(null); + assert.equal(jsManager.getProcessorHttpStatus(), null); - jsProcessor.increment(3); - assert.equal(jsProcessor.getValue(), 8); - manager.release(); + jsProcessor.handleAPIResult(successResult); + assert.deepEqual(jsProcessor.getAPIResult(), successResult); + + jsProcessor.handleAPIResult(failureResult); + assert.deepEqual(jsProcessor.getAPIResult(), failureResult); + + jsProcessor.apiResult = successResult; + assert.deepEqual(jsProcessor.apiResult, successResult); + jsProcessor.apiResult = null; + assert.equal(jsProcessor.apiResult, null); + assert.equal(jsManager.getProcessorAPIResult(), null); + + assert.equal(jsProcessor.helper.name, "JSHelper"); + const newHelper = new exports.Greeter("UpdatedHelper"); + jsProcessor.helper = newHelper; + assert.equal(jsProcessor.helper.name, "UpdatedHelper"); + assert.equal(jsProcessor.helper.greet(), "Hello, UpdatedHelper!"); + + assert.equal(jsProcessor.optionalHelper, null); + const optHelper = new exports.Greeter("OptHelper"); + jsProcessor.optionalHelper = optHelper; + assert.equal(jsProcessor.optionalHelper.name, "OptHelper"); + assert.equal(jsProcessor.optionalHelper.greet(), "Hello, OptHelper!"); + jsProcessor.optionalHelper = null; + assert.equal(jsProcessor.optionalHelper, null); + + assert.equal(jsManager.getProcessorOptionalCount(), null); + jsManager.setProcessorOptionalCount(42); + assert.equal(jsManager.getProcessorOptionalCount(), 42); + jsManager.setProcessorOptionalCount(0); + assert.equal(jsManager.getProcessorOptionalCount(), 0); + jsManager.setProcessorOptionalCount(-100); + assert.equal(jsManager.getProcessorOptionalCount(), -100); + jsManager.setProcessorOptionalCount(null); + assert.equal(jsManager.getProcessorOptionalCount(), null); + + assert.equal(jsProcessor.optionalCount, null); + jsProcessor.optionalCount = 42; + assert.equal(jsProcessor.optionalCount, 42); + assert.equal(jsManager.getProcessorOptionalCount(), 42); + jsProcessor.optionalCount = 0; + assert.equal(jsProcessor.optionalCount, 0); + jsProcessor.optionalCount = null; + assert.equal(jsProcessor.optionalCount, null); + + newHelper.release(); + optHelper.release(); + jsManager.release(); const swiftProcessor = new exports.SwiftDataProcessor(); const swiftManager = new exports.DataProcessorManager(swiftProcessor); - assert.equal(swiftProcessor.count, 0); - assert.equal(swiftProcessor.name, "SwiftDataProcessor"); - swiftManager.incrementByAmount(10); assert.equal(swiftManager.getCurrentValue(), 10); - assert.equal(swiftProcessor.count, 10); swiftManager.setProcessorLabel("Swift", "Label"); assert.equal(swiftManager.getProcessorLabel(), "SwiftLabel"); - swiftProcessor.increment(5); - assert.equal(swiftProcessor.getValue(), 15); - assert.equal(swiftProcessor.count, 15); - - swiftProcessor.count = 100; - assert.equal(swiftProcessor.count, 100); - assert.equal(swiftProcessor.getValue(), 100); - - const testGreeter = new exports.Greeter("TestUser"); - const jsResult = jsProcessor.processGreeter(testGreeter); - assert.equal(jsResult, "JSProcessor processed: Hello, TestUser!"); - - const swiftResult = swiftProcessor.processGreeter(testGreeter); - assert.equal(swiftResult, "SwiftProcessor processed: Hello, TestUser!"); - - // Test swiftHeapObject return from protocol methods - const jsCreatedGreeter = jsProcessor.createGreeter(); - assert.equal(jsCreatedGreeter.name, "JSProcessorGreeter"); - assert.equal(jsCreatedGreeter.greet(), "Hello, JSProcessorGreeter!"); - jsCreatedGreeter.release(); - - const swiftCreatedGreeter = swiftProcessor.createGreeter(); - assert.equal(swiftCreatedGreeter.name, "ProcessorGreeter"); - assert.equal(swiftCreatedGreeter.greet(), "Hello, ProcessorGreeter!"); - swiftCreatedGreeter.release(); - - const optGreeterTest = new exports.Greeter("OptionalTest"); - assert.equal(jsProcessor.processOptionalGreeter(optGreeterTest), "JSProcessor processed optional: Hello, OptionalTest!"); - assert.equal(jsProcessor.processOptionalGreeter(null), "JSProcessor received null"); - assert.equal(swiftProcessor.processOptionalGreeter(optGreeterTest), "SwiftProcessor processed optional: Hello, OptionalTest!"); - assert.equal(swiftProcessor.processOptionalGreeter(null), "SwiftProcessor received nil"); - optGreeterTest.release(); - - const jsOptGreeter = jsProcessor.createOptionalGreeter(); - assert.notEqual(jsOptGreeter, null); - assert.equal(jsOptGreeter.name, "JSOptionalGreeter"); - jsOptGreeter.release(); - - const swiftOptGreeter = swiftProcessor.createOptionalGreeter(); - assert.notEqual(swiftOptGreeter, null); - assert.equal(swiftOptGreeter.name, "OptionalProcessorGreeter"); - swiftOptGreeter.release(); - - assert.equal(jsProcessor.optionalTag, null); - jsProcessor.optionalTag = "test-tag"; - assert.equal(jsProcessor.optionalTag, "test-tag"); - jsProcessor.optionalTag = null; - assert.equal(jsProcessor.optionalTag, null); - - const successResult = { tag: exports.Result.Tag.Success, param0: "Operation completed" }; - const failureResult = { tag: exports.Result.Tag.Failure, param0: 500 }; - - jsProcessor.handleAPIResult(successResult); - assert.deepEqual(jsProcessor.getAPIResult(), successResult); - - jsProcessor.handleAPIResult(failureResult); - assert.deepEqual(jsProcessor.getAPIResult(), failureResult); - - assert.equal(jsProcessor.apiResult, null); - jsProcessor.apiResult = successResult; - assert.deepEqual(jsProcessor.apiResult, successResult); - jsProcessor.apiResult = null; - assert.equal(jsProcessor.apiResult, null); - - testGreeter.release(); - + assert.equal(swiftManager.isProcessorEven(), true); + swiftManager.incrementByAmount(1); + assert.equal(swiftManager.isProcessorEven(), false); + + assert.equal(swiftManager.getProcessorDirection(), null); + swiftManager.setProcessorDirection(exports.Direction.South); + assert.equal(swiftManager.getProcessorDirection(), exports.Direction.South); + swiftManager.setProcessorDirection(exports.Direction.West); + assert.equal(swiftManager.getProcessorDirection(), exports.Direction.West); + swiftManager.setProcessorDirection(null); + assert.equal(swiftManager.getProcessorDirection(), null); + + assert.equal(swiftManager.getProcessorTheme(), null); + swiftProcessor.optionalTheme = exports.Theme.Light; + assert.equal(swiftManager.getProcessorTheme(), exports.Theme.Light); + swiftManager.setProcessorTheme(exports.Theme.Auto); + assert.equal(swiftManager.getProcessorTheme(), exports.Theme.Auto); + swiftManager.setProcessorTheme(exports.Theme.Light); + assert.equal(swiftManager.getProcessorTheme(), exports.Theme.Light); + swiftManager.setProcessorTheme(null); + assert.equal(swiftManager.getProcessorTheme(), null); + + assert.equal(swiftManager.getProcessorHttpStatus(), null); + swiftManager.setProcessorHttpStatus(exports.HttpStatus.ServerError); + assert.equal(swiftManager.getProcessorHttpStatus(), exports.HttpStatus.ServerError); + swiftManager.setProcessorHttpStatus(exports.HttpStatus.Ok); + assert.equal(swiftManager.getProcessorHttpStatus(), exports.HttpStatus.Ok); + swiftManager.setProcessorHttpStatus(null); + assert.equal(swiftManager.getProcessorHttpStatus(), null); + + swiftProcessor.handleAPIResult(successResult); + assert.deepEqual(swiftProcessor.getAPIResult(), successResult); + assert.deepEqual(swiftManager.getProcessorAPIResult(), successResult); + + swiftProcessor.handleAPIResult(failureResult); + assert.deepEqual(swiftProcessor.getAPIResult(), failureResult); + assert.deepEqual(swiftManager.getProcessorAPIResult(), failureResult); + swiftManager.setProcessorAPIResult(successResult); + assert.deepEqual(swiftProcessor.getAPIResult(), successResult); + swiftManager.release(); swiftProcessor.release(); - let optionalProcessorValue = 100; - let optionalProcessorLabel = "optional"; - const optionalProcessor = { + let backupValue = 100; + const backupProcessor = { count: 100, - name: "OptionalProcessor", - optionalTag: "optional-tag", + name: "BackupProcessor", + optionalTag: null, + direction: null, + optionalTheme: null, + httpStatus: null, apiResult: null, - increment(amount) { optionalProcessorValue += amount; this.count += amount; }, - getValue() { return optionalProcessorValue; }, - setLabelElements(labelPrefix, labelSuffix) { optionalProcessorLabel = labelPrefix + labelSuffix; }, - getLabel() { return optionalProcessorLabel; }, - isEven() { return optionalProcessorValue % 2 === 0; }, - processGreeter(greeter) { return `OptionalProcessor processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("OptionalProcessorGreeter"); }, - processOptionalGreeter(greeter) { - return greeter ? `OptionalProcessor processed optional: ${greeter.greet()}` : "OptionalProcessor received null"; - }, + helper: new exports.Greeter("BackupHelper"), + optionalHelper: null, + optionalCount: null, + increment(amount) { backupValue += amount; this.count += amount; }, + getValue() { return backupValue; }, + setLabelElements(labelPrefix, labelSuffix) { }, + getLabel() { return "backup"; }, + isEven() { return backupValue % 2 === 0; }, + processGreeter(greeter) { return ""; }, + createGreeter() { return new exports.Greeter("BackupGreeter"); }, + processOptionalGreeter(greeter) { return ""; }, createOptionalGreeter() { return null; }, handleAPIResult(result) { }, getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } }; - let mainProcessorValue = 0; - let mainProcessorLabel = "main"; + let mainValue = 0; const mainProcessor = { count: 0, name: "MainProcessor", optionalTag: null, + direction: null, + optionalTheme: null, + httpStatus: null, apiResult: null, - increment(amount) { mainProcessorValue += amount; this.count += amount; }, - getValue() { return mainProcessorValue; }, - setLabelElements(labelPrefix, labelSuffix) { mainProcessorLabel = labelPrefix + labelSuffix; }, - getLabel() { return mainProcessorLabel; }, - isEven() { return mainProcessorValue % 2 === 0; }, - processGreeter(greeter) { return `MainProcessor processed: ${greeter.greet()}`; }, - createGreeter() { return new exports.Greeter("MainProcessorGreeter"); }, - processOptionalGreeter(greeter) { - return greeter ? `MainProcessor processed optional: ${greeter.greet()}` : "MainProcessor received null"; - }, - createOptionalGreeter() { return new exports.Greeter("MainOptionalGreeter"); }, + helper: new exports.Greeter("MainHelper"), + optionalHelper: null, + optionalCount: null, + increment(amount) { mainValue += amount; this.count += amount; }, + getValue() { return mainValue; }, + setLabelElements(labelPrefix, labelSuffix) { }, + getLabel() { return "main"; }, + isEven() { return mainValue % 2 === 0; }, + processGreeter(greeter) { return ""; }, + createGreeter() { return new exports.Greeter("MainGreeter"); }, + processOptionalGreeter(greeter) { return ""; }, + createOptionalGreeter() { return null; }, handleAPIResult(result) { }, getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } }; @@ -986,7 +1052,7 @@ function testProtocolSupport(exports) { assert.equal(managerWithOptional.hasBackup(), false); assert.equal(managerWithOptional.getBackupValue(), null); - managerWithOptional.backupProcessor = optionalProcessor; + managerWithOptional.backupProcessor = backupProcessor; assert.notEqual(managerWithOptional.backupProcessor, null); assert.equal(managerWithOptional.hasBackup(), true); @@ -1006,15 +1072,16 @@ function testProtocolSupport(exports) { assert.equal(managerWithOptional.getCurrentValue(), 3); assert.equal(managerWithOptional.getBackupValue(), null); - const swiftBackupProcessor = new exports.SwiftDataProcessor(); - swiftBackupProcessor.increment(1); - managerWithOptional.backupProcessor = swiftBackupProcessor; + const swiftBackup = new exports.SwiftDataProcessor(); + managerWithOptional.backupProcessor = swiftBackup; assert.equal(managerWithOptional.hasBackup(), true); + assert.equal(managerWithOptional.getBackupValue(), 0); + + managerWithOptional.incrementBoth(); + assert.equal(managerWithOptional.getCurrentValue(), 4); assert.equal(managerWithOptional.getBackupValue(), 1); - assert.equal(swiftBackupProcessor.count, 1); - assert.equal(swiftBackupProcessor.name, "SwiftDataProcessor"); managerWithOptional.release(); - swiftBackupProcessor.release(); + swiftBackup.release(); } From 617110edf7c63fbc45810c2ed21b3822d2ff1840 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 24 Oct 2025 15:01:34 +0900 Subject: [PATCH 018/252] PackageToJS: Rename `--platform` to `--default-platform` and fix tests --- Makefile | 1 - Plugins/PackageToJS/Sources/PackageToJS.swift | 5 +- .../Sources/PackageToJSPlugin.swift | 4 +- Plugins/PackageToJS/Templates/index.d.ts | 16 +--- Plugins/PackageToJS/Templates/index.js | 41 ++++++--- .../PackageToJS/Templates/package-lock.json | 41 --------- Plugins/PackageToJS/Templates/package.json | 3 - .../PackageToJS/Templates/platforms/node.d.ts | 2 +- .../PackageToJS/Templates/platforms/node.js | 2 +- Plugins/PackageToJS/Templates/tsconfig.json | 1 + .../PackageToJS/Tests/TemplatesTests.swift | 84 +++++++++++-------- .../Tests/TemporaryDirectory.swift | 7 +- .../planBuild_debug.json | 24 +++--- .../planBuild_release.json | 24 +++--- .../planBuild_release_dwarf.json | 24 +++--- .../planBuild_release_name.json | 24 +++--- .../planBuild_release_no_optimize.json | 24 +++--- .../PackagingPlannerTests/planTestBuild.json | 32 +++---- 18 files changed, 166 insertions(+), 193 deletions(-) delete mode 100644 Plugins/PackageToJS/Templates/package-lock.json diff --git a/Makefile b/Makefile index 4ae7ccaf6..5ac35ea57 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ SWIFT_SDK_ID ?= wasm32-unknown-wasi .PHONY: bootstrap bootstrap: npm ci - cd Plugins/PackageToJS/Templates && npm ci .PHONY: unittest unittest: diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index a9fe6489e..cec51cfb2 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -14,7 +14,7 @@ struct PackageToJS { /// Name of the package (default: lowercased Package.swift name) var packageName: String? /// Target platform for the generated JavaScript (default: browser) - var platform: Platform = .browser + var defaultPlatform: Platform = .browser /// Whether to explain the build plan (default: false) var explain: Bool = false /// Whether to print verbose output @@ -724,7 +724,8 @@ struct PackagingPlanner { "USE_WASI_CDN": options.useCDN, "HAS_BRIDGE": exportedSkeletons.count > 0 || importedSkeletons.count > 0, "HAS_IMPORTS": importedSkeletons.count > 0, - "TARGET_PLATFORM_NODE": options.platform == .node, + "TARGET_DEFAULT_PLATFORM_NODE": options.defaultPlatform == .node, + "TARGET_DEFAULT_PLATFORM_BROWSER": options.defaultPlatform == .browser, ] let constantSubstitutions: [String: String] = [ "PACKAGE_TO_JS_MODULE_PATH": wasmFilename, diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index e934279f6..9a35322f8 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -461,7 +461,7 @@ extension PackageToJS.PackageOptions { let configuration: String? = (extractor.extractOption(named: "configuration") + extractor.extractSingleDashOption(named: "c")).last let packageName = extractor.extractOption(named: "package-name").last - let platform = try extractor.extractPlatformOption(named: "platform") + let defaultPlatform = try extractor.extractPlatformOption(named: "default-platform") let explain = extractor.extractFlag(named: "explain") let useCDN = extractor.extractFlag(named: "use-cdn") let verbose = extractor.extractFlag(named: "verbose") @@ -470,7 +470,7 @@ extension PackageToJS.PackageOptions { outputPath: outputPath, configuration: configuration, packageName: packageName, - platform: platform, + defaultPlatform: defaultPlatform, explain: explain != 0, verbose: verbose != 0, useCDN: useCDN != 0, diff --git a/Plugins/PackageToJS/Templates/index.d.ts b/Plugins/PackageToJS/Templates/index.d.ts index 601f354be..fb063f0ab 100644 --- a/Plugins/PackageToJS/Templates/index.d.ts +++ b/Plugins/PackageToJS/Templates/index.d.ts @@ -1,15 +1,14 @@ import type { Exports, Imports, ModuleSource } from './instantiate.js' -/* #if TARGET_PLATFORM_NODE */ -import type { DefaultNodeSetupOptions } from './platforms/node.js' -/* #endif */ export type Options = { +/* #if TARGET_DEFAULT_PLATFORM_BROWSER */ /** * The WebAssembly module to instantiate * * If not provided, the module will be fetched from the default path. */ module?: ModuleSource +/* #endif */ /* #if HAS_IMPORTS */ /** * The imports to use for the module @@ -21,21 +20,10 @@ export type Options = { /** * Instantiate and initialize the module * -/* #if TARGET_PLATFORM_NODE */ - * This is a convenience function for Node.js environments. -/* #else */ * This is a convenience function for browser environments. -/* #endif */ * If you need a more flexible API, see `instantiate`. */ -/* #if TARGET_PLATFORM_NODE */ -export declare function init(options?: DefaultNodeSetupOptions): Promise<{ - instance: WebAssembly.Instance, - exports: Exports -}> -/* #else */ export declare function init(options?: Options): Promise<{ instance: WebAssembly.Instance, exports: Exports }> -/* #endif */ diff --git a/Plugins/PackageToJS/Templates/index.js b/Plugins/PackageToJS/Templates/index.js index e482b8d4c..7cde8edc9 100644 --- a/Plugins/PackageToJS/Templates/index.js +++ b/Plugins/PackageToJS/Templates/index.js @@ -1,24 +1,29 @@ // @ts-check import { instantiate } from './instantiate.js'; -/* #if TARGET_PLATFORM_NODE */ -import { defaultNodeSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/node.js'; +/* #if TARGET_DEFAULT_PLATFORM_NODE */ +import { defaultNodeSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory as createDefaultWorkerFactoryForNode /* #endif */} from './platforms/node.js'; /* #else */ -import { defaultBrowserSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/browser.js'; +import { defaultBrowserSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory as createDefaultWorkerFactoryForBrowser /* #endif */} from './platforms/browser.js'; /* #endif */ +/* #if TARGET_DEFAULT_PLATFORM_NODE */ /** @type {import('./index.d').init} */ -export async function init(_options) { -/* #if TARGET_PLATFORM_NODE */ +async function initNode(_options) { /** @type {import('./platforms/node.d.ts').DefaultNodeSetupOptions} */ - const options = _options || {}; - const instantiateOptions = await defaultNodeSetup({ - args: options.args, - onExit: options.onExit, + const options = { + ...(_options || {}), /* #if USE_SHARED_MEMORY */ - spawnWorker: options.spawnWorker || createDefaultWorkerFactory() + spawnWorker: createDefaultWorkerFactoryForNode(), /* #endif */ - }); + }; + const instantiateOptions = await defaultNodeSetup(options); + return await instantiate(instantiateOptions); +} + /* #else */ + +/** @type {import('./index.d').init} */ +async function initBrowser(_options) { /** @type {import('./index.d').Options} */ const options = _options || { /* #if HAS_IMPORTS */ @@ -36,9 +41,19 @@ export async function init(_options) { getImports: () => options.getImports(), /* #endif */ /* #if USE_SHARED_MEMORY */ - spawnWorker: createDefaultWorkerFactory() + spawnWorker: createDefaultWorkerFactoryForBrowser() /* #endif */ }) -/* #endif */ return await instantiate(instantiateOptions); } + +/* #endif */ + +/** @type {import('./index.d').init} */ +export async function init(options) { + /* #if TARGET_DEFAULT_PLATFORM_NODE */ + return initNode(options); + /* #else */ + return initBrowser(options); + /* #endif */ +} \ No newline at end of file diff --git a/Plugins/PackageToJS/Templates/package-lock.json b/Plugins/PackageToJS/Templates/package-lock.json deleted file mode 100644 index a0a1b13a8..000000000 --- a/Plugins/PackageToJS/Templates/package-lock.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@PACKAGE_TO_JS_PACKAGE_NAME@", - "version": "0.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@PACKAGE_TO_JS_PACKAGE_NAME@", - "version": "0.0.0", - "dependencies": { - "@bjorn3/browser_wasi_shim": "0.3.0" - }, - "devDependencies": { - "@types/node": "^22.0.0" - } - }, - "node_modules/@bjorn3/browser_wasi_shim": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.3.0.tgz", - "integrity": "sha512-FlRBYttPRLcWORzBe6g8nmYTafBkOEFeOqMYM4tAHJzFsQy4+xJA94z85a9BCs8S+Uzfh9LrkpII7DXr2iUVFg==", - "license": "MIT OR Apache-2.0" - }, - "node_modules/@types/node": { - "version": "22.18.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.11.tgz", - "integrity": "sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, - "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", - "dev": true, - "license": "MIT" - } - } -} diff --git a/Plugins/PackageToJS/Templates/package.json b/Plugins/PackageToJS/Templates/package.json index 0566b0b5e..a3e7074bb 100644 --- a/Plugins/PackageToJS/Templates/package.json +++ b/Plugins/PackageToJS/Templates/package.json @@ -9,8 +9,5 @@ }, "dependencies": { "@bjorn3/browser_wasi_shim": "0.3.0" - }, - "devDependencies": { - "@types/node": "^22.0.0" } } diff --git a/Plugins/PackageToJS/Templates/platforms/node.d.ts b/Plugins/PackageToJS/Templates/platforms/node.d.ts index f756c8efc..ca0e826c4 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.d.ts +++ b/Plugins/PackageToJS/Templates/platforms/node.d.ts @@ -13,4 +13,4 @@ export type DefaultNodeSetupOptions = { export function defaultNodeSetup(options: DefaultNodeSetupOptions): Promise -export function createDefaultWorkerFactory(preludeScript: string): (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker +export function createDefaultWorkerFactory(preludeScript?: string): (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker diff --git a/Plugins/PackageToJS/Templates/platforms/node.js b/Plugins/PackageToJS/Templates/platforms/node.js index ddd017154..2fc0e8d15 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.js +++ b/Plugins/PackageToJS/Templates/platforms/node.js @@ -131,7 +131,7 @@ export async function defaultNodeSetup(options) { new PreopenDirectory("/", rootFs), ], { debug: false }) const pkgDir = path.dirname(path.dirname(fileURLToPath(import.meta.url))) - const module = await WebAssembly.compile(await readFile(path.join(pkgDir, MODULE_PATH))) + const module = await WebAssembly.compile(new Uint8Array(await readFile(path.join(pkgDir, MODULE_PATH)))) /* #if USE_SHARED_MEMORY */ const memory = new WebAssembly.Memory(MEMORY_TYPE); const threadChannel = new DefaultNodeThreadRegistry(options.spawnWorker) diff --git a/Plugins/PackageToJS/Templates/tsconfig.json b/Plugins/PackageToJS/Templates/tsconfig.json index ac3a2b01e..91fe8516f 100644 --- a/Plugins/PackageToJS/Templates/tsconfig.json +++ b/Plugins/PackageToJS/Templates/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "module": "esnext", + "lib": ["es2017", "dom"], "noEmit": true, "allowJs": true, "skipLibCheck": true, diff --git a/Plugins/PackageToJS/Tests/TemplatesTests.swift b/Plugins/PackageToJS/Tests/TemplatesTests.swift index c7b1ba6fb..5a27259c3 100644 --- a/Plugins/PackageToJS/Tests/TemplatesTests.swift +++ b/Plugins/PackageToJS/Tests/TemplatesTests.swift @@ -3,56 +3,66 @@ import Foundation @testable import PackageToJS @Suite struct TemplatesTests { - static let templatesPath = URL(fileURLWithPath: #filePath) + static let pluginPackagePath = URL(fileURLWithPath: #filePath) .deletingLastPathComponent() .deletingLastPathComponent() + static let templatesPath = + pluginPackagePath .appendingPathComponent("Templates") + static let localTemporaryDirectory = + pluginPackagePath + .appendingPathComponent("Tests") + .appendingPathComponent("TemporaryDirectory") /// `npx tsc -p Templates/tsconfig.json` /// Test both node and browser platform variants @Test(arguments: ["node", "browser"]) func tscCheck(platform: String) throws { - // Create a temporary directory for preprocessed files - let tempDir = FileManager.default.temporaryDirectory - .appendingPathComponent("JavaScriptKit-tsc-\(platform)-\(UUID().uuidString)") - defer { - try? FileManager.default.removeItem(at: tempDir) - } + // Use a local temporary directory to place instantiated templates so that + // they can reference repo-root node_modules packages like @types/node. + try FileManager.default.createDirectory( + at: Self.localTemporaryDirectory, + withIntermediateDirectories: true, + attributes: nil + ) + try withTemporaryDirectory(prefixDirectory: Self.localTemporaryDirectory) { tempDir, _ in + let destination = tempDir.appending(path: Self.templatesPath.lastPathComponent) + // Copy entire templates folder to temp location + try FileManager.default.copyItem(at: Self.templatesPath, to: destination) - // Copy entire templates folder to temp location - try FileManager.default.copyItem(at: Self.templatesPath, to: tempDir) + // Setup preprocessing conditions + let conditions: [String: Bool] = [ + "USE_SHARED_MEMORY": false, + "IS_WASI": true, + "USE_WASI_CDN": false, + "HAS_BRIDGE": false, + "HAS_IMPORTS": false, + "TARGET_DEFAULT_PLATFORM_NODE": platform == "node", + "TARGET_DEFAULT_PLATFORM_BROWSER": platform == "browser", + ] + let preprocessOptions = PreprocessOptions(conditions: conditions, substitutions: [:]) - // Setup preprocessing conditions - let conditions: [String: Bool] = [ - "USE_SHARED_MEMORY": false, - "IS_WASI": true, - "USE_WASI_CDN": false, - "HAS_BRIDGE": false, - "HAS_IMPORTS": platform == "browser", - "TARGET_PLATFORM_NODE": platform == "node", - ] - let preprocessOptions = PreprocessOptions(conditions: conditions, substitutions: [:]) + // Preprocess all JS and TS files in-place + let enumerator = FileManager.default.enumerator(at: destination, includingPropertiesForKeys: nil) + while let fileURL = enumerator?.nextObject() as? URL { + guard !fileURL.hasDirectoryPath, + fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" + else { + continue + } - // Preprocess all JS and TS files in-place - let enumerator = FileManager.default.enumerator(at: tempDir, includingPropertiesForKeys: nil) - while let fileURL = enumerator?.nextObject() as? URL { - guard !fileURL.hasDirectoryPath, - fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" - else { - continue + let content = try String(contentsOf: fileURL, encoding: .utf8) + let preprocessed = try preprocess(source: content, file: fileURL.path, options: preprocessOptions) + try preprocessed.write(to: fileURL, atomically: true, encoding: .utf8) } - let content = try String(contentsOf: fileURL, encoding: .utf8) - let preprocessed = try preprocess(source: content, file: fileURL.path, options: preprocessOptions) - try preprocessed.write(to: fileURL, atomically: true, encoding: .utf8) + // Run TypeScript on the preprocessed files + let tsc = Process() + tsc.executableURL = try which("npx") + tsc.arguments = ["tsc", "-p", destination.appending(path: "tsconfig.json").path] + try tsc.run() + tsc.waitUntilExit() + #expect(tsc.terminationStatus == 0) } - - // Run TypeScript on the preprocessed files - let tsc = Process() - tsc.executableURL = try which("npx") - tsc.arguments = ["tsc", "-p", tempDir.appending(path: "tsconfig.json").path] - try tsc.run() - tsc.waitUntilExit() - #expect(tsc.terminationStatus == 0) } } diff --git a/Plugins/PackageToJS/Tests/TemporaryDirectory.swift b/Plugins/PackageToJS/Tests/TemporaryDirectory.swift index 199380fac..c08b044f1 100644 --- a/Plugins/PackageToJS/Tests/TemporaryDirectory.swift +++ b/Plugins/PackageToJS/Tests/TemporaryDirectory.swift @@ -4,9 +4,12 @@ struct MakeTemporaryDirectoryError: Error { let error: CInt } -internal func withTemporaryDirectory(body: (URL, _ retain: inout Bool) throws -> T) throws -> T { +internal func withTemporaryDirectory( + prefixDirectory: URL = FileManager.default.temporaryDirectory, + body: (URL, _ retain: inout Bool) throws -> T +) throws -> T { // Create a temporary directory using mkdtemp - var template = FileManager.default.temporaryDirectory.appendingPathComponent("PackageToJSTests.XXXXXX").path + var template = prefixDirectory.appendingPathComponent("PackageToJSTests.XXXXXX").path return try template.withUTF8 { template in let copy = UnsafeMutableBufferPointer.allocate(capacity: template.count + 1) template.copyBytes(to: copy) diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json index f09b0b44f..49cee1f90 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json index 71801d180..6b1e1090c 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json @@ -62,7 +62,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -79,7 +79,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -96,7 +96,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -113,7 +113,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -143,7 +143,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json index f09b0b44f..49cee1f90 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json index 71801d180..6b1e1090c 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json @@ -62,7 +62,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -79,7 +79,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -96,7 +96,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -113,7 +113,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -143,7 +143,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json index f09b0b44f..49cee1f90 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json @@ -48,7 +48,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -65,7 +65,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -82,7 +82,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -99,7 +99,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -128,7 +128,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json index 475f6726e..5f16f6e8e 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json @@ -73,7 +73,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js" ], "output" : "$OUTPUT\/bin\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -89,7 +89,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -106,7 +106,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -123,7 +123,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -140,7 +140,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -169,7 +169,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT" ] @@ -196,7 +196,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -213,7 +213,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -230,7 +230,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -247,7 +247,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -264,7 +264,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -281,7 +281,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -298,7 +298,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/platforms", @@ -314,7 +314,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html" ], "output" : "$OUTPUT\/test.browser.html", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -329,7 +329,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts" ], "output" : "$OUTPUT\/test.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" @@ -344,7 +344,7 @@ "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js" ], "output" : "$OUTPUT\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9QTEFURk9STV9OT0RFIjpmYWxzZSwiVVNFX1NIQVJFRF9NRU1PUlkiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$OUTPUT\/bin" From eb1f0e3883af4ac86e239094809cec68572e3089 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 24 Oct 2025 10:03:41 +0200 Subject: [PATCH 019/252] BridgeJS: Update PackageToJS template and add short instruction --- CONTRIBUTING.md | 4 ++++ Plugins/PackageToJS/Templates/instantiate.js | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 666b62d24..9ca71ef13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -112,5 +112,9 @@ Run this script when you've made changes to: These changes require updating the pre-generated Swift bindings committed to the repository. +**Adding new BridgeJS intrinsics:** + +If you add new `@_extern(wasm, module: "bjs")` functions to [`BridgeJSInstrincics.swift`](Sources/JavaScriptKit/BridgeJSInstrincics.swift), also add corresponding stub entries to [`Plugins/PackageToJS/Templates/instantiate.js`](Plugins/PackageToJS/Templates/instantiate.js) in the `importObject["bjs"]` object. This allows packages without BridgeJS-generated code to instantiate successfully. + ## Support If you have any questions or need assistance, feel free to reach out via [GitHub Issues](https://github.com/swiftwasm/JavaScriptKit/issues) or [Discord](https://discord.gg/ashJW8T8yp). diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 236b7020b..5d74cc7eb 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -54,6 +54,13 @@ async function createInstantiator(options, swift) { swift_js_return_optional_float: unexpectedBjsCall, swift_js_return_optional_heap_object: unexpectedBjsCall, swift_js_return_optional_object: unexpectedBjsCall, + swift_js_get_optional_int_presence: unexpectedBjsCall, + swift_js_get_optional_int_value: unexpectedBjsCall, + swift_js_get_optional_string: unexpectedBjsCall, + swift_js_get_optional_float_presence: unexpectedBjsCall, + swift_js_get_optional_float_value: unexpectedBjsCall, + swift_js_get_optional_double_presence: unexpectedBjsCall, + swift_js_get_optional_double_value: unexpectedBjsCall, } }, /** @param {WebAssembly.Instance} instance */ From 3d17fda4c0ad9d109e4b1fe9922cda8389f30b52 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 24 Oct 2025 10:42:53 +0200 Subject: [PATCH 020/252] BridgeJS: Swift closure support --- .../Sources/BridgeJSCore/ExportSwift.swift | 364 ++++- .../Sources/BridgeJSCore/ImportTS.swift | 24 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 349 ++++- .../Sources/BridgeJSLink/JSGlueGen.swift | 664 ++++++++- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 82 +- .../Inputs/SwiftClosure.swift | 75 + .../ArrayParameter.Import.js | 14 +- .../BridgeJSLinkTests/Async.Export.js | 14 +- .../BridgeJSLinkTests/Async.Import.js | 14 +- .../DefaultParameters.Export.js | 14 +- .../EnumAssociatedValue.Export.js | 11 +- .../BridgeJSLinkTests/EnumCase.Export.js | 14 +- .../BridgeJSLinkTests/EnumNamespace.Export.js | 11 +- .../BridgeJSLinkTests/EnumRawType.Export.js | 14 +- .../BridgeJSLinkTests/Interface.Import.js | 14 +- .../InvalidPropertyNames.Import.js | 14 +- .../MultipleImportedTypes.Import.js | 14 +- .../BridgeJSLinkTests/Namespaces.Export.js | 11 +- .../BridgeJSLinkTests/Optionals.Export.js | 14 +- .../PrimitiveParameters.Export.js | 14 +- .../PrimitiveParameters.Import.js | 14 +- .../PrimitiveReturn.Export.js | 14 +- .../PrimitiveReturn.Import.js | 14 +- .../BridgeJSLinkTests/PropertyTypes.Export.js | 14 +- .../BridgeJSLinkTests/Protocol.Export.js | 14 +- .../StaticFunctions.Export.js | 11 +- .../StaticProperties.Export.js | 14 +- .../StringParameter.Export.js | 14 +- .../StringParameter.Import.js | 14 +- .../BridgeJSLinkTests/StringReturn.Export.js | 14 +- .../BridgeJSLinkTests/StringReturn.Import.js | 14 +- .../BridgeJSLinkTests/SwiftClass.Export.js | 14 +- .../SwiftClosure.Export.d.ts | 100 ++ .../BridgeJSLinkTests/SwiftClosure.Export.js | 942 +++++++++++++ .../TS2SkeletonLike.Import.js | 14 +- .../BridgeJSLinkTests/Throws.Export.js | 14 +- .../BridgeJSLinkTests/TypeAlias.Import.js | 14 +- .../TypeScriptClass.Import.js | 14 +- .../VoidParameterVoidReturn.Export.js | 14 +- .../VoidParameterVoidReturn.Import.js | 14 +- .../ExportSwiftTests/SwiftClosure.json | 1048 ++++++++++++++ .../ExportSwiftTests/SwiftClosure.swift | 915 ++++++++++++ Plugins/PackageToJS/Templates/instantiate.js | 2 + .../JavaScriptKit/BridgeJSInstrincics.swift | 114 +- .../BridgeJS/Exporting-Swift-to-JavaScript.md | 1 + .../Exporting-Swift-Closure.md | 114 ++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 178 ++- .../Generated/BridgeJS.ExportSwift.swift | 1056 +++++++++++++- .../JavaScript/BridgeJS.ExportSwift.json | 1255 ++++++++++++++++- Tests/prelude.mjs | 195 +++ 50 files changed, 7683 insertions(+), 231 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 4cdc8a3bc..508894629 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -28,6 +28,7 @@ public class ExportSwift { private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() private let enumCodegen: EnumCodegen = EnumCodegen() + private lazy var closureCodegen = ClosureCodegen(moduleName: moduleName) public init(progress: ProgressReporting, moduleName: String) { self.progress = progress @@ -421,7 +422,26 @@ public class ExportSwift { for param in parameterClause.parameters { let resolvedType = self.parent.lookupType(for: param.type) - + if let type = resolvedType, case .closure(let signature) = type { + if signature.isAsync { + diagnose( + node: param.type, + message: "Async is not supported for Swift closures yet." + ) + continue + } + if signature.isThrows { + diagnose( + node: param.type, + message: "Throws is not supported for Swift closures yet." + ) + continue + } + } + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) + continue + } if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) continue @@ -1309,6 +1329,37 @@ public class ExportSwift { } func lookupType(for type: TypeSyntax) -> BridgeType? { + if let attributedType = type.as(AttributedTypeSyntax.self) { + return lookupType(for: attributedType.baseType) + } + + // (T1, T2, ...) -> R + if let functionType = type.as(FunctionTypeSyntax.self) { + var parameters: [BridgeType] = [] + for param in functionType.parameters { + guard let paramType = lookupType(for: param.type) else { + return nil + } + parameters.append(paramType) + } + + guard let returnType = lookupType(for: functionType.returnClause.type) else { + return nil + } + + let isAsync = functionType.effectSpecifiers?.asyncSpecifier != nil + let isThrows = functionType.effectSpecifiers?.throwsClause != nil + + return .closure( + ClosureSignature( + parameters: parameters, + returnType: returnType, + isAsync: isAsync, + isThrows: isThrows + ) + ) + } + // T? if let optionalType = type.as(OptionalTypeSyntax.self) { let wrappedType = optionalType.wrappedType @@ -1426,6 +1477,30 @@ public class ExportSwift { } decls.append(Self.prelude) + // Collect all unique closure signatures + var closureSignatures: Set = [] + for function in exportedFunctions { + collectClosureSignatures(from: function.parameters, into: &closureSignatures) + collectClosureSignatures(from: function.returnType, into: &closureSignatures) + } + for klass in exportedClasses { + if let constructor = klass.constructor { + collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) + } + for method in klass.methods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + for property in klass.properties { + collectClosureSignatures(from: property.type, into: &closureSignatures) + } + } + + for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { + decls.append(try closureCodegen.renderClosureHelper(signature: signature)) + decls.append(try closureCodegen.renderClosureInvokeHandler(signature: signature)) + } + for proto in exportedProtocols { decls.append(try renderProtocolWrapper(protocol: proto)) } @@ -1498,18 +1573,25 @@ public class ExportSwift { } let typeNameForIntrinsic: String + let liftingExpr: ExprSyntax + switch param.type { + case .closure(let signature): + typeNameForIntrinsic = param.type.swiftType + liftingExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: param.name))") case .optional(let wrappedType): typeNameForIntrinsic = "Optional<\(wrappedType.swiftType)>" + liftingExpr = ExprSyntax( + "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" + ) default: typeNameForIntrinsic = param.type.swiftType - } - - liftedParameterExprs.append( - ExprSyntax( + liftingExpr = ExprSyntax( "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" ) - ) + } + + liftedParameterExprs.append(liftingExpr) for (name, type) in zip(argumentsToLift, liftingInfo.parameters.map { $0.type }) { abiParameterSignatures.append((name, type)) } @@ -1660,7 +1742,11 @@ public class ExportSwift { return } - append("return ret.bridgeJSLowerReturn()") + if case .closure(let signature) = returnType { + append("return _BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(ret)") + } else { + append("return ret.bridgeJSLowerReturn()") + } } func render(abiName: String) -> DeclSyntax { @@ -1730,6 +1816,204 @@ public class ExportSwift { } } + private struct ClosureCodegen { + let moduleName: String + + func generateOptionalParameterLowering(signature: ClosureSignature) throws -> String { + var lines: [String] = [] + + for (index, paramType) in signature.parameters.enumerated() { + guard case .optional(let wrappedType) = paramType else { + continue + } + + let paramName = "param\(index)" + + // Use bridgeJSLowerParameterWithRetain for heap objects in escaping closures + // to ensure proper ownership transfer + if case .swiftHeapObject = wrappedType { + lines.append( + "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithRetain()" + ) + } else { + lines.append( + "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithPresence()" + ) + } + } + + return lines.isEmpty ? "" : lines.joined(separator: "\n") + "\n" + } + + func renderClosureHelper(signature: ClosureSignature) throws -> DeclSyntax { + let mangledName = signature.mangleName + let helperName = "_BJS_Closure_\(mangledName)" + let boxClassName = "_BJS_ClosureBox_\(mangledName)" + + let closureParams = signature.parameters.enumerated().map { index, type in + "\(type.swiftType)" + }.joined(separator: ", ") + + let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + let swiftReturnType = signature.returnType.swiftType + let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + + var invokeParams: [(name: String, type: String)] = [("_", "Int32")] + var invokeCallArgs: [String] = ["owner.callbackId"] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + + if case .optional(let wrappedType) = paramType { + invokeParams.append(("_", "Int32")) + + switch wrappedType { + case .swiftHeapObject: + invokeParams.append(("_", "UnsafeMutableRawPointer")) + case .string, .rawValueEnum(_, .string): + invokeParams.append(("_", "Int32")) + default: + let lowerInfo = try wrappedType.loweringReturnInfo() + if let wasmType = lowerInfo.returnType { + invokeParams.append(("_", wasmType.swiftType)) + } else { + invokeParams.append(("_", "Int32")) + } + } + + invokeCallArgs.append("\(paramName)IsSome") + invokeCallArgs.append("\(paramName)Value") + } else { + let lowerInfo = try paramType.loweringReturnInfo() + if let wasmType = lowerInfo.returnType { + invokeParams.append(("_", wasmType.swiftType)) + invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") + } else { + invokeParams.append(("_", "Int32")) + invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") + } + } + } + + let invokeSignature = invokeParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") + let invokeReturnType: String + if case .optional = signature.returnType { + invokeReturnType = "Void" + } else if let wasmType = try signature.returnType.liftingReturnInfo(context: .exportSwift).valueToLift { + invokeReturnType = wasmType.swiftType + } else { + invokeReturnType = "Void" + } + + let returnLifting: String + if signature.returnType == .void { + returnLifting = "_invoke(\(invokeCallArgs.joined(separator: ", ")))" + } else if case .optional = signature.returnType { + returnLifting = """ + _invoke(\(invokeCallArgs.joined(separator: ", "))) + return \(signature.returnType.swiftType).bridgeJSLiftReturnFromSideChannel() + """ + } else { + returnLifting = """ + let resultId = _invoke(\(invokeCallArgs.joined(separator: ", "))) + return \(signature.returnType.swiftType).bridgeJSLiftReturn(resultId) + """ + } + + let externName = "invoke_js_callback_\(mangledName.lowercased())" + let optionalLoweringCode = try generateOptionalParameterLowering(signature: signature) + + return """ + private final class \(raw: boxClassName): _BridgedSwiftClosureBox { + let closure: \(raw: closureType) + init(_ closure: @escaping \(raw: closureType)) { + self.closure = closure + } + } + + private enum \(raw: helperName) { + static func bridgeJSLower(_ closure: @escaping \(raw: closureType)) -> UnsafeMutableRawPointer { + let box = \(raw: boxClassName)(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "\(raw: externName)") + func _invoke(\(raw: invokeSignature)) -> \(raw: invokeReturnType) + \(raw: optionalLoweringCode)\(raw: returnLifting) + #else + fatalError("Only available on WebAssembly") + #endif + } + } + } + """ + } + + func renderClosureInvokeHandler(signature: ClosureSignature) throws -> DeclSyntax { + let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" + let abiName = "invoke_swift_closure_\(signature.mangleName.lowercased())" + + var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")] + var liftedParams: [String] = [] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + let liftInfo = try paramType.liftParameterInfo() + + for (argName, wasmType) in liftInfo.parameters { + let fullName = + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + abiParams.append((fullName, wasmType.swiftType)) + } + + let argNames = liftInfo.parameters.map { (argName, _) in + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + } + liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") + } + + let paramSignature = abiParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") + let closureCall = "box.closure(\(liftedParams.joined(separator: ", ")))" + + let returnCode: String + if signature.returnType == .void { + returnCode = closureCall + } else { + returnCode = """ + let result = \(closureCall) + return result.bridgeJSLowerReturn() + """ + } + + let abiReturnType: String + if signature.returnType == .void { + abiReturnType = "Void" + } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { + abiReturnType = wasmType.swiftType + } else { + abiReturnType = "Void" + } + + return """ + @_expose(wasm, "\(raw: abiName)") + @_cdecl("\(raw: abiName)") + public func _\(raw: abiName)(\(raw: paramSignature)) -> \(raw: abiReturnType) { + #if arch(wasm32) + let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue() + \(raw: returnCode) + #else + fatalError("Only available on WebAssembly") + #endif + } + """ + } + + } + private struct EnumCodegen { func renderCaseEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName @@ -2187,6 +2471,29 @@ public class ExportSwift { return decls } + /// Collects all closure signatures from function parameters + private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { + for param in parameters { + collectClosureSignatures(from: param.type, into: &signatures) + } + } + + /// Collects all closure signatures from a bridge type + private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { + switch type { + case .closure(let signature): + signatures.insert(signature) + for paramType in signature.parameters { + collectClosureSignatures(from: paramType, into: &signatures) + } + collectClosureSignatures(from: signature.returnType, into: &signatures) + case .optional(let wrapped): + collectClosureSignatures(from: wrapped, into: &signatures) + default: + break + } + } + /// Generates a ConvertibleToJSValue extension for the exported class /// /// # Example @@ -2246,7 +2553,7 @@ public class ExportSwift { var externParams: [String] = ["this: Int32"] for param in method.parameters { - let loweringInfo = try param.type.loweringParameterInfo(context: .protocolExport) + let loweringInfo = try param.type.loweringParameterInfo(context: .exportSwift) for (paramName, wasmType) in loweringInfo.loweredParameters { let fullParamName = loweringInfo.loweredParameters.count > 1 @@ -2258,7 +2565,7 @@ public class ExportSwift { var preCallStatements: [String] = [] var callArgs: [String] = ["this: Int32(bitPattern: jsObject.id)"] for param in method.parameters { - let loweringInfo = try param.type.loweringParameterInfo(context: .protocolExport) + let loweringInfo = try param.type.loweringParameterInfo(context: .exportSwift) if case .optional = param.type, loweringInfo.loweredParameters.count > 1 { let isSomeName = "\(param.name)\(loweringInfo.loweredParameters[0].name.capitalizedFirstLetter)" let wrappedName = "\(param.name)\(loweringInfo.loweredParameters[1].name.capitalizedFirstLetter)" @@ -2287,7 +2594,7 @@ public class ExportSwift { } else { returnTypeStr = " -> \(method.returnType.swiftType)" let liftingInfo = try method.returnType.liftingReturnInfo( - context: .protocolExport + context: .exportSwift ) if case .optional = method.returnType { @@ -2371,30 +2678,8 @@ public class ExportSwift { className: protocolName ) - let usesSideChannel: Bool - if case .optional(let wrappedType) = property.type { - switch wrappedType { - case .string: - usesSideChannel = true - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - usesSideChannel = true - default: - usesSideChannel = true - } - case .int, .float, .double: - usesSideChannel = true - case .bool, .caseEnum, .associatedValueEnum, .swiftHeapObject: - usesSideChannel = false - default: - usesSideChannel = false - } - } else { - usesSideChannel = false - } - - let liftingInfo = try property.type.liftingReturnInfo(context: .protocolExport) + let usesSideChannel = property.type.usesSideChannelForOptionalReturn() + let liftingInfo = try property.type.liftingReturnInfo(context: .exportSwift) let getterReturnType: String let getterBody: String @@ -2430,7 +2715,7 @@ public class ExportSwift { } """ } else { - let loweringInfo = try property.type.loweringParameterInfo(context: .protocolExport) + let loweringInfo = try property.type.loweringParameterInfo(context: .exportSwift) let setterParams = (["this: Int32"] + loweringInfo.loweredParameters.map { "\($0.name): \($0.type.swiftType)" }).joined( @@ -2538,6 +2823,10 @@ extension BridgeType { case .rawValueEnum(let name, _): return name case .associatedValueEnum(let name): return name case .namespaceEnum(let name): return name + case .closure(let signature): + let paramTypes = signature.parameters.map { $0.swiftType }.joined(separator: ", ") + let effectsStr = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + return "(\(paramTypes))\(effectsStr) -> \(signature.returnType.swiftType)" } } @@ -2591,6 +2880,8 @@ extension BridgeType { return .associatedValueEnum case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") + case .closure: + return LiftingIntrinsicInfo(parameters: [("callbackId", .i32)]) } } @@ -2641,6 +2932,9 @@ extension BridgeType { return .associatedValueEnum case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") + case .closure: + // Closures are returned as UnsafeMutableRawPointer (box pointer) + return .swiftHeapObject } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 4589817d1..af4a59c97 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -433,6 +433,8 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .void: return .void + case .closure: + throw BridgeJSCoreError("Closure types are not yet supported in TypeScript imports") case .swiftHeapObject(let className): switch context { case .importTS: @@ -442,7 +444,7 @@ extension BridgeType { Swift classes can only be used in @JS protocols where Swift owns the instance. """ ) - case .protocolExport: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) } case .swiftProtocol: @@ -451,14 +453,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("value", .i32)]) } case .rawValueEnum(_, let rawType): switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) } @@ -466,7 +468,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("caseId", .i32)]) } case .namespaceEnum: @@ -475,7 +477,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) var params = [("isSome", WasmCoreType.i32)] params.append(contentsOf: wrappedInfo.loweredParameters) @@ -507,6 +509,8 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .void: return .void + case .closure: + throw BridgeJSCoreError("Closure types are not yet supported in TypeScript imports") case .swiftHeapObject(let className): switch context { case .importTS: @@ -516,7 +520,7 @@ extension BridgeType { JavaScript cannot create Swift heap objects. """ ) - case .protocolExport: + case .exportSwift: return LiftingReturnInfo(valueToLift: .pointer) } case .swiftProtocol: @@ -525,14 +529,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: return LiftingReturnInfo(valueToLift: .i32) } case .rawValueEnum(_, let rawType): switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) } @@ -540,7 +544,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: return LiftingReturnInfo(valueToLift: .i32) } case .namespaceEnum: @@ -549,7 +553,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .protocolExport: + case .exportSwift: let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 6abfd3057..eef3f31d8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -368,9 +368,53 @@ struct BridgeJSLink { declarations.append("const enumHelpers = {};") } + declarations.append("") + declarations.append("let _exports = null;") + declarations.append("let bjs = null;") + return declarations } + /// Checks if a skeleton contains any closure types + private func hasClosureTypes(in skeleton: ExportedSkeleton) -> Bool { + for function in skeleton.functions { + if containsClosureType(in: function.parameters) || containsClosureType(in: function.returnType) { + return true + } + } + for klass in skeleton.classes { + if let constructor = klass.constructor, containsClosureType(in: constructor.parameters) { + return true + } + for method in klass.methods { + if containsClosureType(in: method.parameters) || containsClosureType(in: method.returnType) { + return true + } + } + for property in klass.properties { + if containsClosureType(in: property.type) { + return true + } + } + } + return false + } + + private func containsClosureType(in parameters: [Parameter]) -> Bool { + parameters.contains { containsClosureType(in: $0.type) } + } + + private func containsClosureType(in type: BridgeType) -> Bool { + switch type { + case .closure: + return true + case .optional(let wrapped): + return containsClosureType(in: wrapped) + default: + return false + } + } + private func generateAddImports() -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() printer.write("return {") @@ -384,7 +428,7 @@ struct BridgeJSLink { printer.indent { printer.write(lines: [ - "const bjs = {};", + "bjs = {};", "importObject[\"bjs\"] = bjs;", "const imports = options.getImports(importsContext);", ]) @@ -644,11 +688,231 @@ struct BridgeJSLink { printer.write("return value;") } printer.write("}") + printer.write("bjs[\"swift_js_get_optional_heap_object_pointer\"] = function() {") + printer.indent { + printer.write("const pointer = \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;") + printer.write("return pointer || 0;") + } + printer.write("}") + + var closureSignatures: Set = [] + for skeleton in exportedSkeletons { + collectClosureSignatures(from: skeleton, into: &closureSignatures) + } + + var classToModule: [String: String] = [:] + for skeleton in exportedSkeletons { + for klass in skeleton.classes { + classToModule[klass.name] = skeleton.moduleName + } + } + + for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { + let invokeFuncName = "invoke_js_callback_\(signature.mangleName.lowercased())" + printer.write( + lines: generateInvokeFunction( + signature: signature, + functionName: invokeFuncName, + classToModule: classToModule + ) + ) + + let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())" + printer.write( + lines: generateLowerClosureFunction( + signature: signature, + functionName: lowerFuncName + ) + ) + } + + if !closureSignatures.isEmpty { + printer.nextLine() + printer.write("bjs[\"release_js_callback\"] = function(id) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(id);") + } + printer.write("};") + + printer.nextLine() + printer.write("bjs[\"release_swift_closure\"] = function(boxPtr) {") + printer.indent { + printer.write( + "\(JSGlueVariableScope.reservedInstance).exports._release_swift_closure(boxPtr);" + ) + } + printer.write("};") + } } } + return printer } + private func collectClosureSignatures(from skeleton: ExportedSkeleton, into signatures: inout Set) + { + for function in skeleton.functions { + collectClosureSignatures(from: function.parameters, into: &signatures) + collectClosureSignatures(from: function.returnType, into: &signatures) + } + for klass in skeleton.classes { + if let constructor = klass.constructor { + collectClosureSignatures(from: constructor.parameters, into: &signatures) + } + for method in klass.methods { + collectClosureSignatures(from: method.parameters, into: &signatures) + collectClosureSignatures(from: method.returnType, into: &signatures) + } + for property in klass.properties { + collectClosureSignatures(from: property.type, into: &signatures) + } + } + } + + private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { + for param in parameters { + collectClosureSignatures(from: param.type, into: &signatures) + } + } + + private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { + switch type { + case .closure(let signature): + signatures.insert(signature) + for paramType in signature.parameters { + collectClosureSignatures(from: paramType, into: &signatures) + } + collectClosureSignatures(from: signature.returnType, into: &signatures) + case .optional(let wrapped): + collectClosureSignatures(from: wrapped, into: &signatures) + default: + break + } + } + + private func generateInvokeFunction( + signature: ClosureSignature, + functionName: String, + classToModule: [String: String] + ) -> [String] { + let printer = CodeFragmentPrinter() + let scope = JSGlueVariableScope() + let cleanupCode = CodeFragmentPrinter() + + // Build parameter list for invoke function + var invokeParams: [String] = ["callbackId"] + for (index, paramType) in signature.parameters.enumerated() { + if case .optional = paramType { + invokeParams.append("param\(index)IsSome") + invokeParams.append("param\(index)Value") + } else { + invokeParams.append("param\(index)Id") + } + } + + printer.nextLine() + printer.write("bjs[\"\(functionName)\"] = function(\(invokeParams.joined(separator: ", "))) {") + printer.indent { + printer.write("try {") + printer.indent { + printer.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);") + + for (index, paramType) in signature.parameters.enumerated() { + let fragment = try! IntrinsicJSFragment.closureLiftParameter(type: paramType) + let args: [String] + if case .optional = paramType { + args = ["param\(index)IsSome", "param\(index)Value", "param\(index)"] + } else { + args = ["param\(index)Id", "param\(index)"] + } + _ = fragment.printCode(args, scope, printer, cleanupCode) + } + + let callbackParams = signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ") + printer.write("const result = callback(\(callbackParams));") + + // Type check if needed (for example, formatName requires string return) + switch signature.returnType { + case .string: + printer.write("if (typeof result !== \"string\") {") + printer.indent { + printer.write("throw new TypeError(\"Callback must return a string\");") + } + printer.write("}") + default: + break + } + + let returnFragment = try! IntrinsicJSFragment.closureLowerReturn(type: signature.returnType) + _ = returnFragment.printCode(["result"], scope, printer, cleanupCode) + } + printer.write("} catch (error) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") + let errorFragment = IntrinsicJSFragment.closureErrorReturn(type: signature.returnType) + _ = errorFragment.printCode([], scope, printer, cleanupCode) + } + printer.write("}") + } + printer.write("};") + + return printer.lines + } + + /// Generates a lower_closure_* function that wraps a Swift closure for JavaScript + private func generateLowerClosureFunction( + signature: ClosureSignature, + functionName: String + ) -> [String] { + let printer = CodeFragmentPrinter() + let scope = JSGlueVariableScope() + let cleanupCode = CodeFragmentPrinter() + + printer.nextLine() + printer.write("bjs[\"\(functionName)\"] = function(closurePtr) {") + printer.indent { + printer.write( + "return function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" + ) + printer.indent { + printer.write("try {") + printer.indent { + var invokeArgs: [String] = ["closurePtr"] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + let fragment = try! IntrinsicJSFragment.lowerParameter(type: paramType) + let lowered = fragment.printCode([paramName], scope, printer, cleanupCode) + invokeArgs.append(contentsOf: lowered) + } + + // Call the Swift invoke function + let invokeCall = + "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.mangleName.lowercased())(\(invokeArgs.joined(separator: ", ")))" + + let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) + _ = returnFragment.printCode([invokeCall], scope, printer, cleanupCode) + } + printer.write("} catch (error) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") + switch signature.returnType { + case .void: + printer.write("return;") + default: + printer.write("throw error;") + } + } + printer.write("}") + } + printer.write("};") + } + printer.write("};") + + return printer.lines + } + private func generateTypeScript(data: LinkData) -> String { let header = """ // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, @@ -988,36 +1252,29 @@ struct BridgeJSLink { } /// Generates JavaScript code for assigning namespaced items to globalThis - private func generateNamespacePropertyAssignments(data: LinkData, hasAnyNamespacedItems: Bool) -> [String] { + private func generateNamespacePropertyAssignments( + data: LinkData, + hasAnyNamespacedItems: Bool + ) -> [String] { let printer = CodeFragmentPrinter() - printer.write(lines: data.enumStaticAssignments) - + printer.write("const exports = {") + printer.indent() + printer.write(lines: data.exportsLines.map { "\($0)" }) + printer.unindent() + printer.write("};") + printer.write("_exports = exports;") if hasAnyNamespacedItems { - printer.write("const exports = {") - printer.indent() - printer.write(lines: data.exportsLines.map { "\($0)" }) - printer.unindent() - printer.write("};") - data.namespacedClasses.forEach { klass in let namespacePath: String = klass.namespace?.joined(separator: ".") ?? "" printer.write("globalThis.\(namespacePath).\(klass.name) = exports.\(klass.name);") } - data.namespacedFunctions.forEach { function in let namespacePath: String = function.namespace?.joined(separator: ".") ?? "" printer.write("globalThis.\(namespacePath).\(function.name) = exports.\(function.name);") } - - printer.write("return exports;") - } else { - printer.write("return {") - printer.indent() - printer.write(lines: data.exportsLines.map { "\($0)" }) - printer.unindent() - printer.write("};") } + printer.write("return exports;") return printer.lines } @@ -2017,41 +2274,20 @@ extension BridgeJSLink { } func callPropertyGetter(name: String, returnType: BridgeType) throws -> String? { - if context == .protocolExport, case .optional(let wrappedType) = returnType { - let usesSideChannel: Bool - switch wrappedType { - case .string, .int, .float, .double, .jsObject, .swiftProtocol: - usesSideChannel = true - case .rawValueEnum: - usesSideChannel = true - case .bool, .caseEnum, .swiftHeapObject, .associatedValueEnum: - usesSideChannel = false - default: - usesSideChannel = false + if context == .exportSwift, returnType.usesSideChannelForOptionalReturn() { + guard case .optional(let wrappedType) = returnType else { + fatalError("usesSideChannelForOptionalReturn returned true for non-optional type") } - if usesSideChannel { - let resultVar = scope.variable("ret") - body.write( - "let \(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name);" - ) + let resultVar = scope.variable("ret") + body.write( + "let \(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name);" + ) - switch wrappedType { - case .string, .rawValueEnum(_, .string): - body.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(resultVar);") - case .int, .rawValueEnum(_, .int): - body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(resultVar);") - case .float, .rawValueEnum(_, .float): - body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(resultVar);") - case .double, .rawValueEnum(_, .double): - body.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(resultVar);") - case .jsObject, .swiftProtocol: - body.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(resultVar);") - default: - break - } - return nil // Side-channel types return nil (no direct return value) - } + let fragment = try IntrinsicJSFragment.protocolPropertyOptionalToSideChannel(wrappedType: wrappedType) + _ = fragment.printCode([resultVar], scope, body, cleanupCode) + + return nil // Side-channel types return nil (no direct return value) } return try call( @@ -2539,7 +2775,7 @@ extension BridgeJSLink { className: `protocol`.name ) - let getterThunkBuilder = ImportedThunkBuilder(context: .protocolExport) + let getterThunkBuilder = ImportedThunkBuilder(context: .exportSwift) getterThunkBuilder.liftSelf() let returnExpr = try getterThunkBuilder.callPropertyGetter(name: property.name, returnType: property.type) let getterLines = getterThunkBuilder.renderFunction( @@ -2557,7 +2793,7 @@ extension BridgeJSLink { operation: "set", className: `protocol`.name ) - let setterThunkBuilder = ImportedThunkBuilder(context: .protocolExport) + let setterThunkBuilder = ImportedThunkBuilder(context: .exportSwift) setterThunkBuilder.liftSelf() try setterThunkBuilder.liftParameter( param: Parameter(label: nil, name: "value", type: property.type) @@ -2577,7 +2813,7 @@ extension BridgeJSLink { protocol: ExportedProtocol, method: ExportedFunction ) throws { - let thunkBuilder = ImportedThunkBuilder(context: .protocolExport) + let thunkBuilder = ImportedThunkBuilder(context: .exportSwift) thunkBuilder.liftSelf() for param in method.parameters { try thunkBuilder.liftParameter(param: param) @@ -2627,6 +2863,11 @@ extension BridgeType { return name case .swiftProtocol(let name): return name + case .closure(let signature): + let paramTypes = signature.parameters.enumerated().map { index, param in + "arg\(index): \(param.tsType)" + }.joined(separator: ", ") + return "(\(paramTypes)) => \(signature.returnType.tsType)" } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9cdf9d72b..6ba378de5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -411,7 +411,10 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLiftReturn(wrappedType: BridgeType) -> IntrinsicJSFragment { + static func optionalLiftReturn( + wrappedType: BridgeType, + context: BridgeContext = .exportSwift + ) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanupCode in @@ -441,8 +444,12 @@ struct IntrinsicJSFragment: Sendable { "const \(pointerVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);" ) printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;") + let constructExpr = + context == .exportSwift + ? "\(className).__construct(\(pointerVar))" + : "_exports['\(className)'].__construct(\(pointerVar))" printer.write( - "const \(resultVar) = \(pointerVar) === null ? null : \(className).__construct(\(pointerVar));" + "const \(resultVar) = \(pointerVar) === null ? null : \(constructExpr);" ) case .caseEnum: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") @@ -498,7 +505,7 @@ struct IntrinsicJSFragment: Sendable { static func optionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { switch wrappedType { - case .void, .optional, .namespaceEnum: + case .void, .optional, .namespaceEnum, .closure: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") default: break } @@ -618,6 +625,617 @@ struct IntrinsicJSFragment: Sendable { ) } + // MARK: - Protocol Support + + static func protocolPropertyOptionalToSideChannel(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + switch wrappedType { + case .string, .int, .float, .double, .jsObject, .swiftProtocol: + break + case .rawValueEnum(_, let rawType): + switch rawType { + case .string, .int, .float, .double: + break + default: + throw BridgeJSLinkError( + message: "Unsupported raw value enum type for protocol property side channel: \(rawType)" + ) + } + default: + throw BridgeJSLinkError( + message: "Type \(wrappedType) does not use side channel for protocol property returns" + ) + } + + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + + switch wrappedType { + case .string, .rawValueEnum(_, .string): + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") + case .int, .rawValueEnum(_, .int): + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(value);") + case .float, .rawValueEnum(_, .float): + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(value);") + case .double, .rawValueEnum(_, .double): + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(value);") + case .jsObject, .swiftProtocol: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") + default: + fatalError("Unsupported type in protocolPropertyOptionalToSideChannel: \(wrappedType)") + } + + return [] + } + ) + } + + // MARK: - Closure Support + + /// Lifts a WASM parameter to JS for passing to a JS callback (invoke_js_callback_*) + static func closureLiftParameter(type: BridgeType) throws -> IntrinsicJSFragment { + switch type { + case .int, .float, .double, .caseEnum: + return IntrinsicJSFragment( + parameters: ["value", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("let \(arguments[1]) = \(arguments[0]);") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["value", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLiftParameter + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("let \(arguments[1]) = \(lifted[0]);") + return [] + } + ) + case .string: + return IntrinsicJSFragment( + parameters: ["objectId", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = stringLiftParameter + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("let \(arguments[1]) = String(\(lifted[0]));") + return [] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: ["objectId", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = stringLiftParameter + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("let \(arguments[1]) = String(\(lifted[0]));") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["value", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLiftParameter + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("let \(arguments[1]) = \(lifted[0]);") + return [] + } + ) + default: + return IntrinsicJSFragment( + parameters: ["value", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("let \(arguments[1]) = \(arguments[0]);") + return [] + } + ) + } + case .jsObject: + return IntrinsicJSFragment( + parameters: ["objectId", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let objectId = arguments[0] + let targetVar = arguments[1] + printer.write( + "let \(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") + return [] + } + ) + case .swiftHeapObject(let name): + return IntrinsicJSFragment( + parameters: ["pointer", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let pointer = arguments[0] + let targetVar = arguments[1] + printer.write("let \(targetVar) = _exports['\(name)'].__construct(\(pointer));") + return [] + } + ) + case .associatedValueEnum(let fullName): + return IntrinsicJSFragment( + parameters: ["caseId", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let caseId = arguments[0] + let targetVar = arguments[1] + let base = fullName.components(separatedBy: ".").last ?? fullName + printer.write( + "let \(targetVar) = enumHelpers.\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + return [] + } + ) + case .optional(let wrappedType): + return try closureOptionalLiftParameter(wrappedType: wrappedType) + default: + throw BridgeJSLinkError(message: "Unsupported closure parameter type for lifting: \(type)") + } + } + + /// Handles optional parameter lifting for closure invocation + private static func closureOptionalLiftParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + switch wrappedType { + case .string, .rawValueEnum, .int, .bool, .double, .float, .jsObject, .swiftHeapObject, .caseEnum, + .associatedValueEnum: + break + default: + throw BridgeJSLinkError( + message: "Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)" + ) + } + + return IntrinsicJSFragment( + parameters: ["isSome", "value", "targetVar"], + printCode: { arguments, scope, printer, cleanupCode in + let isSome = arguments[0] + let value = arguments[1] + let targetVar = arguments[2] + + printer.write("let \(targetVar);") + printer.write("if (\(isSome)) {") + printer.indent() + switch wrappedType { + case .string, .rawValueEnum(_, .string): + let objectLabel = scope.variable("\(targetVar)Object") + printer.write( + "const \(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") + printer.write("\(targetVar) = String(\(objectLabel));") + case .int: + printer.write("\(targetVar) = \(value) | 0;") + case .bool: + printer.write("\(targetVar) = \(value) !== 0;") + case .double: + printer.write("\(targetVar) = \(value);") + case .float: + printer.write("\(targetVar) = Math.fround(\(value));") + case .jsObject: + printer.write("\(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));") + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") + case .swiftHeapObject(let typeName): + printer.write("\(targetVar) = _exports['\(typeName)'].__construct(\(value));") + case .caseEnum: + printer.write("\(targetVar) = \(value);") + case .rawValueEnum(_, let rawType): + switch rawType { + case .bool: + printer.write("\(targetVar) = \(value) !== 0;") + default: + printer.write("\(targetVar) = \(value);") + } + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + printer.write( + "\(targetVar) = enumHelpers.\(base).raise(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + default: + fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") + } + printer.unindent() + printer.write("} else {") + printer.indent() + printer.write("\(targetVar) = null;") + printer.unindent() + printer.write("}") + + return [] + } + ) + } + + /// Lowers a JS return value to WASM for returning from callback (invoke_js_callback_*) + static func closureLowerReturn(type: BridgeType) throws -> IntrinsicJSFragment { + switch type { + case .void: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { _, _, printer, _ in + printer.write("return;") + return [] + } + ) + case .int, .caseEnum: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]) | 0;") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + case .float: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return Math.fround(\(arguments[0]));") + return [] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]);") + return [] + } + ) + case .string: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = stringLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + case .jsObject: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = jsObjectLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + case .swiftHeapObject: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = swiftHeapObjectLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = stringLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLowerReturn + let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lowered[0]);") + return [] + } + ) + default: + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]) | 0;") + return [] + } + ) + } + case .associatedValueEnum(let fullName): + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let result = arguments[0] + let base = fullName.components(separatedBy: ".").last ?? fullName + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("cleanup") + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(result));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + printer.write("return \(caseIdVar);") + return [] + } + ) + case .optional(let wrappedType): + return try closureOptionalLowerReturn(wrappedType: wrappedType) + default: + throw BridgeJSLinkError(message: "Unsupported closure return type for lowering: \(type)") + } + } + + /// Handles optional return lowering for closure invocation + private static func closureOptionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["result"], + printCode: { arguments, scope, printer, cleanupCode in + let result = arguments[0] + + switch wrappedType { + case .swiftHeapObject: + printer.write("return \(result) ? \(result).pointer : 0;") + case .string: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(result);") + printer.write("return;") + case .int: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") + printer.write("return;") + case .bool: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = \(result);") + printer.write("return;") + case .float: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(result);") + printer.write("return;") + case .double: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(result);") + printer.write("return;") + case .caseEnum: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") + printer.write("return;") + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(result);") + printer.write("return;") + case .bool: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = \(result);") + printer.write("return;") + case .float: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(result);") + printer.write("return;") + case .double: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(result);") + printer.write("return;") + default: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") + printer.write("return;") + } + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("cleanup") + printer.write("if (\(result)) {") + printer.indent() + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(result));" + ) + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(caseIdVar);") + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + printer.unindent() + printer.write("} else {") + printer.indent() + printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = null;") + printer.unindent() + printer.write("}") + printer.write("return;") + default: + fatalError("Unsupported optional wrapped type in closure return lowering: \(wrappedType)") + } + + return [] + } + ) + } + + /// Lifts a WASM return value to JS from Swift closure (lower_closure_*) + static func closureLiftReturn(type: BridgeType) throws -> IntrinsicJSFragment { + switch type { + case .void: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("\(arguments[0]);") + printer.write("return;") + return [] + } + ) + case .int, .caseEnum: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]) | 0;") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLiftReturn + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lifted[0]);") + return [] + } + ) + case .float, .double: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]);") + return [] + } + ) + case .string: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("const resultLen = \(arguments[0]);") + let baseFragment = stringLiftReturn + let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + printer.write("return \(lifted[0]);") + return [] + } + ) + case .jsObject: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("const resultId = \(arguments[0]);") + let baseFragment = jsObjectLiftReturn + let lifted = baseFragment.printCode(["resultId"], scope, printer, cleanupCode) + printer.write("return \(lifted[0]);") + return [] + } + ) + case .swiftHeapObject(let className): + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("const resultPtr = \(arguments[0]);") + printer.write("return _exports['\(className)'].__construct(resultPtr);") + return [] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("const resultLen = \(arguments[0]);") + let baseFragment = stringLiftReturn + let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + printer.write("return \(lifted[0]);") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + let baseFragment = boolLiftReturn + let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + printer.write("return \(lifted[0]);") + return [] + } + ) + default: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("return \(arguments[0]) | 0;") + return [] + } + ) + } + case .associatedValueEnum(let fullName): + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + printer.write("\(arguments[0]);") + let base = fullName.components(separatedBy: ".").last ?? fullName + let resultVar = scope.variable("result") + printer.write( + "const \(resultVar) = enumHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + printer.write("return \(resultVar);") + return [] + } + ) + case .optional(let wrappedType): + return try closureOptionalLiftReturn(wrappedType: wrappedType) + default: + throw BridgeJSLinkError(message: "Unsupported closure return type for lifting: \(type)") + } + } + + /// Handles optional return lifting for Swift closure returns + private static func closureOptionalLiftReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + let invokeCall = arguments[0] + printer.write("\(invokeCall);") + let baseFragment = optionalLiftReturn(wrappedType: wrappedType, context: .importTS) + let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + if !lifted.isEmpty { + printer.write("return \(lifted[0]);") + } + return [] + } + ) + } + + /// Provides appropriate default values for error cases in closure invocation + static func closureErrorReturn(type: BridgeType) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanupCode in + switch type { + case .void: + printer.write("return;") + case .string: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = new Uint8Array(0);") + printer.write("return 0;") + case .int, .bool, .caseEnum: + printer.write("return 0;") + case .float, .double: + printer.write("return 0.0;") + case .jsObject, .swiftHeapObject: + printer.write("return 0;") + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = new Uint8Array(0);") + printer.write("return 0;") + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: + printer.write("return 0;") + case .float, .double: + printer.write("return 0.0;") + } + case .associatedValueEnum: + printer.write("return;") + case .optional(let wrappedType): + switch wrappedType { + case .swiftHeapObject: + printer.write("return 0;") + default: + printer.write("return;") + } + default: + printer.write("return 0;") + } + + return [] + } + ) + } + // MARK: - ExportSwift /// Returns a fragment that lowers a JS value to Wasm core values for parameters @@ -641,6 +1259,18 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLowerParameter(enumBase: base) + case .closure: + return IntrinsicJSFragment( + parameters: ["closure"], + printCode: { arguments, scope, printer, cleanupCode in + let closure = arguments[0] + let callbackIdVar = scope.variable("callbackId") + printer.write( + "const \(callbackIdVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(closure));" + ) + return [callbackIdVar] + } + ) case .namespaceEnum(let string): throw BridgeJSLinkError(message: "Namespace enums are not supported to be passed as parameters: \(string)") } @@ -667,6 +1297,17 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLiftReturn(enumBase: base) + case .closure(let signature): + return IntrinsicJSFragment( + parameters: ["closurePtr"], + printCode: { arguments, scope, printer, cleanupCode in + let closurePtr = arguments[0] + let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())" + let resultVar = scope.variable("closure") + printer.write("const \(resultVar) = bjs[\"\(lowerFuncName)\"](\(closurePtr));") + return [resultVar] + } + ) case .namespaceEnum(let string): throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from functions: \(string)" @@ -689,7 +1330,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .protocolExport: + case .exportSwift: return .swiftHeapObjectLiftParameter(name) } case .swiftProtocol: return .jsObjectLiftParameter @@ -703,7 +1344,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .protocolExport: + case .exportSwift: return try .optionalLiftParameter(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -720,7 +1361,7 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be passed as parameters to imported JS functions: \(fullName)" ) - case .protocolExport: + case .exportSwift: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["caseId"], @@ -734,6 +1375,8 @@ struct IntrinsicJSFragment: Sendable { } ) } + case .closure: + throw BridgeJSLinkError(message: "Closure parameters not yet implemented for imported JS functions") case .namespaceEnum(let string): throw BridgeJSLinkError( message: @@ -755,7 +1398,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .protocolExport: + case .exportSwift: return .swiftHeapObjectLowerReturn } case .swiftProtocol: return .jsObjectLowerReturn @@ -766,8 +1409,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .protocolExport: - // Protocol exports support Optional - use side channel approach for return values + case .exportSwift: return try .optionalLowerReturn(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -784,9 +1426,11 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be returned from imported JS functions: \(fullName)" ) - case .protocolExport: + case .exportSwift: return associatedValueLowerReturn(fullName: fullName) } + case .closure: + throw BridgeJSLinkError(message: "Closure return values not yet implemented for imported JS functions") case .namespaceEnum(let string): throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from imported JS functions: \(string)" diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index c9a602751..325ace7b2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -70,10 +70,32 @@ public struct ABINameGenerator { /// Context for bridge operations that determines which types are valid public enum BridgeContext: Sendable { case importTS - case protocolExport + case exportSwift } -public enum BridgeType: Codable, Equatable, Sendable { +public struct ClosureSignature: Codable, Equatable, Hashable, Sendable { + public let parameters: [BridgeType] + public let returnType: BridgeType + public let isAsync: Bool + public let isThrows: Bool + public let mangleName: String + + public init(parameters: [BridgeType], returnType: BridgeType, isAsync: Bool = false, isThrows: Bool = false) { + self.parameters = parameters + self.returnType = returnType + self.isAsync = isAsync + self.isThrows = isThrows + + let paramPart = + parameters.isEmpty + ? "Void" + : parameters.map { $0.mangleTypeName }.joined(separator: "_") + let returnPart = returnType.mangleTypeName + self.mangleName = "\(paramPart)_To_\(returnPart)" + } +} + +public enum BridgeType: Codable, Equatable, Hashable, Sendable { case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void indirect case optional(BridgeType) case caseEnum(String) @@ -81,6 +103,7 @@ public enum BridgeType: Codable, Equatable, Sendable { case associatedValueEnum(String) case namespaceEnum(String) case swiftProtocol(String) + indirect case closure(ClosureSignature) } public enum WasmCoreType: String, Codable, Sendable { @@ -567,6 +590,9 @@ extension BridgeType { case .swiftProtocol: // Protocols pass JSObject IDs as Int32 return .i32 + case .closure: + // Closures pass callback ID as Int32 + return .i32 } } @@ -575,4 +601,56 @@ extension BridgeType { if case .optional = self { return true } return false } + + /// Generates a mangled name for use in closure type names + /// Examples: "String", "Int", "MyClass", "Bool" + public var mangleTypeName: String { + switch self { + case .int: return "Int" + case .float: return "Float" + case .double: return "Double" + case .string: return "String" + case .bool: return "Bool" + case .void: return "Void" + case .jsObject(let name): + return name ?? "JSObject" + case .swiftHeapObject(let name): + return name + case .optional(let wrapped): + return "Optional\(wrapped.mangleTypeName)" + case .caseEnum(let name), + .rawValueEnum(let name, _), + .associatedValueEnum(let name), + .namespaceEnum(let name): + return name + case .swiftProtocol(let name): + return name + case .closure(let signature): + return "Closure_\(signature.mangleName)" + } + } + + /// Determines if an optional type requires side-channel communication for protocol property returns + /// + /// Side channels are needed when the wrapped type cannot be directly returned via WASM, + /// or when we need to distinguish null from absent value for certain primitives. + public func usesSideChannelForOptionalReturn() -> Bool { + guard case .optional(let wrappedType) = self else { return false } + + switch wrappedType { + case .string, .int, .float, .double, .jsObject, .swiftProtocol: + return true + case .rawValueEnum(_, let rawType): + switch rawType { + case .string, .int, .float, .double: + return true + default: + return false + } + case .bool, .caseEnum, .swiftHeapObject, .associatedValueEnum: + return false + default: + return false + } + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift new file mode 100644 index 000000000..129f53b50 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift @@ -0,0 +1,75 @@ +import JavaScriptKit + +@JS public class Person { + public let name: String + + @JS public init(name: String) { + self.name = name + } +} + +@JS class TestProcessor { + private var transform: (String) -> String + + @JS init(transform: @escaping (String) -> String) { + self.transform = transform + } + + @JS func getTransform() -> (String) -> String + + @JS func processWithCustom(_ text: String, customTransform: (String) -> String) -> String + + @JS func printTogether( + person: Person, + name: String, + ratio: Double, + customTransform: (Person?, String?, Double?) -> String + ) -> String + + @JS func roundtrip(_ personClosure: (Person) -> String) -> (Person) -> String + @JS func roundtripOptional(_ personClosure: (Person?) -> String) -> (Person?) -> String + + @JS func processDirection(_ callback: (Direction) -> String) -> String + @JS func processTheme(_ callback: (Theme) -> String) -> String + @JS func processHttpStatus(_ callback: (HttpStatus) -> Int) -> Int + @JS func processAPIResult(_ callback: (APIResult) -> String) -> String + + @JS func makeDirectionChecker() -> (Direction) -> Bool + @JS func makeThemeValidator() -> (Theme) -> Bool + @JS func makeStatusCodeExtractor() -> (HttpStatus) -> Int + @JS func makeAPIResultHandler() -> (APIResult) -> String + + @JS func processOptionalDirection(_ callback: (Direction?) -> String) -> String + @JS func processOptionalTheme(_ callback: (Theme?) -> String) -> String + @JS func processOptionalAPIResult(_ callback: (APIResult?) -> String) -> String + @JS func makeOptionalDirectionFormatter() -> (Direction?) -> String +} + +@JS enum Direction { + case north + case south + case east + case west +} + +@JS enum Theme: String { + case light = "light" + case dark = "dark" + case auto = "auto" +} + +@JS enum HttpStatus: Int { + case ok = 200 + case notFound = 404 + case serverError = 500 + case unknown = -1 +} + +@JS enum APIResult { + case success(String) + case failure(Int) + case flag(Bool) + case rate(Float) + case precise(Double) + case info +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index c9485c396..227093668 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkArray"] = function bjs_checkArray(a) { try { @@ -207,8 +215,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index a763e45f5..372de6ec3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,7 +193,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { asyncReturnVoid: function bjs_asyncReturnVoid() { const ret = instance.exports.bjs_asyncReturnVoid(); const ret1 = swift.memory.getObject(ret); @@ -232,6 +240,8 @@ export async function createInstantiator(options, swift) { return ret1; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index b5537ddcb..873c9d697 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_asyncReturnVoid"] = function bjs_asyncReturnVoid() { try { @@ -251,8 +259,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index a2b070028..9f56215d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -32,13 +32,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -179,6 +182,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -340,7 +348,7 @@ export async function createInstantiator(options, swift) { } } } - return { + const exports = { DefaultGreeter, EmptyGreeter, ConstructorDefaults, @@ -422,6 +430,8 @@ export async function createInstantiator(options, swift) { }, Status: StatusValues, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index b6518d71f..658361df1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -510,13 +510,16 @@ export async function createInstantiator(options, swift) { let tmpParamF32s = []; let tmpParamF64s = []; const enumHelpers = {}; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -657,6 +660,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -826,6 +834,7 @@ export async function createInstantiator(options, swift) { NetworkingResult: NetworkingResultValues, APIOptionalResult: APIOptionalResultValues, }; + _exports = exports; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 04eda0631..526e2fc91 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -50,13 +50,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -197,6 +200,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -209,7 +217,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { setDirection: function bjs_setDirection(direction) { instance.exports.bjs_setDirection(direction); }, @@ -246,6 +254,8 @@ export async function createInstantiator(options, swift) { Status: StatusValues, PublicStatus: PublicStatusValues, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 9e645a67d..a788abf5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -70,13 +70,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -217,6 +220,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -333,6 +341,7 @@ export async function createInstantiator(options, swift) { Port: PortValues, SupportedMethod: SupportedMethodValues, }; + _exports = exports; globalThis.Utils.Converter = exports.Converter; globalThis.Networking.API.HTTPServer = exports.HTTPServer; globalThis.Networking.APIV2.Internal.TestServer = exports.TestServer; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 15b03a4b0..9daa221b2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -101,13 +101,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -248,6 +251,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -260,7 +268,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { setTheme: function bjs_setTheme(theme) { const themeBytes = textEncoder.encode(theme); const themeId = swift.memory.retain(themeBytes); @@ -483,6 +491,8 @@ export async function createInstantiator(options, swift) { Precision: PrecisionValues, Ratio: RatioValues, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 51921ddc3..6e5461190 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_returnAnimatable"] = function bjs_returnAnimatable() { try { @@ -213,8 +221,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index b6694c06b..9336edc6d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createArrayBuffer"] = function bjs_createArrayBuffer() { try { @@ -283,8 +291,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 3253d17d5..380f1a721 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createDatabaseConnection"] = function bjs_createDatabaseConnection(config) { try { @@ -317,8 +325,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 89dd90235..395b97f12 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -302,6 +310,7 @@ export async function createInstantiator(options, swift) { return ret; }, }; + _exports = exports; globalThis.__Swift.Foundation.Greeter = exports.Greeter; globalThis.Utils.Converters.Converter = exports.Converter; globalThis.__Swift.Foundation.UUID = exports.UUID; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 319556b90..f9c60e068 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -320,7 +328,7 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_OptionalPropertyHolder_optionalGreeter_set(this.pointer, +isSome, isSome ? value.pointer : 0); } } - return { + const exports = { Greeter, OptionalPropertyHolder, roundTripOptionalClass: function bjs_roundTripOptionalClass(value) { @@ -497,6 +505,8 @@ export async function createInstantiator(options, swift) { return optResult; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index 17e1a1e5f..c8bd621df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,11 +193,13 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { check: function bjs_check(a, b, c, d) { instance.exports.bjs_check(a, b, c, d); }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index e8d18b98e..32f5e36f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check(a, b) { try { @@ -193,8 +201,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index c7efcf0d7..605a13ea6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,7 +193,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { checkInt: function bjs_checkInt() { const ret = instance.exports.bjs_checkInt(); return ret; @@ -203,6 +211,8 @@ export async function createInstantiator(options, swift) { return ret !== 0; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 24fa28a0e..62122a832 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkNumber"] = function bjs_checkNumber() { try { @@ -204,8 +212,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index bc9748d8f..e37af60c9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -344,7 +352,7 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_PropertyHolder_observedProperty_set(this.pointer, value); } } - return { + const exports = { PropertyHolder, createPropertyHolder: function bjs_createPropertyHolder(intValue, floatValue, doubleValue, boolValue, stringValue, jsObject) { const stringValueBytes = textEncoder.encode(stringValue); @@ -360,6 +368,8 @@ export async function createInstantiator(options, swift) { return ret; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 2740c7c20..58f32ea96 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -91,13 +91,16 @@ export async function createInstantiator(options, swift) { let tmpParamF32s = []; let tmpParamF64s = []; const enumHelpers = {}; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -238,6 +241,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -653,7 +661,7 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_MyViewController_secondDelegate_set(this.pointer, +isSome, isSome ? swift.memory.retain(value) : 0); } } - return { + const exports = { Helper, MyViewController, Direction: DirectionValues, @@ -661,6 +669,8 @@ export async function createInstantiator(options, swift) { Result: ResultValues, Priority: PriorityValues, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 6fa84a4fc..14f114697 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -78,13 +78,16 @@ export async function createInstantiator(options, swift) { let tmpParamF32s = []; let tmpParamF64s = []; const enumHelpers = {}; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -225,6 +228,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -324,6 +332,7 @@ export async function createInstantiator(options, swift) { } }, }; + _exports = exports; globalThis.Utils.String.uppercase = exports.uppercase; return exports; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 29060b938..3577228e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -31,13 +31,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -178,6 +181,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -330,7 +338,7 @@ export async function createInstantiator(options, swift) { }, set: function(value) { instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_set(value); } }); - return { + const exports = { PropertyClass, PropertyEnum: { ...PropertyEnumValues, @@ -364,6 +372,8 @@ export async function createInstantiator(options, swift) { } }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index a9f4bcd7b..a668639d4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,7 +193,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { checkString: function bjs_checkString(a) { const aBytes = textEncoder.encode(a); const aId = swift.memory.retain(aBytes); @@ -202,6 +210,8 @@ export async function createInstantiator(options, swift) { return ret; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 4f6e1dae4..e13404bbf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString(a) { try { @@ -204,8 +212,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 2d9a848f9..f31ef1403 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,7 +193,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { checkString: function bjs_checkString() { instance.exports.bjs_checkString(); const ret = tmpRetString; @@ -193,6 +201,8 @@ export async function createInstantiator(options, swift) { return ret; }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index 80d4fcd90..ae86fd8f1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString() { try { @@ -195,8 +203,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 395057d81..9a5eec432 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -269,7 +277,7 @@ export async function createInstantiator(options, swift) { } } - return { + const exports = { Greeter, PublicGreeter, PackageGreeter, @@ -277,6 +285,8 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_takeGreeter(greeter.pointer); }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts new file mode 100644 index 000000000..942b18269 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts @@ -0,0 +1,100 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const DirectionValues: { + readonly North: 0; + readonly South: 1; + readonly East: 2; + readonly West: 3; +}; +export type DirectionTag = typeof DirectionValues[keyof typeof DirectionValues]; + +export const ThemeValues: { + readonly Light: "light"; + readonly Dark: "dark"; + readonly Auto: "auto"; +}; +export type ThemeTag = typeof ThemeValues[keyof typeof ThemeValues]; + +export const HttpStatusValues: { + readonly Ok: 200; + readonly NotFound: 404; + readonly ServerError: 500; + readonly Unknown: -1; +}; +export type HttpStatusTag = typeof HttpStatusValues[keyof typeof HttpStatusValues]; + +export const APIResultValues: { + readonly Tag: { + readonly Success: 0; + readonly Failure: 1; + readonly Flag: 2; + readonly Rate: 3; + readonly Precise: 4; + readonly Info: 5; + }; +}; + +export type APIResultTag = + { tag: typeof APIResultValues.Tag.Success; param0: string } | { tag: typeof APIResultValues.Tag.Failure; param0: number } | { tag: typeof APIResultValues.Tag.Flag; param0: boolean } | { tag: typeof APIResultValues.Tag.Rate; param0: number } | { tag: typeof APIResultValues.Tag.Precise; param0: number } | { tag: typeof APIResultValues.Tag.Info } + +export type DirectionObject = typeof DirectionValues; + +export type ThemeObject = typeof ThemeValues; + +export type HttpStatusObject = typeof HttpStatusValues; + +export type APIResultObject = typeof APIResultValues; + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Person extends SwiftHeapObject { +} +export interface TestProcessor extends SwiftHeapObject { + getTransform(): (arg0: string) => string; + processWithCustom(text: string, customTransform: (arg0: string) => string): string; + printTogether(person: Person, name: string, ratio: number, customTransform: (arg0: Person | null, arg1: string | null, arg2: number | null) => string): string; + roundtrip(personClosure: (arg0: Person) => string): (arg0: Person) => string; + roundtripOptional(personClosure: (arg0: Person | null) => string): (arg0: Person | null) => string; + processDirection(callback: (arg0: DirectionTag) => string): string; + processTheme(callback: (arg0: ThemeTag) => string): string; + processHttpStatus(callback: (arg0: HttpStatusTag) => number): number; + processAPIResult(callback: (arg0: APIResultTag) => string): string; + makeDirectionChecker(): (arg0: DirectionTag) => boolean; + makeThemeValidator(): (arg0: ThemeTag) => boolean; + makeStatusCodeExtractor(): (arg0: HttpStatusTag) => number; + makeAPIResultHandler(): (arg0: APIResultTag) => string; + processOptionalDirection(callback: (arg0: DirectionTag | null) => string): string; + processOptionalTheme(callback: (arg0: ThemeTag | null) => string): string; + processOptionalAPIResult(callback: (arg0: APIResultTag | null) => string): string; + makeOptionalDirectionFormatter(): (arg0: DirectionTag | null) => string; +} +export type Exports = { + Person: { + new(name: string): Person; + } + TestProcessor: { + new(transform: (arg0: string) => string): TestProcessor; + } + Direction: DirectionObject + Theme: ThemeObject + HttpStatus: HttpStatusObject + APIResult: APIResultObject +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js new file mode 100644 index 000000000..4d0a3ab29 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -0,0 +1,942 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const DirectionValues = { + North: 0, + South: 1, + East: 2, + West: 3, +}; + +export const ThemeValues = { + Light: "light", + Dark: "dark", + Auto: "auto", +}; + +export const HttpStatusValues = { + Ok: 200, + NotFound: 404, + ServerError: 500, + Unknown: -1, +}; + +export const APIResultValues = { + Tag: { + Success: 0, + Failure: 1, + Flag: 2, + Rate: 3, + Precise: 4, + Info: 5, + }, +}; + +const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + case APIResultValues.Tag.Flag: { + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Flag, cleanup }; + } + case APIResultValues.Tag.Rate: { + tmpParamF32s.push(Math.fround(value.param0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Rate, cleanup }; + } + case APIResultValues.Tag.Precise: { + tmpParamF64s.push(value.param0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Precise, cleanup }; + } + case APIResultValues.Tag.Info: { + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Info, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + const tag = tmpRetTag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + case APIResultValues.Tag.Flag: { + const bool = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Flag, param0: bool }; + } + case APIResultValues.Tag.Rate: { + const f32 = tmpRetF32s.pop(); + return { tag: APIResultValues.Tag.Rate, param0: f32 }; + } + case APIResultValues.Tag.Precise: { + const f64 = tmpRetF64s.pop(); + return { tag: APIResultValues.Tag.Precise, param0: f64 }; + } + case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); +}; +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + const enumHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + + bjs["invoke_js_callback_apiresult_to_string"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = enumHelpers.APIResult.raise(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_apiresult_to_string"] = function(closurePtr) { + return function(param0) { + try { + const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); + const resultLen = instance.exports.invoke_swift_closure_apiresult_to_string(closurePtr, param0CaseId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_direction_to_bool"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + return result ? 1 : 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + + bjs["lower_closure_direction_to_bool"] = function(closurePtr) { + return function(param0) { + try { + return instance.exports.invoke_swift_closure_direction_to_bool(closurePtr, param0) !== 0; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_direction_to_string"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_direction_to_string"] = function(closurePtr) { + return function(param0) { + try { + const resultLen = instance.exports.invoke_swift_closure_direction_to_string(closurePtr, param0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_httpstatus_to_int"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + return result | 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + + bjs["lower_closure_httpstatus_to_int"] = function(closurePtr) { + return function(param0) { + try { + return instance.exports.invoke_swift_closure_httpstatus_to_int(closurePtr, param0) | 0; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_optionalapiresult_to_string"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = enumHelpers.APIResult.raise(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + } else { + param0 = null; + } + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_optionalapiresult_to_string"] = function(closurePtr) { + return function(param0) { + try { + const isSome = param0 != null; + let param0CaseId, param0Cleanup; + if (isSome) { + const enumResult = enumHelpers.APIResult.lower(param0); + param0CaseId = enumResult.caseId; + param0Cleanup = enumResult.cleanup; + } + const resultLen = instance.exports.invoke_swift_closure_optionalapiresult_to_string(closurePtr, +isSome, isSome ? param0CaseId : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_optionaldirection_to_string"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = param0Value; + } else { + param0 = null; + } + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_optionaldirection_to_string"] = function(closurePtr) { + return function(param0) { + try { + const isSome = param0 != null; + const resultLen = instance.exports.invoke_swift_closure_optionaldirection_to_string(closurePtr, +isSome, isSome ? param0 : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_optionalperson_optionalstring_optionaldouble_to_string"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = _exports['Person'].__construct(param0Value); + } else { + param0 = null; + } + let param1; + if (param1IsSome) { + const param1Object = swift.memory.getObject(param1Value); + swift.memory.release(param1Value); + param1 = String(param1Object); + } else { + param1 = null; + } + let param2; + if (param2IsSome) { + param2 = param2Value; + } else { + param2 = null; + } + const result = callback(param0, param1, param2); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_optionalperson_optionalstring_optionaldouble_to_string"] = function(closurePtr) { + return function(param0, param1, param2) { + try { + const isSome = param0 != null; + const isSome1 = param1 != null; + let param1Id, param1Bytes; + if (isSome1) { + param1Bytes = textEncoder.encode(param1); + param1Id = swift.memory.retain(param1Bytes); + } + const isSome2 = param2 != null; + const resultLen = instance.exports.invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string(closurePtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_optionalperson_to_string"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = _exports['Person'].__construct(param0Value); + } else { + param0 = null; + } + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_optionalperson_to_string"] = function(closurePtr) { + return function(param0) { + try { + const isSome = param0 != null; + const resultLen = instance.exports.invoke_swift_closure_optionalperson_to_string(closurePtr, +isSome, isSome ? param0.pointer : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_optionaltheme_to_string"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + const param0Object = swift.memory.getObject(param0Value); + swift.memory.release(param0Value); + param0 = String(param0Object); + } else { + param0 = null; + } + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_optionaltheme_to_string"] = function(closurePtr) { + return function(param0) { + try { + const isSome = param0 != null; + let param0Id, param0Bytes; + if (isSome) { + param0Bytes = textEncoder.encode(param0); + param0Id = swift.memory.retain(param0Bytes); + } + const resultLen = instance.exports.invoke_swift_closure_optionaltheme_to_string(closurePtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_person_to_string"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = _exports['Person'].__construct(param0Id); + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_person_to_string"] = function(closurePtr) { + return function(param0) { + try { + const resultLen = instance.exports.invoke_swift_closure_person_to_string(closurePtr, param0.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_string_to_string"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_string_to_string"] = function(closurePtr) { + return function(param0) { + try { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const resultLen = instance.exports.invoke_swift_closure_string_to_string(closurePtr, param0Id, param0Bytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_theme_to_bool"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); + const result = callback(param0); + return result ? 1 : 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + + bjs["lower_closure_theme_to_bool"] = function(closurePtr) { + return function(param0) { + try { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + return instance.exports.invoke_swift_closure_theme_to_bool(closurePtr, param0Id, param0Bytes.length) !== 0; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["invoke_js_callback_theme_to_string"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); + const result = callback(param0); + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; + } catch (error) { + setException?.(error); + tmpRetBytes = new Uint8Array(0); + return 0; + } + }; + + bjs["lower_closure_theme_to_string"] = function(closurePtr) { + return function(param0) { + try { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const resultLen = instance.exports.invoke_swift_closure_theme_to_string(closurePtr, param0Id, param0Bytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + + bjs["release_js_callback"] = function(id) { + swift.memory.release(id); + }; + + bjs["release_swift_closure"] = function(boxPtr) { + instance.exports._release_swift_closure(boxPtr); + }; + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Person_wrap"] = function(pointer) { + const obj = Person.__construct(pointer); + return swift.memory.retain(obj); + }; + importObject["TestModule"]["bjs_TestProcessor_wrap"] = function(pointer) { + const obj = TestProcessor.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + enumHelpers.APIResult = APIResultHelpers; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Person extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Person_deinit, Person.prototype); + } + + constructor(name) { + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + const ret = instance.exports.bjs_Person_init(nameId, nameBytes.length); + swift.memory.release(nameId); + return Person.__construct(ret); + } + } + class TestProcessor extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestProcessor_deinit, TestProcessor.prototype); + } + + constructor(transform) { + const callbackId = swift.memory.retain(transform); + const ret = instance.exports.bjs_TestProcessor_init(callbackId); + return TestProcessor.__construct(ret); + } + getTransform() { + const ret = instance.exports.bjs_TestProcessor_getTransform(this.pointer); + const closure = bjs["lower_closure_string_to_string"](ret); + return closure; + } + processWithCustom(text, customTransform) { + const textBytes = textEncoder.encode(text); + const textId = swift.memory.retain(textBytes); + const callbackId = swift.memory.retain(customTransform); + instance.exports.bjs_TestProcessor_processWithCustom(this.pointer, textId, textBytes.length, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(textId); + return ret; + } + printTogether(person, name, ratio, customTransform) { + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + const callbackId = swift.memory.retain(customTransform); + instance.exports.bjs_TestProcessor_printTogether(this.pointer, person.pointer, nameId, nameBytes.length, ratio, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(nameId); + return ret; + } + roundtrip(personClosure) { + const callbackId = swift.memory.retain(personClosure); + const ret = instance.exports.bjs_TestProcessor_roundtrip(this.pointer, callbackId); + const closure = bjs["lower_closure_person_to_string"](ret); + return closure; + } + roundtripOptional(personClosure) { + const callbackId = swift.memory.retain(personClosure); + const ret = instance.exports.bjs_TestProcessor_roundtripOptional(this.pointer, callbackId); + const closure = bjs["lower_closure_optionalperson_to_string"](ret); + return closure; + } + processDirection(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processDirection(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + processTheme(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processTheme(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + processHttpStatus(callback) { + const callbackId = swift.memory.retain(callback); + const ret = instance.exports.bjs_TestProcessor_processHttpStatus(this.pointer, callbackId); + return ret; + } + processAPIResult(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processAPIResult(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + makeDirectionChecker() { + const ret = instance.exports.bjs_TestProcessor_makeDirectionChecker(this.pointer); + const closure = bjs["lower_closure_direction_to_bool"](ret); + return closure; + } + makeThemeValidator() { + const ret = instance.exports.bjs_TestProcessor_makeThemeValidator(this.pointer); + const closure = bjs["lower_closure_theme_to_bool"](ret); + return closure; + } + makeStatusCodeExtractor() { + const ret = instance.exports.bjs_TestProcessor_makeStatusCodeExtractor(this.pointer); + const closure = bjs["lower_closure_httpstatus_to_int"](ret); + return closure; + } + makeAPIResultHandler() { + const ret = instance.exports.bjs_TestProcessor_makeAPIResultHandler(this.pointer); + const closure = bjs["lower_closure_apiresult_to_string"](ret); + return closure; + } + processOptionalDirection(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processOptionalDirection(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + processOptionalTheme(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processOptionalTheme(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + processOptionalAPIResult(callback) { + const callbackId = swift.memory.retain(callback); + instance.exports.bjs_TestProcessor_processOptionalAPIResult(this.pointer, callbackId); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + makeOptionalDirectionFormatter() { + const ret = instance.exports.bjs_TestProcessor_makeOptionalDirectionFormatter(this.pointer); + const closure = bjs["lower_closure_optionaldirection_to_string"](ret); + return closure; + } + } + const exports = { + Person, + TestProcessor, + Direction: DirectionValues, + Theme: ThemeValues, + HttpStatus: HttpStatusValues, + APIResult: APIResultValues, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index a1d39cd28..4c3cbc213 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createTS2Skeleton"] = function bjs_createTS2Skeleton() { try { @@ -255,8 +263,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index f2e0bfc9c..059c93157 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,7 +193,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { throwsSomething: function bjs_throwsSomething() { instance.exports.bjs_throwsSomething(); if (tmpRetException) { @@ -196,6 +204,8 @@ export async function createInstantiator(options, swift) { } }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 7c4438b08..320609e1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkSimple"] = function bjs_checkSimple(a) { try { @@ -193,8 +201,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 49b0b3310..783884efb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_Greeter_init"] = function bjs_Greeter_init(name) { try { @@ -241,8 +249,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index a0f6f0dd4..b6d7a4ea3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } }, setInstance: (i) => { instance = i; @@ -185,11 +193,13 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { check: function bjs_check() { instance.exports.bjs_check(); }, }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index bd1d9bfba..627dd140c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -26,13 +26,16 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + + let _exports = null; + let bjs = null; return { /** * @param {WebAssembly.Imports} importObject */ addImports: (importObject, importsContext) => { - const bjs = {}; + bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { @@ -173,6 +176,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = undefined; return value; } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check() { try { @@ -193,8 +201,10 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - return { + const exports = { }; + _exports = exports; + return exports; }, } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json new file mode 100644 index 000000000..2354469c8 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -0,0 +1,1048 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Person_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "explicitAccessControl" : "public", + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + + ], + "swiftCallName" : "Person" + }, + { + "constructor" : { + "abiName" : "bjs_TestProcessor_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestProcessor_getTransform", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTransform", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processWithCustom", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processWithCustom", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_printTogether", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "printTogether", + "parameters" : [ + { + "label" : "person", + "name" : "person", + "type" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + }, + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "ratio", + "name" : "ratio", + "type" : { + "double" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalPerson_OptionalString_OptionalDouble_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + }, + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + }, + { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Person_To_String", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Person_To_String", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_roundtripOptional", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptional", + "parameters" : [ + { + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalPerson_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalPerson_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Direction_To_String", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Theme_To_String", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "HttpStatus_To_Int", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "APIResult_To_String", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeDirectionChecker", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDirectionChecker", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Direction_To_Bool", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeThemeValidator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeThemeValidator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Theme_To_Bool", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeStatusCodeExtractor", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStatusCodeExtractor", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "HttpStatus_To_Int", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeAPIResultHandler", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultHandler", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "APIResult_To_String", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalDirection_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalTheme_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalAPIResult_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeOptionalDirectionFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalDirectionFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalDirection_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "name" : "TestProcessor", + "properties" : [ + + ], + "swiftCallName" : "TestProcessor" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "const", + "name" : "Theme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Theme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + }, + { + "associatedValues" : [ + + ], + "name" : "unknown", + "rawValue" : "-1" + } + ], + "emitStyle" : "const", + "name" : "HttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "HttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ + { + "type" : { + "float" : { + + } + } + } + ], + "name" : "rate" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult" + } + ], + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift new file mode 100644 index 000000000..888dc5150 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -0,0 +1,915 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +private final class _BJS_ClosureBox_APIResult_To_String: _BridgedSwiftClosureBox { + let closure: (APIResult) -> String + init(_ closure: @escaping (APIResult) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_APIResult_To_String { + static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_APIResult_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_apiresult_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_apiresult_to_string") +@_cdecl("invoke_swift_closure_apiresult_to_string") +public func _invoke_swift_closure_apiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_APIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Direction_To_Bool: _BridgedSwiftClosureBox { + let closure: (Direction) -> Bool + init(_ closure: @escaping (Direction) -> Bool) { + self.closure = closure + } +} + +private enum _BJS_Closure_Direction_To_Bool { + static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Direction_To_Bool(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_bool") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_direction_to_bool") +@_cdecl("invoke_swift_closure_direction_to_bool") +public func _invoke_swift_closure_direction_to_bool(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Direction_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Direction_To_String: _BridgedSwiftClosureBox { + let closure: (Direction) -> String + init(_ closure: @escaping (Direction) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Direction_To_String { + static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Direction_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_direction_to_string") +@_cdecl("invoke_swift_closure_direction_to_string") +public func _invoke_swift_closure_direction_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Direction_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_HttpStatus_To_Int: _BridgedSwiftClosureBox { + let closure: (HttpStatus) -> Int + init(_ closure: @escaping (HttpStatus) -> Int) { + self.closure = closure + } +} + +private enum _BJS_Closure_HttpStatus_To_Int { + static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_HttpStatus_To_Int(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_httpstatus_to_int") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_httpstatus_to_int") +@_cdecl("invoke_swift_closure_httpstatus_to_int") +public func _invoke_swift_closure_httpstatus_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_HttpStatus_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalAPIResult_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalAPIResult_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalAPIResult_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalapiresult_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalapiresult_to_string") +@_cdecl("invoke_swift_closure_optionalapiresult_to_string") +public func _invoke_swift_closure_optionalapiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalAPIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalDirection_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalDirection_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalDirection_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaldirection_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionaldirection_to_string") +@_cdecl("invoke_swift_closure_optionaldirection_to_string") +public func _invoke_swift_closure_optionaldirection_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalDirection_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String: _BridgedSwiftClosureBox { + let closure: (Optional, Optional, Optional) -> String + init(_ closure: @escaping (Optional, Optional, Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalPerson_OptionalString_OptionalDouble_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional, Optional, Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0, param1, param2 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalperson_optionalstring_optionaldouble_to_string") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let (param1IsSome, param1Value) = param1.bridgeJSLowerParameterWithPresence() +let (param2IsSome, param2Value) = param2.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string") +@_cdecl("invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string") +public func _invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer, param1IsSome: Int32, param1Bytes: Int32, param1Length: Int32, param2IsSome: Int32, param2Value: Float64) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalPerson_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalPerson_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalPerson_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalperson_to_string") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalperson_to_string") +@_cdecl("invoke_swift_closure_optionalperson_to_string") +public func _invoke_swift_closure_optionalperson_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalPerson_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalTheme_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalTheme_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalTheme_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaltheme_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionaltheme_to_string") +@_cdecl("invoke_swift_closure_optionaltheme_to_string") +public func _invoke_swift_closure_optionaltheme_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalTheme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Person_To_String: _BridgedSwiftClosureBox { + let closure: (Person) -> String + init(_ closure: @escaping (Person) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Person_To_String { + static func bridgeJSLower(_ closure: @escaping (Person) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Person_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_person_to_string") + func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_person_to_string") +@_cdecl("invoke_swift_closure_person_to_string") +public func _invoke_swift_closure_person_to_string(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Person_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Person.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_String_To_String: _BridgedSwiftClosureBox { + let closure: (String) -> String + init(_ closure: @escaping (String) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_String_To_String { + static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_String_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_string_to_string") +@_cdecl("invoke_swift_closure_string_to_string") +public func _invoke_swift_closure_string_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_String_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Theme_To_Bool: _BridgedSwiftClosureBox { + let closure: (Theme) -> Bool + init(_ closure: @escaping (Theme) -> Bool) { + self.closure = closure + } +} + +private enum _BJS_Closure_Theme_To_Bool { + static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Theme_To_Bool(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_bool") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_theme_to_bool") +@_cdecl("invoke_swift_closure_theme_to_bool") +public func _invoke_swift_closure_theme_to_bool(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Theme_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Theme_To_String: _BridgedSwiftClosureBox { + let closure: (Theme) -> String + init(_ closure: @escaping (Theme) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Theme_To_String { + static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Theme_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_theme_to_string") +@_cdecl("invoke_swift_closure_theme_to_string") +public func _invoke_swift_closure_theme_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Theme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Direction: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction { + return Direction(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .north + case 1: + self = .south + case 2: + self = .east + case 3: + self = .west + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .north: + return 0 + case .south: + return 1 + case .east: + return 2 + case .west: + return 3 + } + } +} + +extension Theme: _BridgedSwiftEnumNoPayload { +} + +extension HttpStatus: _BridgedSwiftEnumNoPayload { +} + +extension APIResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + switch caseId { + case 0: + return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + case 1: + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + case 2: + return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + case 3: + return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())) + case 4: + return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + case 5: + return .info + default: + fatalError("Unknown APIResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + case .flag(let param0): + _swift_js_push_int(param0 ? 1 : 0) + return Int32(2) + case .rate(let param0): + _swift_js_push_f32(param0) + return Int32(3) + case .precise(let param0): + _swift_js_push_f64(param0) + return Int32(4) + case .info: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .success(let param0): + _swift_js_push_tag(Int32(0)) + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + case .failure(let param0): + _swift_js_push_tag(Int32(1)) + _swift_js_push_int(Int32(param0)) + case .flag(let param0): + _swift_js_push_tag(Int32(2)) + _swift_js_push_int(param0 ? 1 : 0) + case .rate(let param0): + _swift_js_push_tag(Int32(3)) + _swift_js_push_f32(param0) + case .precise(let param0): + _swift_js_push_tag(Int32(4)) + _swift_js_push_f64(param0) + case .info: + _swift_js_push_tag(Int32(5)) + } + } +} + +@_expose(wasm, "bjs_Person_init") +@_cdecl("bjs_Person_init") +public func _bjs_Person_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Person(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Person_deinit") +@_cdecl("bjs_Person_deinit") +public func _bjs_Person_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { + public var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") + func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_Person_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_TestProcessor_init") +@_cdecl("bjs_TestProcessor_init") +public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor(transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_getTransform") +@_cdecl("bjs_TestProcessor_getTransform") +public func _bjs_TestProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).getTransform() + return _BJS_Closure_String_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processWithCustom") +@_cdecl("bjs_TestProcessor_processWithCustom") +public func _bjs_TestProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_String_To_String.bridgeJSLift(customTransform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_printTogether") +@_cdecl("bjs_TestProcessor_printTogether") +public func _bjs_TestProcessor_printTogether(_self: UnsafeMutableRawPointer, person: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32, ratio: Float64, customTransform: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).printTogether(person: Person.bridgeJSLiftParameter(person), name: String.bridgeJSLiftParameter(nameBytes, nameLength), ratio: Double.bridgeJSLiftParameter(ratio), customTransform: _BJS_Closure_OptionalPerson_OptionalString_OptionalDouble_To_String.bridgeJSLift(customTransform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_roundtrip") +@_cdecl("bjs_TestProcessor_roundtrip") +public func _bjs_TestProcessor_roundtrip(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_Person_To_String.bridgeJSLift(personClosure)) + return _BJS_Closure_Person_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_roundtripOptional") +@_cdecl("bjs_TestProcessor_roundtripOptional") +public func _bjs_TestProcessor_roundtripOptional(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_OptionalPerson_To_String.bridgeJSLift(personClosure)) + return _BJS_Closure_OptionalPerson_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processDirection") +@_cdecl("bjs_TestProcessor_processDirection") +public func _bjs_TestProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_Direction_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processTheme") +@_cdecl("bjs_TestProcessor_processTheme") +public func _bjs_TestProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_Theme_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processHttpStatus") +@_cdecl("bjs_TestProcessor_processHttpStatus") +public func _bjs_TestProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_HttpStatus_To_Int.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processAPIResult") +@_cdecl("bjs_TestProcessor_processAPIResult") +public func _bjs_TestProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_APIResult_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_makeDirectionChecker") +@_cdecl("bjs_TestProcessor_makeDirectionChecker") +public func _bjs_TestProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() + return _BJS_Closure_Direction_To_Bool.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_makeThemeValidator") +@_cdecl("bjs_TestProcessor_makeThemeValidator") +public func _bjs_TestProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() + return _BJS_Closure_Theme_To_Bool.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_makeStatusCodeExtractor") +@_cdecl("bjs_TestProcessor_makeStatusCodeExtractor") +public func _bjs_TestProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() + return _BJS_Closure_HttpStatus_To_Int.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_makeAPIResultHandler") +@_cdecl("bjs_TestProcessor_makeAPIResultHandler") +public func _bjs_TestProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() + return _BJS_Closure_APIResult_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processOptionalDirection") +@_cdecl("bjs_TestProcessor_processOptionalDirection") +public func _bjs_TestProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_OptionalDirection_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processOptionalTheme") +@_cdecl("bjs_TestProcessor_processOptionalTheme") +public func _bjs_TestProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_OptionalTheme_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_processOptionalAPIResult") +@_cdecl("bjs_TestProcessor_processOptionalAPIResult") +public func _bjs_TestProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_OptionalAPIResult_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_makeOptionalDirectionFormatter") +@_cdecl("bjs_TestProcessor_makeOptionalDirectionFormatter") +public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() + return _BJS_Closure_OptionalDirection_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestProcessor_deinit") +@_cdecl("bjs_TestProcessor_deinit") +public func _bjs_TestProcessor_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension TestProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_TestProcessor_wrap") + func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_TestProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 5d74cc7eb..dca50d086 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -61,6 +61,8 @@ async function createInstantiator(options, swift) { swift_js_get_optional_float_value: unexpectedBjsCall, swift_js_get_optional_double_presence: unexpectedBjsCall, swift_js_get_optional_double_value: unexpectedBjsCall, + swift_js_get_optional_heap_object_pointer: unexpectedBjsCall, + release_js_callback: unexpectedBjsCall, } }, /** @param {WebAssembly.Instance} instance */ diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index 9c97583cb..5b160f779 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -29,6 +29,48 @@ import _CJavaScriptKit } #endif +// MARK: Closure Callback Management + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "release_js_callback") +@_spi(BridgeJS) public func _swift_js_release_callback(_ id: Int32) +#else +/// Releases a JavaScript callback registered from JavaScript side. +/// +/// This function is called by BridgeJS-generated code after consuming a closure +/// parameter to ensure the JavaScript callback is properly cleaned up and can be +/// garbage collected. +/// +/// - Parameter id: The callback ID to release +@_spi(BridgeJS) public func _swift_js_release_callback(_ id: Int32) { + _onlyAvailableOnWasm() +} +#endif + +/// Owns a JavaScript callback and automatically releases it on deinit. +/// This ensures the callback lives exactly as long as the Swift closure that uses it. +/// +/// When a JavaScript function is passed to Swift as a closure parameter, the callback +/// is stored in `swift.memory` with an ID. This owner class captures that ID and ensures +/// it's released when the Swift closure is deallocated, preventing memory leaks while +/// supporting both @escaping and non-escaping closures. +@_spi(BridgeJS) public final class _JSCallbackOwner { + public let callbackId: Int32 + private var isReleased: Bool = false + + public init(callbackId: Int32) { + self.callbackId = callbackId + } + + deinit { + guard !isReleased else { return } + #if arch(wasm32) + _swift_js_release_callback(callbackId) + #endif + isReleased = true + } +} + /// Retrieves and clears any pending JavaScript exception. /// /// This function checks for any JavaScript exceptions that were thrown during @@ -78,7 +120,8 @@ import _CJavaScriptKit // - `func bridgeJSLowerReturn() -> <#WasmCoreType#>`: lower the given higher-level return value to a Wasm core type // // Optional types (ExportSwift only) additionally define: -// - `func bridgeJSLowerParameterWithPresence()`: lower optional as (isSome, value) tuple for protocol setters/parameters +// - `func bridgeJSLowerParameterWithPresence()`: lower optional as (isSome, value) tuple for protocol setters/parameters (borrows object) +// - `func bridgeJSLowerParameterWithRetain()`: lower optional heap object with ownership transfer for escaping closures // - `func bridgeJSLiftReturnFromSideChannel()`: lift optional from side-channel storage for protocol property getters // // See JSGlueGen.swift in BridgeJSLink for JS-side lowering/lifting implementation. @@ -290,6 +333,26 @@ extension _BridgedSwiftHeapObject { return Unmanaged.passRetained(self).toOpaque() } } +// MARK: Closure Box Protocol + +/// A protocol that Swift closure box types must conform to. +/// +/// The conformance is automatically synthesized by the BridgeJS code generator. +@_spi(BridgeJS) public protocol _BridgedSwiftClosureBox: AnyObject {} + +/// Release function for closure boxes +/// - Parameter boxPtr: Opaque pointer to a closure box conforming to _BridgedSwiftClosureBox +#if arch(wasm32) +@_expose(wasm, "release_swift_closure") +@_cdecl("release_swift_closure") +public func _release_swift_closure(boxPtr: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(boxPtr).release() +} +#else +@_spi(BridgeJS) public func _release_swift_closure(boxPtr: UnsafeMutableRawPointer) { + _onlyAvailableOnWasm() +} +#endif extension _JSBridgedClass { // MARK: ImportTS @@ -748,17 +811,46 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } + /// Lowers optional Swift heap object as (isSome, pointer) tuple for protocol parameters. + /// + /// This method uses `passUnretained()` because the caller (JavaScript protocol implementation) + /// already owns the object and will not retain it. The pointer is only valid for the + /// duration of the call. + /// + /// - Returns: A tuple containing presence flag (0 for nil, 1 for some) and unretained pointer @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( isSome: Int32, pointer: UnsafeMutableRawPointer ) { switch consume self { case .none: - return (isSome: 0, pointer: UnsafeMutableRawPointer(bitPattern: 0)!) + return (isSome: 0, pointer: UnsafeMutableRawPointer(bitPattern: 1)!) case .some(let value): return (isSome: 1, pointer: value.bridgeJSLowerParameter()) } } + /// Lowers optional Swift heap object with ownership transfer for escaping closures. + /// + /// This method uses `passRetained()` to transfer ownership to JavaScript, ensuring the + /// object remains valid even if the JavaScript closure escapes and stores the parameter. + /// JavaScript must wrap the pointer with `__construct()` to create a managed reference + /// that will be cleaned up via FinalizationRegistry. + /// + /// Use this method when passing heap objects to @escaping closures that may outlive + /// the original call context. + /// + /// - Returns: A tuple containing presence flag (0 for nil, 1 for some) and retained pointer + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithRetain() -> ( + isSome: Int32, pointer: UnsafeMutableRawPointer + ) { + switch consume self { + case .none: + return (isSome: 0, pointer: UnsafeMutableRawPointer(bitPattern: 1)!) + case .some(let value): + return (isSome: 1, pointer: Unmanaged.passRetained(value).toOpaque()) + } + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Wrapped? { if pointer == UnsafeMutableRawPointer(bitPattern: 0) { @@ -781,6 +873,24 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "swift_js_get_optional_heap_object_pointer") + func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer + #else + func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer { + _onlyAvailableOnWasm() + } + #endif + + let pointer = _swift_js_get_optional_heap_object_pointer() + if pointer == UnsafeMutableRawPointer(bitPattern: 0) { + return nil + } else { + return Wrapped.bridgeJSLiftReturn(pointer) + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_heap_object") diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md index dbdfba785..44019bf6d 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md @@ -66,6 +66,7 @@ This command will: - - - +- - - - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md new file mode 100644 index 000000000..83a1d9f4c --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md @@ -0,0 +1,114 @@ +# Exporting Swift Closures + +Learn how to use closure/function types as parameters and return values in BridgeJS. + +## Overview + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +BridgeJS supports typed closure parameters and return values, allowing you to pass functions between Swift and JavaScript with full type safety. This enables functional programming patterns like callbacks, higher-order functions, and function composition across the language boundary. + +## Example + +```swift +import JavaScriptKit + +@JS class TextProcessor { + private var transform: (String) -> String + + @JS init(transform: @escaping (String) -> String) { + self.transform = transform + } + + @JS func processWithPerson(_ person: Person, formatter: (Person) -> String) -> String { + return formatter(person) + } + + @JS func makePersonCreator(defaultName: String) -> (String) -> Person { + return { name in + let fullName = name.isEmpty ? defaultName : name + return Person(name: fullName) + } + } + + @JS func getTransform() -> (String) -> String { + return transform + } +} +``` + +In JavaScript: + +```javascript +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; +const { exports } = await init({}); + +// Pass closure to initializer +const processor = new exports.TextProcessor((text) => text.toUpperCase()); +console.log(processor.getTransform()("hello")); // "HELLO" + +// Pass closure with Swift class parameter +const person = new exports.Person("Alice"); +const result = processor.processWithPerson(person, (p) => { + return `${p.name}: ${p.greet()}`; +}); +console.log(result); // "Alice: Hello, Alice!" + +// Call returned closure +const creator = processor.makePersonCreator("Default"); +const p1 = creator("Bob"); +console.log(p1.greet()); // "Hello, Bob!" +p1.release(); + +const p2 = creator(""); // Empty uses default +console.log(p2.greet()); // "Hello, Default!" +p2.release(); + +person.release(); +processor.release(); +``` + +The generated TypeScript declarations: + +```typescript +export interface TextProcessor extends SwiftHeapObject { + processWithPerson( + person: Person, + formatter: (arg0: Person) => string + ): string; + makePersonCreator( + defaultName: string + ): (arg0: string) => Person; + getTransform(): (arg0: string) => string; +} + +export type Exports = { + TextProcessor: { + new(transform: (arg0: string) => string): TextProcessor + }; +} +``` + +## Memory Management + +When JavaScript passes a function to Swift, it's automatically stored in `swift.memory` with reference counting. When Swift's closure wrapper is deallocated by ARC, the JavaScript function is released. + +When Swift returns a closure to JavaScript, the Swift closure is boxed and automatically released when the JavaScript function is garbage collected. + +Both directions use automatic memory management - no manual cleanup required. + +## Supported Features + +| Feature | Status | +|:--------|:-------| +| Closure Parameters with Supported Types `(String, Int) -> Person` | ✅ | +| Closure Return Value with Supported Types `() -> Person` | ✅ | +| `@escaping` closures | ✅ | +| Optional types in closures | ✅ | +| Closure-typed `@JS` properties | ❌ | +| Async closures | ❌ | +| Throwing closures | ❌ | + +## See Also + +- - Complete list of supported types across BridgeJS diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 97ebcfd2e..3875d37e7 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -59,7 +59,7 @@ struct TestError: Error { @JS func asyncRoundTripSwiftHeapObject(v: Greeter) async -> Greeter { return v } @JS func asyncRoundTripJSObject(v: JSObject) async -> JSObject { return v } -@JS class Greeter { +@JS public class Greeter { @JS var name: String @JS let prefix: String = "Hello" @@ -76,6 +76,27 @@ struct TestError: Error { self.name = name } + @JS func greetWith(greeter: Greeter, customGreeting: (Greeter) -> String) -> String { + return customGreeting(greeter) + } + + @JS func makeFormatter(suffix: String) -> (String) -> String { + return { value in "\(self.greet()) - \(value) - \(suffix)" } + } + + @JS static func makeCreator(defaultName: String) -> (String) -> Greeter { + return { name in + let fullName = name.isEmpty ? defaultName : name + return Greeter(name: fullName) + } + } + + @JS func makeCustomGreeter() -> (Greeter) -> String { + return { otherGreeter in + return "\(self.name) greets \(otherGreeter.name): \(otherGreeter.greet())" + } + } + deinit { Self.onDeinit() } @@ -1039,6 +1060,161 @@ enum APIOptionalResult { } } +// MARK: - Closure Tests + +// @JS func makeFormatter(prefix: String) -> (String) -> String { +// return { value in "\(prefix) \(value)" } +// } + +@JS func formatName(_ name: String, transform: (String) -> String) -> String { + return transform(name) +} + +@JS func makeFormatter(prefix: String) -> (String) -> String { + return { value in "\(prefix) \(value)" } +} + +@JS func makeAdder(base: Int) -> (Int) -> Int { + return { value in base + value } +} + +@JS class TextProcessor { + private var transform: (String) -> String + + @JS init(transform: @escaping (String) -> String) { + self.transform = transform + } + + @JS func process(_ text: String) -> String { + return transform(text) + } + + @JS func processWithCustom(_ text: String, customTransform: (Int, String, Double) -> String) -> String { + return customTransform(42, text, 3.14) + } + + @JS func getTransform() -> (String) -> String { + return transform + } + + // Optional parameter in closure + @JS func processOptionalString(_ callback: (String?) -> String) -> String { + return callback("test") + " | " + callback(nil) + } + + @JS func processOptionalInt(_ callback: (Int?) -> String) -> String { + return callback(42) + " | " + callback(nil) + } + + @JS func processOptionalGreeter(_ callback: (Greeter?) -> String) -> String { + let greeter = Greeter(name: "Alice") + return callback(greeter) + " | " + callback(nil) + } + + // Return closure with optional parameter + @JS func makeOptionalStringFormatter() -> (String?) -> String { + return { value in + if let value = value { + return "Got: \(value)" + } else { + return "Got: nil" + } + } + } + + // Return closure with optional return type + @JS func makeOptionalGreeterCreator() -> () -> Greeter? { + var count = 0 + return { + count += 1 + if count % 2 == 0 { + return Greeter(name: "Greeter\(count)") + } else { + return nil + } + } + } + + @JS func processDirection(_ callback: (Direction) -> String) -> String { + return callback(.north) + } + + @JS func processTheme(_ callback: (Theme) -> String) -> String { + return callback(.dark) + } + + @JS func processHttpStatus(_ callback: (HttpStatus) -> Int) -> Int { + return callback(.ok) + } + + @JS func processAPIResult(_ callback: (APIResult) -> String) -> String { + return callback(.success("test")) + } + + @JS func makeDirectionChecker() -> (Direction) -> Bool { + return { direction in + direction == .north || direction == .south + } + } + + @JS func makeThemeValidator() -> (Theme) -> Bool { + return { theme in + theme == .dark + } + } + + @JS func makeStatusCodeExtractor() -> (HttpStatus) -> Int { + return { status in + switch status { + case .ok: return 200 + case .notFound: return 404 + case .serverError: return 500 + case .unknown: return -1 + } + } + } + + @JS func makeAPIResultHandler() -> (APIResult) -> String { + return { result in + switch result { + case .success(let message): return "Success: \(message)" + case .failure(let code): return "Failure: \(code)" + case .info: return "Info" + case .flag(let value): return "Flag: \(value)" + case .rate(let value): return "Rate: \(value)" + case .precise(let value): return "Precise: \(value)" + } + } + } + + @JS func processOptionalDirection(_ callback: (Direction?) -> String) -> String { + return callback(.north) + " | " + callback(nil) + } + + @JS func processOptionalTheme(_ callback: (Theme?) -> String) -> String { + return callback(.light) + " | " + callback(nil) + } + + @JS func processOptionalAPIResult(_ callback: (APIResult?) -> String) -> String { + return callback(.success("ok")) + " | " + callback(nil) + } + + @JS func makeOptionalDirectionFormatter() -> (Direction?) -> String { + return { direction in + if let direction = direction { + switch direction { + case .north: return "N" + case .south: return "S" + case .east: return "E" + case .west: return "W" + } + } else { + return "nil" + } + } + } +} + class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 350ef7ae6..67f05fde2 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,6 +6,732 @@ @_spi(BridgeJS) import JavaScriptKit +private final class _BJS_ClosureBox_APIResult_To_String: _BridgedSwiftClosureBox { + let closure: (APIResult) -> String + init(_ closure: @escaping (APIResult) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_APIResult_To_String { + static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_APIResult_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_apiresult_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_apiresult_to_string") +@_cdecl("invoke_swift_closure_apiresult_to_string") +public func _invoke_swift_closure_apiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_APIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Direction_To_Bool: _BridgedSwiftClosureBox { + let closure: (Direction) -> Bool + init(_ closure: @escaping (Direction) -> Bool) { + self.closure = closure + } +} + +private enum _BJS_Closure_Direction_To_Bool { + static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Direction_To_Bool(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_bool") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_direction_to_bool") +@_cdecl("invoke_swift_closure_direction_to_bool") +public func _invoke_swift_closure_direction_to_bool(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Direction_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Direction_To_String: _BridgedSwiftClosureBox { + let closure: (Direction) -> String + init(_ closure: @escaping (Direction) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Direction_To_String { + static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Direction_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_direction_to_string") +@_cdecl("invoke_swift_closure_direction_to_string") +public func _invoke_swift_closure_direction_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Direction_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Greeter_To_String: _BridgedSwiftClosureBox { + let closure: (Greeter) -> String + init(_ closure: @escaping (Greeter) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Greeter_To_String { + static func bridgeJSLower(_ closure: @escaping (Greeter) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Greeter_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Greeter) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_greeter_to_string") + func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_greeter_to_string") +@_cdecl("invoke_swift_closure_greeter_to_string") +public func _invoke_swift_closure_greeter_to_string(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Greeter_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Greeter.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_HttpStatus_To_Int: _BridgedSwiftClosureBox { + let closure: (HttpStatus) -> Int + init(_ closure: @escaping (HttpStatus) -> Int) { + self.closure = closure + } +} + +private enum _BJS_Closure_HttpStatus_To_Int { + static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_HttpStatus_To_Int(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_httpstatus_to_int") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_httpstatus_to_int") +@_cdecl("invoke_swift_closure_httpstatus_to_int") +public func _invoke_swift_closure_httpstatus_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_HttpStatus_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Int_String_Double_To_String: _BridgedSwiftClosureBox { + let closure: (Int, String, Double) -> String + init(_ closure: @escaping (Int, String, Double) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Int_String_Double_To_String { + static func bridgeJSLower(_ closure: @escaping (Int, String, Double) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Int_String_Double_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0, param1, param2 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_int_string_double_to_string") + func _invoke(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_int_string_double_to_string") +@_cdecl("invoke_swift_closure_int_string_double_to_string") +public func _invoke_swift_closure_int_string_double_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32, param1Bytes: Int32, param1Length: Int32, param2: Float64) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Int_String_Double_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Int_To_Int: _BridgedSwiftClosureBox { + let closure: (Int) -> Int + init(_ closure: @escaping (Int) -> Int) { + self.closure = closure + } +} + +private enum _BJS_Closure_Int_To_Int { + static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Int_To_Int(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_int_to_int") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_int_to_int") +@_cdecl("invoke_swift_closure_int_to_int") +public func _invoke_swift_closure_int_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Int_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Int.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalAPIResult_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalAPIResult_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalAPIResult_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalapiresult_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalapiresult_to_string") +@_cdecl("invoke_swift_closure_optionalapiresult_to_string") +public func _invoke_swift_closure_optionalapiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalAPIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalDirection_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalDirection_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalDirection_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaldirection_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionaldirection_to_string") +@_cdecl("invoke_swift_closure_optionaldirection_to_string") +public func _invoke_swift_closure_optionaldirection_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalDirection_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalGreeter_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalGreeter_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalGreeter_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalgreeter_to_string") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalgreeter_to_string") +@_cdecl("invoke_swift_closure_optionalgreeter_to_string") +public func _invoke_swift_closure_optionalgreeter_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalGreeter_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalInt_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalInt_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalInt_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalint_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalint_to_string") +@_cdecl("invoke_swift_closure_optionalint_to_string") +public func _invoke_swift_closure_optionalint_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalInt_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalString_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalString_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalString_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalstring_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionalstring_to_string") +@_cdecl("invoke_swift_closure_optionalstring_to_string") +public func _invoke_swift_closure_optionalstring_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalString_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_OptionalTheme_To_String: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_OptionalTheme_To_String { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_OptionalTheme_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaltheme_to_string") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_optionaltheme_to_string") +@_cdecl("invoke_swift_closure_optionaltheme_to_string") +public func _invoke_swift_closure_optionaltheme_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_OptionalTheme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_String_To_Greeter: _BridgedSwiftClosureBox { + let closure: (String) -> Greeter + init(_ closure: @escaping (String) -> Greeter) { + self.closure = closure + } +} + +private enum _BJS_Closure_String_To_Greeter { + static func bridgeJSLower(_ closure: @escaping (String) -> Greeter) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_String_To_Greeter(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_greeter") + func _invoke(_: Int32, _: Int32) -> UnsafeMutableRawPointer + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Greeter.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_string_to_greeter") +@_cdecl("invoke_swift_closure_string_to_greeter") +public func _invoke_swift_closure_string_to_greeter(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_String_To_Greeter>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_String_To_String: _BridgedSwiftClosureBox { + let closure: (String) -> String + init(_ closure: @escaping (String) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_String_To_String { + static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_String_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_string_to_string") +@_cdecl("invoke_swift_closure_string_to_string") +public func _invoke_swift_closure_string_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_String_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Theme_To_Bool: _BridgedSwiftClosureBox { + let closure: (Theme) -> Bool + init(_ closure: @escaping (Theme) -> Bool) { + self.closure = closure + } +} + +private enum _BJS_Closure_Theme_To_Bool { + static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Theme_To_Bool(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_bool") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_theme_to_bool") +@_cdecl("invoke_swift_closure_theme_to_bool") +public func _invoke_swift_closure_theme_to_bool(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Theme_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Theme_To_String: _BridgedSwiftClosureBox { + let closure: (Theme) -> String + init(_ closure: @escaping (Theme) -> String) { + self.closure = closure + } +} + +private enum _BJS_Closure_Theme_To_String { + static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Theme_To_String(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] param0 in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_string") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_theme_to_string") +@_cdecl("invoke_swift_closure_theme_to_string") +public func _invoke_swift_closure_theme_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Theme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +private final class _BJS_ClosureBox_Void_To_OptionalGreeter: _BridgedSwiftClosureBox { + let closure: () -> Optional + init(_ closure: @escaping () -> Optional) { + self.closure = closure + } +} + +private enum _BJS_Closure_Void_To_OptionalGreeter { + static func bridgeJSLower(_ closure: @escaping () -> Optional) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_Void_To_OptionalGreeter(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional { + let owner = _JSCallbackOwner(callbackId: callbackId) + return { [owner] in + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_void_to_optionalgreeter") + func _invoke(_: Int32) -> Void + _invoke(owner.callbackId) + return Optional.bridgeJSLiftReturnFromSideChannel() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_void_to_optionalgreeter") +@_cdecl("invoke_swift_closure_void_to_optionalgreeter") +public func _invoke_swift_closure_void_to_optionalgreeter(boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_Void_To_OptionalGreeter>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure() + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject @@ -2502,6 +3228,39 @@ public func _bjs_getAllStaticPropertyValues() -> Void { #endif } +@_expose(wasm, "bjs_formatName") +@_cdecl("bjs_formatName") +public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int32) -> Void { + #if arch(wasm32) + let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeFormatter") +@_cdecl("bjs_makeFormatter") +public func _bjs_makeFormatter(prefixBytes: Int32, prefixLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + return _BJS_Closure_String_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeAdder") +@_cdecl("bjs_makeAdder") +public func _bjs_makeAdder(base: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) + return _BJS_Closure_Int_To_Int.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { @@ -2534,6 +3293,50 @@ public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: I #endif } +@_expose(wasm, "bjs_Greeter_greetWith") +@_cdecl("bjs_Greeter_greetWith") +public func _bjs_Greeter_greetWith(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer, customGreeting: Int32) -> Void { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_Greeter_To_String.bridgeJSLift(customGreeting)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_makeFormatter") +@_cdecl("bjs_Greeter_makeFormatter") +public func _bjs_Greeter_makeFormatter(_self: UnsafeMutableRawPointer, suffixBytes: Int32, suffixLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + return _BJS_Closure_String_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_static_makeCreator") +@_cdecl("bjs_Greeter_static_makeCreator") +public func _bjs_Greeter_static_makeCreator(defaultNameBytes: Int32, defaultNameLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) + return _BJS_Closure_String_To_Greeter.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_makeCustomGreeter") +@_cdecl("bjs_Greeter_makeCustomGreeter") +public func _bjs_Greeter_makeCustomGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter() + return _BJS_Closure_Greeter_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_name_get") @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { @@ -2573,7 +3376,7 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { + public var jsValue: JSValue { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap") func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 @@ -4340,4 +5143,255 @@ extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) } +} + +@_expose(wasm, "bjs_TextProcessor_init") +@_cdecl("bjs_TextProcessor_init") +public func _bjs_TextProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor(transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_process") +@_cdecl("bjs_TextProcessor_process") +public func _bjs_TextProcessor_process(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).process(_: String.bridgeJSLiftParameter(textBytes, textLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processWithCustom") +@_cdecl("bjs_TextProcessor_processWithCustom") +public func _bjs_TextProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_Int_String_Double_To_String.bridgeJSLift(customTransform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_getTransform") +@_cdecl("bjs_TextProcessor_getTransform") +public func _bjs_TextProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform() + return _BJS_Closure_String_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalString") +@_cdecl("bjs_TextProcessor_processOptionalString") +public func _bjs_TextProcessor_processOptionalString(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_OptionalString_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalInt") +@_cdecl("bjs_TextProcessor_processOptionalInt") +public func _bjs_TextProcessor_processOptionalInt(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_OptionalInt_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalGreeter") +@_cdecl("bjs_TextProcessor_processOptionalGreeter") +public func _bjs_TextProcessor_processOptionalGreeter(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_OptionalGreeter_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter") +@_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") +public func _bjs_TextProcessor_makeOptionalStringFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() + return _BJS_Closure_OptionalString_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator") +@_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") +public func _bjs_TextProcessor_makeOptionalGreeterCreator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() + return _BJS_Closure_Void_To_OptionalGreeter.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processDirection") +@_cdecl("bjs_TextProcessor_processDirection") +public func _bjs_TextProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_Direction_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processTheme") +@_cdecl("bjs_TextProcessor_processTheme") +public func _bjs_TextProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_Theme_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processHttpStatus") +@_cdecl("bjs_TextProcessor_processHttpStatus") +public func _bjs_TextProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_HttpStatus_To_Int.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processAPIResult") +@_cdecl("bjs_TextProcessor_processAPIResult") +public func _bjs_TextProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_APIResult_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeDirectionChecker") +@_cdecl("bjs_TextProcessor_makeDirectionChecker") +public func _bjs_TextProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() + return _BJS_Closure_Direction_To_Bool.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeThemeValidator") +@_cdecl("bjs_TextProcessor_makeThemeValidator") +public func _bjs_TextProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() + return _BJS_Closure_Theme_To_Bool.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor") +@_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") +public func _bjs_TextProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() + return _BJS_Closure_HttpStatus_To_Int.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler") +@_cdecl("bjs_TextProcessor_makeAPIResultHandler") +public func _bjs_TextProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() + return _BJS_Closure_APIResult_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalDirection") +@_cdecl("bjs_TextProcessor_processOptionalDirection") +public func _bjs_TextProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_OptionalDirection_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalTheme") +@_cdecl("bjs_TextProcessor_processOptionalTheme") +public func _bjs_TextProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_OptionalTheme_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult") +@_cdecl("bjs_TextProcessor_processOptionalAPIResult") +public func _bjs_TextProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_OptionalAPIResult_To_String.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter") +@_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") +public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() + return _BJS_Closure_OptionalDirection_To_String.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_deinit") +@_cdecl("bjs_TextProcessor_deinit") +public func _bjs_TextProcessor_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") + func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) + } } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index c0e0a4a80..23d2afdc4 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -20,6 +20,7 @@ } ] }, + "explicitAccessControl" : "public", "methods" : [ { "abiName" : "bjs_Greeter_greet", @@ -62,6 +63,176 @@ } } + }, + { + "abiName" : "bjs_Greeter_greetWith", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greetWith", + "parameters" : [ + { + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "label" : "customGreeting", + "name" : "customGreeting", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Greeter_To_String", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "suffix", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_Greeter_static_makeCreator", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "makeCreator", + "parameters" : [ + { + "label" : "defaultName", + "name" : "defaultName", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_Greeter", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + "staticContext" : { + "className" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_Greeter_makeCustomGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeCustomGreeter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Greeter_To_String", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } } ], "name" : "Greeter", @@ -1986,103 +2157,943 @@ } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalCount", - "type" : { - "optional" : { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalTheme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "httpStatus", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalHelper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "SwiftDataProcessor" + }, + { + "constructor" : { + "abiName" : "bjs_TextProcessor_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_TextProcessor_process", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "process", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processWithCustom", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processWithCustom", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Int_String_Double_To_String", + "parameters" : [ + { + "int" : { + + } + }, + { + "string" : { + + } + }, + { + "double" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_getTransform", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTransform", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalString", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalString_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalInt", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalInt_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalGreeter_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeOptionalStringFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalStringFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalString_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeOptionalGreeterCreator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalGreeterCreator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Void_To_OptionalGreeter", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Direction_To_String", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Theme_To_String", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "HttpStatus_To_Int", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "APIResult_To_String", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeDirectionChecker", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDirectionChecker", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Direction_To_Bool", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeThemeValidator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeThemeValidator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Theme_To_Bool", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeStatusCodeExtractor", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStatusCodeExtractor", + "parameters" : [ + + ], + "returnType" : { + "closure" : { "_0" : { - "int" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "HttpStatus_To_Int", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + } } } } } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "direction", - "type" : { - "optional" : { + "abiName" : "bjs_TextProcessor_makeAPIResultHandler", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultHandler", + "parameters" : [ + + ], + "returnType" : { + "closure" : { "_0" : { - "caseEnum" : { - "_0" : "Direction" + "isAsync" : false, + "isThrows" : false, + "mangleName" : "APIResult_To_String", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } } } } } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalTheme", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "abiName" : "bjs_TextProcessor_processOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalDirection_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } } } } + ], + "returnType" : { + "string" : { + + } } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "httpStatus", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "abiName" : "bjs_TextProcessor_processOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalTheme_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } } } } + ], + "returnType" : { + "string" : { + + } } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "apiResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "abiName" : "bjs_TextProcessor_processOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalAPIResult_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } } } } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "helper", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" + ], + "returnType" : { + "string" : { + } } }, { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalHelper", - "type" : { - "optional" : { + "abiName" : "bjs_TextProcessor_makeOptionalDirectionFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalDirectionFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "isAsync" : false, + "isThrows" : false, + "mangleName" : "OptionalDirection_To_String", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } } } } } } ], - "swiftCallName" : "SwiftDataProcessor" + "name" : "TextProcessor", + "properties" : [ + + ], + "swiftCallName" : "TextProcessor" } ], "enums" : [ @@ -6354,6 +7365,138 @@ } } + }, + { + "abiName" : "bjs_formatName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "formatName", + "parameters" : [ + { + "label" : "_", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "prefix", + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "String_To_String", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_makeAdder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAdder", + "parameters" : [ + { + "label" : "base", + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "Int_To_Int", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } } ], "moduleName" : "BridgeJSRuntimeTests", diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 10c390af8..f6e9cb85a 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -707,7 +707,202 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { cd5.release(); testProtocolSupport(exports); + testClosureSupport(exports); } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function testClosureSupport(exports) { + const upperTransform = (text) => text.toUpperCase(); + const processor = new exports.TextProcessor(upperTransform); + + assert.equal(processor.process("hello"), "HELLO"); + + const multiParamTransform = (count, text, ratio) => { + return `${text.toUpperCase()}-${count}-${ratio.toFixed(2)}`; + }; + assert.equal(processor.processWithCustom("world", multiParamTransform), "WORLD-42-3.14"); + assert.equal(processor.process("test"), "TEST"); + + const greeterForClosure = new exports.Greeter("World"); + const greeterCaller = new exports.Greeter("Caller"); + const customGreeting = (greeter) => `Custom greeting for ${greeter.name}: ${greeter.greet()}`; + const greetResult = greeterCaller.greetWith(greeterForClosure, customGreeting); + assert.equal(greetResult, "Custom greeting for World: Hello, World!"); + greeterForClosure.release(); + greeterCaller.release(); + + assert.equal(exports.formatName("ada", (name) => name.toUpperCase()), "ADA"); + assert.equal(exports.formatName("grace", (name) => `Dr. ${name}`), "Dr. grace"); + + const addDr = exports.makeFormatter("Dr."); + assert.equal(addDr("Ada"), "Dr. Ada"); + assert.equal(addDr("Grace"), "Dr. Grace"); + + const addProf = exports.makeFormatter("Prof."); + assert.equal(addProf("Hopper"), "Prof. Hopper"); + + const add10 = exports.makeAdder(10); + assert.equal(add10(5), 15); + assert.equal(add10(32), 42); + + const add100 = exports.makeAdder(100); + assert.equal(add100(23), 123); + + const storedTransform = processor.getTransform(); + assert.equal(storedTransform("hello"), "HELLO"); + assert.equal(storedTransform("world"), "WORLD"); + + const greeterForFormatter = new exports.Greeter("Formatter"); + const greeterFormatter = greeterForFormatter.makeFormatter(" [suffix]"); + assert.equal(greeterFormatter("test"), "Hello, Formatter! - test - [suffix]"); + assert.equal(greeterFormatter("data"), "Hello, Formatter! - data - [suffix]"); + greeterForFormatter.release(); + + const greeterCreator = exports.Greeter.makeCreator("Default"); + const createdG1 = greeterCreator("Alice"); + assert.equal(createdG1.name, "Alice"); + assert.equal(createdG1.greet(), "Hello, Alice!"); + const createdG2 = greeterCreator(""); + assert.equal(createdG2.name, "Default"); + assert.equal(createdG2.greet(), "Hello, Default!"); + createdG1.release(); + createdG2.release(); + + const greeterHost = new exports.Greeter("Host"); + const greeterGreeter = greeterHost.makeCustomGreeter(); + const guest1 = new exports.Greeter("Guest1"); + const guest2 = new exports.Greeter("Guest2"); + assert.equal(greeterGreeter(guest1), "Host greets Guest1: Hello, Guest1!"); + assert.equal(greeterGreeter(guest2), "Host greets Guest2: Hello, Guest2!"); + greeterHost.release(); + guest1.release(); + guest2.release(); + + const greeterForMethod = new exports.Greeter("Method"); + const greeterParam = new exports.Greeter("Param"); + const methodResult = greeterForMethod.greetWith(greeterParam, (g) => { + return `Custom: ${g.name} says ${g.greet()}`; + }); + assert.equal(methodResult, "Custom: Param says Hello, Param!"); + greeterForMethod.release(); + greeterParam.release(); + + const optResult1 = processor.processOptionalString((value) => { + return value !== null ? `Got: ${value}` : `Got: null`; + }); + assert.equal(optResult1, "Got: test | Got: null"); + + const optResult2 = processor.processOptionalInt((value) => { + return value !== null ? `Number: ${value}` : `Number: null`; + }); + assert.equal(optResult2, "Number: 42 | Number: null"); + + const optResult3 = processor.processOptionalGreeter((greeter) => { + return greeter !== null ? `Greeter: ${greeter.name}` : `Greeter: null`; + }); + assert.equal(optResult3, "Greeter: Alice | Greeter: null"); + + const optFormatter = processor.makeOptionalStringFormatter(); + assert.equal(optFormatter("world"), "Got: world"); + assert.equal(optFormatter(null), "Got: nil"); + + const optCreator = processor.makeOptionalGreeterCreator(); + const opt1 = optCreator(); + assert.equal(opt1, null); + const opt2 = optCreator(); + assert.notEqual(opt2, null); + assert.equal(opt2.name, "Greeter2"); + assert.equal(opt2.greet(), "Hello, Greeter2!"); + opt2.release(); + const opt3 = optCreator(); + assert.equal(opt3, null); + const opt4 = optCreator(); + assert.notEqual(opt4, null); + assert.equal(opt4.name, "Greeter4"); + opt4.release(); + + const dirResult = processor.processDirection((dir) => { + switch (dir) { + case exports.Direction.North: return "Going North"; + case exports.Direction.South: return "Going South"; + case exports.Direction.East: return "Going East"; + case exports.Direction.West: return "Going West"; + default: return "Unknown"; + } + }); + assert.equal(dirResult, "Going North"); + + const themeResult = processor.processTheme((theme) => { + return theme === exports.Theme.Dark ? "Dark mode" : "Light mode"; + }); + assert.equal(themeResult, "Dark mode"); + + const statusResult = processor.processHttpStatus((status) => { + return status; + }); + assert.equal(statusResult, exports.HttpStatus.Ok); + + const apiResult = processor.processAPIResult((result) => { + if (result.tag === exports.APIResult.Tag.Success) { + return `API Success: ${result.param0}`; + } + return "API Other"; + }); + assert.equal(apiResult, "API Success: test"); + + const dirChecker = processor.makeDirectionChecker(); + assert.equal(dirChecker(exports.Direction.North), true); + assert.equal(dirChecker(exports.Direction.South), true); + assert.equal(dirChecker(exports.Direction.East), false); + assert.equal(dirChecker(exports.Direction.West), false); + + const themeValidator = processor.makeThemeValidator(); + assert.equal(themeValidator(exports.Theme.Dark), true); + assert.equal(themeValidator(exports.Theme.Light), false); + assert.equal(themeValidator(exports.Theme.Auto), false); + + const statusExtractor = processor.makeStatusCodeExtractor(); + assert.equal(statusExtractor(exports.HttpStatus.Ok), 200); + assert.equal(statusExtractor(exports.HttpStatus.NotFound), 404); + assert.equal(statusExtractor(exports.HttpStatus.ServerError), 500); + assert.equal(statusExtractor(exports.HttpStatus.Unknown), -1); + + const apiHandler = processor.makeAPIResultHandler(); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Success, param0: "done" }), "Success: done"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Failure, param0: 500 }), "Failure: 500"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Info }), "Info"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Flag, param0: true }), "Flag: true"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Rate, param0: 1.5 }), "Rate: 1.5"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Precise, param0: 3.14159 }), "Precise: 3.14159"); + + const optDirResult = processor.processOptionalDirection((dir) => { + return dir !== null ? `Dir: ${dir}` : "Dir: null"; + }); + assert.equal(optDirResult, `Dir: ${exports.Direction.North} | Dir: null`); + + const optThemeResult = processor.processOptionalTheme((theme) => { + return theme !== null ? `Theme: ${theme}` : "Theme: null"; + }); + assert.equal(optThemeResult, `Theme: ${exports.Theme.Light} | Theme: null`); + + const optApiResult = processor.processOptionalAPIResult((result) => { + if (result === null) return "Result: null"; + if (result.tag === exports.APIResult.Tag.Success) { + return `Result: Success(${result.param0})`; + } + return "Result: other"; + }); + assert.equal(optApiResult, "Result: Success(ok) | Result: null"); + + const optDirFormatter = processor.makeOptionalDirectionFormatter(); + assert.equal(optDirFormatter(exports.Direction.North), "N"); + assert.equal(optDirFormatter(exports.Direction.South), "S"); + assert.equal(optDirFormatter(exports.Direction.East), "E"); + assert.equal(optDirFormatter(exports.Direction.West), "W"); + assert.equal(optDirFormatter(null), "nil"); + + processor.release(); +} + /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ async function BridgeJSRuntimeTests_runAsyncWorks(exports) { From de9e8a07252f4c2a8c1f290c7585f0cf67612e14 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Mon, 27 Oct 2025 10:04:51 +0100 Subject: [PATCH 021/252] Implement onPageLoad for playwright --- .../PlaywrightOnPageLoadTest/README.md | 156 ++++++++++++++++++ .../SwiftTesting/Package.swift | 17 ++ .../SwiftTesting/Tests/CheckTests.swift | 25 +++ .../XCTest/Package.swift | 17 ++ .../XCTest/Tests/CheckTests.swift | 41 +++++ .../PlaywrightOnPageLoadTest/expose.js | 49 ++++++ Plugins/PackageToJS/Sources/PackageToJS.swift | 10 ++ .../Sources/PackageToJSPlugin.swift | 3 + Plugins/PackageToJS/Templates/bin/test.js | 43 ++++- Plugins/PackageToJS/Templates/test.d.ts | 18 ++ Plugins/PackageToJS/Templates/test.js | 7 +- Plugins/PackageToJS/Tests/ExampleTests.swift | 53 ++++++ 12 files changed, 436 insertions(+), 3 deletions(-) create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/README.md create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Package.swift create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Tests/CheckTests.swift create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Package.swift create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Tests/CheckTests.swift create mode 100644 Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/expose.js diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/README.md b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/README.md new file mode 100644 index 000000000..3266c0c3d --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/README.md @@ -0,0 +1,156 @@ +# Playwright OnPageLoad Test + +This example demonstrates how to expose JavaScript functions to your Swift/WebAssembly tests using Playwright's `page.exposeFunction` API. + +## How it works + +1. **Expose Script**: A JavaScript file that exports functions to be exposed in the browser context +2. **Swift Tests**: Call these exposed functions using JavaScriptKit's `JSObject.global` API +3. **Test Runner**: The `--playwright-expose` flag loads the script and exposes the functions before running tests + +## Usage + +### Define exposed functions in a JavaScript file + +**Important:** All functions exposed via Playwright's `page.exposeFunction` are async from the browser's perspective, meaning they always return Promises. Define them as `async` for clarity. + +#### Option 1: Function with Page Access (Recommended) + +Export a function that receives the Playwright `page` object. This allows your exposed functions to interact with the browser page: + +```javascript +/** + * @param {import('playwright').Page} page - The Playwright Page object + */ +export async function exposedFunctions(page) { + return { + expectToBeTrue: async () => { + return true; + }, + + // Use the page object to interact with the browser + getTitle: async () => { + return await page.title(); + }, + + clickButton: async (selector) => { + await page.click(selector); + return true; + }, + + evaluate: async (script) => { + return await page.evaluate(script); + }, + + screenshot: async () => { + const buffer = await page.screenshot(); + return buffer.toString('base64'); + } + }; +} +``` + +#### Option 2: Static Object (Simple Cases) + +For simple functions that don't need page access: + +```javascript +export const exposedFunctions = { + expectToBeTrue: async () => { + return true; + }, + + addNumbers: async (a, b) => { + return a + b; + } +}; +``` + +### Use the functions in Swift tests + +```swift +import XCTest +import JavaScriptKit +import JavaScriptEventLoop + +final class CheckTests: XCTestCase { + func testExpectToBeTrue() async throws { + guard let expectToBeTrue = JSObject.global.expectToBeTrue.function + else { return XCTFail("Function expectToBeTrue not found") } + + // Functions exposed via Playwright return Promises + guard let promiseObject = expectToBeTrue().object + else { return XCTFail("expectToBeTrue() did not return an object") } + + guard let promise = JSPromise(promiseObject) + else { return XCTFail("expectToBeTrue() did not return a Promise") } + + let resultValue = try await promise.value + guard let result = resultValue.boolean + else { return XCTFail("expectToBeTrue() returned nil") } + + XCTAssertTrue(result) + } +} +``` + +### Run tests with the expose script + +```bash +swift package js test --environment browser --playwright-expose path/to/expose.js +``` + +### Backward Compatibility + +You can also use `--prelude` to define exposed functions, which allows combining WASM setup options (`setupOptions`) and Playwright exposed functions in one file: + +```bash +swift package js test --environment browser --prelude path/to/prelude.js +``` + +However, using `--playwright-expose` is recommended for clarity and separation of concerns. + +## Advanced Usage + +### Access to Page Context + +When you export a function (as shown in Option 1), you receive the Playwright `page` object, which gives you full access to the browser page. This is powerful because you can: + +- **Query the DOM**: `await page.$('selector')` +- **Execute JavaScript**: `await page.evaluate('...')` +- **Take screenshots**: `await page.screenshot()` +- **Navigate**: `await page.goto('...')` +- **Handle events**: `page.on('console', ...)` + +### Async Initialization + +You can perform async initialization before returning your functions: + +```javascript +export async function exposedFunctions(page) { + // Perform async setup + const config = await loadConfiguration(); + + // Navigate to a specific page if needed + await page.goto('http://example.com'); + + return { + expectToBeTrue: async () => true, + + getConfig: async () => config, + + // Function that uses both page and initialization data + checkElement: async (selector) => { + const element = await page.$(selector); + return element !== null; + } + }; +} +``` + +### Best Practices + +1. **Always use `async` functions**: All exposed functions are async from the browser's perspective +2. **Capture `page` in closures**: Functions returned from `exposedFunctions(page)` can access `page` via closure +3. **Handle errors**: Wrap page interactions in try-catch blocks +4. **Return serializable data**: Functions can only return JSON-serializable values diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Package.swift b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Package.swift new file mode 100644 index 000000000..84130401a --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Package.swift @@ -0,0 +1,17 @@ +// swift-tools-version: 6.0 +import PackageDescription + +let package = Package( + name: "Check", + dependencies: [.package(name: "JavaScriptKit", path: "../../../../../")], + targets: [ + .testTarget( + name: "CheckTests", + dependencies: [ + "JavaScriptKit", + .product(name: "JavaScriptEventLoopTestSupport", package: "JavaScriptKit"), + ], + path: "Tests" + ) + ] +) diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Tests/CheckTests.swift b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Tests/CheckTests.swift new file mode 100644 index 000000000..e9b2f935c --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Tests/CheckTests.swift @@ -0,0 +1,25 @@ +import Testing +import JavaScriptKit +import JavaScriptEventLoop + +@Test func expectToBeTrue() async throws { + let expectToBeTrue = try #require(JSObject.global.expectToBeTrue.function) + + // expectToBeTrue returns a Promise, so we need to await it + let promiseObject = try #require(expectToBeTrue.callAsFunction().object) + let promise = try #require(JSPromise(promiseObject)) + + let resultValue = try await promise.value + #expect(resultValue.boolean == true) +} + +@Test func getTitleOfPage() async throws { + let getTitle = try #require(JSObject.global.getTitle.function) + + // getTitle returns a Promise, so we need to await it + let promiseObject = try #require(getTitle.callAsFunction().object) + let promise = try #require(JSPromise(promiseObject)) + + let resultValue = try await promise.value + #expect(resultValue.string == "") +} diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Package.swift b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Package.swift new file mode 100644 index 000000000..84130401a --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Package.swift @@ -0,0 +1,17 @@ +// swift-tools-version: 6.0 +import PackageDescription + +let package = Package( + name: "Check", + dependencies: [.package(name: "JavaScriptKit", path: "../../../../../")], + targets: [ + .testTarget( + name: "CheckTests", + dependencies: [ + "JavaScriptKit", + .product(name: "JavaScriptEventLoopTestSupport", package: "JavaScriptKit"), + ], + path: "Tests" + ) + ] +) diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Tests/CheckTests.swift b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Tests/CheckTests.swift new file mode 100644 index 000000000..49d0a741e --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Tests/CheckTests.swift @@ -0,0 +1,41 @@ +import XCTest +import JavaScriptKit +import JavaScriptEventLoop + +final class CheckTests: XCTestCase { + func testExpectToBeTrue() async throws { + guard let expectToBeTrue = JSObject.global.expectToBeTrue.function + else { return XCTFail("Function expectToBeTrue not found") } + + // expectToBeTrue returns a Promise, so we need to await it + guard let promiseObject = expectToBeTrue().object + else { return XCTFail("expectToBeTrue() did not return an object") } + + guard let promise = JSPromise(promiseObject) + else { return XCTFail("expectToBeTrue() did not return a Promise") } + + let resultValue = try await promise.value + guard let result = resultValue.boolean + else { return XCTFail("expectToBeTrue() returned nil") } + + XCTAssertTrue(result) + } + + func testTileOfPage() async throws { + guard let getTitle = JSObject.global.getTitle.function + else { return XCTFail("Function getTitle not found") } + + // getTitle returns a Promise, so we need to await it + guard let promiseObject = getTitle().object + else { return XCTFail("getTitle() did not return an object") } + + guard let promise = JSPromise(promiseObject) + else { return XCTFail("expectToBeTrue() did not return a Promise") } + + let resultValue = try await promise.value + guard let title = resultValue.string + else { return XCTFail("expectToBeTrue() returned nil") } + + XCTAssertTrue(title == "") + } +} diff --git a/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/expose.js b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/expose.js new file mode 100644 index 000000000..22f760a14 --- /dev/null +++ b/Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/expose.js @@ -0,0 +1,49 @@ +/** + * Playwright exposed functions for PlaywrightOnPageLoadTest + * These functions will be exposed to the browser context and available as global functions + * in the WASM environment (accessible via JSObject.global) + * + * IMPORTANT: All exposed functions are async from the browser's perspective. + * Playwright's page.exposeFunction automatically wraps them to return Promises. + * Therefore, you must use JSPromise to await them in Swift. + */ + +/** + * Export a function that receives the Playwright Page object and returns the exposed functions. + * This allows your functions to interact with the page (click, query DOM, etc.) + * + * @param {import('playwright').Page} page - The Playwright Page object + * @returns {Object} An object mapping function names to async functions + */ +export async function exposedFunctions(page) { + return { + expectToBeTrue: async () => { + return true; + }, + + getTitle: async () => { + return await page.title(); + }, + + // clickButton: async (selector) => { + // await page.click(selector); + // return true; + // }, + + // screenshot: async () => { + // const buffer = await page.screenshot(); + // return buffer.toString('base64'); + // } + }; +} + +/** + * Alternative: Export a static object if you don't need page access + * (Note: This approach doesn't have access to the page object) + */ +// export const exposedFunctions = { +// expectToBeTrue: async () => { +// return true; +// }, +// addNumbers: async (a, b) => a + b, +// }; diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index cec51cfb2..ec9840439 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -58,6 +58,8 @@ struct PackageToJS { var environment: String? /// Whether to run tests in the browser with inspector enabled var inspect: Bool + /// The script defining Playwright exposed functions + var playwrightExpose: String? /// The extra arguments to pass to node var extraNodeArguments: [String] /// The options for packaging @@ -89,6 +91,14 @@ struct PackageToJS { testJsArguments.append("--prelude") testJsArguments.append(preludeURL.path) } + if let playwrightExpose = testOptions.playwrightExpose { + let playwrightExposeURL = URL( + fileURLWithPath: playwrightExpose, + relativeTo: URL(fileURLWithPath: FileManager.default.currentDirectoryPath) + ) + testJsArguments.append("--playwright-expose") + testJsArguments.append(playwrightExposeURL.path) + } if let environment = testOptions.environment { testJsArguments.append("--environment") testJsArguments.append(environment) diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 9a35322f8..709dc8f3a 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -551,6 +551,7 @@ extension PackageToJS.TestOptions { let prelude = extractor.extractOption(named: "prelude").last let environment = extractor.extractOption(named: "environment").last let inspect = extractor.extractFlag(named: "inspect") + let playwrightExpose = extractor.extractOption(named: "playwright-expose").last let extraNodeArguments = extractor.extractSingleDashOption(named: "Xnode") let packageOptions = try PackageToJS.PackageOptions.parse(from: &extractor) var options = PackageToJS.TestOptions( @@ -560,6 +561,7 @@ extension PackageToJS.TestOptions { prelude: prelude, environment: environment, inspect: inspect != 0, + playwrightExpose: playwrightExpose, extraNodeArguments: extraNodeArguments, packageOptions: packageOptions ) @@ -582,6 +584,7 @@ extension PackageToJS.TestOptions { --prelude Path to the prelude script --environment The environment to use for the tests (values: node, browser; default: node) --inspect Whether to run tests in the browser with inspector enabled + --playwright-expose Path to script defining Playwright exposed functions -Xnode Extra arguments to pass to Node.js \(PackageToJS.PackageOptions.optionsHelp()) diff --git a/Plugins/PackageToJS/Templates/bin/test.js b/Plugins/PackageToJS/Templates/bin/test.js index e7444e901..1d48b6853 100644 --- a/Plugins/PackageToJS/Templates/bin/test.js +++ b/Plugins/PackageToJS/Templates/bin/test.js @@ -33,6 +33,7 @@ const args = parseArgs({ environment: { type: "string" }, inspect: { type: "boolean" }, "coverage-file": { type: "string" }, + "playwright-expose": { type: "string" }, }, }) @@ -95,7 +96,47 @@ Hint: This typically means that a continuation leak occurred. } }, browser: async ({ preludeScript }) => { - process.exit(await testBrowser({ preludeScript, inspect: args.values.inspect, args: testFrameworkArgs })); + let onPageLoad = undefined; + + // Load exposed functions from playwright-expose flag + if (args.values["playwright-expose"]) { + const exposeScript = path.resolve(process.cwd(), args.values["playwright-expose"]); + try { + const exposeModule = await import(exposeScript); + const exposedFunctions = exposeModule.exposedFunctions; + + if (exposedFunctions) { + onPageLoad = async (page) => { + // If exposedFunctions is a function, call it with the page object + // This allows the functions to capture the page in their closure + const functions = typeof exposedFunctions === 'function' + ? await exposedFunctions(page) + : exposedFunctions; + + for (const [name, fn] of Object.entries(functions)) { + // Bind the page context to each function if needed + // The function can optionally use the page from its closure + page.exposeFunction(name, fn); + } + }; + } + } catch (e) { + // If --playwright-expose is specified but file doesn't exist or has no exposedFunctions, that's an error + if (args.values["playwright-expose"]) { + throw e; + } + } + } + + const exitCode = await testBrowser({ + preludeScript, + inspect: args.values.inspect, + args: testFrameworkArgs, + playwright: { + onPageLoad + } + }); + process.exit(exitCode); } } diff --git a/Plugins/PackageToJS/Templates/test.d.ts b/Plugins/PackageToJS/Templates/test.d.ts index 03a064f28..4c6741a75 100644 --- a/Plugins/PackageToJS/Templates/test.d.ts +++ b/Plugins/PackageToJS/Templates/test.d.ts @@ -7,6 +7,23 @@ export type SetupOptionsFn = ( } ) => Promise +/** + * Functions to be exposed to the browser context via Playwright's page.exposeFunction. + * Note: All functions are treated as async from the browser's perspective and will + * return Promises when called from Swift/WebAssembly via JavaScriptKit. + */ +export type ExposedFunctions = Record Promise> + +/** + * A function that receives the Playwright Page object and returns exposed functions. + * This allows the exposed functions to interact with the browser page (click, query DOM, etc.) + * Can also be used for async initialization before returning the functions. + * + * @param page - The Playwright Page object for browser interaction + * @returns An object mapping function names to async functions, or a Promise resolving to such an object + */ +export type ExposedFunctionsFn = (page: import('playwright').Page) => ExposedFunctions | Promise + export function testBrowser( options: { /** Path to the prelude script to be injected before tests run */ @@ -17,6 +34,7 @@ export function testBrowser( playwright?: { browser?: string, launchOptions?: import("playwright").LaunchOptions + onPageLoad?: (page: import("playwright").Page) => Promise } } ): Promise diff --git a/Plugins/PackageToJS/Templates/test.js b/Plugins/PackageToJS/Templates/test.js index 19a1deac6..5b7090300 100644 --- a/Plugins/PackageToJS/Templates/test.js +++ b/Plugins/PackageToJS/Templates/test.js @@ -99,13 +99,16 @@ Please run the following command to install it: const browser = await playwright[options.playwright?.browser ?? "chromium"].launch(options.playwright?.launchOptions ?? {}); const context = await browser.newContext(); const page = await context.newPage(); - + // Allow the user to customize the page before it's loaded, for defining custom export functions + if (options.playwright?.onPageLoad) { + await options.playwright.onPageLoad(page); + } // Forward console messages in the page to the Node.js console page.on("console", (message) => { console.log(message.text()); }); - + const onExit = new Promise((resolve) => { page.exposeFunction("exitTest", resolve); }); diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift index e1a103f41..70a0b7556 100644 --- a/Plugins/PackageToJS/Tests/ExampleTests.swift +++ b/Plugins/PackageToJS/Tests/ExampleTests.swift @@ -232,6 +232,16 @@ extension Trait where Self == ConditionTrait { } } + /// FIXME: swift-testing uses too much stack space, so we need to increase the stack size for tests using swift-testing. + static var stackSizeLinkerFlags: [String] { + [ + "-Xlinker", "--stack-first", + "-Xlinker", "-z", + "-Xlinker", "stack-size=524288", + "-Xlinker", "--global-base=524288", + ] + } + @Test(.requireSwiftSDK) func basic() throws { let swiftSDKID = try #require(Self.getSwiftSDKID()) @@ -394,4 +404,47 @@ extension Trait where Self == ConditionTrait { } } #endif + + @Test(.requireSwiftSDK) + func playwrightOnPageLoad_XCTest() throws { + let swiftSDKID = try #require(Self.getSwiftSDKID()) + try withPackage( + at: "Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest", + assertTerminationStatus: { $0 == 0 } + ) { packageDir, runProcess, runSwift in + try runProcess(which("npm"), ["install"], [:]) + try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:]) + + try runSwift( + ["package", "--disable-sandbox"] + Self.stackSizeLinkerFlags + [ + "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser", + "--playwright-expose", "../expose.js", + ], + [:] + ) + } + } + + #if compiler(>=6.1) + // TODO: Remove triple restriction once swift-testing is shipped in p1-threads SDK + @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasi")) + func playwrightOnPageLoad_SwiftTesting() throws { + let swiftSDKID = try #require(Self.getSwiftSDKID()) + try withPackage( + at: "Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting", + assertTerminationStatus: { $0 == 0 } + ) { packageDir, runProcess, runSwift in + try runProcess(which("npm"), ["install"], [:]) + try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:]) + + try runSwift( + [ + "package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser", + "--playwright-expose", "../expose.js", + ], + [:] + ) + } + } + #endif } From 623cda09c34f2cc0b544295e73a55fb1513abbf2 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Fri, 7 Nov 2025 21:31:57 +0100 Subject: [PATCH 022/252] Add missing protocols on generated --- .../Sources/Generated/JavaScript/BridgeJS.ImportTS.json | 5 ++++- .../PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json | 5 ++++- .../Generated/JavaScript/BridgeJS.ImportTS.json | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json index 366342bbc..c00d16169 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json @@ -63,5 +63,8 @@ ] } ], - "moduleName" : "Benchmarks" + "moduleName" : "Benchmarks", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json index f1a567cde..f73620223 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json @@ -44,5 +44,8 @@ ] } ], - "moduleName" : "PlayBridgeJS" + "moduleName" : "PlayBridgeJS", + "protocols" : [ + + ] } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json index 82515fecb..31ffbcee0 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json @@ -229,5 +229,8 @@ ] } ], - "moduleName" : "BridgeJSRuntimeTests" + "moduleName" : "BridgeJSRuntimeTests", + "protocols" : [ + + ] } \ No newline at end of file From 2619cb54ed56a2f4bb5d4c7a6ec60dcbefa0cf1f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 8 Nov 2025 02:10:29 +0000 Subject: [PATCH 023/252] Revert "Add missing protocols on generated" This reverts commit 623cda09c34f2cc0b544295e73a55fb1513abbf2. --- .../Sources/Generated/JavaScript/BridgeJS.ImportTS.json | 5 +---- .../PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json | 5 +---- .../Generated/JavaScript/BridgeJS.ImportTS.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json index c00d16169..366342bbc 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json @@ -63,8 +63,5 @@ ] } ], - "moduleName" : "Benchmarks", - "protocols" : [ - - ] + "moduleName" : "Benchmarks" } \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json index f73620223..f1a567cde 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json @@ -44,8 +44,5 @@ ] } ], - "moduleName" : "PlayBridgeJS", - "protocols" : [ - - ] + "moduleName" : "PlayBridgeJS" } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json index 31ffbcee0..82515fecb 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json @@ -229,8 +229,5 @@ ] } ], - "moduleName" : "BridgeJSRuntimeTests", - "protocols" : [ - - ] + "moduleName" : "BridgeJSRuntimeTests" } \ No newline at end of file From 6514efb47f476a444f12c504b8903d652efea738 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 8 Nov 2025 03:32:46 +0000 Subject: [PATCH 024/252] Exclude Tests/TemporaryDirectory from file copying --- Plugins/PackageToJS/Tests/ExampleTests.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift index 70a0b7556..e673e6630 100644 --- a/Plugins/PackageToJS/Tests/ExampleTests.swift +++ b/Plugins/PackageToJS/Tests/ExampleTests.swift @@ -127,6 +127,7 @@ extension Trait where Self == ConditionTrait { ".vscode", ".build", "node_modules", + "Tests/TemporaryDirectory", ] let enumerator = FileManager.default.enumerator(atPath: repoPath.path)! From f3485f9bad290acdb31121538b53489f9825bc75 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 9 Nov 2025 06:06:18 +0000 Subject: [PATCH 025/252] Tests: Reduce usage of Xlinker flags in Makefile --- Makefile | 4 ---- Package.swift | 27 +++++++++++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5ac35ea57..c46431dd1 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,6 @@ unittest: @echo Running unit tests env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ --disable-sandbox \ - -Xlinker --stack-first \ - -Xlinker --global-base=524288 \ - -Xlinker -z \ - -Xlinker stack-size=524288 \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc .PHONY: regenerate_swiftpm_resources diff --git a/Package.swift b/Package.swift index cf3055c31..a8518a5a1 100644 --- a/Package.swift +++ b/Package.swift @@ -8,6 +8,15 @@ let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMB let useLegacyResourceBundling = Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false +let testingLinkerFlags: [LinkerSetting] = [ + .unsafeFlags([ + "-Xlinker", "--stack-first", + "-Xlinker", "--global-base=524288", + "-Xlinker", "-z", + "-Xlinker", "stack-size=524288", + ]) +] + let package = Package( name: "JavaScriptKit", platforms: [ @@ -55,7 +64,8 @@ let package = Package( dependencies: ["JavaScriptKit"], swiftSettings: [ .enableExperimentalFeature("Extern") - ] + ], + linkerSettings: testingLinkerFlags ), .target( @@ -70,7 +80,8 @@ let package = Package( .target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]), .testTarget( name: "JavaScriptBigIntSupportTests", - dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"] + dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"], + linkerSettings: testingLinkerFlags ), .target( @@ -92,7 +103,8 @@ let package = Package( ], swiftSettings: [ .enableExperimentalFeature("Extern") - ] + ], + linkerSettings: testingLinkerFlags ), .target( name: "JavaScriptEventLoopTestSupport", @@ -107,7 +119,8 @@ let package = Package( dependencies: [ "JavaScriptKit", "JavaScriptEventLoopTestSupport", - ] + ], + linkerSettings: testingLinkerFlags ), .target( name: "JavaScriptFoundationCompat", @@ -119,7 +132,8 @@ let package = Package( name: "JavaScriptFoundationCompatTests", dependencies: [ "JavaScriptFoundationCompat" - ] + ], + linkerSettings: testingLinkerFlags ), .plugin( name: "PackageToJS", @@ -163,7 +177,8 @@ let package = Package( ], swiftSettings: [ .enableExperimentalFeature("Extern") - ] + ], + linkerSettings: testingLinkerFlags ), ] ) From d283e4351392bcbd36f731d97568d794181a1b03 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 10 Nov 2025 14:09:59 +0900 Subject: [PATCH 026/252] CI: Fix documentation redirect for "https://swiftwasm.org/JavaScriptKit" (#467) --- .github/workflows/test.yml | 3 ++- .gitignore | 1 + Utilities/prepare-gh-pages.sh | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 Utilities/prepare-gh-pages.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a07d73915..5df11d0aa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -123,11 +123,12 @@ jobs: env: SWIFT_SDK_ID_wasm32_unknown_wasip1_threads: ${{ steps.setup-wasm32-unknown-wasip1-threads.outputs.swift-sdk-id }} SWIFT_SDK_ID_wasm32_unknown_wasip1: ${{ steps.setup-wasm32-unknown-wasip1.outputs.swift-sdk-id }} + - run: ./Utilities/prepare-gh-pages.sh - name: Upload static files as artifact id: deployment uses: actions/upload-pages-artifact@v4 with: - path: Examples/ + path: ./_site deploy-examples: runs-on: ubuntu-latest if: github.event_name == 'push' && github.ref == 'refs/heads/main' diff --git a/.gitignore b/.gitignore index a62100fde..8dba07278 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Package.resolved Plugins/BridgeJS/Sources/JavaScript/package-lock.json Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/**/*.actual bridge-js.config.local.json +_site/ diff --git a/Utilities/prepare-gh-pages.sh b/Utilities/prepare-gh-pages.sh new file mode 100755 index 000000000..7260717a6 --- /dev/null +++ b/Utilities/prepare-gh-pages.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +mkdir -p ./_site +# Copy all files from ./Examples to ./_site, excluding specified path patterns +rsync -av --progress ./Examples/ ./_site/ --exclude=".build" +cat < _site/index.html + + + + + Redirecting... + + +

If you are not redirected automatically, follow this link to JavaScriptKit documentation.

+ + +EOF + From d628d2d627b78a3d90813089215b193eef366a32 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 14 Nov 2025 08:57:48 +0100 Subject: [PATCH 027/252] BridgeJS: Closure support review comments --- .../Sources/BridgeJSCore/ExportSwift.swift | 23 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 57 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 11 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 59 +- .../BridgeJSLinkTests/SwiftClosure.Export.js | 326 +++++---- .../ExportSwiftTests/SwiftClosure.json | 60 +- .../ExportSwiftTests/SwiftClosure.swift | 488 ++++++------- Plugins/PackageToJS/Templates/instantiate.js | 1 - .../JavaScriptKit/BridgeJSInstrincics.swift | 59 -- .../BridgeJSRuntimeTests/ExportAPITests.swift | 3 - .../Generated/BridgeJS.ExportSwift.swift | 658 +++++++++--------- .../JavaScript/BridgeJS.ExportSwift.json | 81 ++- 12 files changed, 888 insertions(+), 938 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 508894629..07b103b6f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -28,7 +28,7 @@ public class ExportSwift { private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() private let enumCodegen: EnumCodegen = EnumCodegen() - private lazy var closureCodegen = ClosureCodegen(moduleName: moduleName) + private let closureCodegen = ClosureCodegen() public init(progress: ProgressReporting, moduleName: String) { self.progress = progress @@ -1354,6 +1354,7 @@ public class ExportSwift { ClosureSignature( parameters: parameters, returnType: returnType, + moduleName: moduleName, isAsync: isAsync, isThrows: isThrows ) @@ -1477,7 +1478,6 @@ public class ExportSwift { } decls.append(Self.prelude) - // Collect all unique closure signatures var closureSignatures: Set = [] for function in exportedFunctions { collectClosureSignatures(from: function.parameters, into: &closureSignatures) @@ -1817,8 +1817,6 @@ public class ExportSwift { } private struct ClosureCodegen { - let moduleName: String - func generateOptionalParameterLowering(signature: ClosureSignature) throws -> String { var lines: [String] = [] @@ -1826,11 +1824,7 @@ public class ExportSwift { guard case .optional(let wrappedType) = paramType else { continue } - let paramName = "param\(index)" - - // Use bridgeJSLowerParameterWithRetain for heap objects in escaping closures - // to ensure proper ownership transfer if case .swiftHeapObject = wrappedType { lines.append( "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithRetain()" @@ -1859,7 +1853,7 @@ public class ExportSwift { let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" var invokeParams: [(name: String, type: String)] = [("_", "Int32")] - var invokeCallArgs: [String] = ["owner.callbackId"] + var invokeCallArgs: [String] = ["callback.bridgeJSLowerParameter()"] for (index, paramType) in signature.parameters.enumerated() { let paramName = "param\(index)" @@ -1920,7 +1914,7 @@ public class ExportSwift { """ } - let externName = "invoke_js_callback_\(mangledName.lowercased())" + let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" let optionalLoweringCode = try generateOptionalParameterLowering(signature: signature) return """ @@ -1938,8 +1932,8 @@ public class ExportSwift { } static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in #if arch(wasm32) @_extern(wasm, module: "bjs", name: "\(raw: externName)") func _invoke(\(raw: invokeSignature)) -> \(raw: invokeReturnType) @@ -1955,7 +1949,7 @@ public class ExportSwift { func renderClosureInvokeHandler(signature: ClosureSignature) throws -> DeclSyntax { let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" - let abiName = "invoke_swift_closure_\(signature.mangleName.lowercased())" + let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")] var liftedParams: [String] = [] @@ -2471,14 +2465,12 @@ public class ExportSwift { return decls } - /// Collects all closure signatures from function parameters private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { for param in parameters { collectClosureSignatures(from: param.type, into: &signatures) } } - /// Collects all closure signatures from a bridge type private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { switch type { case .closure(let signature): @@ -2933,7 +2925,6 @@ extension BridgeType { case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: - // Closures are returned as UnsafeMutableRawPointer (box pointer) return .swiftHeapObject } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index eef3f31d8..5a7245aa6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -696,53 +696,29 @@ struct BridgeJSLink { } printer.write("}") - var closureSignatures: Set = [] for skeleton in exportedSkeletons { + var closureSignatures: Set = [] collectClosureSignatures(from: skeleton, into: &closureSignatures) - } - var classToModule: [String: String] = [:] - for skeleton in exportedSkeletons { - for klass in skeleton.classes { - classToModule[klass.name] = skeleton.moduleName - } - } + guard !closureSignatures.isEmpty else { continue } - for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { - let invokeFuncName = "invoke_js_callback_\(signature.mangleName.lowercased())" - printer.write( - lines: generateInvokeFunction( - signature: signature, - functionName: invokeFuncName, - classToModule: classToModule + for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { + let invokeFuncName = "invoke_js_callback_\(skeleton.moduleName)_\(signature.mangleName)" + printer.write( + lines: generateInvokeFunction( + signature: signature, + functionName: invokeFuncName + ) ) - ) - let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())" - printer.write( - lines: generateLowerClosureFunction( - signature: signature, - functionName: lowerFuncName - ) - ) - } - - if !closureSignatures.isEmpty { - printer.nextLine() - printer.write("bjs[\"release_js_callback\"] = function(id) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(id);") - } - printer.write("};") - - printer.nextLine() - printer.write("bjs[\"release_swift_closure\"] = function(boxPtr) {") - printer.indent { + let lowerFuncName = "lower_closure_\(skeleton.moduleName)_\(signature.mangleName)" printer.write( - "\(JSGlueVariableScope.reservedInstance).exports._release_swift_closure(boxPtr);" + lines: generateLowerClosureFunction( + signature: signature, + functionName: lowerFuncName + ) ) } - printer.write("};") } } } @@ -793,8 +769,7 @@ struct BridgeJSLink { private func generateInvokeFunction( signature: ClosureSignature, - functionName: String, - classToModule: [String: String] + functionName: String ) -> [String] { let printer = CodeFragmentPrinter() let scope = JSGlueVariableScope() @@ -889,7 +864,7 @@ struct BridgeJSLink { // Call the Swift invoke function let invokeCall = - "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.mangleName.lowercased())(\(invokeArgs.joined(separator: ", ")))" + "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))" let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) _ = returnFragment.printCode([invokeCall], scope, printer, cleanupCode) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 6ba378de5..0be72f6c6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1298,14 +1298,13 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLiftReturn(enumBase: base) case .closure(let signature): + let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)" return IntrinsicJSFragment( - parameters: ["closurePtr"], + parameters: ["boxPtr"], printCode: { arguments, scope, printer, cleanupCode in - let closurePtr = arguments[0] - let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())" - let resultVar = scope.variable("closure") - printer.write("const \(resultVar) = bjs[\"\(lowerFuncName)\"](\(closurePtr));") - return [resultVar] + let boxPtr = arguments[0] + printer.write("return bjs[\"\(lowerFuncName)\"](\(boxPtr));") + return [] } ) case .namespaceEnum(let string): diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 325ace7b2..b019e4d91 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -76,22 +76,34 @@ public enum BridgeContext: Sendable { public struct ClosureSignature: Codable, Equatable, Hashable, Sendable { public let parameters: [BridgeType] public let returnType: BridgeType + /// Simplified Swift ABI-style mangling with module prefix + // + params + _ + return + // Examples: + // - 4MainSS_Si (Main module, String->Int) + // - 6MyAppSiSi_y (MyApp module, Int,Int->Void) + public let mangleName: String public let isAsync: Bool public let isThrows: Bool - public let mangleName: String + public let moduleName: String - public init(parameters: [BridgeType], returnType: BridgeType, isAsync: Bool = false, isThrows: Bool = false) { + public init( + parameters: [BridgeType], + returnType: BridgeType, + moduleName: String, + isAsync: Bool = false, + isThrows: Bool = false + ) { self.parameters = parameters self.returnType = returnType + self.moduleName = moduleName self.isAsync = isAsync self.isThrows = isThrows - let paramPart = parameters.isEmpty - ? "Void" - : parameters.map { $0.mangleTypeName }.joined(separator: "_") - let returnPart = returnType.mangleTypeName - self.mangleName = "\(paramPart)_To_\(returnPart)" + ? "y" + : parameters.map { $0.mangleTypeName }.joined() + let signaturePart = "\(paramPart)_\(returnType.mangleTypeName)" + self.mangleName = "\(moduleName.count)\(moduleName)\(signaturePart)" } } @@ -602,31 +614,36 @@ extension BridgeType { return false } - /// Generates a mangled name for use in closure type names - /// Examples: "String", "Int", "MyClass", "Bool" + /// Simplified Swift ABI-style mangled name + /// https://github.com/swiftlang/swift/blob/main/docs/ABI/Mangling.rst#types public var mangleTypeName: String { switch self { - case .int: return "Int" - case .float: return "Float" - case .double: return "Double" - case .string: return "String" - case .bool: return "Bool" - case .void: return "Void" + case .int: return "Si" + case .float: return "Sf" + case .double: return "Sd" + case .string: return "SS" + case .bool: return "Sb" + case .void: return "y" case .jsObject(let name): - return name ?? "JSObject" + let typeName = name ?? "JSObject" + return "\(typeName.count)\(typeName)C" case .swiftHeapObject(let name): - return name + return "\(name.count)\(name)C" case .optional(let wrapped): - return "Optional\(wrapped.mangleTypeName)" + return "Sq\(wrapped.mangleTypeName)" case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name), .namespaceEnum(let name): - return name + return "\(name.count)\(name)O" case .swiftProtocol(let name): - return name + return "\(name.count)\(name)P" case .closure(let signature): - return "Closure_\(signature.mangleName)" + let params = + signature.parameters.isEmpty + ? "y" + : signature.parameters.map { $0.mangleTypeName }.joined() + return "K\(params)_\(signature.returnType.mangleTypeName)" } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 4d0a3ab29..755d98fd6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -285,54 +285,22 @@ export async function createInstantiator(options, swift) { return pointer || 0; } - bjs["invoke_js_callback_apiresult_to_string"] = function(callbackId, param0Id) { - try { - const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.raise(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); - const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; - } catch (error) { - setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; - } - }; - - bjs["lower_closure_apiresult_to_string"] = function(closurePtr) { - return function(param0) { - try { - const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); - const resultLen = instance.exports.invoke_swift_closure_apiresult_to_string(closurePtr, param0CaseId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); - throw error; - } - }; - }; - - bjs["invoke_js_callback_direction_to_bool"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); let param0 = param0Id; const result = callback(param0); - return result ? 1 : 0; + return result | 0; } catch (error) { setException?.(error); return 0; } }; - bjs["lower_closure_direction_to_bool"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModule10HttpStatusO_Si"] = function(closurePtr) { return function(param0) { try { - return instance.exports.invoke_swift_closure_direction_to_bool(closurePtr, param0) !== 0; + return instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(closurePtr, param0) | 0; } catch (error) { setException?.(error); throw error; @@ -340,10 +308,12 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_direction_to_string"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -357,10 +327,12 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_direction_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModule5ThemeO_SS"] = function(closurePtr) { return function(param0) { try { - const resultLen = instance.exports.invoke_swift_closure_direction_to_string(closurePtr, param0); + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(closurePtr, param0Id, param0Bytes.length); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -371,22 +343,26 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_httpstatus_to_int"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_Sb"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); const result = callback(param0); - return result | 0; + return result ? 1 : 0; } catch (error) { setException?.(error); return 0; } }; - bjs["lower_closure_httpstatus_to_int"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModule5ThemeO_Sb"] = function(closurePtr) { return function(param0) { try { - return instance.exports.invoke_swift_closure_httpstatus_to_int(closurePtr, param0) | 0; + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + return instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(closurePtr, param0Id, param0Bytes.length) !== 0; } catch (error) { setException?.(error); throw error; @@ -394,15 +370,10 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_optionalapiresult_to_string"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModule6PersonC_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = enumHelpers.APIResult.raise(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); - } else { - param0 = null; - } + let param0 = _exports['Person'].__construct(param0Id); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -416,17 +387,10 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_optionalapiresult_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModule6PersonC_SS"] = function(closurePtr) { return function(param0) { try { - const isSome = param0 != null; - let param0CaseId, param0Cleanup; - if (isSome) { - const enumResult = enumHelpers.APIResult.lower(param0); - param0CaseId = enumResult.caseId; - param0Cleanup = enumResult.cleanup; - } - const resultLen = instance.exports.invoke_swift_closure_optionalapiresult_to_string(closurePtr, +isSome, isSome ? param0CaseId : 0); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_SS(closurePtr, param0.pointer); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -437,15 +401,10 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_optionaldirection_to_string"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value; - } else { - param0 = null; - } + let param0 = enumHelpers.APIResult.raise(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -459,11 +418,11 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_optionaldirection_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModule9APIResultO_SS"] = function(closurePtr) { return function(param0) { try { - const isSome = param0 != null; - const resultLen = instance.exports.invoke_swift_closure_optionaldirection_to_string(closurePtr, +isSome, isSome ? param0 : 0); + const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(closurePtr, param0CaseId); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -474,30 +433,11 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_optionalperson_optionalstring_optionaldouble_to_string"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = _exports['Person'].__construct(param0Value); - } else { - param0 = null; - } - let param1; - if (param1IsSome) { - const param1Object = swift.memory.getObject(param1Value); - swift.memory.release(param1Value); - param1 = String(param1Object); - } else { - param1 = null; - } - let param2; - if (param2IsSome) { - param2 = param2Value; - } else { - param2 = null; - } - const result = callback(param0, param1, param2); + let param0 = param0Id; + const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); } @@ -510,18 +450,10 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_optionalperson_optionalstring_optionaldouble_to_string"] = function(closurePtr) { - return function(param0, param1, param2) { + bjs["lower_closure_TestModule_10TestModule9DirectionO_SS"] = function(closurePtr) { + return function(param0) { try { - const isSome = param0 != null; - const isSome1 = param1 != null; - let param1Id, param1Bytes; - if (isSome1) { - param1Bytes = textEncoder.encode(param1); - param1Id = swift.memory.retain(param1Bytes); - } - const isSome2 = param2 != null; - const resultLen = instance.exports.invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string(closurePtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(closurePtr, param0); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -532,15 +464,35 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_optionalperson_to_string"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_Sb"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = _exports['Person'].__construct(param0Value); - } else { - param0 = null; + let param0 = param0Id; + const result = callback(param0); + return result ? 1 : 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + + bjs["lower_closure_TestModule_10TestModule9DirectionO_Sb"] = function(closurePtr) { + return function(param0) { + try { + return instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(closurePtr, param0) !== 0; + } catch (error) { + setException?.(error); + throw error; } + }; + }; + + bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -554,11 +506,12 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_optionalperson_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModuleSS_SS"] = function(closurePtr) { return function(param0) { try { - const isSome = param0 != null; - const resultLen = instance.exports.invoke_swift_closure_optionalperson_to_string(closurePtr, +isSome, isSome ? param0.pointer : 0); + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(closurePtr, param0Id, param0Bytes.length); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -569,7 +522,7 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_optionaltheme_to_string"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; @@ -593,7 +546,7 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_optionaltheme_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModuleSq5ThemeO_SS"] = function(closurePtr) { return function(param0) { try { const isSome = param0 != null; @@ -602,7 +555,7 @@ export async function createInstantiator(options, swift) { param0Bytes = textEncoder.encode(param0); param0Id = swift.memory.retain(param0Bytes); } - const resultLen = instance.exports.invoke_swift_closure_optionaltheme_to_string(closurePtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(closurePtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -613,11 +566,30 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_person_to_string"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { try { const callback = swift.memory.getObject(callbackId); - let param0 = _exports['Person'].__construct(param0Id); - const result = callback(param0); + let param0; + if (param0IsSome) { + param0 = _exports['Person'].__construct(param0Value); + } else { + param0 = null; + } + let param1; + if (param1IsSome) { + const param1Object = swift.memory.getObject(param1Value); + swift.memory.release(param1Value); + param1 = String(param1Object); + } else { + param1 = null; + } + let param2; + if (param2IsSome) { + param2 = param2Value; + } else { + param2 = null; + } + const result = callback(param0, param1, param2); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); } @@ -630,10 +602,18 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_person_to_string"] = function(closurePtr) { - return function(param0) { + bjs["lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(closurePtr) { + return function(param0, param1, param2) { try { - const resultLen = instance.exports.invoke_swift_closure_person_to_string(closurePtr, param0.pointer); + const isSome = param0 != null; + const isSome1 = param1 != null; + let param1Id, param1Bytes; + if (isSome1) { + param1Bytes = textEncoder.encode(param1); + param1Id = swift.memory.retain(param1Bytes); + } + const isSome2 = param2 != null; + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(closurePtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -644,12 +624,15 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_string_to_string"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); + let param0; + if (param0IsSome) { + param0 = _exports['Person'].__construct(param0Value); + } else { + param0 = null; + } const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -663,12 +646,11 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_string_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModuleSq6PersonC_SS"] = function(closurePtr) { return function(param0) { try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const resultLen = instance.exports.invoke_swift_closure_string_to_string(closurePtr, param0Id, param0Bytes.length); + const isSome = param0 != null; + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(closurePtr, +isSome, isSome ? param0.pointer : 0); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -679,26 +661,42 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_theme_to_bool"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); + let param0; + if (param0IsSome) { + param0 = enumHelpers.APIResult.raise(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + } else { + param0 = null; + } const result = callback(param0); - return result ? 1 : 0; + if (typeof result !== "string") { + throw new TypeError("Callback must return a string"); + } + tmpRetBytes = textEncoder.encode(result); + return tmpRetBytes.length; } catch (error) { setException?.(error); + tmpRetBytes = new Uint8Array(0); return 0; } }; - bjs["lower_closure_theme_to_bool"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModuleSq9APIResultO_SS"] = function(closurePtr) { return function(param0) { try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - return instance.exports.invoke_swift_closure_theme_to_bool(closurePtr, param0Id, param0Bytes.length) !== 0; + const isSome = param0 != null; + let param0CaseId, param0Cleanup; + if (isSome) { + const enumResult = enumHelpers.APIResult.lower(param0); + param0CaseId = enumResult.caseId; + param0Cleanup = enumResult.cleanup; + } + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(closurePtr, +isSome, isSome ? param0CaseId : 0); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; } catch (error) { setException?.(error); throw error; @@ -706,12 +704,15 @@ export async function createInstantiator(options, swift) { }; }; - bjs["invoke_js_callback_theme_to_string"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); + let param0; + if (param0IsSome) { + param0 = param0Value; + } else { + param0 = null; + } const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -725,12 +726,11 @@ export async function createInstantiator(options, swift) { } }; - bjs["lower_closure_theme_to_string"] = function(closurePtr) { + bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"] = function(closurePtr) { return function(param0) { try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const resultLen = instance.exports.invoke_swift_closure_theme_to_string(closurePtr, param0Id, param0Bytes.length); + const isSome = param0 != null; + const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(closurePtr, +isSome, isSome ? param0 : 0); const ret = tmpRetString; tmpRetString = undefined; return ret; @@ -740,14 +740,6 @@ export async function createInstantiator(options, swift) { } }; }; - - bjs["release_js_callback"] = function(id) { - swift.memory.release(id); - }; - - bjs["release_swift_closure"] = function(boxPtr) { - instance.exports._release_swift_closure(boxPtr); - }; // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -819,8 +811,7 @@ export async function createInstantiator(options, swift) { } getTransform() { const ret = instance.exports.bjs_TestProcessor_getTransform(this.pointer); - const closure = bjs["lower_closure_string_to_string"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModuleSS_SS"](ret); } processWithCustom(text, customTransform) { const textBytes = textEncoder.encode(text); @@ -845,14 +836,12 @@ export async function createInstantiator(options, swift) { roundtrip(personClosure) { const callbackId = swift.memory.retain(personClosure); const ret = instance.exports.bjs_TestProcessor_roundtrip(this.pointer, callbackId); - const closure = bjs["lower_closure_person_to_string"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModule6PersonC_SS"](ret); } roundtripOptional(personClosure) { const callbackId = swift.memory.retain(personClosure); const ret = instance.exports.bjs_TestProcessor_roundtripOptional(this.pointer, callbackId); - const closure = bjs["lower_closure_optionalperson_to_string"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModuleSq6PersonC_SS"](ret); } processDirection(callback) { const callbackId = swift.memory.retain(callback); @@ -882,23 +871,19 @@ export async function createInstantiator(options, swift) { } makeDirectionChecker() { const ret = instance.exports.bjs_TestProcessor_makeDirectionChecker(this.pointer); - const closure = bjs["lower_closure_direction_to_bool"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModule9DirectionO_Sb"](ret); } makeThemeValidator() { const ret = instance.exports.bjs_TestProcessor_makeThemeValidator(this.pointer); - const closure = bjs["lower_closure_theme_to_bool"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModule5ThemeO_Sb"](ret); } makeStatusCodeExtractor() { const ret = instance.exports.bjs_TestProcessor_makeStatusCodeExtractor(this.pointer); - const closure = bjs["lower_closure_httpstatus_to_int"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModule10HttpStatusO_Si"](ret); } makeAPIResultHandler() { const ret = instance.exports.bjs_TestProcessor_makeAPIResultHandler(this.pointer); - const closure = bjs["lower_closure_apiresult_to_string"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModule9APIResultO_SS"](ret); } processOptionalDirection(callback) { const callbackId = swift.memory.retain(callback); @@ -923,8 +908,7 @@ export async function createInstantiator(options, swift) { } makeOptionalDirectionFormatter() { const ret = instance.exports.bjs_TestProcessor_makeOptionalDirectionFormatter(this.pointer); - const closure = bjs["lower_closure_optionaldirection_to_string"](ret); - return closure; + return bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"](ret); } } const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json index 2354469c8..acb1c8949 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -47,7 +47,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", "parameters" : [ { "string" : { @@ -83,7 +84,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", "parameters" : [ { "string" : { @@ -126,7 +128,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", "parameters" : [ { "string" : { @@ -194,7 +197,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalPerson_OptionalString_OptionalDouble_To_String", + "mangleName" : "10TestModuleSq6PersonCSqSSSqSd_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -257,7 +261,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Person_To_String", + "mangleName" : "10TestModule6PersonC_SS", + "moduleName" : "TestModule", "parameters" : [ { "swiftHeapObject" : { @@ -280,7 +285,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Person_To_String", + "mangleName" : "10TestModule6PersonC_SS", + "moduleName" : "TestModule", "parameters" : [ { "swiftHeapObject" : { @@ -314,7 +320,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalPerson_To_String", + "mangleName" : "10TestModuleSq6PersonC_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -341,7 +348,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalPerson_To_String", + "mangleName" : "10TestModuleSq6PersonC_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -379,7 +387,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Direction_To_String", + "mangleName" : "10TestModule9DirectionO_SS", + "moduleName" : "TestModule", "parameters" : [ { "caseEnum" : { @@ -420,7 +429,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Theme_To_String", + "mangleName" : "10TestModule5ThemeO_SS", + "moduleName" : "TestModule", "parameters" : [ { "rawValueEnum" : { @@ -462,7 +472,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "HttpStatus_To_Int", + "mangleName" : "10TestModule10HttpStatusO_Si", + "moduleName" : "TestModule", "parameters" : [ { "rawValueEnum" : { @@ -504,7 +515,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "APIResult_To_String", + "mangleName" : "10TestModule9APIResultO_SS", + "moduleName" : "TestModule", "parameters" : [ { "associatedValueEnum" : { @@ -544,7 +556,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Direction_To_Bool", + "mangleName" : "10TestModule9DirectionO_Sb", + "moduleName" : "TestModule", "parameters" : [ { "caseEnum" : { @@ -577,7 +590,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Theme_To_Bool", + "mangleName" : "10TestModule5ThemeO_Sb", + "moduleName" : "TestModule", "parameters" : [ { "rawValueEnum" : { @@ -611,7 +625,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "HttpStatus_To_Int", + "mangleName" : "10TestModule10HttpStatusO_Si", + "moduleName" : "TestModule", "parameters" : [ { "rawValueEnum" : { @@ -645,7 +660,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "APIResult_To_String", + "mangleName" : "10TestModule9APIResultO_SS", + "moduleName" : "TestModule", "parameters" : [ { "associatedValueEnum" : { @@ -679,7 +695,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalDirection_To_String", + "mangleName" : "10TestModuleSq9DirectionO_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -724,7 +741,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalTheme_To_String", + "mangleName" : "10TestModuleSq5ThemeO_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -770,7 +788,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalAPIResult_To_String", + "mangleName" : "10TestModuleSq9APIResultO_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { @@ -814,7 +833,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalDirection_To_String", + "mangleName" : "10TestModuleSq9DirectionO_SS", + "moduleName" : "TestModule", "parameters" : [ { "optional" : { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index 888dc5150..4b1b404fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -6,27 +6,27 @@ @_spi(BridgeJS) import JavaScriptKit -private final class _BJS_ClosureBox_APIResult_To_String: _BridgedSwiftClosureBox { - let closure: (APIResult) -> String - init(_ closure: @escaping (APIResult) -> String) { +private final class _BJS_ClosureBox_10TestModule10HttpStatusO_Si: _BridgedSwiftClosureBox { + let closure: (HttpStatus) -> Int + init(_ closure: @escaping (HttpStatus) -> Int) { self.closure = closure } } -private enum _BJS_Closure_APIResult_To_String { - static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_APIResult_To_String(closure) +private enum _BJS_Closure_10TestModule10HttpStatusO_Si { + static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule10HttpStatusO_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_apiresult_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -34,39 +34,39 @@ private enum _BJS_Closure_APIResult_To_String { } } -@_expose(wasm, "invoke_swift_closure_apiresult_to_string") -@_cdecl("invoke_swift_closure_apiresult_to_string") -public func _invoke_swift_closure_apiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") +@_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") +public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_APIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Direction_To_Bool: _BridgedSwiftClosureBox { - let closure: (Direction) -> Bool - init(_ closure: @escaping (Direction) -> Bool) { +private final class _BJS_ClosureBox_10TestModule5ThemeO_SS: _BridgedSwiftClosureBox { + let closure: (Theme) -> String + init(_ closure: @escaping (Theme) -> String) { self.closure = closure } } -private enum _BJS_Closure_Direction_To_Bool { - static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Direction_To_Bool(closure) +private enum _BJS_Closure_10TestModule5ThemeO_SS { + static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_bool") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_SS") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -74,39 +74,39 @@ private enum _BJS_Closure_Direction_To_Bool { } } -@_expose(wasm, "invoke_swift_closure_direction_to_bool") -@_cdecl("invoke_swift_closure_direction_to_bool") -public func _invoke_swift_closure_direction_to_bool(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") +public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Direction_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Direction_To_String: _BridgedSwiftClosureBox { - let closure: (Direction) -> String - init(_ closure: @escaping (Direction) -> String) { +private final class _BJS_ClosureBox_10TestModule5ThemeO_Sb: _BridgedSwiftClosureBox { + let closure: (Theme) -> Bool + init(_ closure: @escaping (Theme) -> Bool) { self.closure = closure } } -private enum _BJS_Closure_Direction_To_String { - static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Direction_To_String(closure) +private enum _BJS_Closure_10TestModule5ThemeO_Sb { + static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule5ThemeO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_Sb") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -114,39 +114,39 @@ private enum _BJS_Closure_Direction_To_String { } } -@_expose(wasm, "invoke_swift_closure_direction_to_string") -@_cdecl("invoke_swift_closure_direction_to_string") -public func _invoke_swift_closure_direction_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") +@_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") +public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Direction_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_HttpStatus_To_Int: _BridgedSwiftClosureBox { - let closure: (HttpStatus) -> Int - init(_ closure: @escaping (HttpStatus) -> Int) { +private final class _BJS_ClosureBox_10TestModule6PersonC_SS: _BridgedSwiftClosureBox { + let closure: (Person) -> String + init(_ closure: @escaping (Person) -> String) { self.closure = closure } } -private enum _BJS_Closure_HttpStatus_To_Int { - static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_HttpStatus_To_Int(closure) +private enum _BJS_Closure_10TestModule6PersonC_SS { + static func bridgeJSLower(_ closure: @escaping (Person) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule6PersonC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_httpstatus_to_int") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_SS") + func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -154,39 +154,38 @@ private enum _BJS_Closure_HttpStatus_To_Int { } } -@_expose(wasm, "invoke_swift_closure_httpstatus_to_int") -@_cdecl("invoke_swift_closure_httpstatus_to_int") -public func _invoke_swift_closure_httpstatus_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule6PersonC_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_SS") +public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_HttpStatus_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Person.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalAPIResult_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_10TestModule9APIResultO_SS: _BridgedSwiftClosureBox { + let closure: (APIResult) -> String + init(_ closure: @escaping (APIResult) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalAPIResult_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalAPIResult_To_String(closure) +private enum _BJS_Closure_10TestModule9APIResultO_SS { + static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalapiresult_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_SS") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -195,39 +194,38 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalapiresult_to_string") -@_cdecl("invoke_swift_closure_optionalapiresult_to_string") -public func _invoke_swift_closure_optionalapiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") +public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalAPIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalDirection_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_10TestModule9DirectionO_SS: _BridgedSwiftClosureBox { + let closure: (Direction) -> String + init(_ closure: @escaping (Direction) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalDirection_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalDirection_To_String(closure) +private enum _BJS_Closure_10TestModule9DirectionO_SS { + static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaldirection_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_SS") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -236,42 +234,39 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionaldirection_to_string") -@_cdecl("invoke_swift_closure_optionaldirection_to_string") -public func _invoke_swift_closure_optionaldirection_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") +public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalDirection_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String: _BridgedSwiftClosureBox { - let closure: (Optional, Optional, Optional) -> String - init(_ closure: @escaping (Optional, Optional, Optional) -> String) { +private final class _BJS_ClosureBox_10TestModule9DirectionO_Sb: _BridgedSwiftClosureBox { + let closure: (Direction) -> Bool + init(_ closure: @escaping (Direction) -> Bool) { self.closure = closure } } -private enum _BJS_Closure_OptionalPerson_OptionalString_OptionalDouble_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional, Optional, Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String(closure) +private enum _BJS_Closure_10TestModule9DirectionO_Sb { + static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModule9DirectionO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0, param1, param2 in + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalperson_optionalstring_optionaldouble_to_string") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let (param1IsSome, param1Value) = param1.bridgeJSLowerParameterWithPresence() -let (param2IsSome, param2Value) = param2.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) - return String.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_Sb") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -279,39 +274,38 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value, param1IsSome } } -@_expose(wasm, "invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string") -@_cdecl("invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string") -public func _invoke_swift_closure_optionalperson_optionalstring_optionaldouble_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer, param1IsSome: Int32, param1Bytes: Int32, param1Length: Int32, param2IsSome: Int32, param2Value: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") +@_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") +public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalPerson_OptionalString_OptionalDouble_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) + let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalPerson_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_10TestModuleSS_SS: _BridgedSwiftClosureBox { + let closure: (String) -> String + init(_ closure: @escaping (String) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalPerson_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalPerson_To_String(closure) +private enum _BJS_Closure_10TestModuleSS_SS { + static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModuleSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalperson_to_string") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -320,39 +314,39 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalperson_to_string") -@_cdecl("invoke_swift_closure_optionalperson_to_string") -public func _invoke_swift_closure_optionalperson_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSS_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalPerson_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalTheme_To_String: _BridgedSwiftClosureBox { +private final class _BJS_ClosureBox_10TestModuleSq5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalTheme_To_String { +private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalTheme_To_String(closure) + let box = _BJS_ClosureBox_10TestModuleSq5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaltheme_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS") func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -361,11 +355,11 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionaltheme_to_string") -@_cdecl("invoke_swift_closure_optionaltheme_to_string") -public func _invoke_swift_closure_optionaltheme_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalTheme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else @@ -373,26 +367,29 @@ public func _invoke_swift_closure_optionaltheme_to_string(boxPtr: UnsafeMutableR #endif } -private final class _BJS_ClosureBox_Person_To_String: _BridgedSwiftClosureBox { - let closure: (Person) -> String - init(_ closure: @escaping (Person) -> String) { +private final class _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS: _BridgedSwiftClosureBox { + let closure: (Optional, Optional, Optional) -> String + init(_ closure: @escaping (Optional, Optional, Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_Person_To_String { - static func bridgeJSLower(_ closure: @escaping (Person) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Person_To_String(closure) +private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { + static func bridgeJSLower(_ closure: @escaping (Optional, Optional, Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1, param2 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_person_to_string") - func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let (param1IsSome, param1Value) = param1.bridgeJSLowerParameterWithPresence() +let (param2IsSome, param2Value) = param2.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -401,38 +398,39 @@ private enum _BJS_Closure_Person_To_String { } } -@_expose(wasm, "invoke_swift_closure_person_to_string") -@_cdecl("invoke_swift_closure_person_to_string") -public func _invoke_swift_closure_person_to_string(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer, param1IsSome: Int32, param1Bytes: Int32, param1Length: Int32, param2IsSome: Int32, param2Value: Float64) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Person_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Person.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_String_To_String: _BridgedSwiftClosureBox { - let closure: (String) -> String - init(_ closure: @escaping (String) -> String) { +private final class _BJS_ClosureBox_10TestModuleSq6PersonC_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_String_To_String { - static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_String_To_String(closure) +private enum _BJS_Closure_10TestModuleSq6PersonC_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModuleSq6PersonC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_string") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -441,39 +439,40 @@ private enum _BJS_Closure_String_To_String { } } -@_expose(wasm, "invoke_swift_closure_string_to_string") -@_cdecl("invoke_swift_closure_string_to_string") -public func _invoke_swift_closure_string_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_String_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Theme_To_Bool: _BridgedSwiftClosureBox { - let closure: (Theme) -> Bool - init(_ closure: @escaping (Theme) -> Bool) { +private final class _BJS_ClosureBox_10TestModuleSq9APIResultO_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_Theme_To_Bool { - static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Theme_To_Bool(closure) +private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModuleSq9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_bool") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -481,38 +480,39 @@ private enum _BJS_Closure_Theme_To_Bool { } } -@_expose(wasm, "invoke_swift_closure_theme_to_bool") -@_cdecl("invoke_swift_closure_theme_to_bool") -public func _invoke_swift_closure_theme_to_bool(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Theme_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Theme_To_String: _BridgedSwiftClosureBox { - let closure: (Theme) -> String - init(_ closure: @escaping (Theme) -> String) { +private final class _BJS_ClosureBox_10TestModuleSq9DirectionO_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_Theme_To_String { - static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Theme_To_String(closure) +private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_10TestModuleSq9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_string") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -521,12 +521,12 @@ private enum _BJS_Closure_Theme_To_String { } } -@_expose(wasm, "invoke_swift_closure_theme_to_string") -@_cdecl("invoke_swift_closure_theme_to_string") -public func _invoke_swift_closure_theme_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Theme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -700,7 +700,7 @@ extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { @_cdecl("bjs_TestProcessor_init") public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TestProcessor(transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + let ret = TestProcessor(transform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -712,7 +712,7 @@ public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer public func _bjs_TestProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).getTransform() - return _BJS_Closure_String_To_String.bridgeJSLower(ret) + return _BJS_Closure_10TestModuleSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -722,7 +722,7 @@ public func _bjs_TestProcessor_getTransform(_self: UnsafeMutableRawPointer) -> U @_cdecl("bjs_TestProcessor_processWithCustom") public func _bjs_TestProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_String_To_String.bridgeJSLift(customTransform)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -733,7 +733,7 @@ public func _bjs_TestProcessor_processWithCustom(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TestProcessor_printTogether") public func _bjs_TestProcessor_printTogether(_self: UnsafeMutableRawPointer, person: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32, ratio: Float64, customTransform: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).printTogether(person: Person.bridgeJSLiftParameter(person), name: String.bridgeJSLiftParameter(nameBytes, nameLength), ratio: Double.bridgeJSLiftParameter(ratio), customTransform: _BJS_Closure_OptionalPerson_OptionalString_OptionalDouble_To_String.bridgeJSLift(customTransform)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).printTogether(person: Person.bridgeJSLiftParameter(person), name: String.bridgeJSLiftParameter(nameBytes, nameLength), ratio: Double.bridgeJSLiftParameter(ratio), customTransform: _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -744,8 +744,8 @@ public func _bjs_TestProcessor_printTogether(_self: UnsafeMutableRawPointer, per @_cdecl("bjs_TestProcessor_roundtrip") public func _bjs_TestProcessor_roundtrip(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_Person_To_String.bridgeJSLift(personClosure)) - return _BJS_Closure_Person_To_String.bridgeJSLower(ret) + let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLift(personClosure)) + return _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -755,8 +755,8 @@ public func _bjs_TestProcessor_roundtrip(_self: UnsafeMutableRawPointer, personC @_cdecl("bjs_TestProcessor_roundtripOptional") public func _bjs_TestProcessor_roundtripOptional(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_OptionalPerson_To_String.bridgeJSLift(personClosure)) - return _BJS_Closure_OptionalPerson_To_String.bridgeJSLower(ret) + let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLift(personClosure)) + return _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -766,7 +766,7 @@ public func _bjs_TestProcessor_roundtripOptional(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TestProcessor_processDirection") public func _bjs_TestProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_Direction_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_10TestModule9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -777,7 +777,7 @@ public func _bjs_TestProcessor_processDirection(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TestProcessor_processTheme") public func _bjs_TestProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_Theme_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_10TestModule5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -788,7 +788,7 @@ public func _bjs_TestProcessor_processTheme(_self: UnsafeMutableRawPointer, call @_cdecl("bjs_TestProcessor_processHttpStatus") public func _bjs_TestProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_HttpStatus_To_Int.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -799,7 +799,7 @@ public func _bjs_TestProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TestProcessor_processAPIResult") public func _bjs_TestProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_APIResult_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -811,7 +811,7 @@ public func _bjs_TestProcessor_processAPIResult(_self: UnsafeMutableRawPointer, public func _bjs_TestProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() - return _BJS_Closure_Direction_To_Bool.bridgeJSLower(ret) + return _BJS_Closure_10TestModule9DirectionO_Sb.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -822,7 +822,7 @@ public func _bjs_TestProcessor_makeDirectionChecker(_self: UnsafeMutableRawPoint public func _bjs_TestProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() - return _BJS_Closure_Theme_To_Bool.bridgeJSLower(ret) + return _BJS_Closure_10TestModule5ThemeO_Sb.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -833,7 +833,7 @@ public func _bjs_TestProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer public func _bjs_TestProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() - return _BJS_Closure_HttpStatus_To_Int.bridgeJSLower(ret) + return _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -844,7 +844,7 @@ public func _bjs_TestProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPo public func _bjs_TestProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() - return _BJS_Closure_APIResult_To_String.bridgeJSLower(ret) + return _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -854,7 +854,7 @@ public func _bjs_TestProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPoint @_cdecl("bjs_TestProcessor_processOptionalDirection") public func _bjs_TestProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_OptionalDirection_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -865,7 +865,7 @@ public func _bjs_TestProcessor_processOptionalDirection(_self: UnsafeMutableRawP @_cdecl("bjs_TestProcessor_processOptionalTheme") public func _bjs_TestProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_OptionalTheme_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_10TestModuleSq5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -876,7 +876,7 @@ public func _bjs_TestProcessor_processOptionalTheme(_self: UnsafeMutableRawPoint @_cdecl("bjs_TestProcessor_processOptionalAPIResult") public func _bjs_TestProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_OptionalAPIResult_To_String.bridgeJSLift(callback)) + let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_10TestModuleSq9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -888,7 +888,7 @@ public func _bjs_TestProcessor_processOptionalAPIResult(_self: UnsafeMutableRawP public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return _BJS_Closure_OptionalDirection_To_String.bridgeJSLower(ret) + return _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index dca50d086..1ab35de35 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -62,7 +62,6 @@ async function createInstantiator(options, swift) { swift_js_get_optional_double_presence: unexpectedBjsCall, swift_js_get_optional_double_value: unexpectedBjsCall, swift_js_get_optional_heap_object_pointer: unexpectedBjsCall, - release_js_callback: unexpectedBjsCall, } }, /** @param {WebAssembly.Instance} instance */ diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index 5b160f779..0db1cd2ed 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -29,48 +29,6 @@ import _CJavaScriptKit } #endif -// MARK: Closure Callback Management - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "release_js_callback") -@_spi(BridgeJS) public func _swift_js_release_callback(_ id: Int32) -#else -/// Releases a JavaScript callback registered from JavaScript side. -/// -/// This function is called by BridgeJS-generated code after consuming a closure -/// parameter to ensure the JavaScript callback is properly cleaned up and can be -/// garbage collected. -/// -/// - Parameter id: The callback ID to release -@_spi(BridgeJS) public func _swift_js_release_callback(_ id: Int32) { - _onlyAvailableOnWasm() -} -#endif - -/// Owns a JavaScript callback and automatically releases it on deinit. -/// This ensures the callback lives exactly as long as the Swift closure that uses it. -/// -/// When a JavaScript function is passed to Swift as a closure parameter, the callback -/// is stored in `swift.memory` with an ID. This owner class captures that ID and ensures -/// it's released when the Swift closure is deallocated, preventing memory leaks while -/// supporting both @escaping and non-escaping closures. -@_spi(BridgeJS) public final class _JSCallbackOwner { - public let callbackId: Int32 - private var isReleased: Bool = false - - public init(callbackId: Int32) { - self.callbackId = callbackId - } - - deinit { - guard !isReleased else { return } - #if arch(wasm32) - _swift_js_release_callback(callbackId) - #endif - isReleased = true - } -} - /// Retrieves and clears any pending JavaScript exception. /// /// This function checks for any JavaScript exceptions that were thrown during @@ -340,20 +298,6 @@ extension _BridgedSwiftHeapObject { /// The conformance is automatically synthesized by the BridgeJS code generator. @_spi(BridgeJS) public protocol _BridgedSwiftClosureBox: AnyObject {} -/// Release function for closure boxes -/// - Parameter boxPtr: Opaque pointer to a closure box conforming to _BridgedSwiftClosureBox -#if arch(wasm32) -@_expose(wasm, "release_swift_closure") -@_cdecl("release_swift_closure") -public func _release_swift_closure(boxPtr: UnsafeMutableRawPointer) { - Unmanaged.fromOpaque(boxPtr).release() -} -#else -@_spi(BridgeJS) public func _release_swift_closure(boxPtr: UnsafeMutableRawPointer) { - _onlyAvailableOnWasm() -} -#endif - extension _JSBridgedClass { // MARK: ImportTS @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { jsObject.bridgeJSLowerParameter() } @@ -836,9 +780,6 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { /// JavaScript must wrap the pointer with `__construct()` to create a managed reference /// that will be cleaned up via FinalizationRegistry. /// - /// Use this method when passing heap objects to @escaping closures that may outlive - /// the original call context. - /// /// - Returns: A tuple containing presence flag (0 for nil, 1 for some) and retained pointer @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithRetain() -> ( isSome: Int32, pointer: UnsafeMutableRawPointer diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 3875d37e7..f5268b4ee 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1097,7 +1097,6 @@ enum APIOptionalResult { return transform } - // Optional parameter in closure @JS func processOptionalString(_ callback: (String?) -> String) -> String { return callback("test") + " | " + callback(nil) } @@ -1111,7 +1110,6 @@ enum APIOptionalResult { return callback(greeter) + " | " + callback(nil) } - // Return closure with optional parameter @JS func makeOptionalStringFormatter() -> (String?) -> String { return { value in if let value = value { @@ -1122,7 +1120,6 @@ enum APIOptionalResult { } } - // Return closure with optional return type @JS func makeOptionalGreeterCreator() -> () -> Greeter? { var count = 0 return { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 67f05fde2..2e7394999 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,27 +6,27 @@ @_spi(BridgeJS) import JavaScriptKit -private final class _BJS_ClosureBox_APIResult_To_String: _BridgedSwiftClosureBox { - let closure: (APIResult) -> String - init(_ closure: @escaping (APIResult) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si: _BridgedSwiftClosureBox { + let closure: (HttpStatus) -> Int + init(_ closure: @escaping (HttpStatus) -> Int) { self.closure = closure } } -private enum _BJS_Closure_APIResult_To_String { - static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_APIResult_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { + static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_apiresult_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -34,39 +34,39 @@ private enum _BJS_Closure_APIResult_To_String { } } -@_expose(wasm, "invoke_swift_closure_apiresult_to_string") -@_cdecl("invoke_swift_closure_apiresult_to_string") -public func _invoke_swift_closure_apiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_APIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Direction_To_Bool: _BridgedSwiftClosureBox { - let closure: (Direction) -> Bool - init(_ closure: @escaping (Direction) -> Bool) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS: _BridgedSwiftClosureBox { + let closure: (Theme) -> String + init(_ closure: @escaping (Theme) -> String) { self.closure = closure } } -private enum _BJS_Closure_Direction_To_Bool { - static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Direction_To_Bool(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { + static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_bool") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -74,39 +74,39 @@ private enum _BJS_Closure_Direction_To_Bool { } } -@_expose(wasm, "invoke_swift_closure_direction_to_bool") -@_cdecl("invoke_swift_closure_direction_to_bool") -public func _invoke_swift_closure_direction_to_bool(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Direction_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Direction_To_String: _BridgedSwiftClosureBox { - let closure: (Direction) -> String - init(_ closure: @escaping (Direction) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb: _BridgedSwiftClosureBox { + let closure: (Theme) -> Bool + init(_ closure: @escaping (Theme) -> Bool) { self.closure = closure } } -private enum _BJS_Closure_Direction_To_String { - static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Direction_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { + static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_direction_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -114,38 +114,38 @@ private enum _BJS_Closure_Direction_To_String { } } -@_expose(wasm, "invoke_swift_closure_direction_to_string") -@_cdecl("invoke_swift_closure_direction_to_string") -public func _invoke_swift_closure_direction_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Direction_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Greeter_To_String: _BridgedSwiftClosureBox { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS: _BridgedSwiftClosureBox { let closure: (Greeter) -> String init(_ closure: @escaping (Greeter) -> String) { self.closure = closure } } -private enum _BJS_Closure_Greeter_To_String { +private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { static func bridgeJSLower(_ closure: @escaping (Greeter) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Greeter_To_String(closure) + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } static func bridgeJSLift(_ callbackId: Int32) -> (Greeter) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_greeter_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -154,11 +154,11 @@ private enum _BJS_Closure_Greeter_To_String { } } -@_expose(wasm, "invoke_swift_closure_greeter_to_string") -@_cdecl("invoke_swift_closure_greeter_to_string") -public func _invoke_swift_closure_greeter_to_string(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Greeter_To_String>.fromOpaque(boxPtr).takeUnretainedValue() + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Greeter.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else @@ -166,27 +166,27 @@ public func _invoke_swift_closure_greeter_to_string(boxPtr: UnsafeMutableRawPoin #endif } -private final class _BJS_ClosureBox_HttpStatus_To_Int: _BridgedSwiftClosureBox { - let closure: (HttpStatus) -> Int - init(_ closure: @escaping (HttpStatus) -> Int) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS: _BridgedSwiftClosureBox { + let closure: (APIResult) -> String + init(_ closure: @escaping (APIResult) -> String) { self.closure = closure } } -private enum _BJS_Closure_HttpStatus_To_Int { - static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_HttpStatus_To_Int(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { + static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_httpstatus_to_int") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -194,38 +194,38 @@ private enum _BJS_Closure_HttpStatus_To_Int { } } -@_expose(wasm, "invoke_swift_closure_httpstatus_to_int") -@_cdecl("invoke_swift_closure_httpstatus_to_int") -public func _invoke_swift_closure_httpstatus_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_HttpStatus_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Int_String_Double_To_String: _BridgedSwiftClosureBox { - let closure: (Int, String, Double) -> String - init(_ closure: @escaping (Int, String, Double) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS: _BridgedSwiftClosureBox { + let closure: (Direction) -> String + init(_ closure: @escaping (Direction) -> String) { self.closure = closure } } -private enum _BJS_Closure_Int_String_Double_To_String { - static func bridgeJSLower(_ closure: @escaping (Int, String, Double) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Int_String_Double_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { + static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0, param1, param2 in + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_int_string_double_to_string") - func _invoke(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -234,39 +234,39 @@ private enum _BJS_Closure_Int_String_Double_To_String { } } -@_expose(wasm, "invoke_swift_closure_int_string_double_to_string") -@_cdecl("invoke_swift_closure_int_string_double_to_string") -public func _invoke_swift_closure_int_string_double_to_string(boxPtr: UnsafeMutableRawPointer, param0: Int32, param1Bytes: Int32, param1Length: Int32, param2: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Int_String_Double_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Int_To_Int: _BridgedSwiftClosureBox { - let closure: (Int) -> Int - init(_ closure: @escaping (Int) -> Int) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb: _BridgedSwiftClosureBox { + let closure: (Direction) -> Bool + init(_ closure: @escaping (Direction) -> Bool) { self.closure = closure } } -private enum _BJS_Closure_Int_To_Int { - static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Int_To_Int(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { + static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_int_to_int") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -274,40 +274,39 @@ private enum _BJS_Closure_Int_To_Int { } } -@_expose(wasm, "invoke_swift_closure_int_to_int") -@_cdecl("invoke_swift_closure_int_to_int") -public func _invoke_swift_closure_int_to_int(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Int_To_Int>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Int.bridgeJSLiftParameter(param0)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalAPIResult_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC: _BridgedSwiftClosureBox { + let closure: (String) -> Greeter + init(_ closure: @escaping (String) -> Greeter) { self.closure = closure } } -private enum _BJS_Closure_OptionalAPIResult_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalAPIResult_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { + static func bridgeJSLower(_ closure: @escaping (String) -> Greeter) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalapiresult_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") + func _invoke(_: Int32, _: Int32) -> UnsafeMutableRawPointer + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Greeter.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -315,39 +314,38 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalapiresult_to_string") -@_cdecl("invoke_swift_closure_optionalapiresult_to_string") -public func _invoke_swift_closure_optionalapiresult_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalAPIResult_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalDirection_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS: _BridgedSwiftClosureBox { + let closure: (String) -> String + init(_ closure: @escaping (String) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalDirection_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalDirection_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { + static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaldirection_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -356,39 +354,38 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionaldirection_to_string") -@_cdecl("invoke_swift_closure_optionaldirection_to_string") -public func _invoke_swift_closure_optionaldirection_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalDirection_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalGreeter_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS: _BridgedSwiftClosureBox { + let closure: (Int, String, Double) -> String + init(_ closure: @escaping (Int, String, Double) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalGreeter_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalGreeter_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { + static func bridgeJSLower(_ closure: @escaping (Int, String, Double) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1, param2 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalgreeter_to_string") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") + func _invoke(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -397,40 +394,39 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalgreeter_to_string") -@_cdecl("invoke_swift_closure_optionalgreeter_to_string") -public func _invoke_swift_closure_optionalgreeter_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32, param1Bytes: Int32, param1Length: Int32, param2: Float64) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalGreeter_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalInt_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si: _BridgedSwiftClosureBox { + let closure: (Int) -> Int + init(_ closure: @escaping (Int) -> Int) { self.closure = closure } } -private enum _BJS_Closure_OptionalInt_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalInt_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { + static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalint_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") + func _invoke(_: Int32, _: Int32) -> Int32 + let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -438,39 +434,39 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalint_to_string") -@_cdecl("invoke_swift_closure_optionalint_to_string") -public func _invoke_swift_closure_optionalint_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalInt_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Int.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalString_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalString_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalString_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionalstring_to_string") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -479,39 +475,39 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionalstring_to_string") -@_cdecl("invoke_swift_closure_optionalstring_to_string") -public func _invoke_swift_closure_optionalstring_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalString_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_OptionalTheme_To_String: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_OptionalTheme_To_String { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_OptionalTheme_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_optionaltheme_to_string") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") + func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -520,39 +516,40 @@ let resultId = _invoke(owner.callbackId, param0IsSome, param0Value) } } -@_expose(wasm, "invoke_swift_closure_optionaltheme_to_string") -@_cdecl("invoke_swift_closure_optionaltheme_to_string") -public func _invoke_swift_closure_optionaltheme_to_string(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_OptionalTheme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_String_To_Greeter: _BridgedSwiftClosureBox { - let closure: (String) -> Greeter - init(_ closure: @escaping (String) -> Greeter) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_String_To_Greeter { - static func bridgeJSLower(_ closure: @escaping (String) -> Greeter) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_String_To_Greeter(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_greeter") - func _invoke(_: Int32, _: Int32) -> UnsafeMutableRawPointer - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Greeter.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -560,38 +557,39 @@ private enum _BJS_Closure_String_To_Greeter { } } -@_expose(wasm, "invoke_swift_closure_string_to_greeter") -@_cdecl("invoke_swift_closure_string_to_greeter") -public func _invoke_swift_closure_string_to_greeter(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_String_To_Greeter>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_String_To_String: _BridgedSwiftClosureBox { - let closure: (String) -> String - init(_ closure: @escaping (String) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_String_To_String { - static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_String_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_string_to_string") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -600,39 +598,40 @@ private enum _BJS_Closure_String_To_String { } } -@_expose(wasm, "invoke_swift_closure_string_to_string") -@_cdecl("invoke_swift_closure_string_to_string") -public func _invoke_swift_closure_string_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_String_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Theme_To_Bool: _BridgedSwiftClosureBox { - let closure: (Theme) -> Bool - init(_ closure: @escaping (Theme) -> Bool) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_Theme_To_Bool { - static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Theme_To_Bool(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_bool") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) + return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") #endif @@ -640,38 +639,39 @@ private enum _BJS_Closure_Theme_To_Bool { } } -@_expose(wasm, "invoke_swift_closure_theme_to_bool") -@_cdecl("invoke_swift_closure_theme_to_bool") -public func _invoke_swift_closure_theme_to_bool(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Theme_To_Bool>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Theme_To_String: _BridgedSwiftClosureBox { - let closure: (Theme) -> String - init(_ closure: @escaping (Theme) -> String) { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS: _BridgedSwiftClosureBox { + let closure: (Optional) -> String + init(_ closure: @escaping (Optional) -> String) { self.closure = closure } } -private enum _BJS_Closure_Theme_To_String { - static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Theme_To_String(closure) +private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { + static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] param0 in + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_theme_to_string") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(owner.callbackId, param0.bridgeJSLowerParameter()) + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") + func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() +let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") @@ -680,38 +680,38 @@ private enum _BJS_Closure_Theme_To_String { } } -@_expose(wasm, "invoke_swift_closure_theme_to_string") -@_cdecl("invoke_swift_closure_theme_to_string") -public func _invoke_swift_closure_theme_to_string(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Theme_To_String>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -private final class _BJS_ClosureBox_Void_To_OptionalGreeter: _BridgedSwiftClosureBox { +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC: _BridgedSwiftClosureBox { let closure: () -> Optional init(_ closure: @escaping () -> Optional) { self.closure = closure } } -private enum _BJS_Closure_Void_To_OptionalGreeter { +private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { static func bridgeJSLower(_ closure: @escaping () -> Optional) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_Void_To_OptionalGreeter(closure) + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC(closure) return Unmanaged.passRetained(box).toOpaque() } static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional { - let owner = _JSCallbackOwner(callbackId: callbackId) - return { [owner] in + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_void_to_optionalgreeter") + @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") func _invoke(_: Int32) -> Void - _invoke(owner.callbackId) + _invoke(callback.bridgeJSLowerParameter()) return Optional.bridgeJSLiftReturnFromSideChannel() #else fatalError("Only available on WebAssembly") @@ -720,11 +720,11 @@ private enum _BJS_Closure_Void_To_OptionalGreeter { } } -@_expose(wasm, "invoke_swift_closure_void_to_optionalgreeter") -@_cdecl("invoke_swift_closure_void_to_optionalgreeter") -public func _invoke_swift_closure_void_to_optionalgreeter(boxPtr: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_Void_To_OptionalGreeter>.fromOpaque(boxPtr).takeUnretainedValue() + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure() return result.bridgeJSLowerReturn() #else @@ -3232,7 +3232,7 @@ public func _bjs_getAllStaticPropertyValues() -> Void { @_cdecl("bjs_formatName") public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int32) -> Void { #if arch(wasm32) - let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -3244,7 +3244,7 @@ public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int3 public func _bjs_makeFormatter(prefixBytes: Int32, prefixLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) - return _BJS_Closure_String_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -3255,7 +3255,7 @@ public func _bjs_makeFormatter(prefixBytes: Int32, prefixLength: Int32) -> Unsaf public func _bjs_makeAdder(base: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) - return _BJS_Closure_Int_To_Int.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -3297,7 +3297,7 @@ public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: I @_cdecl("bjs_Greeter_greetWith") public func _bjs_Greeter_greetWith(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer, customGreeting: Int32) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_Greeter_To_String.bridgeJSLift(customGreeting)) + let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -3309,7 +3309,7 @@ public func _bjs_Greeter_greetWith(_self: UnsafeMutableRawPointer, greeter: Unsa public func _bjs_Greeter_makeFormatter(_self: UnsafeMutableRawPointer, suffixBytes: Int32, suffixLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) - return _BJS_Closure_String_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -3320,7 +3320,7 @@ public func _bjs_Greeter_makeFormatter(_self: UnsafeMutableRawPointer, suffixByt public func _bjs_Greeter_static_makeCreator(defaultNameBytes: Int32, defaultNameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) - return _BJS_Closure_String_To_Greeter.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -3331,7 +3331,7 @@ public func _bjs_Greeter_static_makeCreator(defaultNameBytes: Int32, defaultName public func _bjs_Greeter_makeCustomGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter() - return _BJS_Closure_Greeter_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5149,7 +5149,7 @@ extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { @_cdecl("bjs_TextProcessor_init") public func _bjs_TextProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TextProcessor(transform: _BJS_Closure_String_To_String.bridgeJSLift(transform)) + let ret = TextProcessor(transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5171,7 +5171,7 @@ public func _bjs_TextProcessor_process(_self: UnsafeMutableRawPointer, textBytes @_cdecl("bjs_TextProcessor_processWithCustom") public func _bjs_TextProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_Int_String_Double_To_String.bridgeJSLift(customTransform)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5183,7 +5183,7 @@ public func _bjs_TextProcessor_processWithCustom(_self: UnsafeMutableRawPointer, public func _bjs_TextProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform() - return _BJS_Closure_String_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5193,7 +5193,7 @@ public func _bjs_TextProcessor_getTransform(_self: UnsafeMutableRawPointer) -> U @_cdecl("bjs_TextProcessor_processOptionalString") public func _bjs_TextProcessor_processOptionalString(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_OptionalString_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5204,7 +5204,7 @@ public func _bjs_TextProcessor_processOptionalString(_self: UnsafeMutableRawPoin @_cdecl("bjs_TextProcessor_processOptionalInt") public func _bjs_TextProcessor_processOptionalInt(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_OptionalInt_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5215,7 +5215,7 @@ public func _bjs_TextProcessor_processOptionalInt(_self: UnsafeMutableRawPointer @_cdecl("bjs_TextProcessor_processOptionalGreeter") public func _bjs_TextProcessor_processOptionalGreeter(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_OptionalGreeter_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5227,7 +5227,7 @@ public func _bjs_TextProcessor_processOptionalGreeter(_self: UnsafeMutableRawPoi public func _bjs_TextProcessor_makeOptionalStringFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() - return _BJS_Closure_OptionalString_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5238,7 +5238,7 @@ public func _bjs_TextProcessor_makeOptionalStringFormatter(_self: UnsafeMutableR public func _bjs_TextProcessor_makeOptionalGreeterCreator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() - return _BJS_Closure_Void_To_OptionalGreeter.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5248,7 +5248,7 @@ public func _bjs_TextProcessor_makeOptionalGreeterCreator(_self: UnsafeMutableRa @_cdecl("bjs_TextProcessor_processDirection") public func _bjs_TextProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_Direction_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5259,7 +5259,7 @@ public func _bjs_TextProcessor_processDirection(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TextProcessor_processTheme") public func _bjs_TextProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_Theme_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5270,7 +5270,7 @@ public func _bjs_TextProcessor_processTheme(_self: UnsafeMutableRawPointer, call @_cdecl("bjs_TextProcessor_processHttpStatus") public func _bjs_TextProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_HttpStatus_To_Int.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5281,7 +5281,7 @@ public func _bjs_TextProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, @_cdecl("bjs_TextProcessor_processAPIResult") public func _bjs_TextProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_APIResult_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5293,7 +5293,7 @@ public func _bjs_TextProcessor_processAPIResult(_self: UnsafeMutableRawPointer, public func _bjs_TextProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() - return _BJS_Closure_Direction_To_Bool.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5304,7 +5304,7 @@ public func _bjs_TextProcessor_makeDirectionChecker(_self: UnsafeMutableRawPoint public func _bjs_TextProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() - return _BJS_Closure_Theme_To_Bool.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5315,7 +5315,7 @@ public func _bjs_TextProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer public func _bjs_TextProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() - return _BJS_Closure_HttpStatus_To_Int.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5326,7 +5326,7 @@ public func _bjs_TextProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPo public func _bjs_TextProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() - return _BJS_Closure_APIResult_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif @@ -5336,7 +5336,7 @@ public func _bjs_TextProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPoint @_cdecl("bjs_TextProcessor_processOptionalDirection") public func _bjs_TextProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_OptionalDirection_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5347,7 +5347,7 @@ public func _bjs_TextProcessor_processOptionalDirection(_self: UnsafeMutableRawP @_cdecl("bjs_TextProcessor_processOptionalTheme") public func _bjs_TextProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_OptionalTheme_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5358,7 +5358,7 @@ public func _bjs_TextProcessor_processOptionalTheme(_self: UnsafeMutableRawPoint @_cdecl("bjs_TextProcessor_processOptionalAPIResult") public func _bjs_TextProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_OptionalAPIResult_To_String.bridgeJSLift(callback)) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5370,7 +5370,7 @@ public func _bjs_TextProcessor_processOptionalAPIResult(_self: UnsafeMutableRawP public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return _BJS_Closure_OptionalDirection_To_String.bridgeJSLower(ret) + return _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 23d2afdc4..c5ac3294d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -90,7 +90,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Greeter_To_String", + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "swiftHeapObject" : { @@ -138,7 +139,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -179,7 +181,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_Greeter", + "mangleName" : "20BridgeJSRuntimeTestsSS_7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -217,7 +220,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Greeter_To_String", + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "swiftHeapObject" : { @@ -2272,7 +2276,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -2343,7 +2348,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Int_String_Double_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSiSSSd_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "int" : { @@ -2393,7 +2399,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -2427,7 +2434,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalString_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -2472,7 +2480,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalInt_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSqSi_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -2517,7 +2526,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalGreeter_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -2561,7 +2571,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalString_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -2598,7 +2609,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Void_To_OptionalGreeter", + "mangleName" : "20BridgeJSRuntimeTestsy_Sq7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ ], @@ -2632,7 +2644,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Direction_To_String", + "mangleName" : "20BridgeJSRuntimeTests9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "caseEnum" : { @@ -2673,7 +2686,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Theme_To_String", + "mangleName" : "20BridgeJSRuntimeTests5ThemeO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "rawValueEnum" : { @@ -2715,7 +2729,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "HttpStatus_To_Int", + "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "rawValueEnum" : { @@ -2757,7 +2772,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "APIResult_To_String", + "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "associatedValueEnum" : { @@ -2797,7 +2813,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Direction_To_Bool", + "mangleName" : "20BridgeJSRuntimeTests9DirectionO_Sb", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "caseEnum" : { @@ -2830,7 +2847,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Theme_To_Bool", + "mangleName" : "20BridgeJSRuntimeTests5ThemeO_Sb", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "rawValueEnum" : { @@ -2864,7 +2882,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "HttpStatus_To_Int", + "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "rawValueEnum" : { @@ -2898,7 +2917,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "APIResult_To_String", + "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "associatedValueEnum" : { @@ -2932,7 +2952,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalDirection_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -2977,7 +2998,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalTheme_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSq5ThemeO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -3023,7 +3045,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalAPIResult_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSq9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -3067,7 +3090,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "OptionalDirection_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "optional" : { @@ -7392,7 +7416,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -7440,7 +7465,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "String_To_String", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "string" : { @@ -7481,7 +7507,8 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "Int_To_Int", + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { "int" : { From 09c1e2a248149fa6a3843574aebf402afb6f06c0 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 19 Nov 2025 08:52:09 +0100 Subject: [PATCH 028/252] BridgeJS: Namespaced elements in Exports --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 756 +++++++++++------- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 11 + .../EnumAssociatedValue.Export.d.ts | 8 +- .../EnumAssociatedValue.Export.js | 8 +- .../EnumNamespace.Export.d.ts | 38 +- .../BridgeJSLinkTests/EnumNamespace.Export.js | 32 +- .../BridgeJSLinkTests/Namespaces.Export.d.ts | 30 +- .../BridgeJSLinkTests/Namespaces.Export.js | 36 +- .../StaticFunctions.Export.d.ts | 5 + .../StaticFunctions.Export.js | 24 +- .../StaticProperties.Export.d.ts | 9 + .../StaticProperties.Export.js | 101 ++- .../Exporting-Swift/Using-Namespace.md | 30 +- Tests/prelude.mjs | 41 +- 14 files changed, 723 insertions(+), 406 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 5a7245aa6..478ba15dd 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -12,6 +12,7 @@ struct BridgeJSLink { var exportedSkeletons: [ExportedSkeleton] = [] var importedSkeletons: [ImportedModuleSkeleton] = [] let sharedMemory: Bool + private let namespaceBuilder = NamespaceBuilder() init( exportedSkeletons: [ExportedSkeleton] = [], @@ -65,14 +66,11 @@ struct BridgeJSLink { } """ - private struct LinkData { + fileprivate struct LinkData { var exportsLines: [String] = [] var classLines: [String] = [] var dtsExportLines: [String] = [] var dtsClassLines: [String] = [] - var namespacedFunctions: [ExportedFunction] = [] - var namespacedClasses: [ExportedClass] = [] - var namespacedEnums: [ExportedEnum] = [] var topLevelEnumLines: [String] = [] var topLevelDtsEnumLines: [String] = [] var importObjectBuilders: [ImportObjectBuilder] = [] @@ -102,13 +100,13 @@ struct BridgeJSLink { for klass in skeleton.classes { let (jsType, dtsType, dtsExportEntry) = try renderExportedClass(klass) data.classLines.append(contentsOf: jsType) - data.exportsLines.append("\(klass.name),") - data.dtsExportLines.append(contentsOf: dtsExportEntry) - data.dtsClassLines.append(contentsOf: dtsType) - if klass.namespace != nil { - data.namespacedClasses.append(klass) + if klass.namespace == nil { + data.exportsLines.append("\(klass.name),") + data.dtsExportLines.append(contentsOf: dtsExportEntry) } + + data.dtsClassLines.append(contentsOf: dtsType) } // Process enums @@ -126,10 +124,6 @@ struct BridgeJSLink { } data.topLevelEnumLines.append(contentsOf: exportedJsEnum) data.topLevelDtsEnumLines.append(contentsOf: dtsEnum) - - if enumDefinition.namespace != nil { - data.namespacedEnums.append(enumDefinition) - } case .associatedValue: var exportedJsEnum = jsEnum if !exportedJsEnum.isEmpty && exportedJsEnum[0].hasPrefix("const ") { @@ -137,61 +131,29 @@ struct BridgeJSLink { } data.topLevelEnumLines.append(contentsOf: exportedJsEnum) data.topLevelDtsEnumLines.append(contentsOf: dtsEnum) - if enumDefinition.namespace != nil { - data.namespacedEnums.append(enumDefinition) - } } } } // Process functions for function in skeleton.functions { - var (js, dts) = try renderExportedFunction(function: function) - - if function.effects.isStatic, - case .namespaceEnum = function.staticContext - { - data.namespacedFunctions.append(function) - } else if function.namespace != nil { - data.namespacedFunctions.append(function) - } - - js[0] = "\(function.name): " + js[0] - js[js.count - 1] += "," - data.exportsLines.append(contentsOf: js) - data.dtsExportLines.append(contentsOf: dts) - } - - for enumDefinition in skeleton.enums where enumDefinition.enumType == .namespace { - for function in enumDefinition.staticMethods { - // Create namespace function with full namespace path (parent namespace + enum name) - var functionWithNamespace = function - let fullNamespace = (enumDefinition.namespace ?? []) + [enumDefinition.name] - functionWithNamespace.namespace = fullNamespace - data.namespacedFunctions.append(functionWithNamespace) - - var (js, dts) = try renderExportedFunction(function: functionWithNamespace) - js[0] = "\(functionWithNamespace.name): " + js[0] + if function.namespace == nil { + var (js, dts) = try renderExportedFunction(function: function) + js[0] = "\(function.name): " + js[0] js[js.count - 1] += "," data.exportsLines.append(contentsOf: js) data.dtsExportLines.append(contentsOf: dts) } - - for property in enumDefinition.staticProperties { - let fullNamespace = (enumDefinition.namespace ?? []) + [enumDefinition.name] - let namespacePath = fullNamespace.joined(separator: ".") - let (propJs, _) = try renderNamespaceStaticProperty( - property: property, - namespacePath: namespacePath - ) - data.enumStaticAssignments.append(contentsOf: propJs) - } } for enumDefinition in skeleton.enums where enumDefinition.enumType != .namespace && enumDefinition.emitStyle != .tsEnum { + if enumDefinition.namespace != nil { + continue + } + let enumExportPrinter = CodeFragmentPrinter() - let enumValuesName = "\(enumDefinition.name)Values" + let enumValuesName = enumDefinition.valuesName for function in enumDefinition.staticMethods { let thunkBuilder = ExportedThunkBuilder(effects: function.effects) @@ -281,7 +243,7 @@ struct BridgeJSLink { exportsPrinter.write("\(enumDefinition.name): \(enumValuesName),") } - dtsExportsPrinter.write("\(enumDefinition.name): \(enumDefinition.name)Object") + dtsExportsPrinter.write("\(enumDefinition.name): \(enumDefinition.objectTypeName)") data.exportsLines.append(contentsOf: exportsPrinter.lines) data.dtsExportLines.append(contentsOf: dtsExportsPrinter.lines) @@ -927,8 +889,8 @@ struct BridgeJSLink { for skeleton in exportedSkeletons { for enumDefinition in skeleton.enums where enumDefinition.enumType != .namespace && enumDefinition.emitStyle != .tsEnum { - let enumValuesName = "\(enumDefinition.name)Values" - let enumObjectName = "\(enumDefinition.name)Object" + let enumValuesName = enumDefinition.valuesName + let enumObjectName = enumDefinition.objectTypeName if !enumDefinition.staticMethods.isEmpty || !enumDefinition.staticProperties.isEmpty { printer.write("export type \(enumObjectName) = typeof \(enumValuesName) & {") @@ -952,7 +914,6 @@ struct BridgeJSLink { } // Type definitions section (namespace declarations, class definitions, imported types) - let namespaceBuilder = NamespaceBuilder() let namespaceDeclarationsLines = namespaceBuilder.namespaceDeclarations( exportedSkeletons: exportedSkeletons, renderTSSignatureCallback: { parameters, returnType, effects in @@ -969,7 +930,30 @@ struct BridgeJSLink { // Exports type printer.write("export type Exports = {") printer.indent { + // Add non-namespaced items printer.write(lines: data.dtsExportLines) + + // Add hierarchical namespaced items + let hierarchicalLines = namespaceBuilder.buildHierarchicalExportsType( + exportedSkeletons: exportedSkeletons, + renderClassEntry: { klass in + let printer = CodeFragmentPrinter() + printer.write("\(klass.name): {") + printer.indent { + if let constructor = klass.constructor { + printer.write( + "new\(self.renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name), effects: constructor.effects));" + ) + } + } + printer.write("}") + return printer.lines + }, + renderFunctionSignature: { function in + "\(function.name)\(self.renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));" + } + ) + printer.write(lines: hierarchicalLines) } printer.write("}") @@ -999,7 +983,7 @@ struct BridgeJSLink { } /// Generates JavaScript output using CodeFragmentPrinter for better maintainability - private func generateJavaScript(data: LinkData) -> String { + private func generateJavaScript(data: LinkData) throws -> String { let header = """ // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. @@ -1013,21 +997,11 @@ struct BridgeJSLink { // Top-level enums section printer.write(lines: data.topLevelEnumLines) - // Namespace assignments section - let topLevelNamespaceCode = generateNamespaceInitializationCode( - namespacePaths: Set(data.namespacedEnums.compactMap { $0.namespace }) + let topLevelNamespaceCode = namespaceBuilder.buildTopLevelNamespaceInitialization( + exportedSkeletons: exportedSkeletons ) printer.write(lines: topLevelNamespaceCode) - // Add enum assignments to global namespace - for enumDef in data.namespacedEnums { - if enumDef.enumType != .namespace { - let namespacePath = enumDef.namespace?.joined(separator: ".") ?? "" - let enumValuesName = enumDef.emitStyle == .tsEnum ? enumDef.name : "\(enumDef.name)Values" - printer.write("globalThis.\(namespacePath).\(enumValuesName) = \(enumValuesName);") - } - } - // Main function declaration printer.write("export async function createInstantiator(options, \(JSGlueVariableScope.reservedSwift)) {") @@ -1076,33 +1050,25 @@ struct BridgeJSLink { } // createExports method - printer.indent { + try printer.indent { printer.write(lines: [ "/** @param {WebAssembly.Instance} instance */", "createExports: (instance) => {", ]) - printer.indent { + try printer.indent { printer.write("const js = \(JSGlueVariableScope.reservedSwift).memory.heap;") - // Exports / return section - let hasNamespacedItems = !data.namespacedFunctions.isEmpty || !data.namespacedClasses.isEmpty - let hasNamespacedEnums = !data.namespacedEnums.isEmpty - let hasAnyNamespacedItems = hasNamespacedItems || hasNamespacedEnums - printer.write(lines: data.classLines) - // Initialize all namespaces before property assignments - if hasAnyNamespacedItems { - let allNamespacePaths = collectAllNamespacePaths(data: data) - let namespaceInitializationCode = generateNamespaceInitializationCode( - namespacePaths: allNamespacePaths - ) - printer.write(lines: namespaceInitializationCode) - } + let namespaceInitCode = namespaceBuilder.buildNamespaceInitialization( + exportedSkeletons: exportedSkeletons + ) + printer.write(lines: namespaceInitCode) - let propertyAssignments = generateNamespacePropertyAssignments( + let propertyAssignments = try generateNamespacePropertyAssignments( data: data, - hasAnyNamespacedItems: hasAnyNamespacedItems + exportedSkeletons: exportedSkeletons, + namespaceBuilder: namespaceBuilder ) printer.write(lines: propertyAssignments) } @@ -1117,7 +1083,7 @@ struct BridgeJSLink { func link() throws -> (outputJs: String, outputDts: String) { let data = try collectLinkData() - let outputJs = generateJavaScript(data: data) + let outputJs = try generateJavaScript(data: data) let outputDts = generateTypeScript(data: data) return (outputJs, outputDts) } @@ -1127,12 +1093,10 @@ struct BridgeJSLink { for skeleton in exportedSkeletons { for enumDef in skeleton.enums where enumDef.enumType == .associatedValue { - let base = enumDef.name - let baseValues = "\(base)Values" printer.write( - "const \(base)Helpers = __bjs_create\(baseValues)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift));" + "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift));" ) - printer.write("enumHelpers.\(base) = \(base)Helpers;") + printer.write("enumHelpers.\(enumDef.name) = \(enumDef.name)Helpers;") printer.nextLine() } } @@ -1173,82 +1137,33 @@ struct BridgeJSLink { return wrapperLines } - /// Collects all unique namespace paths from functions, classes, enums, and static properties - private func collectAllNamespacePaths(data: LinkData) -> Set<[String]> { - let functionNamespacePaths: Set<[String]> = Set( - data.namespacedFunctions.compactMap { $0.namespace } - ) - let classNamespacePaths: Set<[String]> = Set( - data.namespacedClasses.compactMap { $0.namespace } - ) - let allRegularNamespacePaths = functionNamespacePaths.union(classNamespacePaths) - - let enumNamespacePaths: Set<[String]> = Set( - data.namespacedEnums.compactMap { $0.namespace } - ) - var staticPropertyNamespacePaths: Set<[String]> = Set() - for skeleton in exportedSkeletons { - for enumDefinition in skeleton.enums { - for property in enumDefinition.staticProperties { - if let namespace = property.namespace, !namespace.isEmpty { - staticPropertyNamespacePaths.insert(namespace) - } - } - } - } - - return allRegularNamespacePaths.union(enumNamespacePaths).union(staticPropertyNamespacePaths) - } - - /// Generates JavaScript code lines for initializing namespace objects on globalThis - private func generateNamespaceInitializationCode(namespacePaths: Set<[String]>) -> [String] { - let printer = CodeFragmentPrinter() - var allUniqueNamespaces: [String] = [] - var seen = Set() - - namespacePaths.forEach { namespacePath in - namespacePath.enumerated().forEach { (index, _) in - let path = namespacePath[0...index].joined(separator: ".") - if seen.insert(path).inserted { - allUniqueNamespaces.append(path) - } - } - } - - allUniqueNamespaces.sorted().forEach { namespace in - printer.write("if (typeof globalThis.\(namespace) === 'undefined') {") - printer.indent { - printer.write("globalThis.\(namespace) = {};") - } - printer.write("}") - } - - return printer.lines - } - - /// Generates JavaScript code for assigning namespaced items to globalThis private func generateNamespacePropertyAssignments( data: LinkData, - hasAnyNamespacedItems: Bool - ) -> [String] { + exportedSkeletons: [ExportedSkeleton], + namespaceBuilder: NamespaceBuilder + ) throws -> [String] { let printer = CodeFragmentPrinter() printer.write(lines: data.enumStaticAssignments) + printer.write("const exports = {") - printer.indent() - printer.write(lines: data.exportsLines.map { "\($0)" }) - printer.unindent() + try printer.indent { + printer.write(lines: data.exportsLines.map { "\($0)" }) + + let hierarchicalLines = try namespaceBuilder.buildHierarchicalExportsObject( + exportedSkeletons: exportedSkeletons, + renderFunctionImpl: { function in + let (js, _) = try self.renderExportedFunction(function: function) + return js + } + ) + printer.write(lines: hierarchicalLines) + } printer.write("};") printer.write("_exports = exports;") - if hasAnyNamespacedItems { - data.namespacedClasses.forEach { klass in - let namespacePath: String = klass.namespace?.joined(separator: ".") ?? "" - printer.write("globalThis.\(namespacePath).\(klass.name) = exports.\(klass.name);") - } - data.namespacedFunctions.forEach { function in - let namespacePath: String = function.namespace?.joined(separator: ".") ?? "" - printer.write("globalThis.\(namespacePath).\(function.name) = exports.\(function.name);") - } - } + + let globalThisLines = namespaceBuilder.buildGlobalThisAssignments(exportedSkeletons: exportedSkeletons) + printer.write(lines: globalThisLines) + printer.write("return exports;") return printer.lines @@ -1453,7 +1368,7 @@ struct BridgeJSLink { return "null" case .enumCase(let enumName, let caseName): let simpleName = enumName.components(separatedBy: ".").last ?? enumName - let jsEnumName = format == .javascript ? "\(simpleName)Values" : simpleName + let jsEnumName = format == .javascript ? "\(simpleName)\(ExportedEnum.valuesSuffix)" : simpleName return "\(jsEnumName).\(caseName.capitalizedFirstLetter)" case .object(let className): return "new \(className)()" @@ -1497,7 +1412,7 @@ struct BridgeJSLink { let scope = JSGlueVariableScope() let cleanup = CodeFragmentPrinter() let printer = CodeFragmentPrinter() - let enumValuesName = enumDefinition.emitStyle == .tsEnum ? enumDefinition.name : "\(enumDefinition.name)Values" + let enumValuesName = enumDefinition.valuesName switch enumDefinition.enumType { case .simple: @@ -1529,7 +1444,7 @@ struct BridgeJSLink { private func generateDeclarations(enumDefinition: ExportedEnum) -> [String] { let printer = CodeFragmentPrinter() - let enumValuesName = enumDefinition.emitStyle == .tsEnum ? enumDefinition.name : "\(enumDefinition.name)Values" + let enumValuesName = enumDefinition.valuesName switch enumDefinition.emitStyle { case .tsEnum: @@ -1848,80 +1763,6 @@ extension BridgeJSLink { return (jsLines, dtsLines) } - /// Renders a namespace static property as getter/setter assignments on the namespace object - private func renderNamespaceStaticProperty( - property: ExportedProperty, - namespacePath: String - ) throws -> (js: [String], dts: [String]) { - var jsLines: [String] = [] - - // Generate getter assignment - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) - let getterReturnExpr = try getterThunkBuilder.call( - abiName: property.getterAbiName(), - returnType: property.type - ) - - let getterLines = getterThunkBuilder.renderFunction( - name: property.name, - parameters: [], - returnExpr: getterReturnExpr, - declarationPrefixKeyword: nil - ) - - // Build Object.defineProperty call for namespace - var definePropertyLines: [String] = [] - definePropertyLines.append( - "Object.defineProperty(globalThis.\(namespacePath), '\(property.name)', { get: function() {" - ) - - // Add getter body (skip function declaration and closing brace) - if getterLines.count > 2 { - let bodyLines = Array(getterLines[1.. 2 { - let bodyLines = Array(setterLines[1.. (js: [String], dtsType: [String], dtsExportEntry: [String]) { @@ -2320,11 +2161,129 @@ extension BridgeJSLink { } struct NamespaceBuilder { + func collectAllNamespacePaths(exportedSkeletons: [ExportedSkeleton]) -> Set<[String]> { + return Set( + exportedSkeletons.flatMap { skeleton in + let itemNamespaces = + (skeleton.functions.compactMap(\.namespace) + skeleton.classes.compactMap(\.namespace) + + skeleton.enums.filter { $0.namespace != nil && $0.enumType != .namespace } + .compactMap(\.namespace)) + + let namespaceEnumPaths = skeleton.enums + .filter { $0.enumType == .namespace } + .filter { !$0.staticProperties.isEmpty || !$0.staticMethods.isEmpty } + .map { ($0.namespace ?? []) + [$0.name] } + + return itemNamespaces + namespaceEnumPaths + } + ) + } + + func buildNamespaceInitialization(exportedSkeletons: [ExportedSkeleton]) -> [String] { + let allNamespacePaths = collectAllNamespacePaths(exportedSkeletons: exportedSkeletons) + return generateNamespaceInitializationCode(namespacePaths: allNamespacePaths) + } + + func buildTopLevelNamespaceInitialization(exportedSkeletons: [ExportedSkeleton]) -> [String] { + var namespacedEnumPaths: Set<[String]> = [] + for skeleton in exportedSkeletons { + for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { + namespacedEnumPaths.insert(enumDef.namespace!) + } + } + + let initCode = generateNamespaceInitializationCode(namespacePaths: namespacedEnumPaths) + + let printer = CodeFragmentPrinter() + printer.write(lines: initCode) + + for skeleton in exportedSkeletons { + for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { + let namespacePath = enumDef.namespace!.joined(separator: ".") + printer.write("globalThis.\(namespacePath).\(enumDef.valuesName) = \(enumDef.valuesName);") + } + } + + return printer.lines + } + + func buildGlobalThisAssignments(exportedSkeletons: [ExportedSkeleton]) -> [String] { + let printer = CodeFragmentPrinter() + + for skeleton in exportedSkeletons { + for klass in skeleton.classes where klass.namespace != nil { + let namespacePath = klass.namespace!.joined(separator: ".") + printer.write("globalThis.\(namespacePath).\(klass.name) = exports.\(namespacePath).\(klass.name);") + } + for function in skeleton.functions where function.namespace != nil { + let namespacePath = function.namespace!.joined(separator: ".") + printer.write( + "globalThis.\(namespacePath).\(function.name) = exports.\(namespacePath).\(function.name);" + ) + } + for enumDef in skeleton.enums where enumDef.enumType == .namespace { + for function in enumDef.staticMethods { + let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name] + let namespacePath = fullNamespace.joined(separator: ".") + printer.write( + "globalThis.\(namespacePath).\(function.name) = exports.\(namespacePath).\(function.name);" + ) + } + for property in enumDef.staticProperties { + let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name] + let namespacePath = fullNamespace.joined(separator: ".") + let exportsPath = "exports.\(namespacePath)" + + printer.write("Object.defineProperty(globalThis.\(namespacePath), '\(property.name)', {") + printer.indent { + printer.write("get: () => \(exportsPath).\(property.name),") + if !property.isReadonly { + printer.write("set: (value) => { \(exportsPath).\(property.name) = value; }") + } + } + printer.write("});") + } + } + } + + return printer.lines + } + + private func generateNamespaceInitializationCode(namespacePaths: Set<[String]>) -> [String] { + let printer = CodeFragmentPrinter() + var allUniqueNamespaces: [String] = [] + var seen = Set() + + namespacePaths.forEach { namespacePath in + namespacePath.enumerated().forEach { (index, _) in + let path = namespacePath[0...index].joined(separator: ".") + if seen.insert(path).inserted { + allUniqueNamespaces.append(path) + } + } + } + + allUniqueNamespaces.sorted().forEach { namespace in + printer.write("if (typeof globalThis.\(namespace) === 'undefined') {") + printer.indent { + printer.write("globalThis.\(namespace) = {};") + } + printer.write("}") + } + + return printer.lines + } + private struct NamespaceContent { var functions: [ExportedFunction] = [] var classes: [ExportedClass] = [] var enums: [ExportedEnum] = [] var staticProperties: [ExportedProperty] = [] + var functionJsLines: [(name: String, lines: [String])] = [] + var functionDtsLines: [(name: String, lines: [String])] = [] + var classDtsLines: [(name: String, lines: [String])] = [] + var enumDtsLines: [(name: String, line: String)] = [] + var propertyJsLines: [String] = [] } private final class NamespaceNode { @@ -2346,6 +2305,259 @@ extension BridgeJSLink { } } + private func buildExportsTree( + rootNode: NamespaceNode, + exportedSkeletons: [ExportedSkeleton] + ) { + for skeleton in exportedSkeletons { + for function in skeleton.functions where function.namespace != nil { + var currentNode = rootNode + for part in function.namespace! { + currentNode = currentNode.addChild(part) + } + currentNode.content.functions.append(function) + } + + for klass in skeleton.classes where klass.namespace != nil { + var currentNode = rootNode + for part in klass.namespace! { + currentNode = currentNode.addChild(part) + } + currentNode.content.classes.append(klass) + } + + for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { + var currentNode = rootNode + for part in enumDef.namespace! { + currentNode = currentNode.addChild(part) + } + currentNode.content.enums.append(enumDef) + } + + for enumDef in skeleton.enums where enumDef.enumType == .namespace { + for property in enumDef.staticProperties { + let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name] + var currentNode = rootNode + for part in fullNamespace { + currentNode = currentNode.addChild(part) + } + currentNode.content.staticProperties.append(property) + } + for function in enumDef.staticMethods { + let fullNamespace = (enumDef.namespace ?? []) + [enumDef.name] + var currentNode = rootNode + for part in fullNamespace { + currentNode = currentNode.addChild(part) + } + currentNode.content.functions.append(function) + } + } + } + } + + fileprivate func buildHierarchicalExportsType( + exportedSkeletons: [ExportedSkeleton], + renderClassEntry: (ExportedClass) -> [String], + renderFunctionSignature: (ExportedFunction) -> String + ) -> [String] { + let printer = CodeFragmentPrinter() + let rootNode = NamespaceNode(name: "") + + buildExportsTree(rootNode: rootNode, exportedSkeletons: exportedSkeletons) + + for (_, node) in rootNode.children { + populateTypeScriptExportLines( + node: node, + renderClassEntry: renderClassEntry, + renderFunctionSignature: renderFunctionSignature + ) + } + + printExportsTypeHierarchy(node: rootNode, printer: printer) + + return printer.lines + } + + private func populateTypeScriptExportLines( + node: NamespaceNode, + renderClassEntry: (ExportedClass) -> [String], + renderFunctionSignature: (ExportedFunction) -> String + ) { + for function in node.content.functions { + let signature = renderFunctionSignature(function) + node.content.functionDtsLines.append((function.name, [signature])) + } + + for klass in node.content.classes { + let entry = renderClassEntry(klass) + node.content.classDtsLines.append((klass.name, entry)) + } + + for enumDef in node.content.enums { + node.content.enumDtsLines.append((enumDef.name, "\(enumDef.name): \(enumDef.objectTypeName)")) + } + + for (_, childNode) in node.children { + populateTypeScriptExportLines( + node: childNode, + renderClassEntry: renderClassEntry, + renderFunctionSignature: renderFunctionSignature + ) + } + } + + fileprivate func buildHierarchicalExportsObject( + exportedSkeletons: [ExportedSkeleton], + renderFunctionImpl: (ExportedFunction) throws -> [String] + ) throws -> [String] { + let printer = CodeFragmentPrinter() + let rootNode = NamespaceNode(name: "") + + buildExportsTree(rootNode: rootNode, exportedSkeletons: exportedSkeletons) + + try populateJavaScriptExportLines(node: rootNode, renderFunctionImpl: renderFunctionImpl) + + try populatePropertyImplementations(node: rootNode) + + printExportsObjectHierarchy(node: rootNode, printer: printer, currentPath: []) + + return printer.lines + } + + private func populateJavaScriptExportLines( + node: NamespaceNode, + renderFunctionImpl: (ExportedFunction) throws -> [String] + ) throws { + for function in node.content.functions { + let impl = try renderFunctionImpl(function) + node.content.functionJsLines.append((function.name, impl)) + } + + for (_, childNode) in node.children { + try populateJavaScriptExportLines(node: childNode, renderFunctionImpl: renderFunctionImpl) + } + } + + private func populatePropertyImplementations(node: NamespaceNode) throws { + for property in node.content.staticProperties { + // Generate getter + let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let getterReturnExpr = try getterThunkBuilder.call( + abiName: property.getterAbiName(), + returnType: property.type + ) + + let getterPrinter = CodeFragmentPrinter() + getterPrinter.write("get \(property.name)() {") + getterPrinter.indent { + getterPrinter.write(contentsOf: getterThunkBuilder.body) + getterPrinter.write(contentsOf: getterThunkBuilder.cleanupCode) + getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) + if let returnExpr = getterReturnExpr { + getterPrinter.write("return \(returnExpr);") + } + } + getterPrinter.write("},") + + var propertyLines = getterPrinter.lines + + // Generate setter if not readonly + if !property.isReadonly { + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false) + ) + try setterThunkBuilder.lowerParameter( + param: Parameter(label: "value", name: "value", type: property.type) + ) + _ = try setterThunkBuilder.call( + abiName: property.setterAbiName(), + returnType: .void + ) + + let setterPrinter = CodeFragmentPrinter() + setterPrinter.write("set \(property.name)(value) {") + setterPrinter.indent { + setterPrinter.write(contentsOf: setterThunkBuilder.body) + setterPrinter.write(contentsOf: setterThunkBuilder.cleanupCode) + setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) + } + setterPrinter.write("},") + + propertyLines.append(contentsOf: setterPrinter.lines) + } + + node.content.propertyJsLines.append(contentsOf: propertyLines) + } + + // Recursively process child nodes + for (_, childNode) in node.children { + try populatePropertyImplementations(node: childNode) + } + } + + private func printExportsTypeHierarchy(node: NamespaceNode, printer: CodeFragmentPrinter) { + for (childName, childNode) in node.children.sorted(by: { $0.key < $1.key }) { + printer.write("\(childName): {") + printer.indent { + for (_, lines) in childNode.content.classDtsLines.sorted(by: { $0.name < $1.name }) { + printer.write(lines: lines) + } + + for (_, line) in childNode.content.enumDtsLines.sorted(by: { $0.name < $1.name }) { + printer.write(line) + } + + for property in childNode.content.staticProperties.sorted(by: { $0.name < $1.name }) { + let readonly = property.isReadonly ? "readonly " : "" + printer.write("\(readonly)\(property.name): \(property.type.tsType);") + } + + for (_, lines) in childNode.content.functionDtsLines.sorted(by: { $0.name < $1.name }) { + for line in lines { + printer.write(line) + } + } + + printExportsTypeHierarchy(node: childNode, printer: printer) + } + printer.write("},") + } + } + + private func printExportsObjectHierarchy( + node: NamespaceNode, + printer: CodeFragmentPrinter, + currentPath: [String] = [] + ) { + for (childName, childNode) in node.children.sorted(by: { $0.key < $1.key }) { + let newPath = currentPath + [childName] + printer.write("\(childName): {") + printer.indent { + for klass in childNode.content.classes.sorted(by: { $0.name < $1.name }) { + printer.write("\(klass.name),") + } + + for enumDef in childNode.content.enums.sorted(by: { $0.name < $1.name }) { + printer.write("\(enumDef.name): \(enumDef.valuesName),") + } + + // Print function and property implementations + printer.write(lines: childNode.content.propertyJsLines) + for (name, lines) in childNode.content.functionJsLines.sorted(by: { $0.name < $1.name }) { + var modifiedLines = lines + if !modifiedLines.isEmpty { + modifiedLines[0] = "\(name): " + modifiedLines[0] + modifiedLines[modifiedLines.count - 1] += "," + } + printer.write(lines: modifiedLines) + } + + printExportsObjectHierarchy(node: childNode, printer: printer, currentPath: newPath) + } + printer.write("},") + } + } + /// Generates TypeScript declarations for all namespaces /// /// This function enables properly grouping all Swift code within given namespaces @@ -2368,70 +2580,7 @@ extension BridgeJSLink { let printer = CodeFragmentPrinter() let rootNode = NamespaceNode(name: "") - for skeleton in exportedSkeletons { - for function in skeleton.functions { - if function.effects.isStatic, - case .namespaceEnum = function.staticContext - { - // Use the function's namespace property instead of enumName - if let namespace = function.namespace { - var currentNode = rootNode - for part in namespace { - currentNode = currentNode.addChild(part) - } - currentNode.content.functions.append(function) - } - } else if let namespace = function.namespace { - var currentNode = rootNode - for part in namespace { - currentNode = currentNode.addChild(part) - } - currentNode.content.functions.append(function) - } - } - for klass in skeleton.classes { - if let classNamespace = klass.namespace { - var currentNode = rootNode - for part in classNamespace { - currentNode = currentNode.addChild(part) - } - currentNode.content.classes.append(klass) - } - } - for enumDefinition in skeleton.enums { - if let enumNamespace = enumDefinition.namespace, enumDefinition.enumType != .namespace { - var currentNode = rootNode - for part in enumNamespace { - currentNode = currentNode.addChild(part) - } - currentNode.content.enums.append(enumDefinition) - } - - if enumDefinition.enumType == .namespace { - for function in enumDefinition.staticMethods { - var currentNode = rootNode - // Build full namespace path: parent namespace + enum name - let fullNamespace = (enumDefinition.namespace ?? []) + [enumDefinition.name] - for part in fullNamespace { - currentNode = currentNode.addChild(part) - } - currentNode.content.functions.append(function) - } - - // Add static properties to namespace content for TypeScript declarations - for property in enumDefinition.staticProperties { - var currentNode = rootNode - let fullNamespace = (enumDefinition.namespace ?? []) + [enumDefinition.name] - for part in fullNamespace { - currentNode = currentNode.addChild(part) - } - if !currentNode.content.staticProperties.contains(where: { $0.name == property.name }) { - currentNode.content.staticProperties.append(property) - } - } - } - } - } + buildExportsTree(rootNode: rootNode, exportedSkeletons: exportedSkeletons) guard !rootNode.children.isEmpty else { return printer.lines @@ -2471,8 +2620,7 @@ extension BridgeJSLink { let sortedEnums = childNode.content.enums.sorted { $0.name < $1.name } for enumDefinition in sortedEnums { let style: EnumEmitStyle = enumDefinition.emitStyle - let enumValuesName = - enumDefinition.emitStyle == .tsEnum ? enumDefinition.name : "\(enumDefinition.name)Values" + let enumValuesName = enumDefinition.valuesName switch enumDefinition.enumType { case .simple: switch style { diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index b019e4d91..1b59ddfc3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -260,6 +260,9 @@ public enum EnumEmitStyle: String, Codable, Sendable { } public struct ExportedEnum: Codable, Equatable, Sendable { + public static let valuesSuffix = "Values" + public static let objectSuffix = "Object" + public let name: String public let swiftCallName: String public let explicitAccessControl: String? @@ -279,6 +282,14 @@ public struct ExportedEnum: Codable, Equatable, Sendable { } } + public var valuesName: String { + emitStyle == .tsEnum ? name : "\(name)\(Self.valuesSuffix)" + } + + public var objectTypeName: String { + "\(name)\(Self.objectSuffix)" + } + public init( name: String, swiftCallName: String, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts index aac40514d..e79f4119e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts @@ -93,9 +93,13 @@ export type Exports = { roundTripOptionalAPIOptionalResult(result: APIOptionalResultTag | null): APIOptionalResultTag | null; APIResult: APIResultObject ComplexResult: ComplexResultObject - Result: ResultObject - NetworkingResult: NetworkingResultObject APIOptionalResult: APIOptionalResultObject + API: { + NetworkingResult: NetworkingResultObject + }, + Utilities: { + Result: ResultObject + }, } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index 658361df1..14c150e51 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -830,9 +830,13 @@ export async function createInstantiator(options, swift) { }, APIResult: APIResultValues, ComplexResult: ComplexResultValues, - Result: ResultValues, - NetworkingResult: NetworkingResultValues, APIOptionalResult: APIOptionalResultValues, + API: { + NetworkingResult: NetworkingResultValues, + }, + Utilities: { + Result: ResultValues, + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts index 7c05f1714..b7c1549a0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts @@ -83,19 +83,31 @@ export interface TestServer extends SwiftHeapObject { call(method: Internal.SupportedMethodTag): void; } export type Exports = { - Converter: { - new(): Converter; - } - HTTPServer: { - new(): HTTPServer; - } - TestServer: { - new(): TestServer; - } - Method: MethodObject - LogLevel: LogLevelObject - Port: PortObject - SupportedMethod: SupportedMethodObject + Configuration: { + LogLevel: LogLevelObject + Port: PortObject + }, + Networking: { + API: { + HTTPServer: { + new(): HTTPServer; + } + Method: MethodObject + }, + APIV2: { + Internal: { + TestServer: { + new(): TestServer; + } + SupportedMethod: SupportedMethodObject + }, + }, + }, + Utils: { + Converter: { + new(): Converter; + } + }, } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index a788abf5a..a38b50933 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -333,18 +333,30 @@ export async function createInstantiator(options, swift) { globalThis.Utils = {}; } const exports = { - Converter, - HTTPServer, - TestServer, - Method: MethodValues, - LogLevel: LogLevelValues, - Port: PortValues, - SupportedMethod: SupportedMethodValues, + Configuration: { + LogLevel: LogLevelValues, + Port: PortValues, + }, + Networking: { + API: { + HTTPServer, + Method: MethodValues, + }, + APIV2: { + Internal: { + TestServer, + SupportedMethod: SupportedMethodValues, + }, + }, + }, + Utils: { + Converter, + }, }; _exports = exports; - globalThis.Utils.Converter = exports.Converter; - globalThis.Networking.API.HTTPServer = exports.HTTPServer; - globalThis.Networking.APIV2.Internal.TestServer = exports.TestServer; + globalThis.Utils.Converter = exports.Utils.Converter; + globalThis.Networking.API.HTTPServer = exports.Networking.API.HTTPServer; + globalThis.Networking.APIV2.Internal.TestServer = exports.Networking.APIV2.Internal.TestServer; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts index c6e403998..cdf83f36d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts @@ -50,16 +50,28 @@ export interface UUID extends SwiftHeapObject { uuidString(): string; } export type Exports = { - Greeter: { - new(name: string): Greeter; - } - Converter: { - new(): Converter; - } - UUID: { - } plainFunction(): string; - namespacedFunction(): string; + MyModule: { + Utils: { + namespacedFunction(): string; + }, + }, + Utils: { + Converters: { + Converter: { + new(): Converter; + } + }, + }, + __Swift: { + Foundation: { + Greeter: { + new(name: string): Greeter; + } + UUID: { + } + }, + }, } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 395b97f12..67670d204 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -294,27 +294,39 @@ export async function createInstantiator(options, swift) { globalThis.__Swift.Foundation = {}; } const exports = { - Greeter, - Converter, - UUID, plainFunction: function bjs_plainFunction() { instance.exports.bjs_plainFunction(); const ret = tmpRetString; tmpRetString = undefined; return ret; }, - namespacedFunction: function bjs_MyModule_Utils_namespacedFunction() { - instance.exports.bjs_MyModule_Utils_namespacedFunction(); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + MyModule: { + Utils: { + namespacedFunction: function bjs_MyModule_Utils_namespacedFunction() { + instance.exports.bjs_MyModule_Utils_namespacedFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + }, + Utils: { + Converters: { + Converter, + }, + }, + __Swift: { + Foundation: { + Greeter, + UUID, + }, }, }; _exports = exports; - globalThis.__Swift.Foundation.Greeter = exports.Greeter; - globalThis.Utils.Converters.Converter = exports.Converter; - globalThis.__Swift.Foundation.UUID = exports.UUID; - globalThis.MyModule.Utils.namespacedFunction = exports.namespacedFunction; + globalThis.__Swift.Foundation.Greeter = exports.__Swift.Foundation.Greeter; + globalThis.Utils.Converters.Converter = exports.Utils.Converters.Converter; + globalThis.__Swift.Foundation.UUID = exports.__Swift.Foundation.UUID; + globalThis.MyModule.Utils.namespacedFunction = exports.MyModule.Utils.namespacedFunction; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts index 9622891a8..069c1628c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts @@ -56,6 +56,11 @@ export type Exports = { } Calculator: CalculatorObject APIResult: APIResultObject + Utils: { + String: { + uppercase(text: string): string; + }, + }, } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 14f114697..3e445992e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -305,15 +305,6 @@ export async function createInstantiator(options, swift) { } const exports = { MathUtils, - uppercase: function bjs_Utils_String_static_uppercase(text) { - const textBytes = textEncoder.encode(text); - const textId = swift.memory.retain(textBytes); - instance.exports.bjs_Utils_String_static_uppercase(textId, textBytes.length); - const ret = tmpRetString; - tmpRetString = undefined; - swift.memory.release(textId); - return ret; - }, Calculator: { ...CalculatorValues, square: function(value) { @@ -331,9 +322,22 @@ export async function createInstantiator(options, swift) { return ret; } }, + Utils: { + String: { + uppercase: function bjs_Utils_String_static_uppercase(text) { + const textBytes = textEncoder.encode(text); + const textId = swift.memory.retain(textBytes); + instance.exports.bjs_Utils_String_static_uppercase(textId, textBytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(textId); + return ret; + }, + }, + }, }; _exports = exports; - globalThis.Utils.String.uppercase = exports.uppercase; + globalThis.Utils.String.uppercase = exports.Utils.String.uppercase; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts index 40e28718e..fea3c4b59 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts @@ -51,6 +51,15 @@ export type Exports = { optionalProperty: string | null; } PropertyEnum: PropertyEnumObject + PropertyNamespace: { + readonly namespaceConstant: string; + namespaceProperty: string; + Nested: { + readonly nestedConstant: string; + nestedDouble: number; + nestedProperty: number; + }, + }, } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 3577228e8..09a2b0de9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -303,41 +303,12 @@ export async function createInstantiator(options, swift) { } } } - Object.defineProperty(globalThis.PropertyNamespace, 'namespaceProperty', { get: function() { - instance.exports.bjs_PropertyNamespace_static_namespaceProperty_get(); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - }, set: function(value) { - const valueBytes = textEncoder.encode(value); - const valueId = swift.memory.retain(valueBytes); - instance.exports.bjs_PropertyNamespace_static_namespaceProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); - } }); - Object.defineProperty(globalThis.PropertyNamespace, 'namespaceConstant', { get: function() { - instance.exports.bjs_PropertyNamespace_static_namespaceConstant_get(); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedProperty', { get: function() { - const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_get(); - return ret; - }, set: function(value) { - instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_set(value); - } }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedConstant', { get: function() { - instance.exports.bjs_PropertyNamespace_Nested_static_nestedConstant_get(); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedDouble', { get: function() { - const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_get(); - return ret; - }, set: function(value) { - instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_set(value); - } }); + if (typeof globalThis.PropertyNamespace === 'undefined') { + globalThis.PropertyNamespace = {}; + } + if (typeof globalThis.PropertyNamespace.Nested === 'undefined') { + globalThis.PropertyNamespace.Nested = {}; + } const exports = { PropertyClass, PropertyEnum: { @@ -371,8 +342,68 @@ export async function createInstantiator(options, swift) { swift.memory.release(valueId); } }, + PropertyNamespace: { + get namespaceProperty() { + instance.exports.bjs_PropertyNamespace_static_namespaceProperty_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + set namespaceProperty(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyNamespace_static_namespaceProperty_set(valueId, valueBytes.length); + swift.memory.release(valueId); + }, + get namespaceConstant() { + instance.exports.bjs_PropertyNamespace_static_namespaceConstant_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + Nested: { + get nestedProperty() { + const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_get(); + return ret; + }, + set nestedProperty(value) { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_set(value); + }, + get nestedConstant() { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedConstant_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + get nestedDouble() { + const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_get(); + return ret; + }, + set nestedDouble(value) { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_set(value); + }, + }, + }, }; _exports = exports; + Object.defineProperty(globalThis.PropertyNamespace, 'namespaceProperty', { + get: () => exports.PropertyNamespace.namespaceProperty, + set: (value) => { exports.PropertyNamespace.namespaceProperty = value; } + }); + Object.defineProperty(globalThis.PropertyNamespace, 'namespaceConstant', { + get: () => exports.PropertyNamespace.namespaceConstant, + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedProperty', { + get: () => exports.PropertyNamespace.Nested.nestedProperty, + set: (value) => { exports.PropertyNamespace.Nested.nestedProperty = value; } + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedConstant', { + get: () => exports.PropertyNamespace.Nested.nestedConstant, + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedDouble', { + get: () => exports.PropertyNamespace.Nested.nestedDouble, + set: (value) => { exports.PropertyNamespace.Nested.nestedDouble = value; } + }); return exports; }, } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md index 2026c6a2b..427dd5971 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md @@ -21,10 +21,18 @@ import JavaScriptKit } ``` -This function will be accessible in JavaScript through its namespace hierarchy: +This function will be accessible in JavaScript through its namespace hierarchy in two ways: ```javascript -// Access the function through its namespace +// Recommended: Access via the exports object (supports multiple WASM instances) +const { createInstantiator } = await import('./path/to/bridge-js.js'); +const instantiator = await createInstantiator(options, swift); +const exports = instantiator.createExports(instance); + +const result = exports.MyModule.Utils.namespacedFunction(); +console.log(result); // "namespaced" + +// Alternative: Access via globalThis const result = globalThis.MyModule.Utils.namespacedFunction(); console.log(result); // "namespaced" ``` @@ -65,10 +73,14 @@ import JavaScriptKit } ``` -In JavaScript, this class is accessible through its namespace: +In JavaScript, this class is accessible through its namespace in two ways: ```javascript -// Create instances through namespaced constructors +// Recommended: Access via the exports object (supports multiple WASM instances) +const greeter = new exports.__Swift.Foundation.Greeter("World"); +console.log(greeter.greet()); // "Hello, World!" + +// Alternative: Access via globalThis and through its namespace const greeter = new globalThis.__Swift.Foundation.Greeter("World"); console.log(greeter.greet()); // "Hello, World!" ``` @@ -87,6 +99,16 @@ declare global { } } +export type Exports = { + __Swift: { + Foundation: { + Greeter: { + new(name: string): Greeter; + } + } + } +} + export interface Greeter extends SwiftHeapObject { greet(): string; } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index f6e9cb85a..77123fec1 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -356,6 +356,22 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); + assert.equal(exports.StaticPropertyNamespace.namespaceProperty, "modified namespace"); + assert.equal(exports.StaticPropertyNamespace.namespaceConstant, "constant"); + exports.StaticPropertyNamespace.namespaceProperty = "exports modified"; + assert.equal(exports.StaticPropertyNamespace.namespaceProperty, "exports modified"); + assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "exports modified"); + + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); + exports.StaticPropertyNamespace.NestedProperties.nestedProperty = 2000; + exports.StaticPropertyNamespace.NestedProperties.nestedDouble = 3.14; + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 2000); + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedDouble, 3.14); + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 2000); + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 3.14); + // Test class without @JS init constructor const calc = exports.createCalculator(); assert.equal(calc.square(5), 25); @@ -428,6 +444,10 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(globalThis.Networking.API.MethodValues.Post, 1); assert.equal(globalThis.Networking.API.MethodValues.Put, 2); assert.equal(globalThis.Networking.API.MethodValues.Delete, 3); + assert.equal(exports.Networking.API.Method.Get, 0); + assert.equal(exports.Networking.API.Method.Post, 1); + assert.equal(exports.Networking.API.Method.Put, 2); + assert.equal(exports.Networking.API.Method.Delete, 3); assert.equal(globalThis.Configuration.LogLevelValues.Debug, "debug"); assert.equal(globalThis.Configuration.LogLevelValues.Info, "info"); assert.equal(globalThis.Configuration.LogLevelValues.Warning, "warning"); @@ -435,8 +455,17 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(globalThis.Configuration.PortValues.Http, 80); assert.equal(globalThis.Configuration.PortValues.Https, 443); assert.equal(globalThis.Configuration.PortValues.Development, 3000); + assert.equal(exports.Configuration.LogLevel.Debug, "debug"); + assert.equal(exports.Configuration.LogLevel.Info, "info"); + assert.equal(exports.Configuration.LogLevel.Warning, "warning"); + assert.equal(exports.Configuration.LogLevel.Error, "error"); + assert.equal(exports.Configuration.Port.Http, 80); + assert.equal(exports.Configuration.Port.Https, 443); + assert.equal(exports.Configuration.Port.Development, 3000); assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get, 0); assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post, 1); + assert.equal(exports.Networking.APIV2.Internal.SupportedMethod.Get, 0); + assert.equal(exports.Networking.APIV2.Internal.SupportedMethod.Post, 1); assert.equal(exports.roundtripNetworkingAPIMethod(globalThis.Networking.API.MethodValues.Get), globalThis.Networking.API.MethodValues.Get); assert.equal(exports.roundtripConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Debug), globalThis.Configuration.LogLevelValues.Debug); @@ -447,17 +476,17 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.processConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Error), globalThis.Configuration.PortValues.Development); assert.equal(exports.roundtripInternalSupportedMethod(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get), globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get); - const converter = new exports.Converter(); + const converter = new exports.Utils.Converter(); assert.equal(converter.toString(42), "42"); assert.equal(converter.toString(123), "123"); converter.release(); - const httpServer = new exports.HTTPServer(); + const httpServer = new exports.Networking.API.HTTPServer(); httpServer.call(globalThis.Networking.API.MethodValues.Get); httpServer.call(globalThis.Networking.API.MethodValues.Post); httpServer.release(); - const testServer = new exports.TestServer(); + const testServer = new exports.Networking.APIV2.Internal.TestServer(); testServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get); testServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post); testServer.release(); @@ -643,6 +672,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(StaticCalculatorValues.Scientific, exports.StaticCalculator.Scientific); assert.equal(StaticCalculatorValues.Basic, exports.StaticCalculator.Basic); assert.equal(globalThis.StaticUtils.Nested.roundtrip("hello world"), "hello world"); + assert.equal(exports.StaticUtils.Nested.roundtrip("test"), "test"); + assert.equal(exports.StaticUtils.Nested.roundtrip("exports api"), "exports api"); // Test default parameters assert.equal(exports.testStringDefault(), "Hello World"); @@ -1034,8 +1065,8 @@ function testProtocolSupport(exports) { getAPIResult() { return lastAPIResult; } }; - const successResult = { tag: exports.Result.Tag.Success, param0: "Operation completed" }; - const failureResult = { tag: exports.Result.Tag.Failure, param0: 500 }; + const successResult = { tag: exports.Utilities.Result.Tag.Success, param0: "Operation completed" }; + const failureResult = { tag: exports.Utilities.Result.Tag.Failure, param0: 500 }; const jsManager = new exports.DataProcessorManager(jsProcessor); From d7610c895bc0fa2b9fc32888dc4b48f5dc25d98b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 19 Nov 2025 12:52:24 +0000 Subject: [PATCH 029/252] BridgeJS: Move extern decls in BridgeJSIntrinsics.swift to top-level --- .../JavaScriptKit/BridgeJSInstrincics.swift | 442 ++++++++---------- 1 file changed, 188 insertions(+), 254 deletions(-) diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index 0db1cd2ed..b0e5ec395 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -167,29 +167,13 @@ extension String { // MARK: ImportTS @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_make_js_string") - func _swift_js_make_js_string(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 - #else - /// Creates a JavaScript string from UTF-8 data in WebAssembly memory - func _swift_js_make_js_string(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 { - _onlyAvailableOnWasm() - } - #endif return self.withUTF8 { b in _swift_js_make_js_string(b.baseAddress.unsafelyUnwrapped, Int32(b.count)) } } @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ bytesCount: Int32) -> String { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_init_memory_with_result") - func _swift_js_init_memory_with_result(_ ptr: UnsafePointer?, _ len: Int32) - #else - /// Initializes WebAssembly memory with result data of JavaScript function call - func _swift_js_init_memory_with_result(_ ptr: UnsafePointer?, _ len: Int32) { - _onlyAvailableOnWasm() - } + #if !arch(wasm32) guard #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else { _onlyAvailableOnWasm() } #endif return String(unsafeUninitializedCapacity: Int(bytesCount)) { b in @@ -201,14 +185,7 @@ extension String { // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ bytes: Int32, _ count: Int32) -> String { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_init_memory") - func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer?) - #else - /// Initializes a part of WebAssembly memory with Uint8Array a JavaScript object - func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer?) { - _onlyAvailableOnWasm() - } + #if !arch(wasm32) guard #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else { _onlyAvailableOnWasm() } #endif return String(unsafeUninitializedCapacity: Int(count)) { b in @@ -218,15 +195,6 @@ extension String { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_string") - func _swift_js_return_string(_ ptr: UnsafePointer?, _ len: Int32) - #else - /// Write a string to reserved string storage to be returned to JavaScript - func _swift_js_return_string(_ ptr: UnsafePointer?, _ len: Int32) { - _onlyAvailableOnWasm() - } - #endif return self.withUTF8 { ptr in _swift_js_return_string(ptr.baseAddress, Int32(ptr.count)) } @@ -250,16 +218,6 @@ extension JSObject { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_retain") - func _swift_js_retain(_ id: Int32) -> Int32 - #else - /// Retains a JavaScript object reference to ensure the object id - /// remains valid after the function returns - func _swift_js_retain(_ id: Int32) -> Int32 { - _onlyAvailableOnWasm() - } - #endif return _swift_js_retain(Int32(bitPattern: self.id)) } } @@ -475,6 +433,191 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif +// MARK: Wasm externs used by type lowering/lifting + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_make_js_string") +func _swift_js_make_js_string(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 +#else +/// Creates a JavaScript string from UTF-8 data in WebAssembly memory +func _swift_js_make_js_string(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_init_memory_with_result") +func _swift_js_init_memory_with_result(_ ptr: UnsafePointer?, _ len: Int32) +#else +/// Initializes WebAssembly memory with result data of JavaScript function call +func _swift_js_init_memory_with_result(_ ptr: UnsafePointer?, _ len: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_string") +func _swift_js_return_string(_ ptr: UnsafePointer?, _ len: Int32) +#else +/// Write a string to reserved string storage to be returned to JavaScript +func _swift_js_return_string(_ ptr: UnsafePointer?, _ len: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_retain") +func _swift_js_retain(_ id: Int32) -> Int32 +#else +/// Retains a JavaScript object reference to ensure the object id +/// remains valid after the function returns +func _swift_js_retain(_ id: Int32) -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_bool") +func _swift_js_return_optional_bool(_ isSome: Int32, _ value: Int32) +#else +/// Sets the optional bool for return value storage +func _swift_js_return_optional_bool(_ isSome: Int32, _ value: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_presence") +func _swift_js_get_optional_int_presence() -> Int32 +#else +func _swift_js_get_optional_int_presence() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_value") +func _swift_js_get_optional_int_value() -> Int32 +#else +func _swift_js_get_optional_int_value() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_int") +func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) +#else +/// Sets the optional int for return value storage +func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_string") +func _swift_js_get_optional_string() -> Int32 +#else +func _swift_js_get_optional_string() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_string") +func _swift_js_return_optional_string(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) +#else +/// Write an optional string to reserved string storage to be returned to JavaScript +func _swift_js_return_optional_string(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_object") +func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) +#else +/// Write an optional JSObject to reserved storage to be returned to JavaScript +func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_heap_object_pointer") +func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer +#else +func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_heap_object") +func _swift_js_return_optional_heap_object(_ isSome: Int32, _ pointer: UnsafeMutableRawPointer?) +#else +/// Write an optional Swift heap object to reserved storage to be returned to JavaScript +func _swift_js_return_optional_heap_object(_ isSome: Int32, _ pointer: UnsafeMutableRawPointer?) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_presence") +func _swift_js_get_optional_float_presence() -> Int32 +#else +func _swift_js_get_optional_float_presence() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_value") +func _swift_js_get_optional_float_value() -> Float32 +#else +func _swift_js_get_optional_float_value() -> Float32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_float") +func _swift_js_return_optional_float(_ isSome: Int32, _ value: Float32) +#else +/// Sets the optional float for return value storage +func _swift_js_return_optional_float(_ isSome: Int32, _ value: Float32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_presence") +func _swift_js_get_optional_double_presence() -> Int32 +#else +func _swift_js_get_optional_double_presence() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_value") +func _swift_js_get_optional_double_value() -> Float64 +#else +func _swift_js_get_optional_double_value() -> Float64 { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_return_optional_double") +func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) +#else +/// Sets the optional double for return value storage +func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { + _onlyAvailableOnWasm() +} +#endif + extension Optional where Wrapped == Bool { // MARK: ImportTS @@ -516,16 +659,6 @@ extension Optional where Wrapped == Bool { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_bool") - func _swift_js_return_optional_bool(_ isSome: Int32, _ value: Int32) - #else - /// Sets the optional bool for return value storage - func _swift_js_return_optional_bool(_ isSome: Int32, _ value: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_bool(0, 0) @@ -563,20 +696,6 @@ extension Optional where Wrapped == Int { } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Int? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_presence") - func _swift_js_get_optional_int_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_value") - func _swift_js_get_optional_int_value() -> Int32 - #else - func _swift_js_get_optional_int_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_int_value() -> Int32 { - _onlyAvailableOnWasm() - } - #endif - let isSome = _swift_js_get_optional_int_presence() if isSome == 0 { return nil @@ -586,16 +705,6 @@ extension Optional where Wrapped == Int { } @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_int") - func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) - #else - /// Sets the optional int for return value storage - func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch self { case .none: _swift_js_return_optional_int(0, 0) @@ -628,15 +737,6 @@ extension Optional where Wrapped == String { } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> String? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_string") - func _swift_js_get_optional_string() -> Int32 - #else - func _swift_js_get_optional_string() -> Int32 { - _onlyAvailableOnWasm() - } - #endif - let length = _swift_js_get_optional_string() if length < 0 { return nil @@ -646,16 +746,6 @@ extension Optional where Wrapped == String { } @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_string") - func _swift_js_return_optional_string(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) - #else - /// Write an optional string to reserved string storage to be returned to JavaScript - func _swift_js_return_optional_string(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch self { case .none: _swift_js_return_optional_string(0, nil, 0) @@ -689,16 +779,6 @@ extension Optional where Wrapped == JSObject { } @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_object") - func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) - #else - /// Write an optional JSObject to reserved storage to be returned to JavaScript - func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch self { case .none: _swift_js_return_optional_object(0, 0) @@ -721,16 +801,6 @@ extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_object") - func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) - #else - /// Write an optional protocol wrapper to reserved storage to be returned to JavaScript - func _swift_js_return_optional_object(_ isSome: Int32, _ objectId: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_object(0, 0) @@ -815,15 +885,6 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_heap_object_pointer") - func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer - #else - func _swift_js_get_optional_heap_object_pointer() -> UnsafeMutableRawPointer { - _onlyAvailableOnWasm() - } - #endif - let pointer = _swift_js_get_optional_heap_object_pointer() if pointer == UnsafeMutableRawPointer(bitPattern: 0) { return nil @@ -833,16 +894,6 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_heap_object") - func _swift_js_return_optional_heap_object(_ isSome: Int32, _ pointer: UnsafeMutableRawPointer?) - #else - /// Write an optional Swift heap object to reserved storage to be returned to JavaScript - func _swift_js_return_optional_heap_object(_ isSome: Int32, _ pointer: UnsafeMutableRawPointer?) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_heap_object(0, nil) @@ -869,20 +920,6 @@ extension Optional where Wrapped == Float { } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Float? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_presence") - func _swift_js_get_optional_float_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_value") - func _swift_js_get_optional_float_value() -> Float32 - #else - func _swift_js_get_optional_float_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_float_value() -> Float32 { - _onlyAvailableOnWasm() - } - #endif - let isSome = _swift_js_get_optional_float_presence() if isSome == 0 { return nil @@ -892,16 +929,6 @@ extension Optional where Wrapped == Float { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_float") - func _swift_js_return_optional_float(_ isSome: Int32, _ value: Float32) - #else - /// Sets the optional float for return value storage - func _swift_js_return_optional_float(_ isSome: Int32, _ value: Float32) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_float(0, 0.0) @@ -929,20 +956,6 @@ extension Optional where Wrapped == Double { } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Double? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_presence") - func _swift_js_get_optional_double_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_value") - func _swift_js_get_optional_double_value() -> Float64 - #else - func _swift_js_get_optional_double_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_double_value() -> Float64 { - _onlyAvailableOnWasm() - } - #endif - let isSome = _swift_js_get_optional_double_presence() if isSome == 0 { return nil @@ -952,16 +965,6 @@ extension Optional where Wrapped == Double { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_double") - func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) - #else - /// Sets the optional double for return value storage - func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_double(0, 0.0) @@ -1001,16 +1004,6 @@ extension Optional where Wrapped: _BridgedSwiftCaseEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_return_optional_int") - func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) - #else - /// Sets the optional int for return value storage - func _swift_js_return_optional_int(_ isSome: Int32, _ value: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_return_optional_int(0, 0) @@ -1062,15 +1055,6 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_string") - func _swift_js_get_optional_string() -> Int32 - #else - func _swift_js_get_optional_string() -> Int32 { - _onlyAvailableOnWasm() - } - #endif - let length = _swift_js_get_optional_string() if length < 0 { return nil @@ -1103,20 +1087,6 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_presence") - func _swift_js_get_optional_int_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_int_value") - func _swift_js_get_optional_int_value() -> Int32 - #else - func _swift_js_get_optional_int_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_int_value() -> Int32 { - _onlyAvailableOnWasm() - } - #endif - let isSome = _swift_js_get_optional_int_presence() if isSome == 0 { return nil @@ -1164,21 +1134,8 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres let optionalRawValue = Float?.bridgeJSLiftParameter(isSome, wrappedValue) return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_presence") - func _swift_js_get_optional_float_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_float_value") - func _swift_js_get_optional_float_value() -> Float32 - #else - func _swift_js_get_optional_float_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_float_value() -> Float32 { - _onlyAvailableOnWasm() - } - #endif + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let isSome = _swift_js_get_optional_float_presence() if isSome == 0 { return nil @@ -1214,20 +1171,6 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_presence") - func _swift_js_get_optional_double_presence() -> Int32 - @_extern(wasm, module: "bjs", name: "swift_js_get_optional_double_value") - func _swift_js_get_optional_double_value() -> Float64 - #else - func _swift_js_get_optional_double_presence() -> Int32 { - _onlyAvailableOnWasm() - } - func _swift_js_get_optional_double_value() -> Float64 { - _onlyAvailableOnWasm() - } - #endif - let isSome = _swift_js_get_optional_double_presence() if isSome == 0 { return nil @@ -1274,15 +1217,6 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "swift_js_push_tag") - func _swift_js_push_tag(_ tag: Int32) - #else - func _swift_js_push_tag(_ tag: Int32) { - _onlyAvailableOnWasm() - } - #endif - switch consume self { case .none: _swift_js_push_tag(-1) // Use -1 as sentinel for null From 734ec3c7e2301ac4ffe0830babaeec6c3b202ed8 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 22 Nov 2025 17:52:29 +0900 Subject: [PATCH 030/252] Documentation: Update Hello World tutorial prerequisites for Swift 6.2.1 --- .../Hello-World/Hello-World.tutorial | 30 ++++++++++++++----- .../hello-world-0-0-install-swiftly.txt | 9 ++++++ .../hello-world-0-1-install-toolchain.txt | 14 +++++++++ .../hello-world-0-1-swift-version.txt | 7 ----- .../Resources/hello-world-0-2-install-sdk.txt | 6 ++++ .../Resources/hello-world-0-2-select-sdk.txt | 9 ------ .../Resources/hello-world-0-3-verify-sdk.txt | 8 +++++ .../hello-world-1-2-add-dependency.txt | 2 +- .../hello-world-1-3-add-target-dependency.txt | 2 +- 9 files changed, 62 insertions(+), 25 deletions(-) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-0-install-swiftly.txt create mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-install-toolchain.txt delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-swift-version.txt create mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-install-sdk.txt delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-select-sdk.txt create mode 100644 Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-3-verify-sdk.txt diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial index c054e3a48..d8fa16aad 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial @@ -6,19 +6,35 @@ } @Section(title: "Prerequisites") { - Visit the [installation guide](https://book.swiftwasm.org/getting-started/setup.html) to install the Swift SDK for WebAssembly before starting this tutorial. - This tutorial assumes you have the Swift SDK for WebAssembly installed. Please check your Swift installation. + This tutorial requires the OSS Swift Toolchain and Swift SDK for WebAssembly to be installed. Follow these steps to set up your development environment for building web applications with JavaScriptKit. @Steps { @Step { - Check your Swift toolchain version. If you see different - @Code(name: "Console", file: "hello-world-0-1-swift-version.txt") + Install `swiftly`, the Swift toolchain installer, per the [instructions on swift.org](https://www.swift.org/install/) for your platform. + + `swiftly` is the recommended way to install and manage OSS Swift toolchains. You cannot use toolchains bundled with Xcode for WebAssembly development. + @Code(name: "Console", file: "hello-world-0-0-install-swiftly.txt") + } + + @Step { + Install the latest Swift 6.2 development snapshot using `swiftly`: + + @Code(name: "Console", file: "hello-world-0-1-install-toolchain.txt") } + + @Step { + Install the Swift SDK for WASI that matches your toolchain version: + + Navigate to [the downloads page](https://www.swift.org/download/) and find the "Swift SDK for WASI" section. Find a version that **exactly** matches the toolchain version from step 2. + + @Code(name: "Console", file: "hello-world-0-2-install-sdk.txt") + } + @Step { - Select a Swift SDK for WebAssembly version that matches the version of the Swift toolchain you have installed. + Verify the Swift SDK installation and set up your environment: The following sections of this tutorial assume you have set the `SWIFT_SDK_ID` environment variable. - @Code(name: "Console", file: "hello-world-0-2-select-sdk.txt") + @Code(name: "Console", file: "hello-world-0-3-verify-sdk.txt") } } } @@ -98,4 +114,4 @@ } } } -} +} diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-0-install-swiftly.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-0-install-swiftly.txt new file mode 100644 index 000000000..96abdfc4f --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-0-install-swiftly.txt @@ -0,0 +1,9 @@ +# Install swiftly per the instructions for your platform +# Visit https://www.swift.org/install/ for platform-specific instructions + +# Example for macOS: +$ curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && \ +installer -pkg swiftly.pkg -target CurrentUserHomeDirectory && \ +~/.swiftly/bin/swiftly init --quiet-shell-followup && \ +. "${SWIFTLY_HOME_DIR:-$HOME/.swiftly}/env.sh" && \ +hash -r diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-install-toolchain.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-install-toolchain.txt new file mode 100644 index 000000000..8e2941014 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-install-toolchain.txt @@ -0,0 +1,14 @@ +# Install latest 6.2 development snapshot +$ swiftly install 6.2.1 +Installing Swift 6.2.1... +Swift 6.2.1 installed successfully. + +# Select the installed toolchain +$ swiftly use 6.2.1 +Using Swift 6.2.1 + +# Verify the toolchain is active +$ swift --version +Apple Swift version 6.2.1 (swift-6.2.1-RELEASE) +or +Swift version 6.2.1 (swift-6.2.1-RELEASE) diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-swift-version.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-swift-version.txt deleted file mode 100644 index 5d5ad28df..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-1-swift-version.txt +++ /dev/null @@ -1,7 +0,0 @@ -$ swift --version -Apple Swift version 6.0.3 (swift-6.0.3-RELEASE) -or -Swift version 6.0.3 (swift-6.0.3-RELEASE) - -$ swift sdk list -6.0.3-RELEASE-wasm32-unknown-wasi diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-install-sdk.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-install-sdk.txt new file mode 100644 index 000000000..7127316d1 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-install-sdk.txt @@ -0,0 +1,6 @@ +# Navigate to https://www.swift.org/download/ and find the "Swift SDK for WASI" section +# Find a URL that exactly matches your toolchain version from the previous step +# Press "Copy install command" to get the installation command + +# Example installation command (replace with the exact command from swift.org): +$ swift sdk install https://download.swift.org/swift-6.2.1-release/wasm-sdk/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE_wasm.artifactbundle.tar.gz --checksum 482b9f95462b87bedfafca94a092cf9ec4496671ca13b43745097122d20f18af diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-select-sdk.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-select-sdk.txt deleted file mode 100644 index b5fc2c620..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-2-select-sdk.txt +++ /dev/null @@ -1,9 +0,0 @@ -$ swift --version -Apple Swift version 6.0.3 (swift-6.0.3-RELEASE) -or -Swift version 6.0.3 (swift-6.0.3-RELEASE) - -$ swift sdk list -6.0.3-RELEASE-wasm32-unknown-wasi - -$ export SWIFT_SDK_ID=6.0.3-RELEASE-wasm32-unknown-wasi diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-3-verify-sdk.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-3-verify-sdk.txt new file mode 100644 index 000000000..10d256ec1 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-0-3-verify-sdk.txt @@ -0,0 +1,8 @@ +# Verify the Swift SDK was installed +$ swift sdk list +swift-6.2.1-RELEASE_wasm +swift-6.2.1-RELEASE_wasm-embedded + +# In this tutorial, we use non-embedded SDK. +# Set the SDK ID as an environment variable for convenience +$ export SWIFT_SDK_ID=swift-6.2.1-RELEASE_wasm diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt index 358629d0c..5c31a9349 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt @@ -5,5 +5,5 @@ Creating .gitignore Creating Sources/ Creating Sources/main.swift -$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --branch main +$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from 0.36.0 Updating package manifest at Package.swift... done. diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt index 317690412..1cee1ca37 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt @@ -5,7 +5,7 @@ Creating .gitignore Creating Sources/ Creating Sources/main.swift -$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --branch main +$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from 0.36.0 Updating package manifest at Package.swift... done. $ swift package add-target-dependency --package JavaScriptKit JavaScriptKit Hello From 199fd749ddafe485bb333fcb11e9e69c9d359c44 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 22 Nov 2025 18:17:22 +0900 Subject: [PATCH 031/252] Documentation: Update estimated time --- .../Tutorials/Hello-World/Hello-World.tutorial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial index d8fa16aad..021960501 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Hello-World.tutorial @@ -1,4 +1,4 @@ -@Tutorial(time: 5) { +@Tutorial(time: 30) { @Intro(title: "Quick Start: Hello World") { This tutorial walks you through creating a simple web application using JavaScriptKit. You'll learn how to set up a Swift package, add JavaScriptKit as a dependency, write code to manipulate the DOM, and build and run your web application. From c1829425e50729999d022dcc0f41a3b10865ae94 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 22 Nov 2025 18:18:41 +0900 Subject: [PATCH 032/252] Documentation: Leave `--from` version as `` in tutorial files --- .../Hello-World/Resources/hello-world-1-2-add-dependency.txt | 2 +- .../Resources/hello-world-1-3-add-target-dependency.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt index 5c31a9349..f5b88a17a 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-2-add-dependency.txt @@ -5,5 +5,5 @@ Creating .gitignore Creating Sources/ Creating Sources/main.swift -$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from 0.36.0 +$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from Updating package manifest at Package.swift... done. diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt index 1cee1ca37..02dda64cb 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-1-3-add-target-dependency.txt @@ -5,7 +5,7 @@ Creating .gitignore Creating Sources/ Creating Sources/main.swift -$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from 0.36.0 +$ swift package add-dependency https://github.com/swiftwasm/JavaScriptKit.git --from Updating package manifest at Package.swift... done. $ swift package add-target-dependency --package JavaScriptKit JavaScriptKit Hello From ad8e34a6222da01fae516d07607a962b49dc4e20 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Nov 2025 03:18:59 +0000 Subject: [PATCH 033/252] BridgeJS: Move all `@_extern(wasm)` declarations to top-level When generating `@_extern(wasm)` function declarations in the BridgeJS plugin, we now need to ensure that they are placed at the top level of the module, rather than nested within other declarations because of the restrictions of the main branch Swift compiler. --- .../Sources/BridgeJSCore/ExportSwift.swift | 130 +++++++++++------- .../Sources/BridgeJSCore/ImportTS.swift | 8 +- 2 files changed, 84 insertions(+), 54 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 07b103b6f..b061716dc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1497,12 +1497,12 @@ public class ExportSwift { } for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { - decls.append(try closureCodegen.renderClosureHelper(signature: signature)) + decls.append(contentsOf: try closureCodegen.renderClosureHelper(signature: signature)) decls.append(try closureCodegen.renderClosureInvokeHandler(signature: signature)) } for proto in exportedProtocols { - decls.append(try renderProtocolWrapper(protocol: proto)) + decls.append(contentsOf: try renderProtocolWrapper(protocol: proto)) } for enumDef in exportedEnums { @@ -1547,6 +1547,7 @@ public class ExportSwift { var parameters: [Parameter] = [] var abiParameterSignatures: [(name: String, type: WasmCoreType)] = [] var abiReturnType: WasmCoreType? + var externDecls: [DeclSyntax] = [] let effects: Effects init(effects: Effects) { @@ -1839,7 +1840,7 @@ public class ExportSwift { return lines.isEmpty ? "" : lines.joined(separator: "\n") + "\n" } - func renderClosureHelper(signature: ClosureSignature) throws -> DeclSyntax { + func renderClosureHelper(signature: ClosureSignature) throws -> [DeclSyntax] { let mangledName = signature.mangleName let helperName = "_BJS_Closure_\(mangledName)" let boxClassName = "_BJS_ClosureBox_\(mangledName)" @@ -1899,25 +1900,31 @@ public class ExportSwift { invokeReturnType = "Void" } + let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" + let returnLifting: String if signature.returnType == .void { - returnLifting = "_invoke(\(invokeCallArgs.joined(separator: ", ")))" + returnLifting = "\(externName)(\(invokeCallArgs.joined(separator: ", ")))" } else if case .optional = signature.returnType { returnLifting = """ - _invoke(\(invokeCallArgs.joined(separator: ", "))) + \(externName)(\(invokeCallArgs.joined(separator: ", "))) return \(signature.returnType.swiftType).bridgeJSLiftReturnFromSideChannel() """ } else { returnLifting = """ - let resultId = _invoke(\(invokeCallArgs.joined(separator: ", "))) + let resultId = \(externName)(\(invokeCallArgs.joined(separator: ", "))) return \(signature.returnType.swiftType).bridgeJSLiftReturn(resultId) """ } - let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" let optionalLoweringCode = try generateOptionalParameterLowering(signature: signature) - return """ + let externDecl: DeclSyntax = """ + @_extern(wasm, module: "bjs", name: "\(raw: externName)") + fileprivate func \(raw: externName)(\(raw: invokeSignature)) -> \(raw: invokeReturnType) + """ + + let boxDecl: DeclSyntax = """ private final class \(raw: boxClassName): _BridgedSwiftClosureBox { let closure: \(raw: closureType) init(_ closure: @escaping \(raw: closureType)) { @@ -1935,16 +1942,15 @@ public class ExportSwift { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "\(raw: externName)") - func _invoke(\(raw: invokeSignature)) -> \(raw: invokeReturnType) \(raw: optionalLoweringCode)\(raw: returnLifting) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } """ + return [externDecl, boxDecl] } func renderClosureInvokeHandler(signature: ClosureSignature) throws -> DeclSyntax { @@ -2051,28 +2057,28 @@ public class ExportSwift { func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName return """ - extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { + extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(raw: typeName) { switch caseId { \(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n")) default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)") } } - + // MARK: Protocol Export - + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { \(raw: generateLowerParameterSwitchCases(enumDef: enumDef).joined(separator: "\n")) } } - + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(raw: typeName) { return _bridgeJSLiftFromCaseId(caseId) } - + // MARK: ExportSwift - + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { return _bridgeJSLiftFromCaseId(caseId) } @@ -2460,7 +2466,7 @@ public class ExportSwift { } // Generate ConvertibleToJSValue extension - decls.append(renderConvertibleToJSValueExtension(klass: klass)) + decls.append(contentsOf: renderConvertibleToJSValueExtension(klass: klass)) return decls } @@ -2501,36 +2507,40 @@ public class ExportSwift { /// } /// } /// ``` - func renderConvertibleToJSValueExtension(klass: ExportedClass) -> DeclSyntax { + func renderConvertibleToJSValueExtension(klass: ExportedClass) -> [DeclSyntax] { let wrapFunctionName = "_bjs_\(klass.name)_wrap" let externFunctionName = "bjs_\(klass.name)_wrap" // If the class has an explicit access control, we need to add it to the extension declaration. let accessControl = klass.explicitAccessControl.map { "\($0) " } ?? "" - return """ + let extensionDecl: DeclSyntax = """ extension \(raw: klass.swiftCallName): ConvertibleToJSValue, _BridgedSwiftHeapObject { \(raw: accessControl)var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: externFunctionName)") - func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 - #else - func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: \(raw: wrapFunctionName)(Unmanaged.passRetained(self).toOpaque())))) } } """ + let externDecl: DeclSyntax = """ + #if arch(wasm32) + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: externFunctionName)") + fileprivate func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 + #else + fileprivate func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + """ + return [extensionDecl, externDecl] } /// Creates a struct that wraps a JSObject and implements protocol methods /// by calling `@_extern(wasm)` functions that forward to JavaScript via JSObject ID - func renderProtocolWrapper(protocol proto: ExportedProtocol) throws -> DeclSyntax { + func renderProtocolWrapper(protocol proto: ExportedProtocol) throws -> [DeclSyntax] { let wrapperName = "Any\(proto.name)" let protocolName = proto.name var methodDecls: [DeclSyntax] = [] + var externDecls: [DeclSyntax] = [] for method in proto.methods { var swiftParams: [String] = [] @@ -2617,10 +2627,16 @@ public class ExportSwift { """ } } + + externDecls.append( + """ + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: method.abiName)") + fileprivate func _extern_\(raw: method.name)(\(raw: externParams.joined(separator: ", ")))\(raw: externReturnType) + """ + ) + let methodImplementation: DeclSyntax = """ func \(raw: method.name)(\(raw: swiftParams.joined(separator: ", ")))\(raw: returnTypeStr) { - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: method.abiName)") - func _extern_\(raw: method.name)(\(raw: externParams.joined(separator: ", ")))\(raw: externReturnType) \(raw: callCode) } """ @@ -2631,34 +2647,36 @@ public class ExportSwift { var propertyDecls: [DeclSyntax] = [] for property in proto.properties { - let propertyImpl = try renderProtocolProperty( + let (propertyImpl, propertyExternDecls) = try renderProtocolProperty( property: property, protocolName: protocolName, moduleName: moduleName ) propertyDecls.append(propertyImpl) + externDecls.append(contentsOf: propertyExternDecls) } let allDecls = (methodDecls + propertyDecls).map { $0.description }.joined(separator: "\n\n") - return """ + let structDecl: DeclSyntax = """ struct \(raw: wrapperName): \(raw: protocolName), _BridgedSwiftProtocolWrapper { let jsObject: JSObject - + \(raw: allDecls) - + static func bridgeJSLiftParameter(_ value: Int32) -> Self { return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) } } """ + return [structDecl] + externDecls } private func renderProtocolProperty( property: ExportedProtocolProperty, protocolName: String, moduleName: String - ) throws -> DeclSyntax { + ) throws -> (propertyDecl: DeclSyntax, externDecls: [DeclSyntax]) { let getterAbiName = ABINameGenerator.generateABIName( baseName: property.name, operation: "get", @@ -2679,33 +2697,39 @@ public class ExportSwift { // Optional case/raw enums use side-channel reading (Void return) getterReturnType = "" getterBody = """ - _extern_get(this: Int32(bitPattern: jsObject.id)) + \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) return \(property.type.swiftType).bridgeJSLiftReturnFromSideChannel() """ } else if let abiType = liftingInfo.valueToLift { getterReturnType = " -> \(abiType.swiftType)" getterBody = """ - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) return \(property.type.swiftType).bridgeJSLiftReturn(ret) """ } else { getterReturnType = "" getterBody = """ - _extern_get(this: Int32(bitPattern: jsObject.id)) + \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) return \(property.type.swiftType).bridgeJSLiftReturn() """ } + let getterExternDecl: DeclSyntax = """ + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") + fileprivate func \(raw: getterAbiName)(this: Int32)\(raw: getterReturnType) + """ + if property.isReadonly { - return """ + return ( + """ var \(raw: property.name): \(raw: property.type.swiftType) { get { - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") - func _extern_get(this: Int32)\(raw: getterReturnType) \(raw: getterBody) } } - """ + """, + [getterExternDecl] + ) } else { let loweringInfo = try property.type.loweringParameterInfo(context: .exportSwift) @@ -2720,28 +2744,32 @@ public class ExportSwift { let wrappedParam = loweringInfo.loweredParameters[1].name setterBody = """ let (\(isSomeParam), \(wrappedParam)) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), \(isSomeParam): \(isSomeParam), \(wrappedParam): \(wrappedParam)) + \(setterAbiName)(this: Int32(bitPattern: jsObject.id), \(isSomeParam): \(isSomeParam), \(wrappedParam): \(wrappedParam)) """ } else { let paramName = loweringInfo.loweredParameters[0].name setterBody = - "_extern_set(this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter())" + "\(setterAbiName)(this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter())" } - return """ + let setterExternDecl: DeclSyntax = """ + @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: setterAbiName)") + fileprivate func \(raw: setterAbiName)(\(raw: setterParams)) + """ + + return ( + """ var \(raw: property.name): \(raw: property.type.swiftType) { get { - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") - func _extern_get(this: Int32)\(raw: getterReturnType) \(raw: getterBody) } set { - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: setterAbiName)") - func _extern_set(\(raw: setterParams)) \(raw: setterBody) } } - """ + """, + [getterExternDecl, setterExternDecl] + ) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index af4a59c97..39a735f06 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -175,7 +175,6 @@ public struct ImportTS { ) ), body: CodeBlockSyntax { - self.renderImportDecl() body } ) @@ -200,7 +199,6 @@ public struct ImportTS { effectSpecifiers: ImportTS.buildFunctionEffect(throws: true, async: false) ), bodyBuilder: { - self.renderImportDecl() body } ) @@ -228,6 +226,7 @@ public struct ImportTS { } builder.call(returnType: function.returnType) try builder.liftReturnValue(returnType: function.returnType) + topLevelDecls.append(builder.renderImportDecl()) return [ builder.renderThunkDecl( name: function.name, @@ -249,6 +248,7 @@ public struct ImportTS { } builder.call(returnType: method.returnType) try builder.liftReturnValue(returnType: method.returnType) + topLevelDecls.append(builder.renderImportDecl()) return [ builder.renderThunkDecl( name: method.name, @@ -266,6 +266,7 @@ public struct ImportTS { } builder.call(returnType: .jsObject(name)) builder.assignThis(returnType: .jsObject(name)) + topLevelDecls.append(builder.renderImportDecl()) return [ builder.renderConstructorDecl(parameters: constructor.parameters) ] @@ -279,11 +280,11 @@ public struct ImportTS { try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) builder.call(returnType: property.type) try builder.liftReturnValue(returnType: property.type) + topLevelDecls.append(builder.renderImportDecl()) return AccessorDeclSyntax( accessorSpecifier: .keyword(.get), effectSpecifiers: Self.buildAccessorEffect(throws: true, async: false), body: CodeBlockSyntax { - builder.renderImportDecl() builder.body } ) @@ -298,6 +299,7 @@ public struct ImportTS { try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) try builder.lowerParameter(param: newValue) builder.call(returnType: .void) + topLevelDecls.append(builder.renderImportDecl()) return builder.renderThunkDecl( name: "set\(property.name.capitalizedFirstLetter)", parameters: [newValue], From c4c3ad8a490796decb9853c992a6670ed1853c68 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Nov 2025 03:29:03 +0000 Subject: [PATCH 034/252] BridgeJS: Update snapshot tests --- .../ExportSwiftTests/DefaultParameters.swift | 53 ++-- .../ExportSwiftTests/EnumNamespace.swift | 53 ++-- .../ExportSwiftTests/Namespaces.swift | 53 ++-- .../ExportSwiftTests/Optionals.swift | 36 +-- .../ExportSwiftTests/PropertyTypes.swift | 19 +- .../ExportSwiftTests/Protocol.swift | 243 ++++++++++-------- .../ExportSwiftTests/StaticFunctions.swift | 19 +- .../ExportSwiftTests/StaticProperties.swift | 19 +- .../ExportSwiftTests/SwiftClass.swift | 53 ++-- .../ExportSwiftTests/SwiftClosure.swift | 153 ++++++----- .../ImportTSTests/ArrayParameter.swift | 51 ++-- .../__Snapshots__/ImportTSTests/Async.swift | 119 +++++---- .../ImportTSTests/Interface.swift | 51 ++-- .../ImportTSTests/InvalidPropertyNames.swift | 187 +++++++------- .../ImportTSTests/MultipleImportedTypes.swift | 238 +++++++++-------- .../ImportTSTests/PrimitiveParameters.swift | 17 +- .../ImportTSTests/PrimitiveReturn.swift | 34 +-- .../ImportTSTests/StringParameter.swift | 34 +-- .../ImportTSTests/StringReturn.swift | 17 +- .../ImportTSTests/TS2SkeletonLike.swift | 119 +++++---- .../ImportTSTests/TypeAlias.swift | 17 +- .../ImportTSTests/TypeScriptClass.swift | 102 ++++---- .../VoidParameterVoidReturn.swift | 17 +- 23 files changed, 915 insertions(+), 789 deletions(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 675f7bfb0..525782c4f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -206,18 +206,19 @@ public func _bjs_DefaultGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension DefaultGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_DefaultGreeter_wrap") - func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_DefaultGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_DefaultGreeter_wrap") +fileprivate func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_EmptyGreeter_init") @_cdecl("bjs_EmptyGreeter_init") public func _bjs_EmptyGreeter_init() -> UnsafeMutableRawPointer { @@ -237,18 +238,19 @@ public func _bjs_EmptyGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension EmptyGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_EmptyGreeter_wrap") - func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_EmptyGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_EmptyGreeter_wrap") +fileprivate func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, count: Int32, enabled: Int32, status: Int32, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> UnsafeMutableRawPointer { @@ -384,14 +386,15 @@ public func _bjs_ConstructorDefaults_deinit(pointer: UnsafeMutableRawPointer) { extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_ConstructorDefaults_wrap") - func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_ConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ConstructorDefaults_wrap") +fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index ca201f3d9..cf4977501 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -120,18 +120,19 @@ public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @@ -161,18 +162,19 @@ public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @@ -202,14 +204,15 @@ public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift index f868fa111..3e7714464 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift @@ -58,18 +58,19 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @@ -100,18 +101,19 @@ public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { @@ -131,14 +133,15 @@ public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) { extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") - func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") +fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift index 9cd9e1f69..0834943eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift @@ -232,18 +232,19 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") public func _bjs_OptionalPropertyHolder_init() -> UnsafeMutableRawPointer { @@ -326,14 +327,15 @@ public func _bjs_OptionalPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_OptionalPropertyHolder_wrap") - func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_OptionalPropertyHolder_wrap") +fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift index 822e58467..f622e3ac6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift @@ -334,14 +334,15 @@ public func _bjs_PropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_PropertyHolder_wrap") - func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PropertyHolder_wrap") +fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index d68ef81d0..ef6160d28 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -10,235 +10,169 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto let jsObject: JSObject func onSomethingHappened() { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") - func _extern_onSomethingHappened(this: Int32) _extern_onSomethingHappened(this: Int32(bitPattern: jsObject.id)) } func onValueChanged(_ value: String) { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") - func _extern_onValueChanged(this: Int32, value: Int32) _extern_onValueChanged(this: Int32(bitPattern: jsObject.id), value: value.bridgeJSLowerParameter()) } func onCountUpdated(count: Int) -> Bool { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") - func _extern_onCountUpdated(this: Int32, count: Int32) -> Int32 let ret = _extern_onCountUpdated(this: Int32(bitPattern: jsObject.id), count: count.bridgeJSLowerParameter()) return Bool.bridgeJSLiftReturn(ret) } func onLabelUpdated(_ prefix: String, _ suffix: String) { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") - func _extern_onLabelUpdated(this: Int32, prefix: Int32, suffix: Int32) _extern_onLabelUpdated(this: Int32(bitPattern: jsObject.id), prefix: prefix.bridgeJSLowerParameter(), suffix: suffix.bridgeJSLowerParameter()) } func isCountEven() -> Bool { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") - func _extern_isCountEven(this: Int32) -> Int32 let ret = _extern_isCountEven(this: Int32(bitPattern: jsObject.id)) return Bool.bridgeJSLiftReturn(ret) } func onHelperUpdated(_ helper: Helper) { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") - func _extern_onHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) _extern_onHelperUpdated(this: Int32(bitPattern: jsObject.id), helper: helper.bridgeJSLowerParameter()) } func createHelper() -> Helper { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") - func _extern_createHelper(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createHelper(this: Int32(bitPattern: jsObject.id)) return Helper.bridgeJSLiftReturn(ret) } func onOptionalHelperUpdated(_ helper: Optional) { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") - func _extern_onOptionalHelperUpdated(this: Int32, helperIsSome: Int32, helperPointer: UnsafeMutableRawPointer) let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameterWithPresence() _extern_onOptionalHelperUpdated(this: Int32(bitPattern: jsObject.id), helperIsSome: helperIsSome, helperPointer: helperPointer) } func createOptionalHelper() -> Optional { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") - func _extern_createOptionalHelper(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createOptionalHelper(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } func createEnum() -> ExampleEnum { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") - func _extern_createEnum(this: Int32) -> Int32 let ret = _extern_createEnum(this: Int32(bitPattern: jsObject.id)) return ExampleEnum.bridgeJSLiftReturn(ret) } func handleResult(_ result: Result) { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") - func _extern_handleResult(this: Int32, result: Int32) _extern_handleResult(this: Int32(bitPattern: jsObject.id), result: result.bridgeJSLowerParameter()) } func getResult() -> Result { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") - func _extern_getResult(this: Int32) -> Int32 let ret = _extern_getResult(this: Int32(bitPattern: jsObject.id)) return Result.bridgeJSLiftReturn(ret) } var eventCount: Int { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_eventCount_get(this: Int32(bitPattern: jsObject.id)) return Int.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + bjs_MyViewControllerDelegate_eventCount_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } var delegateName: String { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_delegateName_get(this: Int32(bitPattern: jsObject.id)) return String.bridgeJSLiftReturn(ret) } } var optionalName: Optional { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_MyViewControllerDelegate_optionalName_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_MyViewControllerDelegate_optionalName_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var optionalRawEnum: Optional { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_MyViewControllerDelegate_optionalRawEnum_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_MyViewControllerDelegate_optionalRawEnum_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var rawStringEnum: ExampleEnum { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_rawStringEnum_get(this: Int32(bitPattern: jsObject.id)) return ExampleEnum.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + bjs_MyViewControllerDelegate_rawStringEnum_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } var result: Result { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_result_get(this: Int32(bitPattern: jsObject.id)) return Result.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") - func _extern_set(this: Int32, caseId: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), caseId: newValue.bridgeJSLowerParameter()) + bjs_MyViewControllerDelegate_result_set(this: Int32(bitPattern: jsObject.id), caseId: newValue.bridgeJSLowerParameter()) } } var optionalResult: Optional { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_optionalResult_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") - func _extern_set(this: Int32, isSome: Int32, caseId: Int32) let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + bjs_MyViewControllerDelegate_optionalResult_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) } } var direction: Direction { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_direction_get(this: Int32(bitPattern: jsObject.id)) return Direction.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + bjs_MyViewControllerDelegate_direction_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } var directionOptional: Optional { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_directionOptional_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_MyViewControllerDelegate_directionOptional_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var priority: Priority { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_MyViewControllerDelegate_priority_get(this: Int32(bitPattern: jsObject.id)) return Priority.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + bjs_MyViewControllerDelegate_priority_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } var priorityOptional: Optional { get { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_MyViewControllerDelegate_priorityOptional_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_MyViewControllerDelegate_priorityOptional_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } @@ -247,6 +181,105 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } } +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") +fileprivate func _extern_onSomethingHappened(this: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") +fileprivate func _extern_onValueChanged(this: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") +fileprivate func _extern_onCountUpdated(this: Int32, count: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") +fileprivate func _extern_onLabelUpdated(this: Int32, prefix: Int32, suffix: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") +fileprivate func _extern_isCountEven(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") +fileprivate func _extern_onHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") +fileprivate func _extern_createHelper(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") +fileprivate func _extern_onOptionalHelperUpdated(this: Int32, helperIsSome: Int32, helperPointer: UnsafeMutableRawPointer) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") +fileprivate func _extern_createOptionalHelper(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") +fileprivate func _extern_createEnum(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") +fileprivate func _extern_handleResult(this: Int32, result: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") +fileprivate func _extern_getResult(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") +fileprivate func bjs_MyViewControllerDelegate_eventCount_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") +fileprivate func bjs_MyViewControllerDelegate_eventCount_set(this: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") +fileprivate func bjs_MyViewControllerDelegate_delegateName_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") +fileprivate func bjs_MyViewControllerDelegate_optionalName_get(this: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") +fileprivate func bjs_MyViewControllerDelegate_optionalName_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(this: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(this: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") +fileprivate func bjs_MyViewControllerDelegate_result_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") +fileprivate func bjs_MyViewControllerDelegate_result_set(this: Int32, caseId: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") +fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") +fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(this: Int32, isSome: Int32, caseId: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") +fileprivate func bjs_MyViewControllerDelegate_direction_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") +fileprivate func bjs_MyViewControllerDelegate_direction_set(this: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") +fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") +fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") +fileprivate func bjs_MyViewControllerDelegate_priority_get(this: Int32) -> Int32 + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") +fileprivate func bjs_MyViewControllerDelegate_priority_set(this: Int32, value: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(this: Int32) + +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(this: Int32, isSome: Int32, value: Int32) + extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -399,18 +432,19 @@ public func _bjs_Helper_deinit(pointer: UnsafeMutableRawPointer) { extension Helper: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Helper_wrap") - func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Helper_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Helper_wrap") +fileprivate func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_MyViewController_init") @_cdecl("bjs_MyViewController_init") public func _bjs_MyViewController_init(delegate: Int32) -> UnsafeMutableRawPointer { @@ -536,14 +570,15 @@ public func _bjs_MyViewController_deinit(pointer: UnsafeMutableRawPointer) { extension MyViewController: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_MyViewController_wrap") - func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_MyViewController_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewController_wrap") +fileprivate func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 7aa91b915..81ea282fe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -179,14 +179,15 @@ public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift index 72d561a00..e34f26f8c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift @@ -325,14 +325,15 @@ public func _bjs_PropertyClass_deinit(pointer: UnsafeMutableRawPointer) { extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") - func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyClass_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") +fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift index 81f5ccf47..097f73a97 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift @@ -77,18 +77,19 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { @@ -97,18 +98,19 @@ public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { public var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_PublicGreeter_wrap") - func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PublicGreeter_wrap") +fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { @@ -117,14 +119,15 @@ public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { package var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_PackageGreeter_wrap") - func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PackageGreeter_wrap") +fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index 4b1b404fc..c036a7973 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -6,6 +6,9 @@ @_spi(BridgeJS) import JavaScriptKit +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule10HttpStatusO_Si: _BridgedSwiftClosureBox { let closure: (HttpStatus) -> Int init(_ closure: @escaping (HttpStatus) -> Int) { @@ -23,13 +26,11 @@ private enum _BJS_Closure_10TestModule10HttpStatusO_Si { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -46,6 +47,9 @@ public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Theme) -> String init(_ closure: @escaping (Theme) -> String) { @@ -63,13 +67,11 @@ private enum _BJS_Closure_10TestModule5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule5ThemeO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -86,6 +88,9 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr: Unsa #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_Sb") +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule5ThemeO_Sb: _BridgedSwiftClosureBox { let closure: (Theme) -> Bool init(_ closure: @escaping (Theme) -> Bool) { @@ -103,13 +108,11 @@ private enum _BJS_Closure_10TestModule5ThemeO_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_Sb") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -126,6 +129,9 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr: Unsa #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_SS") +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_: Int32, _: UnsafeMutableRawPointer) -> Int32 + private final class _BJS_ClosureBox_10TestModule6PersonC_SS: _BridgedSwiftClosureBox { let closure: (Person) -> String init(_ closure: @escaping (Person) -> String) { @@ -143,13 +149,11 @@ private enum _BJS_Closure_10TestModule6PersonC_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_SS") - func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule6PersonC_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -166,6 +170,9 @@ public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr: Uns #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (APIResult) -> String init(_ closure: @escaping (APIResult) -> String) { @@ -183,13 +190,11 @@ private enum _BJS_Closure_10TestModule9APIResultO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule9APIResultO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -206,6 +211,9 @@ public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr: #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Direction) -> String init(_ closure: @escaping (Direction) -> String) { @@ -223,13 +231,11 @@ private enum _BJS_Closure_10TestModule9DirectionO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule9DirectionO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -246,6 +252,9 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr: #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_Sb") +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModule9DirectionO_Sb: _BridgedSwiftClosureBox { let closure: (Direction) -> Bool init(_ closure: @escaping (Direction) -> Bool) { @@ -263,13 +272,11 @@ private enum _BJS_Closure_10TestModule9DirectionO_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_Sb") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -286,6 +293,9 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr: #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSS_SS: _BridgedSwiftClosureBox { let closure: (String) -> String init(_ closure: @escaping (String) -> String) { @@ -303,13 +313,11 @@ private enum _BJS_Closure_10TestModuleSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_TestModule_10TestModuleSS_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -326,6 +334,9 @@ public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr: UnsafeMut #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSq5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -343,14 +354,12 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -367,6 +376,9 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr: Un #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS: _BridgedSwiftClosureBox { let closure: (Optional, Optional, Optional) -> String init(_ closure: @escaping (Optional, Optional, Optional) -> String) { @@ -384,16 +396,14 @@ private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0, param1, param2 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() let (param1IsSome, param1Value) = param1.bridgeJSLowerParameterWithPresence() let (param2IsSome, param2Value) = param2.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) +let resultId = invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -410,6 +420,9 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(b #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSq6PersonC_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -427,14 +440,12 @@ private enum _BJS_Closure_10TestModuleSq6PersonC_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -451,6 +462,9 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr: U #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSq9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -468,14 +482,12 @@ private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -492,6 +504,9 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_10TestModuleSq9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -509,14 +524,12 @@ private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -684,18 +697,19 @@ public func _bjs_Person_deinit(pointer: UnsafeMutableRawPointer) { extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { public var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") - func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Person_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") +fileprivate func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_TestProcessor_init") @_cdecl("bjs_TestProcessor_init") public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { @@ -902,14 +916,15 @@ public func _bjs_TestProcessor_deinit(pointer: UnsafeMutableRawPointer) { extension TestProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_TestProcessor_wrap") - func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_TestProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_TestProcessor_wrap") +fileprivate func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift index 96fac13d6..6a624246e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift @@ -6,45 +6,48 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkArray") +func bjs_checkArray(_ a: Int32) -> Void +#else +func bjs_checkArray(_ a: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkArray(_ a: JSObject) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkArray") - func bjs_checkArray(_ a: Int32) -> Void - #else - func bjs_checkArray(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkArray(a.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkArrayWithLength") +func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void +#else +func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkArrayWithLength") - func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void - #else - func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkArrayWithLength(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkArray") +func bjs_checkArray(_ a: Int32) -> Void +#else +func bjs_checkArray(_ a: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkArray(_ a: JSObject) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkArray") - func bjs_checkArray(_ a: Int32) -> Void - #else - func bjs_checkArray(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkArray(a.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift index a8ecf8d57..36ad4cd30 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncReturnVoid") +func bjs_asyncReturnVoid() -> Int32 +#else +func bjs_asyncReturnVoid() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncReturnVoid() throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncReturnVoid") - func bjs_asyncReturnVoid() -> Int32 - #else - func bjs_asyncReturnVoid() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncReturnVoid() if let error = _swift_js_take_exception() { throw error @@ -22,15 +23,16 @@ func asyncReturnVoid() throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripInt") +func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 +#else +func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripInt") - func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 - #else - func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripInt(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -38,15 +40,16 @@ func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripString") +func bjs_asyncRoundTripString(_ v: Int32) -> Int32 +#else +func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripString") - func bjs_asyncRoundTripString(_ v: Int32) -> Int32 - #else - func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripString(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -54,15 +57,16 @@ func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripBool") +func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 +#else +func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripBool") - func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 - #else - func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripBool(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -70,15 +74,16 @@ func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripFloat") +func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 +#else +func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripFloat") - func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 - #else - func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripFloat(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -86,15 +91,16 @@ func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripDouble") +func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 +#else +func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripDouble") - func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 - #else - func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripDouble(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -102,15 +108,16 @@ func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripJSObject") +func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 +#else +func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripJSObject") - func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 - #else - func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_asyncRoundTripJSObject(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift index 68f148085..e0571d5f1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_returnAnimatable") +func bjs_returnAnimatable() -> Int32 +#else +func bjs_returnAnimatable() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func returnAnimatable() throws(JSException) -> Animatable { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_returnAnimatable") - func bjs_returnAnimatable() -> Int32 - #else - func bjs_returnAnimatable() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_returnAnimatable() if let error = _swift_js_take_exception() { throw error @@ -22,6 +23,24 @@ func returnAnimatable() throws(JSException) -> Animatable { return Animatable.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Animatable_animate") +func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 +#else +func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Animatable_getAnimations") +func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 +#else +func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct Animatable: _JSBridgedClass { let jsObject: JSObject @@ -30,14 +49,6 @@ struct Animatable: _JSBridgedClass { } func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Animatable_animate") - func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 - #else - func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Animatable_animate(self.bridgeJSLowerParameter(), keyframes.bridgeJSLowerParameter(), options.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -46,14 +57,6 @@ struct Animatable: _JSBridgedClass { } func getAnimations(_ options: JSObject) throws(JSException) -> JSObject { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Animatable_getAnimations") - func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 - #else - func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Animatable_getAnimations(self.bridgeJSLowerParameter(), options.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index 7e35f9215..2d04f47e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createArrayBuffer") +func bjs_createArrayBuffer() -> Int32 +#else +func bjs_createArrayBuffer() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createArrayBuffer() throws(JSException) -> ArrayBufferLike { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createArrayBuffer") - func bjs_createArrayBuffer() -> Int32 - #else - func bjs_createArrayBuffer() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createArrayBuffer() if let error = _swift_js_take_exception() { throw error @@ -22,15 +23,16 @@ func createArrayBuffer() throws(JSException) -> ArrayBufferLike { return ArrayBufferLike.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createWeirdObject") +func bjs_createWeirdObject() -> Int32 +#else +func bjs_createWeirdObject() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createWeirdObject() throws(JSException) -> WeirdNaming { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createWeirdObject") - func bjs_createWeirdObject() -> Int32 - #else - func bjs_createWeirdObject() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createWeirdObject() if let error = _swift_js_take_exception() { throw error @@ -38,6 +40,24 @@ func createWeirdObject() throws(JSException) -> WeirdNaming { return WeirdNaming.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_byteLength_get") +func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 +#else +func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_slice") +func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 +#else +func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct ArrayBufferLike: _JSBridgedClass { let jsObject: JSObject @@ -47,14 +67,6 @@ struct ArrayBufferLike: _JSBridgedClass { var byteLength: Double { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_byteLength_get") - func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 - #else - func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_ArrayBufferLike_byteLength_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -64,14 +76,6 @@ struct ArrayBufferLike: _JSBridgedClass { } func slice(_ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_slice") - func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 - #else - func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_ArrayBufferLike_slice(self.bridgeJSLowerParameter(), begin.bridgeJSLowerParameter(), end.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -81,6 +85,69 @@ struct ArrayBufferLike: _JSBridgedClass { } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_get") +func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 +#else +func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") +func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void +#else +func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") +func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 +#else +func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") +func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void +#else +func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") +func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 +#else +func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_set") +func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void +#else +func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_as") +func bjs_WeirdNaming_as(_ self: Int32) -> Void +#else +func bjs_WeirdNaming_as(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + struct WeirdNaming: _JSBridgedClass { let jsObject: JSObject @@ -90,14 +157,6 @@ struct WeirdNaming: _JSBridgedClass { var normalProperty: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_get") - func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 - #else - func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_WeirdNaming_normalProperty_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -107,14 +166,6 @@ struct WeirdNaming: _JSBridgedClass { } func setNormalProperty(_ newValue: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") - func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void - #else - func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_WeirdNaming_normalProperty_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -123,14 +174,6 @@ struct WeirdNaming: _JSBridgedClass { var `for`: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") - func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 - #else - func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_WeirdNaming_for_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -140,14 +183,6 @@ struct WeirdNaming: _JSBridgedClass { } func setFor(_ newValue: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") - func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void - #else - func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_WeirdNaming_for_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -156,14 +191,6 @@ struct WeirdNaming: _JSBridgedClass { var `Any`: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") - func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 - #else - func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_WeirdNaming_Any_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -173,14 +200,6 @@ struct WeirdNaming: _JSBridgedClass { } func setAny(_ newValue: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_set") - func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void - #else - func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_WeirdNaming_Any_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -188,14 +207,6 @@ struct WeirdNaming: _JSBridgedClass { } func `as`() throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_as") - func bjs_WeirdNaming_as(_ self: Int32) -> Void - #else - func bjs_WeirdNaming_as(_ self: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_WeirdNaming_as(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift index 810df3683..288382150 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createDatabaseConnection") +func bjs_createDatabaseConnection(_ config: Int32) -> Int32 +#else +func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createDatabaseConnection") - func bjs_createDatabaseConnection(_ config: Int32) -> Int32 - #else - func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createDatabaseConnection(config.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -22,15 +23,16 @@ func createDatabaseConnection(_ config: JSObject) throws(JSException) -> Databas return DatabaseConnection.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createLogger") +func bjs_createLogger(_ level: Int32) -> Int32 +#else +func bjs_createLogger(_ level: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createLogger(_ level: String) throws(JSException) -> Logger { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createLogger") - func bjs_createLogger(_ level: Int32) -> Int32 - #else - func bjs_createLogger(_ level: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createLogger(level.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -38,15 +40,16 @@ func createLogger(_ level: String) throws(JSException) -> Logger { return Logger.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_getConfigManager") +func bjs_getConfigManager() -> Int32 +#else +func bjs_getConfigManager() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func getConfigManager() throws(JSException) -> ConfigManager { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_getConfigManager") - func bjs_getConfigManager() -> Int32 - #else - func bjs_getConfigManager() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_getConfigManager() if let error = _swift_js_take_exception() { throw error @@ -54,6 +57,51 @@ func getConfigManager() throws(JSException) -> ConfigManager { return ConfigManager.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_isConnected_get") +func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 +#else +func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_get") +func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 +#else +func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_set") +func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void +#else +func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connect") +func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void +#else +func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_execute") +func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 +#else +func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct DatabaseConnection: _JSBridgedClass { let jsObject: JSObject @@ -63,14 +111,6 @@ struct DatabaseConnection: _JSBridgedClass { var isConnected: Bool { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_isConnected_get") - func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 - #else - func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_DatabaseConnection_isConnected_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -81,14 +121,6 @@ struct DatabaseConnection: _JSBridgedClass { var connectionTimeout: Double { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_get") - func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 - #else - func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_DatabaseConnection_connectionTimeout_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -98,14 +130,6 @@ struct DatabaseConnection: _JSBridgedClass { } func setConnectionTimeout(_ newValue: Double) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_set") - func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void - #else - func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_DatabaseConnection_connectionTimeout_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -113,14 +137,6 @@ struct DatabaseConnection: _JSBridgedClass { } func connect(_ url: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connect") - func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void - #else - func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_DatabaseConnection_connect(self.bridgeJSLowerParameter(), url.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -128,14 +144,6 @@ struct DatabaseConnection: _JSBridgedClass { } func execute(_ query: String) throws(JSException) -> JSObject { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_execute") - func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 - #else - func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_DatabaseConnection_execute(self.bridgeJSLowerParameter(), query.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -145,6 +153,33 @@ struct DatabaseConnection: _JSBridgedClass { } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Logger_level_get") +func bjs_Logger_level_get(_ self: Int32) -> Int32 +#else +func bjs_Logger_level_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Logger_log") +func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void +#else +func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Logger_error") +func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void +#else +func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + struct Logger: _JSBridgedClass { let jsObject: JSObject @@ -154,14 +189,6 @@ struct Logger: _JSBridgedClass { var level: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Logger_level_get") - func bjs_Logger_level_get(_ self: Int32) -> Int32 - #else - func bjs_Logger_level_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Logger_level_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -171,14 +198,6 @@ struct Logger: _JSBridgedClass { } func log(_ message: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Logger_log") - func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void - #else - func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_Logger_log(self.bridgeJSLowerParameter(), message.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -186,14 +205,6 @@ struct Logger: _JSBridgedClass { } func error(_ message: String, _ error: JSObject) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Logger_error") - func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void - #else - func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_Logger_error(self.bridgeJSLowerParameter(), message.bridgeJSLowerParameter(), error.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -202,6 +213,33 @@ struct Logger: _JSBridgedClass { } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_ConfigManager_configPath_get") +func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 +#else +func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_ConfigManager_get") +func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 +#else +func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_ConfigManager_set") +func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void +#else +func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + struct ConfigManager: _JSBridgedClass { let jsObject: JSObject @@ -211,14 +249,6 @@ struct ConfigManager: _JSBridgedClass { var configPath: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_ConfigManager_configPath_get") - func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 - #else - func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_ConfigManager_configPath_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -228,14 +258,6 @@ struct ConfigManager: _JSBridgedClass { } func get(_ key: String) throws(JSException) -> JSObject { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_ConfigManager_get") - func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 - #else - func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_ConfigManager_get(self.bridgeJSLowerParameter(), key.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -244,14 +266,6 @@ struct ConfigManager: _JSBridgedClass { } func set(_ key: String, _ value: JSObject) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_ConfigManager_set") - func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void - #else - func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_ConfigManager_set(self.bridgeJSLowerParameter(), key.bridgeJSLowerParameter(), value.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift index 30f66a265..00d220eab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_check") +func bjs_check(_ a: Float64, _ b: Int32) -> Void +#else +func bjs_check(_ a: Float64, _ b: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func check(_ a: Double, _ b: Bool) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_check") - func bjs_check(_ a: Float64, _ b: Int32) -> Void - #else - func bjs_check(_ a: Float64, _ b: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_check(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift index 29ba81c62..b33250625 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkNumber") +func bjs_checkNumber() -> Float64 +#else +func bjs_checkNumber() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + func checkNumber() throws(JSException) -> Double { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkNumber") - func bjs_checkNumber() -> Float64 - #else - func bjs_checkNumber() -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_checkNumber() if let error = _swift_js_take_exception() { throw error @@ -22,15 +23,16 @@ func checkNumber() throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkBoolean") +func bjs_checkBoolean() -> Int32 +#else +func bjs_checkBoolean() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func checkBoolean() throws(JSException) -> Bool { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkBoolean") - func bjs_checkBoolean() -> Int32 - #else - func bjs_checkBoolean() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_checkBoolean() if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift index 99215a30c..fdaf7c49d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift @@ -6,30 +6,32 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkString") +func bjs_checkString(_ a: Int32) -> Void +#else +func bjs_checkString(_ a: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkString(_ a: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkString") - func bjs_checkString(_ a: Int32) -> Void - #else - func bjs_checkString(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkString(a.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkStringWithLength") +func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void +#else +func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkStringWithLength") - func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void - #else - func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkStringWithLength(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift index 05bb8aeab..9edc42cf8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkString") +func bjs_checkString() -> Int32 +#else +func bjs_checkString() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func checkString() throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkString") - func bjs_checkString() -> Int32 - #else - func bjs_checkString() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_checkString() if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift index 0b17f13ba..23e8ea7df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createTS2Skeleton") +func bjs_createTS2Skeleton() -> Int32 +#else +func bjs_createTS2Skeleton() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createTS2Skeleton") - func bjs_createTS2Skeleton() -> Int32 - #else - func bjs_createTS2Skeleton() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createTS2Skeleton() if let error = _swift_js_take_exception() { throw error @@ -22,15 +23,16 @@ func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { return TypeScriptProcessor.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createCodeGenerator") +func bjs_createCodeGenerator(_ format: Int32) -> Int32 +#else +func bjs_createCodeGenerator(_ format: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_createCodeGenerator") - func bjs_createCodeGenerator(_ format: Int32) -> Int32 - #else - func bjs_createCodeGenerator(_ format: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createCodeGenerator(format.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -38,6 +40,33 @@ func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator return CodeGenerator.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_version_get") +func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 +#else +func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_convert") +func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 +#else +func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_validate") +func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 +#else +func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct TypeScriptProcessor: _JSBridgedClass { let jsObject: JSObject @@ -47,14 +76,6 @@ struct TypeScriptProcessor: _JSBridgedClass { var version: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_version_get") - func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 - #else - func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_TypeScriptProcessor_version_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -64,14 +85,6 @@ struct TypeScriptProcessor: _JSBridgedClass { } func convert(_ ts: String) throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_convert") - func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 - #else - func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_TypeScriptProcessor_convert(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -80,14 +93,6 @@ struct TypeScriptProcessor: _JSBridgedClass { } func validate(_ ts: String) throws(JSException) -> Bool { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_validate") - func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 - #else - func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_TypeScriptProcessor_validate(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -97,6 +102,24 @@ struct TypeScriptProcessor: _JSBridgedClass { } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_CodeGenerator_outputFormat_get") +func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 +#else +func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_CodeGenerator_generate") +func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 +#else +func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct CodeGenerator: _JSBridgedClass { let jsObject: JSObject @@ -106,14 +129,6 @@ struct CodeGenerator: _JSBridgedClass { var outputFormat: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_CodeGenerator_outputFormat_get") - func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 - #else - func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_CodeGenerator_outputFormat_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -123,14 +138,6 @@ struct CodeGenerator: _JSBridgedClass { } func generate(_ input: JSObject) throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_CodeGenerator_generate") - func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 - #else - func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_CodeGenerator_generate(self.bridgeJSLowerParameter(), input.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift index d8b184638..d007caf63 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_checkSimple") +func bjs_checkSimple(_ a: Float64) -> Void +#else +func bjs_checkSimple(_ a: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func checkSimple(_ a: Double) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_checkSimple") - func bjs_checkSimple(_ a: Float64) -> Void - #else - func bjs_checkSimple(_ a: Float64) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_checkSimple(a.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift index 455b38bc5..7fe7133db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift @@ -6,6 +6,60 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_init") +func bjs_Greeter_init(_ name: Int32) -> Int32 +#else +func bjs_Greeter_init(_ name: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_name_get") +func bjs_Greeter_name_get(_ self: Int32) -> Int32 +#else +func bjs_Greeter_name_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") +func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +#else +func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") +func bjs_Greeter_age_get(_ self: Int32) -> Float64 +#else +func bjs_Greeter_age_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_greet") +func bjs_Greeter_greet(_ self: Int32) -> Int32 +#else +func bjs_Greeter_greet(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_Greeter_changeName") +func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void +#else +func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + struct Greeter: _JSBridgedClass { let jsObject: JSObject @@ -14,14 +68,6 @@ struct Greeter: _JSBridgedClass { } init(_ name: String) throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_init") - func bjs_Greeter_init(_ name: Int32) -> Int32 - #else - func bjs_Greeter_init(_ name: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Greeter_init(name.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -31,14 +77,6 @@ struct Greeter: _JSBridgedClass { var name: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_name_get") - func bjs_Greeter_name_get(_ self: Int32) -> Int32 - #else - func bjs_Greeter_name_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Greeter_name_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -48,14 +86,6 @@ struct Greeter: _JSBridgedClass { } func setName(_ newValue: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") - func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void - #else - func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_Greeter_name_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -64,14 +94,6 @@ struct Greeter: _JSBridgedClass { var age: Double { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") - func bjs_Greeter_age_get(_ self: Int32) -> Float64 - #else - func bjs_Greeter_age_get(_ self: Int32) -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Greeter_age_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -81,14 +103,6 @@ struct Greeter: _JSBridgedClass { } func greet() throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_greet") - func bjs_Greeter_greet(_ self: Int32) -> Int32 - #else - func bjs_Greeter_greet(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_Greeter_greet(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -97,14 +111,6 @@ struct Greeter: _JSBridgedClass { } func changeName(_ name: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_Greeter_changeName") - func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void - #else - func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_Greeter_changeName(self.bridgeJSLowerParameter(), name.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift index ae7ae0e8e..a5ac5afc4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_check") +func bjs_check() -> Void +#else +func bjs_check() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func check() throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Check", name: "bjs_check") - func bjs_check() -> Void - #else - func bjs_check() -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_check() if let error = _swift_js_take_exception() { throw error From eddc81f3ba8b8096b10f4c67342fb64a8820837f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Nov 2025 03:29:16 +0000 Subject: [PATCH 035/252] BridgeJS: Utilities/bridge-js-generate.sh --- .../Generated/BridgeJS.ExportSwift.swift | 53 +- .../Sources/Generated/BridgeJS.ImportTS.swift | 51 +- .../Generated/BridgeJS.ExportSwift.swift | 36 +- .../Generated/BridgeJS.ImportTS.swift | 34 +- .../Generated/BridgeJS.ExportSwift.swift | 641 ++++++++++-------- .../Generated/BridgeJS.ImportTS.swift | 255 +++---- 6 files changed, 580 insertions(+), 490 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift index ab0cbb197..8fb5c97d7 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift @@ -362,18 +362,19 @@ public func _bjs_EnumRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { extension EnumRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_EnumRoundtrip_wrap") - func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_EnumRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_EnumRoundtrip_wrap") +fileprivate func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_ComplexResultRoundtrip_init") @_cdecl("bjs_ComplexResultRoundtrip_init") public func _bjs_ComplexResultRoundtrip_init() -> UnsafeMutableRawPointer { @@ -491,18 +492,19 @@ public func _bjs_ComplexResultRoundtrip_deinit(pointer: UnsafeMutableRawPointer) extension ComplexResultRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_ComplexResultRoundtrip_wrap") - func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_ComplexResultRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_ComplexResultRoundtrip_wrap") +fileprivate func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_StringRoundtrip_init") @_cdecl("bjs_StringRoundtrip_init") public func _bjs_StringRoundtrip_init() -> UnsafeMutableRawPointer { @@ -543,14 +545,15 @@ public func _bjs_StringRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { extension StringRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_StringRoundtrip_wrap") - func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_StringRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_StringRoundtrip_wrap") +fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift index bc7f0b172..721f089d8 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift @@ -6,45 +6,48 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") +func bjs_benchmarkHelperNoop() -> Void +#else +func bjs_benchmarkHelperNoop() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func benchmarkHelperNoop() throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") - func bjs_benchmarkHelperNoop() -> Void - #else - func bjs_benchmarkHelperNoop() -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_benchmarkHelperNoop() if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") +func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void +#else +func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") - func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void - #else - func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_benchmarkHelperNoopWithNumber(n.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") +func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void +#else +func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") - func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void - #else - func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_benchmarkRunner(name.bridgeJSLowerParameter(), body.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift index 9e4515f57..be683415c 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift @@ -50,18 +50,19 @@ public func _bjs_PlayBridgeJS_deinit(pointer: UnsafeMutableRawPointer) { extension PlayBridgeJS: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJS_wrap") - func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PlayBridgeJS_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJS_wrap") +fileprivate func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PlayBridgeJSOutput_outputJs") @_cdecl("bjs_PlayBridgeJSOutput_outputJs") public func _bjs_PlayBridgeJSOutput_outputJs(_self: UnsafeMutableRawPointer) -> Void { @@ -114,14 +115,15 @@ public func _bjs_PlayBridgeJSOutput_deinit(pointer: UnsafeMutableRawPointer) { extension PlayBridgeJSOutput: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJSOutput_wrap") - func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PlayBridgeJSOutput_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJSOutput_wrap") +fileprivate func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift index 4d35ef745..5864feb5d 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift @@ -6,15 +6,16 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Skeleton") +func bjs_createTS2Skeleton() -> Int32 +#else +func bjs_createTS2Skeleton() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func createTS2Skeleton() throws(JSException) -> TS2Skeleton { - #if arch(wasm32) - @_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Skeleton") - func bjs_createTS2Skeleton() -> Int32 - #else - func bjs_createTS2Skeleton() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_createTS2Skeleton() if let error = _swift_js_take_exception() { throw error @@ -22,6 +23,15 @@ func createTS2Skeleton() throws(JSException) -> TS2Skeleton { return TS2Skeleton.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Skeleton_convert") +func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 +#else +func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + struct TS2Skeleton: _JSBridgedClass { let jsObject: JSObject @@ -30,14 +40,6 @@ struct TS2Skeleton: _JSBridgedClass { } func convert(_ ts: String) throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Skeleton_convert") - func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 - #else - func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_TS2Skeleton_convert(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 2e7394999..572890b0f 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,6 +6,9 @@ @_spi(BridgeJS) import JavaScriptKit +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si: _BridgedSwiftClosureBox { let closure: (HttpStatus) -> Int init(_ closure: @escaping (HttpStatus) -> Int) { @@ -23,13 +26,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -46,6 +47,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10H #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Theme) -> String init(_ closure: @escaping (Theme) -> String) { @@ -63,13 +67,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -86,6 +88,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb: _BridgedSwiftClosureBox { let closure: (Theme) -> Bool init(_ closure: @escaping (Theme) -> Bool) { @@ -103,13 +108,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -126,6 +129,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_: Int32, _: UnsafeMutableRawPointer) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS: _BridgedSwiftClosureBox { let closure: (Greeter) -> String init(_ closure: @escaping (Greeter) -> String) { @@ -143,13 +149,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") - func _invoke(_: Int32, _: UnsafeMutableRawPointer) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -166,6 +170,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7Gr #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (APIResult) -> String init(_ closure: @escaping (APIResult) -> String) { @@ -183,13 +190,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -206,6 +211,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9AP #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Direction) -> String init(_ closure: @escaping (Direction) -> String) { @@ -223,13 +231,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -246,6 +252,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb: _BridgedSwiftClosureBox { let closure: (Direction) -> Bool init(_ closure: @escaping (Direction) -> Bool) { @@ -263,13 +272,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Bool.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -286,6 +293,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_: Int32, _: Int32) -> UnsafeMutableRawPointer + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC: _BridgedSwiftClosureBox { let closure: (String) -> Greeter init(_ closure: @escaping (String) -> Greeter) { @@ -303,13 +313,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") - func _invoke(_: Int32, _: Int32) -> UnsafeMutableRawPointer - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Greeter.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -326,6 +334,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS: _BridgedSwiftClosureBox { let closure: (String) -> String init(_ closure: @escaping (String) -> String) { @@ -343,13 +354,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -366,6 +375,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS: _BridgedSwiftClosureBox { let closure: (Int, String, Double) -> String init(_ closure: @escaping (Int, String, Double) -> String) { @@ -383,13 +395,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0, param1, param2 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") - func _invoke(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -406,6 +416,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiS #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si: _BridgedSwiftClosureBox { let closure: (Int) -> Int init(_ closure: @escaping (Int) -> Int) { @@ -423,13 +436,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") - func _invoke(_: Int32, _: Int32) -> Int32 - let resultId = _invoke(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) + let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) return Int.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -446,6 +457,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_ #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -463,14 +477,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -487,6 +499,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5 #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -504,14 +519,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") - func _invoke(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -528,6 +541,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7 #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -545,14 +561,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -569,6 +583,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -586,14 +603,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -610,6 +625,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -627,14 +645,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -651,6 +667,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_: Int32, _: Int32, _: Int32) -> Int32 + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String init(_ closure: @escaping (Optional) -> String) { @@ -668,14 +687,12 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") - func _invoke(_: Int32, _: Int32, _: Int32) -> Int32 let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = _invoke(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) +let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) return String.bridgeJSLiftReturn(resultId) #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -692,6 +709,9 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #endif } +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_: Int32) -> Void + private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC: _BridgedSwiftClosureBox { let closure: () -> Optional init(_ closure: @escaping () -> Optional) { @@ -709,13 +729,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] in #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") - func _invoke(_: Int32) -> Void - _invoke(callback.bridgeJSLowerParameter()) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(callback.bridgeJSLowerParameter()) return Optional.bridgeJSLiftReturnFromSideChannel() #else fatalError("Only available on WebAssembly") - #endif + #endif } } } @@ -736,220 +754,160 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject func increment(by amount: Int) { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") - func _extern_increment(this: Int32, amount: Int32) _extern_increment(this: Int32(bitPattern: jsObject.id), amount: amount.bridgeJSLowerParameter()) } func getValue() -> Int { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") - func _extern_getValue(this: Int32) -> Int32 let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) return Int.bridgeJSLiftReturn(ret) } func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") - func _extern_setLabelElements(this: Int32, labelPrefix: Int32, labelSuffix: Int32) _extern_setLabelElements(this: Int32(bitPattern: jsObject.id), labelPrefix: labelPrefix.bridgeJSLowerParameter(), labelSuffix: labelSuffix.bridgeJSLowerParameter()) } func getLabel() -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") - func _extern_getLabel(this: Int32) -> Int32 let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) return String.bridgeJSLiftReturn(ret) } func isEven() -> Bool { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") - func _extern_isEven(this: Int32) -> Int32 let ret = _extern_isEven(this: Int32(bitPattern: jsObject.id)) return Bool.bridgeJSLiftReturn(ret) } func processGreeter(_ greeter: Greeter) -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") - func _extern_processGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 let ret = _extern_processGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) return String.bridgeJSLiftReturn(ret) } func createGreeter() -> Greeter { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") - func _extern_createGreeter(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createGreeter(this: Int32(bitPattern: jsObject.id)) return Greeter.bridgeJSLiftReturn(ret) } func processOptionalGreeter(_ greeter: Optional) -> String { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") - func _extern_processOptionalGreeter(this: Int32, greeterIsSome: Int32, greeterPointer: UnsafeMutableRawPointer) -> Int32 let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameterWithPresence() let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeterIsSome: greeterIsSome, greeterPointer: greeterPointer) return String.bridgeJSLiftReturn(ret) } func createOptionalGreeter() -> Optional { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") - func _extern_createOptionalGreeter(this: Int32) -> UnsafeMutableRawPointer let ret = _extern_createOptionalGreeter(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } func handleAPIResult(_ result: Optional) { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") - func _extern_handleAPIResult(this: Int32, resultIsSome: Int32, resultCaseId: Int32) let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameterWithPresence() _extern_handleAPIResult(this: Int32(bitPattern: jsObject.id), resultIsSome: resultIsSome, resultCaseId: resultCaseId) } func getAPIResult() -> Optional { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") - func _extern_getAPIResult(this: Int32) -> Int32 let ret = _extern_getAPIResult(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } var count: Int { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_count_get(this: Int32(bitPattern: jsObject.id)) return Int.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + bjs_DataProcessor_count_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) } } var name: String { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_name_get(this: Int32(bitPattern: jsObject.id)) return String.bridgeJSLiftReturn(ret) } } var optionalTag: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_DataProcessor_optionalTag_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_DataProcessor_optionalTag_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var optionalCount: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_DataProcessor_optionalCount_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_DataProcessor_optionalCount_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var direction: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_direction_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_DataProcessor_direction_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var optionalTheme: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_DataProcessor_optionalTheme_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_DataProcessor_optionalTheme_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var httpStatus: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) + bjs_DataProcessor_httpStatus_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") - func _extern_set(this: Int32, isSome: Int32, value: Int32) let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + bjs_DataProcessor_httpStatus_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) } } var apiResult: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_apiResult_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") - func _extern_set(this: Int32, isSome: Int32, caseId: Int32) let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + bjs_DataProcessor_apiResult_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) } } var helper: Greeter { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") - func _extern_get(this: Int32) -> UnsafeMutableRawPointer - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_helper_get(this: Int32(bitPattern: jsObject.id)) return Greeter.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") - func _extern_set(this: Int32, pointer: UnsafeMutableRawPointer) - _extern_set(this: Int32(bitPattern: jsObject.id), pointer: newValue.bridgeJSLowerParameter()) + bjs_DataProcessor_helper_set(this: Int32(bitPattern: jsObject.id), pointer: newValue.bridgeJSLowerParameter()) } } var optionalHelper: Optional { get { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") - func _extern_get(this: Int32) -> UnsafeMutableRawPointer - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + let ret = bjs_DataProcessor_optionalHelper_get(this: Int32(bitPattern: jsObject.id)) return Optional.bridgeJSLiftReturn(ret) } set { - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") - func _extern_set(this: Int32, isSome: Int32, pointer: UnsafeMutableRawPointer) let (isSome, pointer) = newValue.bridgeJSLowerParameterWithPresence() - _extern_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, pointer: pointer) + bjs_DataProcessor_optionalHelper_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, pointer: pointer) } } @@ -958,6 +916,96 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { } } +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") +fileprivate func _extern_increment(this: Int32, amount: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") +fileprivate func _extern_getValue(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") +fileprivate func _extern_setLabelElements(this: Int32, labelPrefix: Int32, labelSuffix: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") +fileprivate func _extern_getLabel(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") +fileprivate func _extern_isEven(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") +fileprivate func _extern_processGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") +fileprivate func _extern_createGreeter(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") +fileprivate func _extern_processOptionalGreeter(this: Int32, greeterIsSome: Int32, greeterPointer: UnsafeMutableRawPointer) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") +fileprivate func _extern_createOptionalGreeter(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") +fileprivate func _extern_handleAPIResult(this: Int32, resultIsSome: Int32, resultCaseId: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") +fileprivate func _extern_getAPIResult(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") +fileprivate func bjs_DataProcessor_count_get(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") +fileprivate func bjs_DataProcessor_count_set(this: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") +fileprivate func bjs_DataProcessor_name_get(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") +fileprivate func bjs_DataProcessor_optionalTag_get(this: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") +fileprivate func bjs_DataProcessor_optionalTag_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") +fileprivate func bjs_DataProcessor_optionalCount_get(this: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") +fileprivate func bjs_DataProcessor_optionalCount_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") +fileprivate func bjs_DataProcessor_direction_get(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") +fileprivate func bjs_DataProcessor_direction_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") +fileprivate func bjs_DataProcessor_optionalTheme_get(this: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") +fileprivate func bjs_DataProcessor_optionalTheme_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") +fileprivate func bjs_DataProcessor_httpStatus_get(this: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") +fileprivate func bjs_DataProcessor_httpStatus_set(this: Int32, isSome: Int32, value: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") +fileprivate func bjs_DataProcessor_apiResult_get(this: Int32) -> Int32 + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") +fileprivate func bjs_DataProcessor_apiResult_set(this: Int32, isSome: Int32, caseId: Int32) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") +fileprivate func bjs_DataProcessor_helper_get(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") +fileprivate func bjs_DataProcessor_helper_set(this: Int32, pointer: UnsafeMutableRawPointer) + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") +fileprivate func bjs_DataProcessor_optionalHelper_get(this: Int32) -> UnsafeMutableRawPointer + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") +fileprivate func bjs_DataProcessor_optionalHelper_set(this: Int32, isSome: Int32, pointer: UnsafeMutableRawPointer) + extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -3377,18 +3425,19 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { public var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap") - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_Calculator_square") @_cdecl("bjs_Calculator_square") public func _bjs_Calculator_square(_self: UnsafeMutableRawPointer, value: Int32) -> Int32 { @@ -3419,18 +3468,19 @@ public func _bjs_Calculator_deinit(pointer: UnsafeMutableRawPointer) { extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap") - func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Calculator_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap") +fileprivate func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_InternalGreeter_deinit") @_cdecl("bjs_InternalGreeter_deinit") public func _bjs_InternalGreeter_deinit(pointer: UnsafeMutableRawPointer) { @@ -3439,18 +3489,19 @@ public func _bjs_InternalGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { internal var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap") - func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_InternalGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap") +fileprivate func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { @@ -3459,18 +3510,19 @@ public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { public var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap") - func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap") +fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { @@ -3479,18 +3531,19 @@ public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { package var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap") - func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PackageGreeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap") +fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @@ -3521,18 +3574,19 @@ public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @@ -3562,18 +3616,19 @@ public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @@ -3603,18 +3658,19 @@ public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") public func _bjs_OptionalPropertyHolder_init(optionalNameIsSome: Int32, optionalNameBytes: Int32, optionalNameLength: Int32) -> UnsafeMutableRawPointer { @@ -3697,18 +3753,19 @@ public func _bjs_OptionalPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") - func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") +fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_SimplePropertyHolder_init") @_cdecl("bjs_SimplePropertyHolder_init") public func _bjs_SimplePropertyHolder_init(value: Int32) -> UnsafeMutableRawPointer { @@ -3749,18 +3806,19 @@ public func _bjs_SimplePropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap") - func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_SimplePropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap") +fileprivate func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PropertyHolder_init") @_cdecl("bjs_PropertyHolder_init") public func _bjs_PropertyHolder_init(intValue: Int32, floatValue: Float32, doubleValue: Float64, boolValue: Int32, stringValueBytes: Int32, stringValueLength: Int32, jsObject: Int32, sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { @@ -4067,18 +4125,19 @@ public func _bjs_PropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap") - func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap") +fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_MathUtils_static_add") @_cdecl("bjs_MathUtils_static_add") public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { @@ -4109,18 +4168,19 @@ public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap") - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap") +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, count: Int32, enabled: Int32, status: Int32, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> UnsafeMutableRawPointer { @@ -4256,18 +4316,19 @@ public func _bjs_ConstructorDefaults_deinit(pointer: UnsafeMutableRawPointer) { extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ConstructorDefaults_wrap") - func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_ConstructorDefaults_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ConstructorDefaults_wrap") +fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_StaticPropertyHolder_init") @_cdecl("bjs_StaticPropertyHolder_init") public func _bjs_StaticPropertyHolder_init() -> UnsafeMutableRawPointer { @@ -4498,18 +4559,19 @@ public func _bjs_StaticPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap") - func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_StaticPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap") +fileprivate func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_DataProcessorManager_init") @_cdecl("bjs_DataProcessorManager_init") public func _bjs_DataProcessorManager_init(processor: Int32) -> UnsafeMutableRawPointer { @@ -4784,18 +4846,19 @@ public func _bjs_DataProcessorManager_deinit(pointer: UnsafeMutableRawPointer) { extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap") - func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_DataProcessorManager_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap") +fileprivate func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_SwiftDataProcessor_init") @_cdecl("bjs_SwiftDataProcessor_init") public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer { @@ -5133,18 +5196,19 @@ public func _bjs_SwiftDataProcessor_deinit(pointer: UnsafeMutableRawPointer) { extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap") - func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftDataProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap") +fileprivate func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_TextProcessor_init") @_cdecl("bjs_TextProcessor_init") public func _bjs_TextProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { @@ -5384,14 +5448,15 @@ public func _bjs_TextProcessor_deinit(pointer: UnsafeMutableRawPointer) { extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") - func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") +fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift index 19bc82fcb..0936983e7 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift @@ -6,30 +6,32 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") +func bjs_jsRoundTripVoid() -> Void +#else +func bjs_jsRoundTripVoid() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func jsRoundTripVoid() throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") - func bjs_jsRoundTripVoid() -> Void - #else - func bjs_jsRoundTripVoid() -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_jsRoundTripVoid() if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") +func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 +#else +func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") - func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 - #else - func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsRoundTripNumber(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -37,15 +39,16 @@ func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") +func bjs_jsRoundTripBool(_ v: Int32) -> Int32 +#else +func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") - func bjs_jsRoundTripBool(_ v: Int32) -> Int32 - #else - func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsRoundTripBool(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -53,15 +56,16 @@ func jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { return Bool.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") +func bjs_jsRoundTripString(_ v: Int32) -> Int32 +#else +func bjs_jsRoundTripString(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func jsRoundTripString(_ v: String) throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") - func bjs_jsRoundTripString(_ v: Int32) -> Int32 - #else - func bjs_jsRoundTripString(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsRoundTripString(v.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -69,30 +73,32 @@ func jsRoundTripString(_ v: String) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") +func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void +#else +func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") - func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void - #else - func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_jsThrowOrVoid(shouldThrow.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") +func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 +#else +func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") - func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 - #else - func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsThrowOrNumber(shouldThrow.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -100,15 +106,16 @@ func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") +func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 +#else +func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") - func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 - #else - func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsThrowOrBool(shouldThrow.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -116,15 +123,16 @@ func jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { return Bool.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") +func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 +#else +func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") - func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 - #else - func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_jsThrowOrString(shouldThrow.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -132,15 +140,16 @@ func jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") +func bjs_runAsyncWorks() -> Int32 +#else +func bjs_runAsyncWorks() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + func runAsyncWorks() throws(JSException) -> JSPromise { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") - func bjs_runAsyncWorks() -> Int32 - #else - func bjs_runAsyncWorks() -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_runAsyncWorks() if let error = _swift_js_take_exception() { throw error @@ -148,6 +157,60 @@ func runAsyncWorks() throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") +func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 +#else +func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") +func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 +#else +func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") +func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +#else +func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") +func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 +#else +func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") +func bjs_JsGreeter_greet(_ self: Int32) -> Int32 +#else +func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") +func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void +#else +func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + struct JsGreeter: _JSBridgedClass { let jsObject: JSObject @@ -156,14 +219,6 @@ struct JsGreeter: _JSBridgedClass { } init(_ name: String, _ prefix: String) throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") - func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 - #else - func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_JsGreeter_init(name.bridgeJSLowerParameter(), prefix.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -173,14 +228,6 @@ struct JsGreeter: _JSBridgedClass { var name: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") - func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 - #else - func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_JsGreeter_name_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -190,14 +237,6 @@ struct JsGreeter: _JSBridgedClass { } func setName(_ newValue: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") - func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void - #else - func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_JsGreeter_name_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -206,14 +245,6 @@ struct JsGreeter: _JSBridgedClass { var prefix: String { get throws(JSException) { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") - func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 - #else - func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_JsGreeter_prefix_get(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -223,14 +254,6 @@ struct JsGreeter: _JSBridgedClass { } func greet() throws(JSException) -> String { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") - func bjs_JsGreeter_greet(_ self: Int32) -> Int32 - #else - func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif let ret = bjs_JsGreeter_greet(self.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error @@ -239,14 +262,6 @@ struct JsGreeter: _JSBridgedClass { } func changeName(_ name: String) throws(JSException) -> Void { - #if arch(wasm32) - @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") - func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void - #else - func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { - fatalError("Only available on WebAssembly") - } - #endif bjs_JsGreeter_changeName(self.bridgeJSLowerParameter(), name.bridgeJSLowerParameter()) if let error = _swift_js_take_exception() { throw error From 6716b0789720c7f4be6fbef0c3e838f63fca818d Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Nov 2025 03:46:12 +0000 Subject: [PATCH 036/252] BridgeJS: Ensure extern func decl won't be visible outside of the generated file --- .../Sources/Generated/BridgeJS.ImportTS.swift | 12 ++-- .../Generated/BridgeJS.ImportTS.swift | 8 +-- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../Sources/BridgeJSCore/ImportTS.swift | 3 + .../ImportTSTests/ArrayParameter.swift | 12 ++-- .../__Snapshots__/ImportTSTests/Async.swift | 28 ++++----- .../ImportTSTests/Interface.swift | 12 ++-- .../ImportTSTests/InvalidPropertyNames.swift | 44 +++++++------- .../ImportTSTests/MultipleImportedTypes.swift | 56 ++++++++--------- .../ImportTSTests/PrimitiveParameters.swift | 4 +- .../ImportTSTests/PrimitiveReturn.swift | 8 +-- .../ImportTSTests/StringParameter.swift | 8 +-- .../ImportTSTests/StringReturn.swift | 4 +- .../ImportTSTests/TS2SkeletonLike.swift | 28 ++++----- .../ImportTSTests/TypeAlias.swift | 4 +- .../ImportTSTests/TypeScriptClass.swift | 24 ++++---- .../VoidParameterVoidReturn.swift | 4 +- .../Generated/BridgeJS.ImportTS.swift | 60 +++++++++---------- 18 files changed, 163 insertions(+), 160 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift index 721f089d8..e885569de 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") -func bjs_benchmarkHelperNoop() -> Void +fileprivate func bjs_benchmarkHelperNoop() -> Void #else -func bjs_benchmarkHelperNoop() -> Void { +fileprivate func bjs_benchmarkHelperNoop() -> Void { fatalError("Only available on WebAssembly") } #endif @@ -24,9 +24,9 @@ func benchmarkHelperNoop() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") -func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void +fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void #else -func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { +fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -40,9 +40,9 @@ func benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") -func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void +fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void #else -func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { +fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift index 5864feb5d..fca5dcb20 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Skeleton") -func bjs_createTS2Skeleton() -> Int32 +fileprivate func bjs_createTS2Skeleton() -> Int32 #else -func bjs_createTS2Skeleton() -> Int32 { +fileprivate func bjs_createTS2Skeleton() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func createTS2Skeleton() throws(JSException) -> TS2Skeleton { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Skeleton_convert") -func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 +fileprivate func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 #else -func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 { +fileprivate func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index b061716dc..0938bfcf3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -2501,11 +2501,11 @@ public class ExportSwift { /// ```swift /// extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { /// var jsValue: JSValue { - /// @_extern(wasm, module: "MyModule", name: "bjs_Greeter_wrap") - /// func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 /// return JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))) /// } /// } + /// @_extern(wasm, module: "MyModule", name: "bjs_Greeter_wrap") + /// fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 /// ``` func renderConvertibleToJSValueExtension(klass: ExportedClass) -> [DeclSyntax] { let wrapFunctionName = "_bjs_\(klass.name)_wrap" diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 39a735f06..00ef5399b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -116,6 +116,9 @@ public struct ImportTS { func renderImportDecl() -> DeclSyntax { let baseDecl = FunctionDeclSyntax( + modifiers: DeclModifierListSyntax(itemsBuilder: { + DeclModifierSyntax(name: .keyword(.fileprivate)).with(\.trailingTrivia, .space) + }), funcKeyword: .keyword(.func).with(\.trailingTrivia, .space), name: .identifier(abiName), signature: FunctionSignatureSyntax( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift index 6a624246e..1806d8aad 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkArray") -func bjs_checkArray(_ a: Int32) -> Void +fileprivate func bjs_checkArray(_ a: Int32) -> Void #else -func bjs_checkArray(_ a: Int32) -> Void { +fileprivate func bjs_checkArray(_ a: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -24,9 +24,9 @@ func checkArray(_ a: JSObject) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkArrayWithLength") -func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void +fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void #else -func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { +fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -40,9 +40,9 @@ func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Voi #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkArray") -func bjs_checkArray(_ a: Int32) -> Void +fileprivate func bjs_checkArray(_ a: Int32) -> Void #else -func bjs_checkArray(_ a: Int32) -> Void { +fileprivate func bjs_checkArray(_ a: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift index 36ad4cd30..5e564aa3a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncReturnVoid") -func bjs_asyncReturnVoid() -> Int32 +fileprivate func bjs_asyncReturnVoid() -> Int32 #else -func bjs_asyncReturnVoid() -> Int32 { +fileprivate func bjs_asyncReturnVoid() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func asyncReturnVoid() throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripInt") -func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 +fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 #else -func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { +fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -42,9 +42,9 @@ func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripString") -func bjs_asyncRoundTripString(_ v: Int32) -> Int32 +fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 #else -func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { +fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -59,9 +59,9 @@ func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripBool") -func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 +fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 #else -func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { +fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -76,9 +76,9 @@ func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripFloat") -func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 +fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 #else -func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { +fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -93,9 +93,9 @@ func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripDouble") -func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 +fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 #else -func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { +fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -110,9 +110,9 @@ func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncRoundTripJSObject") -func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 +fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 #else -func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { +fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift index e0571d5f1..12e04e054 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_returnAnimatable") -func bjs_returnAnimatable() -> Int32 +fileprivate func bjs_returnAnimatable() -> Int32 #else -func bjs_returnAnimatable() -> Int32 { +fileprivate func bjs_returnAnimatable() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,18 +25,18 @@ func returnAnimatable() throws(JSException) -> Animatable { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Animatable_animate") -func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 +fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 #else -func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { +fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Animatable_getAnimations") -func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 +fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 #else -func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { +fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index 2d04f47e6..9fa2feafb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createArrayBuffer") -func bjs_createArrayBuffer() -> Int32 +fileprivate func bjs_createArrayBuffer() -> Int32 #else -func bjs_createArrayBuffer() -> Int32 { +fileprivate func bjs_createArrayBuffer() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func createArrayBuffer() throws(JSException) -> ArrayBufferLike { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createWeirdObject") -func bjs_createWeirdObject() -> Int32 +fileprivate func bjs_createWeirdObject() -> Int32 #else -func bjs_createWeirdObject() -> Int32 { +fileprivate func bjs_createWeirdObject() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -42,18 +42,18 @@ func createWeirdObject() throws(JSException) -> WeirdNaming { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_byteLength_get") -func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 +fileprivate func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 #else -func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 { +fileprivate func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_slice") -func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 +fileprivate func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 #else -func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 { +fileprivate func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -87,63 +87,63 @@ struct ArrayBufferLike: _JSBridgedClass { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_get") -func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 #else -func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") -func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void #else -func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") -func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 #else -func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") -func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void #else -func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") -func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 #else -func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_set") -func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void #else -func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_as") -func bjs_WeirdNaming_as(_ self: Int32) -> Void +fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void #else -func bjs_WeirdNaming_as(_ self: Int32) -> Void { +fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift index 288382150..3102cd6e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createDatabaseConnection") -func bjs_createDatabaseConnection(_ config: Int32) -> Int32 +fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 #else -func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { +fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func createDatabaseConnection(_ config: JSObject) throws(JSException) -> Databas #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createLogger") -func bjs_createLogger(_ level: Int32) -> Int32 +fileprivate func bjs_createLogger(_ level: Int32) -> Int32 #else -func bjs_createLogger(_ level: Int32) -> Int32 { +fileprivate func bjs_createLogger(_ level: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -42,9 +42,9 @@ func createLogger(_ level: String) throws(JSException) -> Logger { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_getConfigManager") -func bjs_getConfigManager() -> Int32 +fileprivate func bjs_getConfigManager() -> Int32 #else -func bjs_getConfigManager() -> Int32 { +fileprivate func bjs_getConfigManager() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -59,45 +59,45 @@ func getConfigManager() throws(JSException) -> ConfigManager { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_isConnected_get") -func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 +fileprivate func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 #else -func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 { +fileprivate func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_get") -func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 +fileprivate func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 #else -func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 { +fileprivate func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_set") -func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void +fileprivate func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void #else -func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void { +fileprivate func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connect") -func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void +fileprivate func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void #else -func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void { +fileprivate func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_execute") -func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 +fileprivate func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 #else -func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 { +fileprivate func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -155,27 +155,27 @@ struct DatabaseConnection: _JSBridgedClass { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Logger_level_get") -func bjs_Logger_level_get(_ self: Int32) -> Int32 +fileprivate func bjs_Logger_level_get(_ self: Int32) -> Int32 #else -func bjs_Logger_level_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Logger_level_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Logger_log") -func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void +fileprivate func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void #else -func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void { +fileprivate func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Logger_error") -func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void +fileprivate func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void #else -func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void { +fileprivate func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -215,27 +215,27 @@ struct Logger: _JSBridgedClass { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ConfigManager_configPath_get") -func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 +fileprivate func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 #else -func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 { +fileprivate func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ConfigManager_get") -func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 +fileprivate func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 #else -func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 { +fileprivate func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ConfigManager_set") -func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void +fileprivate func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void #else -func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void { +fileprivate func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift index 00d220eab..2643eaa08 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_check") -func bjs_check(_ a: Float64, _ b: Int32) -> Void +fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void #else -func bjs_check(_ a: Float64, _ b: Int32) -> Void { +fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift index b33250625..6424329b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkNumber") -func bjs_checkNumber() -> Float64 +fileprivate func bjs_checkNumber() -> Float64 #else -func bjs_checkNumber() -> Float64 { +fileprivate func bjs_checkNumber() -> Float64 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func checkNumber() throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkBoolean") -func bjs_checkBoolean() -> Int32 +fileprivate func bjs_checkBoolean() -> Int32 #else -func bjs_checkBoolean() -> Int32 { +fileprivate func bjs_checkBoolean() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift index fdaf7c49d..68b341ca7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkString") -func bjs_checkString(_ a: Int32) -> Void +fileprivate func bjs_checkString(_ a: Int32) -> Void #else -func bjs_checkString(_ a: Int32) -> Void { +fileprivate func bjs_checkString(_ a: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -24,9 +24,9 @@ func checkString(_ a: String) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkStringWithLength") -func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void +fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void #else -func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { +fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift index 9edc42cf8..638eedb05 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkString") -func bjs_checkString() -> Int32 +fileprivate func bjs_checkString() -> Int32 #else -func bjs_checkString() -> Int32 { +fileprivate func bjs_checkString() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift index 23e8ea7df..2e4331c78 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createTS2Skeleton") -func bjs_createTS2Skeleton() -> Int32 +fileprivate func bjs_createTS2Skeleton() -> Int32 #else -func bjs_createTS2Skeleton() -> Int32 { +fileprivate func bjs_createTS2Skeleton() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -25,9 +25,9 @@ func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createCodeGenerator") -func bjs_createCodeGenerator(_ format: Int32) -> Int32 +fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 #else -func bjs_createCodeGenerator(_ format: Int32) -> Int32 { +fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -42,27 +42,27 @@ func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_version_get") -func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 +fileprivate func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 #else -func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 { +fileprivate func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_convert") -func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 +fileprivate func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 #else -func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 { +fileprivate func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_validate") -func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 +fileprivate func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 #else -func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 { +fileprivate func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -104,18 +104,18 @@ struct TypeScriptProcessor: _JSBridgedClass { #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_CodeGenerator_outputFormat_get") -func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 +fileprivate func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 #else -func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 { +fileprivate func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_CodeGenerator_generate") -func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 +fileprivate func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 #else -func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 { +fileprivate func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift index d007caf63..e539e65df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkSimple") -func bjs_checkSimple(_ a: Float64) -> Void +fileprivate func bjs_checkSimple(_ a: Float64) -> Void #else -func bjs_checkSimple(_ a: Float64) -> Void { +fileprivate func bjs_checkSimple(_ a: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift index 7fe7133db..148419de2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift @@ -8,54 +8,54 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_init") -func bjs_Greeter_init(_ name: Int32) -> Int32 +fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 #else -func bjs_Greeter_init(_ name: Int32) -> Int32 { +fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_name_get") -func bjs_Greeter_name_get(_ self: Int32) -> Int32 +fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 #else -func bjs_Greeter_name_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") -func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void #else -func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") -func bjs_Greeter_age_get(_ self: Int32) -> Float64 +fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 #else -func bjs_Greeter_age_get(_ self: Int32) -> Float64 { +fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_greet") -func bjs_Greeter_greet(_ self: Int32) -> Int32 +fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 #else -func bjs_Greeter_greet(_ self: Int32) -> Int32 { +fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_changeName") -func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void +fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void #else -func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { +fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift index a5ac5afc4..511678471 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_check") -func bjs_check() -> Void +fileprivate func bjs_check() -> Void #else -func bjs_check() -> Void { +fileprivate func bjs_check() -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift index 0936983e7..e75febb86 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift @@ -8,9 +8,9 @@ #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") -func bjs_jsRoundTripVoid() -> Void +fileprivate func bjs_jsRoundTripVoid() -> Void #else -func bjs_jsRoundTripVoid() -> Void { +fileprivate func bjs_jsRoundTripVoid() -> Void { fatalError("Only available on WebAssembly") } #endif @@ -24,9 +24,9 @@ func jsRoundTripVoid() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") -func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 #else -func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif @@ -41,9 +41,9 @@ func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") -func bjs_jsRoundTripBool(_ v: Int32) -> Int32 +fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 #else -func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -58,9 +58,9 @@ func jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") -func bjs_jsRoundTripString(_ v: Int32) -> Int32 +fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 #else -func bjs_jsRoundTripString(_ v: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -75,9 +75,9 @@ func jsRoundTripString(_ v: String) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") -func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void +fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void #else -func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { +fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -91,9 +91,9 @@ func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") -func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 +fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 #else -func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { +fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif @@ -108,9 +108,9 @@ func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") -func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 +fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 #else -func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { +fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -125,9 +125,9 @@ func jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") -func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 +fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 #else -func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { +fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -142,9 +142,9 @@ func jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") -func bjs_runAsyncWorks() -> Int32 +fileprivate func bjs_runAsyncWorks() -> Int32 #else -func bjs_runAsyncWorks() -> Int32 { +fileprivate func bjs_runAsyncWorks() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -159,54 +159,54 @@ func runAsyncWorks() throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") -func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 +fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 #else -func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") -func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 #else -func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") -func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void #else -func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") -func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 #else -func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") -func bjs_JsGreeter_greet(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 #else -func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") -func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void +fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void #else -func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { +fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif From 3c1481514a8b94ceb05af201c058bf05d87e9a99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Nov 2025 12:51:04 +0900 Subject: [PATCH 037/252] Bump actions/checkout from 5 to 6 (#470) Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5df11d0aa..487b008e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: JAVASCRIPTKIT_WASI_BACKEND: ${{ matrix.entry.wasi-backend }} steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - uses: ./.github/actions/install-swift with: download-url: ${{ matrix.entry.toolchain.download-url }} @@ -69,7 +69,7 @@ jobs: xcode: Xcode_16.4 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - run: swift build --package-path ./Examples/Basic env: DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/ @@ -79,7 +79,7 @@ jobs: container: image: swift:6.1.2 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - run: ./Utilities/format.swift - name: Check for formatting changes run: | @@ -92,7 +92,7 @@ jobs: check-bridgejs-generated: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: ./.github/actions/install-swift with: download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz @@ -109,7 +109,7 @@ jobs: build-examples: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: ./.github/actions/install-swift with: download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz From 30ae01a8a99e4ce6381c8dd022351314a162f246 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 20 Nov 2025 13:40:49 +0200 Subject: [PATCH 038/252] BridgeJS: Optional global namespace generation --- .../Sources/PlayBridgeJS/main.swift | 3 +- .../Sources/BridgeJSCore/ExportSwift.swift | 8 + .../Sources/BridgeJSLink/BridgeJSLink.swift | 231 ++++++++--- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 3 + .../BridgeJSToolTests/BridgeJSLinkTests.swift | 50 ++- .../EnumAssociatedValue.Export.d.ts | 6 +- .../EnumNamespace.Export.d.ts | 12 +- .../EnumNamespace_NoGlobal.Export.d.ts | 101 +++++ .../EnumNamespace_NoGlobal.Export.js | 323 +++++++++++++++ .../Namespaces_NoGlobal.Export.d.ts | 55 +++ .../Namespaces_NoGlobal.Export.js | 311 ++++++++++++++ .../StaticFunctions_NoGlobal.Export.d.ts | 63 +++ .../StaticFunctions_NoGlobal.Export.js | 337 +++++++++++++++ .../StaticProperties_NoGlobal.Export.d.ts | 58 +++ .../StaticProperties_NoGlobal.Export.js | 386 ++++++++++++++++++ .../ExportSwiftTests/DefaultParameters.json | 3 +- .../ExportSwiftTests/EnumAssociatedValue.json | 18 +- .../ExportSwiftTests/EnumCase.json | 12 +- .../ExportSwiftTests/EnumNamespace.json | 27 +- .../ExportSwiftTests/EnumRawType.json | 36 +- .../ExportSwiftTests/Protocol.json | 12 +- .../ExportSwiftTests/StaticFunctions.json | 12 +- .../ExportSwiftTests/StaticProperties.json | 9 +- .../ExportSwiftTests/SwiftClosure.json | 12 +- Plugins/PackageToJS/Sources/PackageToJS.swift | 3 +- .../JavaScript/BridgeJS.ExportSwift.json | 84 ++-- 26 files changed, 2029 insertions(+), 146 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index 35d2340d2..2be8626e1 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -40,7 +40,8 @@ import class Foundation.JSONDecoder children: [importSkeleton] ) ], - sharedMemory: false + sharedMemory: false, + exposeToGlobal: true ) let linked = try linker.link() diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 0938bfcf3..4859ba6d9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -882,10 +882,18 @@ public class ExportSwift { message: "Enum visibility must be at least internal" ) + let tsFullPath: String + if let namespace = namespaceResult.namespace, !namespace.isEmpty { + tsFullPath = namespace.joined(separator: ".") + "." + name + } else { + tsFullPath = name + } + // Create enum directly in dictionary let exportedEnum = ExportedEnum( name: name, swiftCallName: swiftCallName, + tsFullPath: tsFullPath, explicitAccessControl: explicitAccessControl, cases: [], // Will be populated in visit(EnumCaseDeclSyntax) rawType: SwiftEnumRawType(rawType), diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 478ba15dd..98b572029 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -12,16 +12,19 @@ struct BridgeJSLink { var exportedSkeletons: [ExportedSkeleton] = [] var importedSkeletons: [ImportedModuleSkeleton] = [] let sharedMemory: Bool + let exposeToGlobal: Bool private let namespaceBuilder = NamespaceBuilder() init( exportedSkeletons: [ExportedSkeleton] = [], importedSkeletons: [ImportedModuleSkeleton] = [], - sharedMemory: Bool + sharedMemory: Bool, + exposeToGlobal: Bool = true ) { self.exportedSkeletons = exportedSkeletons self.importedSkeletons = importedSkeletons self.sharedMemory = sharedMemory + self.exposeToGlobal = exposeToGlobal } mutating func addExportedSkeletonFile(data: Data) throws { @@ -77,7 +80,7 @@ struct BridgeJSLink { var enumStaticAssignments: [String] = [] } - private func collectLinkData() throws -> LinkData { + private func collectLinkData(exposeToGlobal: Bool) throws -> LinkData { var data = LinkData() // Swift heap object class definitions @@ -873,8 +876,8 @@ struct BridgeJSLink { for property in proto.properties { let propertySignature = property.isReadonly - ? "readonly \(property.name): \(property.type.tsType);" - : "\(property.name): \(property.type.tsType);" + ? "readonly \(property.name): \(resolveTypeScriptType(property.type));" + : "\(property.name): \(resolveTypeScriptType(property.type));" printer.write(propertySignature) } } @@ -892,8 +895,16 @@ struct BridgeJSLink { let enumValuesName = enumDefinition.valuesName let enumObjectName = enumDefinition.objectTypeName + // Use fully-qualified path for namespaced enums + let fullEnumValuesPath: String + if let namespace = enumDefinition.namespace, !namespace.isEmpty { + fullEnumValuesPath = namespace.joined(separator: ".") + "." + enumValuesName + } else { + fullEnumValuesPath = enumValuesName + } + if !enumDefinition.staticMethods.isEmpty || !enumDefinition.staticProperties.isEmpty { - printer.write("export type \(enumObjectName) = typeof \(enumValuesName) & {") + printer.write("export type \(enumObjectName) = typeof \(fullEnumValuesPath) & {") printer.indent { for function in enumDefinition.staticMethods { printer.write( @@ -902,12 +913,12 @@ struct BridgeJSLink { } for property in enumDefinition.staticProperties { let readonly = property.isReadonly ? "readonly " : "" - printer.write("\(readonly)\(property.name): \(property.type.tsType);") + printer.write("\(readonly)\(property.name): \(resolveTypeScriptType(property.type));") } } printer.write("};") } else { - printer.write("export type \(enumObjectName) = typeof \(enumValuesName);") + printer.write("export type \(enumObjectName) = typeof \(fullEnumValuesPath);") } printer.nextLine() } @@ -916,6 +927,7 @@ struct BridgeJSLink { // Type definitions section (namespace declarations, class definitions, imported types) let namespaceDeclarationsLines = namespaceBuilder.namespaceDeclarations( exportedSkeletons: exportedSkeletons, + exposeToGlobal: exposeToGlobal, renderTSSignatureCallback: { parameters, returnType, effects in self.renderTSSignature(parameters: parameters, returnType: returnType, effects: effects) } @@ -998,7 +1010,8 @@ struct BridgeJSLink { printer.write(lines: data.topLevelEnumLines) let topLevelNamespaceCode = namespaceBuilder.buildTopLevelNamespaceInitialization( - exportedSkeletons: exportedSkeletons + exportedSkeletons: exportedSkeletons, + exposeToGlobal: exposeToGlobal ) printer.write(lines: topLevelNamespaceCode) @@ -1061,14 +1074,16 @@ struct BridgeJSLink { printer.write(lines: data.classLines) let namespaceInitCode = namespaceBuilder.buildNamespaceInitialization( - exportedSkeletons: exportedSkeletons + exportedSkeletons: exportedSkeletons, + exposeToGlobal: exposeToGlobal ) printer.write(lines: namespaceInitCode) - let propertyAssignments = try generateNamespacePropertyAssignments( - data: data, - exportedSkeletons: exportedSkeletons, - namespaceBuilder: namespaceBuilder + let propertyAssignments = try generateNamespacePropertyAssignments( + data: data, + exportedSkeletons: exportedSkeletons, + namespaceBuilder: namespaceBuilder, + exposeToGlobal: exposeToGlobal ) printer.write(lines: propertyAssignments) } @@ -1082,7 +1097,7 @@ struct BridgeJSLink { } func link() throws -> (outputJs: String, outputDts: String) { - let data = try collectLinkData() + let data = try collectLinkData(exposeToGlobal: exposeToGlobal) let outputJs = try generateJavaScript(data: data) let outputDts = generateTypeScript(data: data) return (outputJs, outputDts) @@ -1140,10 +1155,15 @@ struct BridgeJSLink { private func generateNamespacePropertyAssignments( data: LinkData, exportedSkeletons: [ExportedSkeleton], - namespaceBuilder: NamespaceBuilder + namespaceBuilder: NamespaceBuilder, + exposeToGlobal: Bool ) throws -> [String] { let printer = CodeFragmentPrinter() - printer.write(lines: data.enumStaticAssignments) + + // Only write globalThis property assignments when exposeToGlobal is true + if exposeToGlobal { + printer.write(lines: data.enumStaticAssignments) + } printer.write("const exports = {") try printer.indent { @@ -1151,6 +1171,7 @@ struct BridgeJSLink { let hierarchicalLines = try namespaceBuilder.buildHierarchicalExportsObject( exportedSkeletons: exportedSkeletons, + exposeToGlobal: exposeToGlobal, renderFunctionImpl: { function in let (js, _) = try self.renderExportedFunction(function: function) return js @@ -1161,8 +1182,10 @@ struct BridgeJSLink { printer.write("};") printer.write("_exports = exports;") - let globalThisLines = namespaceBuilder.buildGlobalThisAssignments(exportedSkeletons: exportedSkeletons) - printer.write(lines: globalThisLines) + if exposeToGlobal { + let globalThisLines = namespaceBuilder.buildGlobalThisAssignments(exportedSkeletons: exportedSkeletons) + printer.write(lines: globalThisLines) + } printer.write("return exports;") @@ -1189,8 +1212,8 @@ struct BridgeJSLink { for property in type.properties { let propertySignature = property.isReadonly - ? "readonly \(property.name): \(property.type.tsType);" - : "\(property.name): \(property.type.tsType);" + ? "readonly \(property.name): \(resolveTypeScriptType(property.type));" + : "\(property.name): \(resolveTypeScriptType(property.type));" printer.write(propertySignature) } @@ -1320,16 +1343,57 @@ struct BridgeJSLink { } } + /// Returns TypeScript type string for a BridgeType, using full paths for enums + /// If the type is an enum, looks up the ExportedEnum and uses its tsFullPath + /// Otherwise, uses the default tsType property + private func resolveTypeScriptType(_ type: BridgeType) -> String { + return Self.resolveTypeScriptType(type, exportedSkeletons: exportedSkeletons) + } + + /// Static helper for resolving TypeScript types with full enum paths + /// Can be used by both BridgeJSLink and NamespaceBuilder + fileprivate static func resolveTypeScriptType(_ type: BridgeType, exportedSkeletons: [ExportedSkeleton]) -> String { + switch type { + case .caseEnum(let name), .rawValueEnum(let name, _), + .associatedValueEnum(let name), .namespaceEnum(let name): + // Look up the enum to get its tsFullPath + for skeleton in exportedSkeletons { + for enumDef in skeleton.enums { + if enumDef.name == name || enumDef.swiftCallName == name { + // Use the stored tsFullPath which has the full namespace + switch type { + case .caseEnum: + return "\(enumDef.tsFullPath)Tag" + case .rawValueEnum: + return "\(enumDef.tsFullPath)Tag" + case .associatedValueEnum: + return "\(enumDef.tsFullPath)Tag" + case .namespaceEnum: + return enumDef.tsFullPath + default: + return type.tsType + } + } + } + } + return type.tsType + case .optional(let wrapped): + return "\(resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons)) | null" + default: + return type.tsType + } + } + private func renderTSSignature(parameters: [Parameter], returnType: BridgeType, effects: Effects) -> String { let returnTypeWithEffect: String if effects.isAsync { - returnTypeWithEffect = "Promise<\(returnType.tsType)>" + returnTypeWithEffect = "Promise<\(resolveTypeScriptType(returnType))>" } else { - returnTypeWithEffect = returnType.tsType + returnTypeWithEffect = resolveTypeScriptType(returnType) } let parameterSignatures = parameters.map { param in let optional = param.hasDefault ? "?" : "" - return "\(param.name)\(optional): \(param.type.tsType)" + return "\(param.name)\(optional): \(resolveTypeScriptType(param.type))" } return "(\(parameterSignatures.joined(separator: ", "))): \(returnTypeWithEffect)" } @@ -2179,12 +2243,18 @@ extension BridgeJSLink { ) } - func buildNamespaceInitialization(exportedSkeletons: [ExportedSkeleton]) -> [String] { + func buildNamespaceInitialization(exportedSkeletons: [ExportedSkeleton], exposeToGlobal: Bool) -> [String] { + guard exposeToGlobal else { return [] } let allNamespacePaths = collectAllNamespacePaths(exportedSkeletons: exportedSkeletons) return generateNamespaceInitializationCode(namespacePaths: allNamespacePaths) } - func buildTopLevelNamespaceInitialization(exportedSkeletons: [ExportedSkeleton]) -> [String] { + func buildTopLevelNamespaceInitialization( + exportedSkeletons: [ExportedSkeleton], + exposeToGlobal: Bool + ) -> [String] { + guard exposeToGlobal else { return [] } + var namespacedEnumPaths: Set<[String]> = [] for skeleton in exportedSkeletons { for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { @@ -2408,6 +2478,7 @@ extension BridgeJSLink { fileprivate func buildHierarchicalExportsObject( exportedSkeletons: [ExportedSkeleton], + exposeToGlobal: Bool, renderFunctionImpl: (ExportedFunction) throws -> [String] ) throws -> [String] { let printer = CodeFragmentPrinter() @@ -2575,6 +2646,7 @@ extension BridgeJSLink { /// - Returns: Array of TypeScript declaration lines defining the global namespace structure func namespaceDeclarations( exportedSkeletons: [ExportedSkeleton], + exposeToGlobal: Bool, renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String ) -> [String] { let printer = CodeFragmentPrinter() @@ -2585,38 +2657,76 @@ extension BridgeJSLink { guard !rootNode.children.isEmpty else { return printer.lines } - printer.write("export {};") - printer.nextLine() - printer.write("declare global {") - printer.indent() + + if exposeToGlobal { + printer.write("export {};") + printer.nextLine() + printer.write("declare global {") + printer.indent() + } + + func hasContent(node: NamespaceNode) -> Bool { + // Enums are always included + if !node.content.enums.isEmpty { + return true + } + + // When exposeToGlobal is true, classes, functions, and properties are included + if exposeToGlobal { + if !node.content.classes.isEmpty || !node.content.functions.isEmpty + || !node.content.staticProperties.isEmpty + { + return true + } + } + + // Check if any child has content + for (_, childNode) in node.children { + if hasContent(node: childNode) { + return true + } + } + + return false + } func generateNamespaceDeclarations(node: NamespaceNode, depth: Int) { let sortedChildren = node.children.sorted { $0.key < $1.key } for (childName, childNode) in sortedChildren { - printer.write("namespace \(childName) {") + // Skip empty namespaces + guard hasContent(node: childNode) else { + continue + } + + let exportKeyword = exposeToGlobal ? "" : "export " + printer.write("\(exportKeyword)namespace \(childName) {") printer.indent() - let sortedClasses = childNode.content.classes.sorted { $0.name < $1.name } - for klass in sortedClasses { - printer.write("class \(klass.name) {") - printer.indent { - if let constructor = klass.constructor { - let constructorSignature = - "constructor(\(constructor.parameters.map { "\($0.name): \($0.type.tsType)" }.joined(separator: ", ")));" - printer.write(constructorSignature) - } + // Only include classes when exposeToGlobal is true + if exposeToGlobal { + let sortedClasses = childNode.content.classes.sorted { $0.name < $1.name } + for klass in sortedClasses { + printer.write("class \(klass.name) {") + printer.indent { + if let constructor = klass.constructor { + let constructorSignature = + "constructor(\(constructor.parameters.map { "\($0.name): \($0.type.tsType)" }.joined(separator: ", ")));" + printer.write(constructorSignature) + } - let sortedMethods = klass.methods.sorted { $0.name < $1.name } - for method in sortedMethods { - let methodSignature = - "\(method.name)\(renderTSSignatureCallback(method.parameters, method.returnType, method.effects));" - printer.write(methodSignature) + let sortedMethods = klass.methods.sorted { $0.name < $1.name } + for method in sortedMethods { + let methodSignature = + "\(method.name)\(renderTSSignatureCallback(method.parameters, method.returnType, method.effects));" + printer.write(methodSignature) + } } + printer.write("}") } - printer.write("}") } + // Generate enum definitions within declare global namespace let sortedEnums = childNode.content.enums.sorted { $0.name < $1.name } for enumDefinition in sortedEnums { let style: EnumEmitStyle = enumDefinition.emitStyle @@ -2721,16 +2831,19 @@ extension BridgeJSLink { } } - let sortedFunctions = childNode.content.functions.sorted { $0.name < $1.name } - for function in sortedFunctions { - let signature = - "\(function.name)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));" - printer.write(signature) - } - let sortedProperties = childNode.content.staticProperties.sorted { $0.name < $1.name } - for property in sortedProperties { - let readonly = property.isReadonly ? "var " : "let " - printer.write("\(readonly)\(property.name): \(property.type.tsType);") + // Only include functions and properties when exposeToGlobal is true + if exposeToGlobal { + let sortedFunctions = childNode.content.functions.sorted { $0.name < $1.name } + for function in sortedFunctions { + let signature = + "\(function.name)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));" + printer.write(signature) + } + let sortedProperties = childNode.content.staticProperties.sorted { $0.name < $1.name } + for property in sortedProperties { + let readonly = property.isReadonly ? "var " : "let " + printer.write("\(readonly)\(property.name): \(property.type.tsType);") + } } generateNamespaceDeclarations(node: childNode, depth: depth + 1) @@ -2742,9 +2855,11 @@ extension BridgeJSLink { generateNamespaceDeclarations(node: rootNode, depth: 1) - printer.unindent() - printer.write("}") - printer.nextLine() + if exposeToGlobal { + printer.unindent() + printer.write("}") + printer.nextLine() + } return printer.lines } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 1b59ddfc3..a862f3c3b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -265,6 +265,7 @@ public struct ExportedEnum: Codable, Equatable, Sendable { public let name: String public let swiftCallName: String + public let tsFullPath: String public let explicitAccessControl: String? public var cases: [EnumCase] public let rawType: SwiftEnumRawType? @@ -293,6 +294,7 @@ public struct ExportedEnum: Codable, Equatable, Sendable { public init( name: String, swiftCallName: String, + tsFullPath: String, explicitAccessControl: String?, cases: [EnumCase], rawType: SwiftEnumRawType?, @@ -303,6 +305,7 @@ public struct ExportedEnum: Codable, Equatable, Sendable { ) { self.name = name self.swiftCallName = swiftCallName + self.tsFullPath = tsFullPath self.explicitAccessControl = explicitAccessControl self.cases = cases self.rawType = rawType diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 37edf8308..b837451db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -55,7 +55,7 @@ import Testing let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] let outputSkeletonData = try encoder.encode(outputSkeleton) - var bridgeJSLink = BridgeJSLink(sharedMemory: false) + var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: true) try bridgeJSLink.addExportedSkeletonFile(data: outputSkeletonData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Export") } @@ -74,8 +74,54 @@ import Testing encoder.outputFormatting = [.prettyPrinted, .sortedKeys] let outputSkeletonData = try encoder.encode(importTS.skeleton) - var bridgeJSLink = BridgeJSLink(sharedMemory: false) + var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: true) try bridgeJSLink.addImportedSkeletonFile(data: outputSkeletonData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") } + + @Test(arguments: [ + "Namespaces.swift", + "StaticFunctions.swift", + "StaticProperties.swift", + "EnumNamespace.swift" + ]) + func testWithoutGlobal(inputFile: String) throws { + let url = Self.inputsDirectory.appendingPathComponent(inputFile) + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule") + try swiftAPI.addSourceFile(sourceFile, inputFile) + + let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let outputSkeletonData = try encoder.encode(outputSkeleton) + + var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: false) + try bridgeJSLink.addExportedSkeletonFile(data: outputSkeletonData) + + let (outputJs, outputDts) = try bridgeJSLink.link() + + // Verify no global declarations + #expect(!outputDts.contains("declare global")) + #expect(!outputJs.contains("globalThis.")) + + // Save snapshots + let name = url.deletingPathExtension().lastPathComponent + "_NoGlobal.Export" + try assertSnapshot( + name: name, + filePath: #filePath, + function: #function, + sourceLocation: #_sourceLocation, + input: outputJs.data(using: .utf8)!, + fileExtension: "js" + ) + try assertSnapshot( + name: name, + filePath: #filePath, + function: #function, + sourceLocation: #_sourceLocation, + input: outputDts.data(using: .utf8)!, + fileExtension: "d.ts" + ) + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts index e79f4119e..5523b89ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts @@ -47,9 +47,9 @@ export type APIResultObject = typeof APIResultValues; export type ComplexResultObject = typeof ComplexResultValues; -export type ResultObject = typeof ResultValues; +export type ResultObject = typeof Utilities.ResultValues; -export type NetworkingResultObject = typeof NetworkingResultValues; +export type NetworkingResultObject = typeof API.NetworkingResultValues; export type APIOptionalResultObject = typeof APIOptionalResultValues; @@ -89,7 +89,7 @@ export type Exports = { roundtripComplexResult(result: ComplexResultTag): ComplexResultTag; roundTripOptionalComplexResult(result: ComplexResultTag | null): ComplexResultTag | null; roundTripOptionalUtilitiesResult(result: Utilities.ResultTag | null): Utilities.ResultTag | null; - roundTripOptionalNetworkingResult(result: NetworkingResultTag | null): NetworkingResultTag | null; + roundTripOptionalNetworkingResult(result: API.NetworkingResultTag | null): API.NetworkingResultTag | null; roundTripOptionalAPIOptionalResult(result: APIOptionalResultTag | null): APIOptionalResultTag | null; APIResult: APIResultObject ComplexResult: ComplexResultObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts index b7c1549a0..4261ca3bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts @@ -4,13 +4,13 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -export type MethodObject = typeof MethodValues; +export type MethodObject = typeof Networking.API.MethodValues; -export type LogLevelObject = typeof LogLevelValues; +export type LogLevelObject = typeof Configuration.LogLevelValues; -export type PortObject = typeof PortValues; +export type PortObject = typeof Configuration.PortValues; -export type SupportedMethodObject = typeof SupportedMethodValues; +export type SupportedMethodObject = typeof Networking.APIV2.Internal.SupportedMethodValues; export {}; @@ -48,7 +48,7 @@ declare global { namespace Internal { class TestServer { constructor(); - call(method: Internal.SupportedMethodTag): void; + call(method: Networking.APIV2.Internal.SupportedMethodTag): void; } const SupportedMethodValues: { readonly Get: 0; @@ -80,7 +80,7 @@ export interface HTTPServer extends SwiftHeapObject { call(method: Networking.API.MethodTag): void; } export interface TestServer extends SwiftHeapObject { - call(method: Internal.SupportedMethodTag): void; + call(method: Networking.APIV2.Internal.SupportedMethodTag): void; } export type Exports = { Configuration: { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts new file mode 100644 index 000000000..b8b92d14e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts @@ -0,0 +1,101 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export type MethodObject = typeof Networking.API.MethodValues; + +export type LogLevelObject = typeof Configuration.LogLevelValues; + +export type PortObject = typeof Configuration.PortValues; + +export type SupportedMethodObject = typeof Networking.APIV2.Internal.SupportedMethodValues; + +export namespace Configuration { + const LogLevelValues: { + readonly Debug: "debug"; + readonly Info: "info"; + readonly Warning: "warning"; + readonly Error: "error"; + }; + type LogLevelTag = typeof LogLevelValues[keyof typeof LogLevelValues]; + const PortValues: { + readonly Http: 80; + readonly Https: 443; + readonly Development: 3000; + }; + type PortTag = typeof PortValues[keyof typeof PortValues]; +} +export namespace Networking { + export namespace API { + const MethodValues: { + readonly Get: 0; + readonly Post: 1; + readonly Put: 2; + readonly Delete: 3; + }; + type MethodTag = typeof MethodValues[keyof typeof MethodValues]; + } + export namespace APIV2 { + export namespace Internal { + const SupportedMethodValues: { + readonly Get: 0; + readonly Post: 1; + }; + type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues]; + } + } +} +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Converter extends SwiftHeapObject { + toString(value: number): string; +} +export interface HTTPServer extends SwiftHeapObject { + call(method: Networking.API.MethodTag): void; +} +export interface TestServer extends SwiftHeapObject { + call(method: Networking.APIV2.Internal.SupportedMethodTag): void; +} +export type Exports = { + Configuration: { + LogLevel: LogLevelObject + Port: PortObject + }, + Networking: { + API: { + HTTPServer: { + new(): HTTPServer; + } + Method: MethodObject + }, + APIV2: { + Internal: { + TestServer: { + new(): TestServer; + } + SupportedMethod: SupportedMethodObject + }, + }, + }, + Utils: { + Converter: { + new(): Converter; + } + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js new file mode 100644 index 000000000..9fed226d9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js @@ -0,0 +1,323 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const MethodValues = { + Get: 0, + Post: 1, + Put: 2, + Delete: 3, +}; + +export const LogLevelValues = { + Debug: "debug", + Info: "info", + Warning: "warning", + Error: "error", +}; + +export const PortValues = { + Http: 80, + Https: 443, + Development: 3000, +}; + +export const SupportedMethodValues = { + Get: 0, + Post: 1, +}; + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { + const obj = Converter.__construct(pointer); + return swift.memory.retain(obj); + }; + importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) { + const obj = HTTPServer.__construct(pointer); + return swift.memory.retain(obj); + }; + importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) { + const obj = TestServer.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Converter extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); + } + + constructor() { + const ret = instance.exports.bjs_Converter_init(); + return Converter.__construct(ret); + } + toString(value) { + instance.exports.bjs_Converter_toString(this.pointer, value); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + class HTTPServer extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_HTTPServer_deinit, HTTPServer.prototype); + } + + constructor() { + const ret = instance.exports.bjs_HTTPServer_init(); + return HTTPServer.__construct(ret); + } + call(method) { + instance.exports.bjs_HTTPServer_call(this.pointer, method); + } + } + class TestServer extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestServer_deinit, TestServer.prototype); + } + + constructor() { + const ret = instance.exports.bjs_TestServer_init(); + return TestServer.__construct(ret); + } + call(method) { + instance.exports.bjs_TestServer_call(this.pointer, method); + } + } + const exports = { + Configuration: { + LogLevel: LogLevelValues, + Port: PortValues, + }, + Networking: { + API: { + HTTPServer, + Method: MethodValues, + }, + APIV2: { + Internal: { + TestServer, + SupportedMethod: SupportedMethodValues, + }, + }, + }, + Utils: { + Converter, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts new file mode 100644 index 000000000..67a89533a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts @@ -0,0 +1,55 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Greeter extends SwiftHeapObject { + greet(): string; +} +export interface Converter extends SwiftHeapObject { + toString(value: number): string; +} +export interface UUID extends SwiftHeapObject { + uuidString(): string; +} +export type Exports = { + plainFunction(): string; + MyModule: { + Utils: { + namespacedFunction(): string; + }, + }, + Utils: { + Converters: { + Converter: { + new(): Converter; + } + }, + }, + __Swift: { + Foundation: { + Greeter: { + new(name: string): Greeter; + } + UUID: { + } + }, + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js new file mode 100644 index 000000000..08601bd50 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js @@ -0,0 +1,311 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { + const obj = Greeter.__construct(pointer); + return swift.memory.retain(obj); + }; + importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { + const obj = Converter.__construct(pointer); + return swift.memory.retain(obj); + }; + importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) { + const obj = UUID.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Greeter extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); + } + + constructor(name) { + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); + swift.memory.release(nameId); + return Greeter.__construct(ret); + } + greet() { + instance.exports.bjs_Greeter_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + class Converter extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); + } + + constructor() { + const ret = instance.exports.bjs_Converter_init(); + return Converter.__construct(ret); + } + toString(value) { + instance.exports.bjs_Converter_toString(this.pointer, value); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + class UUID extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype); + } + + uuidString() { + instance.exports.bjs_UUID_uuidString(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + const exports = { + plainFunction: function bjs_plainFunction() { + instance.exports.bjs_plainFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + MyModule: { + Utils: { + namespacedFunction: function bjs_MyModule_Utils_namespacedFunction() { + instance.exports.bjs_MyModule_Utils_namespacedFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + }, + Utils: { + Converters: { + Converter, + }, + }, + __Swift: { + Foundation: { + Greeter, + UUID, + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts new file mode 100644 index 000000000..e938ddb9a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts @@ -0,0 +1,63 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const CalculatorValues: { + readonly Scientific: 0; + readonly Basic: 1; +}; +export type CalculatorTag = typeof CalculatorValues[keyof typeof CalculatorValues]; + +export const APIResultValues: { + readonly Tag: { + readonly Success: 0; + readonly Failure: 1; + }; +}; + +export type APIResultTag = + { tag: typeof APIResultValues.Tag.Success; param0: string } | { tag: typeof APIResultValues.Tag.Failure; param0: number } + +export type CalculatorObject = typeof CalculatorValues & { + square(value: number): number; +}; + +export type APIResultObject = typeof APIResultValues & { + roundtrip(value: APIResultTag): APIResultTag; +}; + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface MathUtils extends SwiftHeapObject { + multiply(x: number, y: number): number; +} +export type Exports = { + MathUtils: { + new(): MathUtils; + subtract(a: number, b: number): number; + add(a: number, b: number): number; + } + Calculator: CalculatorObject + APIResult: APIResultObject + Utils: { + String: { + uppercase(text: string): string; + }, + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js new file mode 100644 index 000000000..8522168f2 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js @@ -0,0 +1,337 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const CalculatorValues = { + Scientific: 0, + Basic: 1, +}; + +export const APIResultValues = { + Tag: { + Success: 0, + Failure: 1, + }, +}; + +const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + const tag = tmpRetTag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); +}; +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + const enumHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_MathUtils_wrap"] = function(pointer) { + const obj = MathUtils.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + enumHelpers.APIResult = APIResultHelpers; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class MathUtils extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MathUtils_deinit, MathUtils.prototype); + } + + constructor() { + const ret = instance.exports.bjs_MathUtils_init(); + return MathUtils.__construct(ret); + } + static subtract(a, b) { + const ret = instance.exports.bjs_MathUtils_static_subtract(a, b); + return ret; + } + static add(a, b) { + const ret = instance.exports.bjs_MathUtils_static_add(a, b); + return ret; + } + multiply(x, y) { + const ret = instance.exports.bjs_MathUtils_multiply(this.pointer, x, y); + return ret; + } + } + const exports = { + MathUtils, + Calculator: { + ...CalculatorValues, + square: function(value) { + const ret = instance.exports.bjs_Calculator_static_square(value); + return ret; + } + }, + APIResult: { + ...APIResultValues, + roundtrip: function(value) { + const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); + instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); + const ret = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + if (valueCleanup) { valueCleanup(); } + return ret; + } + }, + Utils: { + String: { + uppercase: function bjs_Utils_String_static_uppercase(text) { + const textBytes = textEncoder.encode(text); + const textId = swift.memory.retain(textBytes); + instance.exports.bjs_Utils_String_static_uppercase(textId, textBytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(textId); + return ret; + }, + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts new file mode 100644 index 000000000..4ce689edb --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts @@ -0,0 +1,58 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const PropertyEnumValues: { + readonly Value1: 0; + readonly Value2: 1; +}; +export type PropertyEnumTag = typeof PropertyEnumValues[keyof typeof PropertyEnumValues]; + +export type PropertyEnumObject = typeof PropertyEnumValues & { + enumProperty: string; + readonly enumConstant: number; + computedEnum: string; +}; + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface PropertyClass extends SwiftHeapObject { +} +export type Exports = { + PropertyClass: { + new(): PropertyClass; + readonly staticConstant: string; + staticVariable: number; + jsObjectProperty: any; + classVariable: string; + computedProperty: string; + readonly readOnlyComputed: number; + optionalProperty: string | null; + } + PropertyEnum: PropertyEnumObject + PropertyNamespace: { + readonly namespaceConstant: string; + namespaceProperty: string; + Nested: { + readonly nestedConstant: string; + nestedDouble: number; + nestedProperty: number; + }, + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js new file mode 100644 index 000000000..5d70c39b1 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js @@ -0,0 +1,386 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const PropertyEnumValues = { + Value1: 0, + Value2: 1, +}; + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_PropertyClass_wrap"] = function(pointer) { + const obj = PropertyClass.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class PropertyClass extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PropertyClass_deinit, PropertyClass.prototype); + } + + constructor() { + const ret = instance.exports.bjs_PropertyClass_init(); + return PropertyClass.__construct(ret); + } + static get staticConstant() { + instance.exports.bjs_PropertyClass_static_staticConstant_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + static get staticVariable() { + const ret = instance.exports.bjs_PropertyClass_static_staticVariable_get(); + return ret; + } + static set staticVariable(value) { + instance.exports.bjs_PropertyClass_static_staticVariable_set(value); + } + static get jsObjectProperty() { + const ret = instance.exports.bjs_PropertyClass_static_jsObjectProperty_get(); + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } + static set jsObjectProperty(value) { + instance.exports.bjs_PropertyClass_static_jsObjectProperty_set(swift.memory.retain(value)); + } + static get classVariable() { + instance.exports.bjs_PropertyClass_static_classVariable_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + static set classVariable(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyClass_static_classVariable_set(valueId, valueBytes.length); + swift.memory.release(valueId); + } + static get computedProperty() { + instance.exports.bjs_PropertyClass_static_computedProperty_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + static set computedProperty(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyClass_static_computedProperty_set(valueId, valueBytes.length); + swift.memory.release(valueId); + } + static get readOnlyComputed() { + const ret = instance.exports.bjs_PropertyClass_static_readOnlyComputed_get(); + return ret; + } + static get optionalProperty() { + instance.exports.bjs_PropertyClass_static_optionalProperty_get(); + const optResult = tmpRetString; + tmpRetString = undefined; + return optResult; + } + static set optionalProperty(value) { + const isSome = value != null; + let valueId, valueBytes; + if (isSome) { + valueBytes = textEncoder.encode(value); + valueId = swift.memory.retain(valueBytes); + } + instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + if (valueId != undefined) { + swift.memory.release(valueId); + } + } + } + const exports = { + PropertyClass, + PropertyEnum: { + ...PropertyEnumValues, + get enumProperty() { + instance.exports.bjs_PropertyEnum_static_enumProperty_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + set enumProperty(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyEnum_static_enumProperty_set(valueId, valueBytes.length); + swift.memory.release(valueId); + }, + get enumConstant() { + const ret = instance.exports.bjs_PropertyEnum_static_enumConstant_get(); + return ret; + }, + get computedEnum() { + instance.exports.bjs_PropertyEnum_static_computedEnum_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + set computedEnum(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyEnum_static_computedEnum_set(valueId, valueBytes.length); + swift.memory.release(valueId); + } + }, + PropertyNamespace: { + get namespaceProperty() { + instance.exports.bjs_PropertyNamespace_static_namespaceProperty_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + set namespaceProperty(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_PropertyNamespace_static_namespaceProperty_set(valueId, valueBytes.length); + swift.memory.release(valueId); + }, + get namespaceConstant() { + instance.exports.bjs_PropertyNamespace_static_namespaceConstant_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + Nested: { + get nestedProperty() { + const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_get(); + return ret; + }, + set nestedProperty(value) { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedProperty_set(value); + }, + get nestedConstant() { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedConstant_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + get nestedDouble() { + const ret = instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_get(); + return ret; + }, + set nestedDouble(value) { + instance.exports.bjs_PropertyNamespace_Nested_static_nestedDouble_set(value); + }, + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index 05d71b5f8..98c09bef0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -255,7 +255,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Status" + "swiftCallName" : "Status", + "tsFullPath" : "Status" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index c75e7d856..d2ab06d42 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -80,7 +80,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIResult" + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" }, { "cases" : [ @@ -250,7 +251,8 @@ "staticProperties" : [ ], - "swiftCallName" : "ComplexResult" + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" }, { "cases" : [ @@ -264,7 +266,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utilities" + "swiftCallName" : "Utilities", + "tsFullPath" : "Utilities" }, { "cases" : [ @@ -337,7 +340,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utilities.Result" + "swiftCallName" : "Utilities.Result", + "tsFullPath" : "Utilities.Result" }, { "cases" : [ @@ -384,7 +388,8 @@ "staticProperties" : [ ], - "swiftCallName" : "NetworkingResult" + "swiftCallName" : "NetworkingResult", + "tsFullPath" : "API.NetworkingResult" }, { "cases" : [ @@ -478,7 +483,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIOptionalResult" + "swiftCallName" : "APIOptionalResult", + "tsFullPath" : "APIOptionalResult" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json index 825b41050..3e738dd2b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json @@ -38,7 +38,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Direction" + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" }, { "cases" : [ @@ -69,7 +70,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Status" + "swiftCallName" : "Status", + "tsFullPath" : "Status" }, { "cases" : [ @@ -106,7 +108,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TSDirection" + "swiftCallName" : "TSDirection", + "tsFullPath" : "TSDirection" }, { "cases" : [ @@ -126,7 +129,8 @@ "staticProperties" : [ ], - "swiftCallName" : "PublicStatus" + "swiftCallName" : "PublicStatus", + "tsFullPath" : "PublicStatus" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 0b94c1c5d..1ba8279e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -173,7 +173,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utils" + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" }, { "cases" : [ @@ -187,7 +188,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking" + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" }, { "cases" : [ @@ -204,7 +206,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking.API" + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" }, { "cases" : [ @@ -245,7 +248,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking.API.Method" + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" }, { "cases" : [ @@ -259,7 +263,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration" + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" }, { "cases" : [ @@ -304,7 +309,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration.LogLevel" + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" }, { "cases" : [ @@ -342,7 +348,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration.Port" + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" }, { "cases" : [ @@ -360,7 +367,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Internal" + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" }, { "cases" : [ @@ -390,7 +398,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Internal.SupportedMethod" + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json index b5da17265..30ec6a35d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json @@ -36,7 +36,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Theme" + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" }, { "cases" : [ @@ -71,7 +72,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TSTheme" + "swiftCallName" : "TSTheme", + "tsFullPath" : "TSTheme" }, { "cases" : [ @@ -99,7 +101,8 @@ "staticProperties" : [ ], - "swiftCallName" : "FeatureFlag" + "swiftCallName" : "FeatureFlag", + "tsFullPath" : "FeatureFlag" }, { "cases" : [ @@ -134,7 +137,8 @@ "staticProperties" : [ ], - "swiftCallName" : "HttpStatus" + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" }, { "cases" : [ @@ -169,7 +173,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TSHttpStatus" + "swiftCallName" : "TSHttpStatus", + "tsFullPath" : "TSHttpStatus" }, { "cases" : [ @@ -218,7 +223,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Priority" + "swiftCallName" : "Priority", + "tsFullPath" : "Priority" }, { "cases" : [ @@ -260,7 +266,8 @@ "staticProperties" : [ ], - "swiftCallName" : "FileSize" + "swiftCallName" : "FileSize", + "tsFullPath" : "FileSize" }, { "cases" : [ @@ -295,7 +302,8 @@ "staticProperties" : [ ], - "swiftCallName" : "UserId" + "swiftCallName" : "UserId", + "tsFullPath" : "UserId" }, { "cases" : [ @@ -330,7 +338,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TokenId" + "swiftCallName" : "TokenId", + "tsFullPath" : "TokenId" }, { "cases" : [ @@ -365,7 +374,8 @@ "staticProperties" : [ ], - "swiftCallName" : "SessionId" + "swiftCallName" : "SessionId", + "tsFullPath" : "SessionId" }, { "cases" : [ @@ -400,7 +410,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Precision" + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" }, { "cases" : [ @@ -442,7 +453,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Ratio" + "swiftCallName" : "Ratio", + "tsFullPath" : "Ratio" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index 46b96429d..efda4d145 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -285,7 +285,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Direction" + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" }, { "cases" : [ @@ -313,7 +314,8 @@ "staticProperties" : [ ], - "swiftCallName" : "ExampleEnum" + "swiftCallName" : "ExampleEnum", + "tsFullPath" : "ExampleEnum" }, { "cases" : [ @@ -350,7 +352,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Result" + "swiftCallName" : "Result", + "tsFullPath" : "Result" }, { "cases" : [ @@ -385,7 +388,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Priority" + "swiftCallName" : "Priority", + "tsFullPath" : "Priority" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index cbd0fa2b8..705de9378 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -186,7 +186,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Calculator" + "swiftCallName" : "Calculator", + "tsFullPath" : "Calculator" }, { "cases" : [ @@ -252,7 +253,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIResult" + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" }, { "cases" : [ @@ -266,7 +268,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utils" + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" }, { "cases" : [ @@ -316,7 +319,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utils.String" + "swiftCallName" : "Utils.String", + "tsFullPath" : "Utils.String" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index 63de88b99..1c5cdd6a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -198,7 +198,8 @@ } } ], - "swiftCallName" : "PropertyEnum" + "swiftCallName" : "PropertyEnum", + "tsFullPath" : "PropertyEnum" }, { "cases" : [ @@ -247,7 +248,8 @@ } } ], - "swiftCallName" : "PropertyNamespace" + "swiftCallName" : "PropertyNamespace", + "tsFullPath" : "PropertyNamespace" }, { "cases" : [ @@ -320,7 +322,8 @@ } } ], - "swiftCallName" : "PropertyNamespace.Nested" + "swiftCallName" : "PropertyNamespace.Nested", + "tsFullPath" : "PropertyNamespace.Nested" } ], "functions" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json index acb1c8949..d6518fc69 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -899,7 +899,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Direction" + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" }, { "cases" : [ @@ -934,7 +935,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Theme" + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" }, { "cases" : [ @@ -976,7 +978,8 @@ "staticProperties" : [ ], - "swiftCallName" : "HttpStatus" + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" }, { "cases" : [ @@ -1055,7 +1058,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIResult" + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" } ], "functions" : [ diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index ec9840439..9576c2b76 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -613,7 +613,8 @@ struct PackagingPlanner { let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: $0).path)) return try decoder.decode(ImportedModuleSkeleton.self, from: data) }, - sharedMemory: Self.isSharedMemoryEnabled(triple: triple) + sharedMemory: Self.isSharedMemoryEnabled(triple: triple), + exposeToGlobal: true ) let (outputJs, outputDts) = try link.link() try system.writeFile(atPath: scope.resolve(path: bridgeJs).path, content: Data(outputJs.utf8)) diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index c5ac3294d..c1877ab35 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -3156,7 +3156,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Direction" + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" }, { "cases" : [ @@ -3187,7 +3188,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Status" + "swiftCallName" : "Status", + "tsFullPath" : "Status" }, { "cases" : [ @@ -3222,7 +3224,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Theme" + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" }, { "cases" : [ @@ -3264,7 +3267,8 @@ "staticProperties" : [ ], - "swiftCallName" : "HttpStatus" + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" }, { "cases" : [ @@ -3301,7 +3305,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TSDirection" + "swiftCallName" : "TSDirection", + "tsFullPath" : "TSDirection" }, { "cases" : [ @@ -3336,7 +3341,8 @@ "staticProperties" : [ ], - "swiftCallName" : "TSTheme" + "swiftCallName" : "TSTheme", + "tsFullPath" : "TSTheme" }, { "cases" : [ @@ -3350,7 +3356,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utils" + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" }, { "cases" : [ @@ -3364,7 +3371,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking" + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" }, { "cases" : [ @@ -3381,7 +3389,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking.API" + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" }, { "cases" : [ @@ -3422,7 +3431,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Networking.API.Method" + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" }, { "cases" : [ @@ -3436,7 +3446,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration" + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" }, { "cases" : [ @@ -3481,7 +3492,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration.LogLevel" + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" }, { "cases" : [ @@ -3519,7 +3531,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Configuration.Port" + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" }, { "cases" : [ @@ -3537,7 +3550,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Internal" + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" }, { "cases" : [ @@ -3567,7 +3581,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Internal.SupportedMethod" + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" }, { "cases" : [ @@ -3646,7 +3661,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIResult" + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" }, { "cases" : [ @@ -3842,7 +3858,8 @@ "staticProperties" : [ ], - "swiftCallName" : "ComplexResult" + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" }, { "cases" : [ @@ -3856,7 +3873,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utilities" + "swiftCallName" : "Utilities", + "tsFullPath" : "Utilities" }, { "cases" : [ @@ -3929,7 +3947,8 @@ "staticProperties" : [ ], - "swiftCallName" : "Utilities.Result" + "swiftCallName" : "Utilities.Result", + "tsFullPath" : "Utilities.Result" }, { "cases" : [ @@ -3943,7 +3962,8 @@ "staticProperties" : [ ], - "swiftCallName" : "API" + "swiftCallName" : "API", + "tsFullPath" : "API" }, { "cases" : [ @@ -3990,7 +4010,8 @@ "staticProperties" : [ ], - "swiftCallName" : "API.NetworkingResult" + "swiftCallName" : "API.NetworkingResult", + "tsFullPath" : "API.NetworkingResult" }, { "cases" : [ @@ -4084,7 +4105,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIOptionalResult" + "swiftCallName" : "APIOptionalResult", + "tsFullPath" : "APIOptionalResult" }, { "cases" : [ @@ -4138,7 +4160,8 @@ "staticProperties" : [ ], - "swiftCallName" : "StaticCalculator" + "swiftCallName" : "StaticCalculator", + "tsFullPath" : "StaticCalculator" }, { "cases" : [ @@ -4152,7 +4175,8 @@ "staticProperties" : [ ], - "swiftCallName" : "StaticUtils" + "swiftCallName" : "StaticUtils", + "tsFullPath" : "StaticUtils" }, { "cases" : [ @@ -4202,7 +4226,8 @@ "staticProperties" : [ ], - "swiftCallName" : "StaticUtils.Nested" + "swiftCallName" : "StaticUtils.Nested", + "tsFullPath" : "StaticUtils.Nested" }, { "cases" : [ @@ -4316,7 +4341,8 @@ } } ], - "swiftCallName" : "StaticPropertyEnum" + "swiftCallName" : "StaticPropertyEnum", + "tsFullPath" : "StaticPropertyEnum" }, { "cases" : [ @@ -4365,7 +4391,8 @@ } } ], - "swiftCallName" : "StaticPropertyNamespace" + "swiftCallName" : "StaticPropertyNamespace", + "tsFullPath" : "StaticPropertyNamespace" }, { "cases" : [ @@ -4438,7 +4465,8 @@ } } ], - "swiftCallName" : "StaticPropertyNamespace.NestedProperties" + "swiftCallName" : "StaticPropertyNamespace.NestedProperties", + "tsFullPath" : "StaticPropertyNamespace.NestedProperties" } ], "functions" : [ From afe86fcc9f77e68a44c30eb48f7bc750758aac46 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 21 Nov 2025 12:16:45 +0200 Subject: [PATCH 039/252] BridgeJS: Global namespace configuration and tests --- .../JavaScript/BridgeJS.ExportSwift.json | 7 +- .../JavaScript/BridgeJS.ExportSwift.json | 1 + .../Sources/PlayBridgeJS/main.swift | 5 +- Makefile | 10 + .../BridgeJSBuildPlugin.swift | 2 + .../BridgeJSCommandPlugin.swift | 2 + .../Sources/BridgeJSCore/BridgeJSConfig.swift | 28 +- .../Sources/BridgeJSCore/ExportSwift.swift | 10 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 29 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 10 +- .../Sources/BridgeJSTool/BridgeJSTool.swift | 12 +- .../BridgeJSToolTests/BridgeJSLinkTests.swift | 51 +-- .../BridgeJSToolTests/ExportSwiftTests.swift | 17 +- .../EnumAssociatedValue.Export.d.ts | 41 +- .../EnumAssociatedValue.Export.js | 14 - .../EnumNamespace.Export.d.ts | 73 ++-- .../BridgeJSLinkTests/EnumNamespace.Export.js | 40 -- ....d.ts => EnumNamespace.Global.Export.d.ts} | 73 ++-- ...port.js => EnumNamespace.Global.Export.js} | 40 ++ .../BridgeJSLinkTests/Namespaces.Export.d.ts | 29 -- .../BridgeJSLinkTests/Namespaces.Export.js | 22 - ...ort.d.ts => Namespaces.Global.Export.d.ts} | 29 ++ ....Export.js => Namespaces.Global.Export.js} | 22 + .../StaticFunctions.Export.d.ts | 10 - .../StaticFunctions.Export.js | 7 - ....ts => StaticFunctions.Global.Export.d.ts} | 10 + ...rt.js => StaticFunctions.Global.Export.js} | 7 + .../StaticProperties.Export.d.ts | 14 - .../StaticProperties.Export.js | 24 - ...ts => StaticProperties.Global.Export.d.ts} | 14 + ...t.js => StaticProperties.Global.Export.js} | 24 + .../__Snapshots__/ExportSwiftTests/Async.json | 1 + .../ExportSwiftTests/DefaultParameters.json | 1 + .../ExportSwiftTests/EnumAssociatedValue.json | 1 + .../ExportSwiftTests/EnumCase.json | 1 + .../EnumNamespace.Global.json | 413 ++++++++++++++++++ .../EnumNamespace.Global.swift | 215 +++++++++ .../ExportSwiftTests/EnumNamespace.json | 1 + .../ExportSwiftTests/EnumRawType.json | 1 + .../ExportSwiftTests/Namespaces.Global.json | 180 ++++++++ .../ExportSwiftTests/Namespaces.Global.swift | 144 ++++++ .../ExportSwiftTests/Namespaces.json | 1 + .../ExportSwiftTests/Optionals.json | 1 + .../ExportSwiftTests/PrimitiveParameters.json | 1 + .../ExportSwiftTests/PrimitiveReturn.json | 1 + .../ExportSwiftTests/PropertyTypes.json | 1 + .../ExportSwiftTests/Protocol.json | 1 + .../StaticFunctions.Global.json | 334 ++++++++++++++ .../StaticFunctions.Global.swift | 192 ++++++++ .../ExportSwiftTests/StaticFunctions.json | 1 + .../StaticProperties.Global.json | 337 ++++++++++++++ .../StaticProperties.Global.swift | 338 ++++++++++++++ .../ExportSwiftTests/StaticProperties.json | 1 + .../ExportSwiftTests/StringParameter.json | 1 + .../ExportSwiftTests/StringReturn.json | 1 + .../ExportSwiftTests/SwiftClass.json | 1 + .../ExportSwiftTests/SwiftClosure.json | 1 + .../ExportSwiftTests/Throws.json | 1 + .../VoidParameterVoidReturn.json | 1 + Plugins/PackageToJS/Sources/PackageToJS.swift | 3 +- .../BridgeJS/BridgeJS-Configuration.md | 38 +- .../Exporting-Swift/Using-Namespace.md | 10 +- .../JavaScript/BridgeJS.ExportSwift.json | 1 + .../bridge-js.config.exposeToGlobal.json | 3 + .../bridge-js.config.json | 4 +- Tests/prelude.exposeToGlobal.mjs | 248 +++++++++++ Tests/prelude.mjs | 121 ++--- 67 files changed, 2863 insertions(+), 415 deletions(-) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace_NoGlobal.Export.d.ts => EnumNamespace.Global.Export.d.ts} (57%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace_NoGlobal.Export.js => EnumNamespace.Global.Export.js} (87%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces_NoGlobal.Export.d.ts => Namespaces.Global.Export.d.ts} (70%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces_NoGlobal.Export.js => Namespaces.Global.Export.js} (91%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions_NoGlobal.Export.d.ts => StaticFunctions.Global.Export.d.ts} (92%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions_NoGlobal.Export.js => StaticFunctions.Global.Export.js} (97%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties_NoGlobal.Export.d.ts => StaticProperties.Global.Export.d.ts} (85%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties_NoGlobal.Export.js => StaticProperties.Global.Export.js} (92%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift create mode 100644 Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json create mode 100644 Tests/prelude.exposeToGlobal.mjs diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json index cfec1d468..9094df267 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -502,7 +502,8 @@ "staticProperties" : [ ], - "swiftCallName" : "APIResult" + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" }, { "cases" : [ @@ -698,9 +699,11 @@ "staticProperties" : [ ], - "swiftCallName" : "ComplexResult" + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_run", diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json index 3e00433ef..f48970689 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -135,6 +135,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index 2be8626e1..52cb0cc27 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -17,7 +17,7 @@ import class Foundation.JSONDecoder } func _update(swiftSource: String, dtsSource: String) throws -> PlayBridgeJSOutput { - let exportSwift = ExportSwift(progress: .silent, moduleName: "Playground") + let exportSwift = ExportSwift(progress: .silent, moduleName: "Playground", exposeToGlobal: false) let sourceFile = Parser.parse(source: swiftSource) try exportSwift.addSourceFile(sourceFile, "Playground.swift") let exportResult = try exportSwift.finalize() @@ -40,8 +40,7 @@ import class Foundation.JSONDecoder children: [importSkeleton] ) ], - sharedMemory: false, - exposeToGlobal: true + sharedMemory: false ) let linked = try linker.link() diff --git a/Makefile b/Makefile index c46431dd1..453b0b648 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,16 @@ unittest: --disable-sandbox \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc +.PHONY: unittest-with-global +unittest-with-global: + cp Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json Tests/BridgeJSRuntimeTests/bridge-js.config.local.json + swift package --allow-writing-to-directory Tests/BridgeJSRuntimeTests \ + bridge-js --package-path Tests/BridgeJSRuntimeTests + rm -f Tests/BridgeJSRuntimeTests/bridge-js.config.local.json + env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ + --disable-sandbox \ + js test --prelude ./Tests/prelude.exposeToGlobal.mjs -Xnode --expose-gc + .PHONY: regenerate_swiftpm_resources regenerate_swiftpm_resources: npm run build diff --git a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift index 9ea095205..47487bfc2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift @@ -44,6 +44,8 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { "export", "--module-name", target.name, + "--target-dir", + target.directoryURL.path, "--output-skeleton", outputSkeletonPath.path, "--output-swift", diff --git a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift index a4a2fcf1e..26a0d0ef9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift @@ -107,6 +107,8 @@ extension BridgeJSCommandPlugin.Context { "export", "--module-name", target.name, + "--target-dir", + target.directoryURL.path, "--output-skeleton", generatedJavaScriptDirectory.appending(path: "BridgeJS.ExportSwift.json").path, "--output-swift", diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift index cf6f881e6..56646b59c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift @@ -10,6 +10,31 @@ public struct BridgeJSConfig: Codable { /// If not present, the tool will be searched for in the system PATH. public var tools: [String: String]? + /// Whether to expose exported Swift APIs to the global namespace. + /// + /// When `true`, exported functions, classes, and namespaces are available + /// via `globalThis` in JavaScript. When `false`, they are only available + /// through the exports object returned by `createExports()`. + /// + /// Default: `false` + public var exposeToGlobal: Bool + + public init(tools: [String: String]? = nil, exposeToGlobal: Bool = false) { + self.tools = tools + self.exposeToGlobal = exposeToGlobal + } + + enum CodingKeys: String, CodingKey { + case tools + case exposeToGlobal + } + + public init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + tools = try container.decodeIfPresent([String: String].self, forKey: .tools) + exposeToGlobal = try container.decodeIfPresent(Bool.self, forKey: .exposeToGlobal) ?? false + } + /// Load the configuration file from the SwiftPM package target directory. /// /// Files are loaded **in this order** and merged (later files override earlier ones): @@ -49,7 +74,8 @@ public struct BridgeJSConfig: Codable { /// Merge the current configuration with the overrides. func merging(overrides: BridgeJSConfig) -> BridgeJSConfig { return BridgeJSConfig( - tools: (tools ?? [:]).merging(overrides.tools ?? [:], uniquingKeysWith: { $1 }) + tools: (tools ?? [:]).merging(overrides.tools ?? [:], uniquingKeysWith: { $1 }), + exposeToGlobal: overrides.exposeToGlobal ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 4859ba6d9..d4ea770a3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -20,7 +20,7 @@ import BridgeJSUtilities public class ExportSwift { let progress: ProgressReporting let moduleName: String - + private let exposeToGlobal: Bool private var exportedFunctions: [ExportedFunction] = [] private var exportedClasses: [ExportedClass] = [] private var exportedEnums: [ExportedEnum] = [] @@ -30,9 +30,10 @@ public class ExportSwift { private let enumCodegen: EnumCodegen = EnumCodegen() private let closureCodegen = ClosureCodegen() - public init(progress: ProgressReporting, moduleName: String) { + public init(progress: ProgressReporting, moduleName: String, exposeToGlobal: Bool) { self.progress = progress self.moduleName = moduleName + self.exposeToGlobal = exposeToGlobal } /// Processes a Swift source file to find declarations marked with @JS @@ -55,6 +56,8 @@ public class ExportSwift { /// Finalizes the export process and generates the bridge code /// + /// - Parameters: + /// - exposeToGlobal: Whether to expose exported APIs to the global namespace (default: false) /// - Returns: A tuple containing the generated Swift code and a skeleton /// describing the exported APIs public func finalize() throws -> (outputSwift: String, outputSkeleton: ExportedSkeleton)? { @@ -68,7 +71,8 @@ public class ExportSwift { functions: exportedFunctions, classes: exportedClasses, enums: exportedEnums, - protocols: exportedProtocols + protocols: exportedProtocols, + exposeToGlobal: exposeToGlobal ) ) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 98b572029..23884608a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -12,24 +12,26 @@ struct BridgeJSLink { var exportedSkeletons: [ExportedSkeleton] = [] var importedSkeletons: [ImportedModuleSkeleton] = [] let sharedMemory: Bool - let exposeToGlobal: Bool + var exposeToGlobal: Bool private let namespaceBuilder = NamespaceBuilder() init( exportedSkeletons: [ExportedSkeleton] = [], importedSkeletons: [ImportedModuleSkeleton] = [], - sharedMemory: Bool, - exposeToGlobal: Bool = true + sharedMemory: Bool ) { self.exportedSkeletons = exportedSkeletons self.importedSkeletons = importedSkeletons self.sharedMemory = sharedMemory - self.exposeToGlobal = exposeToGlobal + self.exposeToGlobal = exportedSkeletons.contains { $0.exposeToGlobal } } mutating func addExportedSkeletonFile(data: Data) throws { let skeleton = try JSONDecoder().decode(ExportedSkeleton.self, from: data) exportedSkeletons.append(skeleton) + if skeleton.exposeToGlobal { + exposeToGlobal = true + } } mutating func addImportedSkeletonFile(data: Data) throws { @@ -80,7 +82,7 @@ struct BridgeJSLink { var enumStaticAssignments: [String] = [] } - private func collectLinkData(exposeToGlobal: Bool) throws -> LinkData { + private func collectLinkData() throws -> LinkData { var data = LinkData() // Swift heap object class definitions @@ -1079,11 +1081,11 @@ struct BridgeJSLink { ) printer.write(lines: namespaceInitCode) - let propertyAssignments = try generateNamespacePropertyAssignments( - data: data, - exportedSkeletons: exportedSkeletons, - namespaceBuilder: namespaceBuilder, - exposeToGlobal: exposeToGlobal + let propertyAssignments = try generateNamespacePropertyAssignments( + data: data, + exportedSkeletons: exportedSkeletons, + namespaceBuilder: namespaceBuilder, + exposeToGlobal: exposeToGlobal ) printer.write(lines: propertyAssignments) } @@ -1097,7 +1099,7 @@ struct BridgeJSLink { } func link() throws -> (outputJs: String, outputDts: String) { - let data = try collectLinkData(exposeToGlobal: exposeToGlobal) + let data = try collectLinkData() let outputJs = try generateJavaScript(data: data) let outputDts = generateTypeScript(data: data) return (outputJs, outputDts) @@ -1160,7 +1162,6 @@ struct BridgeJSLink { ) throws -> [String] { let printer = CodeFragmentPrinter() - // Only write globalThis property assignments when exposeToGlobal is true if exposeToGlobal { printer.write(lines: data.enumStaticAssignments) } @@ -1171,7 +1172,6 @@ struct BridgeJSLink { let hierarchicalLines = try namespaceBuilder.buildHierarchicalExportsObject( exportedSkeletons: exportedSkeletons, - exposeToGlobal: exposeToGlobal, renderFunctionImpl: { function in let (js, _) = try self.renderExportedFunction(function: function) return js @@ -2478,7 +2478,6 @@ extension BridgeJSLink { fileprivate func buildHierarchicalExportsObject( exportedSkeletons: [ExportedSkeleton], - exposeToGlobal: Bool, renderFunctionImpl: (ExportedFunction) throws -> [String] ) throws -> [String] { let printer = CodeFragmentPrinter() @@ -2698,7 +2697,7 @@ extension BridgeJSLink { guard hasContent(node: childNode) else { continue } - + let exportKeyword = exposeToGlobal ? "" : "export " printer.write("\(exportKeyword)namespace \(childName) {") printer.indent() diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index a862f3c3b..12970b505 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -499,19 +499,27 @@ public struct ExportedSkeleton: Codable { public let classes: [ExportedClass] public let enums: [ExportedEnum] public let protocols: [ExportedProtocol] + /// Whether to expose exported APIs to the global namespace. + /// + /// When `true`, exported functions, classes, and namespaces are available + /// via `globalThis` in JavaScript. When `false`, they are only available + /// through the exports object. + public var exposeToGlobal: Bool public init( moduleName: String, functions: [ExportedFunction], classes: [ExportedClass], enums: [ExportedEnum], - protocols: [ExportedProtocol] = [] + protocols: [ExportedProtocol] = [], + exposeToGlobal: Bool ) { self.moduleName = moduleName self.functions = functions self.classes = classes self.enums = enums self.protocols = protocols + self.exposeToGlobal = exposeToGlobal } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index dba6fe47c..d5a58aba9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -162,6 +162,10 @@ import TS2Skeleton help: "The name of the module for external function references", required: true ), + "target-dir": OptionRule( + help: "The SwiftPM package target directory", + required: true + ), "output-skeleton": OptionRule( help: "The output file path for the skeleton of the exported Swift APIs", required: true @@ -181,7 +185,13 @@ import TS2Skeleton arguments: Array(arguments.dropFirst()) ) let progress = ProgressReporting(verbose: doubleDashOptions["verbose"] == "true") - let exporter = ExportSwift(progress: progress, moduleName: doubleDashOptions["module-name"]!) + let targetDirectory = URL(fileURLWithPath: doubleDashOptions["target-dir"]!) + let config = try BridgeJSConfig.load(targetDirectory: targetDirectory) + let exporter = ExportSwift( + progress: progress, + moduleName: doubleDashOptions["module-name"]!, + exposeToGlobal: config.exposeToGlobal + ) for inputFile in positionalArguments.sorted() { let sourceURL = URL(fileURLWithPath: inputFile) guard sourceURL.pathExtension == "swift" else { continue } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index b837451db..989d05e2f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -47,16 +47,12 @@ import Testing func snapshotExport(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule") + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) try swiftAPI.addSourceFile(sourceFile, input) let name = url.deletingPathExtension().lastPathComponent let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(outputSkeleton) - var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: true) - try bridgeJSLink.addExportedSkeletonFile(data: outputSkeletonData) + let bridgeJSLink: BridgeJSLink = BridgeJSLink(exportedSkeletons: [outputSkeleton], sharedMemory: false) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Export") } @@ -74,7 +70,7 @@ import Testing encoder.outputFormatting = [.prettyPrinted, .sortedKeys] let outputSkeletonData = try encoder.encode(importTS.skeleton) - var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: true) + var bridgeJSLink = BridgeJSLink(sharedMemory: false) try bridgeJSLink.addImportedSkeletonFile(data: outputSkeletonData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") } @@ -83,45 +79,16 @@ import Testing "Namespaces.swift", "StaticFunctions.swift", "StaticProperties.swift", - "EnumNamespace.swift" + "EnumNamespace.swift", ]) - func testWithoutGlobal(inputFile: String) throws { + func snapshotExportWithGlobal(inputFile: String) throws { let url = Self.inputsDirectory.appendingPathComponent(inputFile) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule") + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) try swiftAPI.addSourceFile(sourceFile, inputFile) - + let name = url.deletingPathExtension().lastPathComponent let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(outputSkeleton) - - var bridgeJSLink = BridgeJSLink(sharedMemory: false, exposeToGlobal: false) - try bridgeJSLink.addExportedSkeletonFile(data: outputSkeletonData) - - let (outputJs, outputDts) = try bridgeJSLink.link() - - // Verify no global declarations - #expect(!outputDts.contains("declare global")) - #expect(!outputJs.contains("globalThis.")) - - // Save snapshots - let name = url.deletingPathExtension().lastPathComponent + "_NoGlobal.Export" - try assertSnapshot( - name: name, - filePath: #filePath, - function: #function, - sourceLocation: #_sourceLocation, - input: outputJs.data(using: .utf8)!, - fileExtension: "js" - ) - try assertSnapshot( - name: name, - filePath: #filePath, - function: #function, - sourceLocation: #_sourceLocation, - input: outputDts.data(using: .utf8)!, - fileExtension: "d.ts" - ) + let bridgeJSLink: BridgeJSLink = BridgeJSLink(exportedSkeletons: [outputSkeleton], sharedMemory: false) + try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global.Export") } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift index e184116fe..32c3aae73 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift @@ -47,11 +47,26 @@ import Testing @Test(arguments: collectInputs()) func snapshot(input: String) throws { - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule") + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) let url = Self.inputsDirectory.appendingPathComponent(input) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) try swiftAPI.addSourceFile(sourceFile, input) let name = url.deletingPathExtension().lastPathComponent try snapshot(swiftAPI: swiftAPI, name: name) } + + @Test(arguments: [ + "Namespaces.swift", + "StaticFunctions.swift", + "StaticProperties.swift", + "EnumNamespace.swift", + ]) + func snapshotWithGlobal(input: String) throws { + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) + let url = Self.inputsDirectory.appendingPathComponent(input) + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + try swiftAPI.addSourceFile(sourceFile, input) + let name = url.deletingPathExtension().lastPathComponent + try snapshot(swiftAPI: swiftAPI, name: name + ".Global") + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts index 5523b89ec..9df9bbea3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts @@ -53,32 +53,27 @@ export type NetworkingResultObject = typeof API.NetworkingResultValues; export type APIOptionalResultObject = typeof APIOptionalResultValues; -export {}; - -declare global { - namespace API { - const NetworkingResultValues: { - readonly Tag: { - readonly Success: 0; - readonly Failure: 1; - }; +export namespace API { + const NetworkingResultValues: { + readonly Tag: { + readonly Success: 0; + readonly Failure: 1; }; - type NetworkingResultTag = - { tag: typeof NetworkingResultValues.Tag.Success; param0: string } | { tag: typeof NetworkingResultValues.Tag.Failure; param0: string; param1: number } - } - namespace Utilities { - const ResultValues: { - readonly Tag: { - readonly Success: 0; - readonly Failure: 1; - readonly Status: 2; - }; + }; + type NetworkingResultTag = + { tag: typeof NetworkingResultValues.Tag.Success; param0: string } | { tag: typeof NetworkingResultValues.Tag.Failure; param0: string; param1: number } +} +export namespace Utilities { + const ResultValues: { + readonly Tag: { + readonly Success: 0; + readonly Failure: 1; + readonly Status: 2; }; - type ResultTag = - { tag: typeof ResultValues.Tag.Success; param0: string } | { tag: typeof ResultValues.Tag.Failure; param0: string; param1: number } | { tag: typeof ResultValues.Tag.Status; param0: boolean; param1: number; param2: string } - } + }; + type ResultTag = + { tag: typeof ResultValues.Tag.Success; param0: string } | { tag: typeof ResultValues.Tag.Failure; param0: string; param1: number } | { tag: typeof ResultValues.Tag.Status; param0: boolean; param1: number; param2: string } } - export type Exports = { handle(result: APIResultTag): void; getResult(): APIResultTag; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index 14c150e51..c332a403e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -479,14 +479,6 @@ const __bjs_createAPIOptionalResultValuesHelpers = () => { } }); }; -if (typeof globalThis.API === 'undefined') { - globalThis.API = {}; -} -if (typeof globalThis.Utilities === 'undefined') { - globalThis.Utilities = {}; -} -globalThis.Utilities.ResultValues = ResultValues; -globalThis.API.NetworkingResultValues = NetworkingResultValues; export async function createInstantiator(options, swift) { let instance; let memory; @@ -692,12 +684,6 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - if (typeof globalThis.API === 'undefined') { - globalThis.API = {}; - } - if (typeof globalThis.Utilities === 'undefined') { - globalThis.Utilities = {}; - } const exports = { handle: function bjs_handle(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts index 4261ca3bb..b8b92d14e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts @@ -12,60 +12,41 @@ export type PortObject = typeof Configuration.PortValues; export type SupportedMethodObject = typeof Networking.APIV2.Internal.SupportedMethodValues; -export {}; - -declare global { - namespace Configuration { - const LogLevelValues: { - readonly Debug: "debug"; - readonly Info: "info"; - readonly Warning: "warning"; - readonly Error: "error"; - }; - type LogLevelTag = typeof LogLevelValues[keyof typeof LogLevelValues]; - const PortValues: { - readonly Http: 80; - readonly Https: 443; - readonly Development: 3000; +export namespace Configuration { + const LogLevelValues: { + readonly Debug: "debug"; + readonly Info: "info"; + readonly Warning: "warning"; + readonly Error: "error"; + }; + type LogLevelTag = typeof LogLevelValues[keyof typeof LogLevelValues]; + const PortValues: { + readonly Http: 80; + readonly Https: 443; + readonly Development: 3000; + }; + type PortTag = typeof PortValues[keyof typeof PortValues]; +} +export namespace Networking { + export namespace API { + const MethodValues: { + readonly Get: 0; + readonly Post: 1; + readonly Put: 2; + readonly Delete: 3; }; - type PortTag = typeof PortValues[keyof typeof PortValues]; + type MethodTag = typeof MethodValues[keyof typeof MethodValues]; } - namespace Networking { - namespace API { - class HTTPServer { - constructor(); - call(method: Networking.API.MethodTag): void; - } - const MethodValues: { + export namespace APIV2 { + export namespace Internal { + const SupportedMethodValues: { readonly Get: 0; readonly Post: 1; - readonly Put: 2; - readonly Delete: 3; }; - type MethodTag = typeof MethodValues[keyof typeof MethodValues]; - } - namespace APIV2 { - namespace Internal { - class TestServer { - constructor(); - call(method: Networking.APIV2.Internal.SupportedMethodTag): void; - } - const SupportedMethodValues: { - readonly Get: 0; - readonly Post: 1; - }; - type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues]; - } - } - } - namespace Utils { - class Converter { - constructor(); - toString(value: number): string; + type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues]; } } } - /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index a38b50933..9fed226d9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -29,25 +29,6 @@ export const SupportedMethodValues = { Post: 1, }; -if (typeof globalThis.Configuration === 'undefined') { - globalThis.Configuration = {}; -} -if (typeof globalThis.Networking === 'undefined') { - globalThis.Networking = {}; -} -if (typeof globalThis.Networking.API === 'undefined') { - globalThis.Networking.API = {}; -} -if (typeof globalThis.Networking.APIV2 === 'undefined') { - globalThis.Networking.APIV2 = {}; -} -if (typeof globalThis.Networking.APIV2.Internal === 'undefined') { - globalThis.Networking.APIV2.Internal = {}; -} -globalThis.Networking.API.MethodValues = MethodValues; -globalThis.Configuration.LogLevelValues = LogLevelValues; -globalThis.Configuration.PortValues = PortValues; -globalThis.Networking.APIV2.Internal.SupportedMethodValues = SupportedMethodValues; export async function createInstantiator(options, swift) { let instance; let memory; @@ -314,24 +295,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_TestServer_call(this.pointer, method); } } - if (typeof globalThis.Configuration === 'undefined') { - globalThis.Configuration = {}; - } - if (typeof globalThis.Networking === 'undefined') { - globalThis.Networking = {}; - } - if (typeof globalThis.Networking.API === 'undefined') { - globalThis.Networking.API = {}; - } - if (typeof globalThis.Networking.APIV2 === 'undefined') { - globalThis.Networking.APIV2 = {}; - } - if (typeof globalThis.Networking.APIV2.Internal === 'undefined') { - globalThis.Networking.APIV2.Internal = {}; - } - if (typeof globalThis.Utils === 'undefined') { - globalThis.Utils = {}; - } const exports = { Configuration: { LogLevel: LogLevelValues, @@ -354,9 +317,6 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; - globalThis.Utils.Converter = exports.Utils.Converter; - globalThis.Networking.API.HTTPServer = exports.Networking.API.HTTPServer; - globalThis.Networking.APIV2.Internal.TestServer = exports.Networking.APIV2.Internal.TestServer; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts similarity index 57% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts index b8b92d14e..4261ca3bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts @@ -12,41 +12,60 @@ export type PortObject = typeof Configuration.PortValues; export type SupportedMethodObject = typeof Networking.APIV2.Internal.SupportedMethodValues; -export namespace Configuration { - const LogLevelValues: { - readonly Debug: "debug"; - readonly Info: "info"; - readonly Warning: "warning"; - readonly Error: "error"; - }; - type LogLevelTag = typeof LogLevelValues[keyof typeof LogLevelValues]; - const PortValues: { - readonly Http: 80; - readonly Https: 443; - readonly Development: 3000; - }; - type PortTag = typeof PortValues[keyof typeof PortValues]; -} -export namespace Networking { - export namespace API { - const MethodValues: { - readonly Get: 0; - readonly Post: 1; - readonly Put: 2; - readonly Delete: 3; +export {}; + +declare global { + namespace Configuration { + const LogLevelValues: { + readonly Debug: "debug"; + readonly Info: "info"; + readonly Warning: "warning"; + readonly Error: "error"; + }; + type LogLevelTag = typeof LogLevelValues[keyof typeof LogLevelValues]; + const PortValues: { + readonly Http: 80; + readonly Https: 443; + readonly Development: 3000; }; - type MethodTag = typeof MethodValues[keyof typeof MethodValues]; + type PortTag = typeof PortValues[keyof typeof PortValues]; } - export namespace APIV2 { - export namespace Internal { - const SupportedMethodValues: { + namespace Networking { + namespace API { + class HTTPServer { + constructor(); + call(method: Networking.API.MethodTag): void; + } + const MethodValues: { readonly Get: 0; readonly Post: 1; + readonly Put: 2; + readonly Delete: 3; }; - type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues]; + type MethodTag = typeof MethodValues[keyof typeof MethodValues]; + } + namespace APIV2 { + namespace Internal { + class TestServer { + constructor(); + call(method: Networking.APIV2.Internal.SupportedMethodTag): void; + } + const SupportedMethodValues: { + readonly Get: 0; + readonly Post: 1; + }; + type SupportedMethodTag = typeof SupportedMethodValues[keyof typeof SupportedMethodValues]; + } + } + } + namespace Utils { + class Converter { + constructor(); + toString(value: number): string; } } } + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js similarity index 87% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 9fed226d9..a38b50933 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace_NoGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -29,6 +29,25 @@ export const SupportedMethodValues = { Post: 1, }; +if (typeof globalThis.Configuration === 'undefined') { + globalThis.Configuration = {}; +} +if (typeof globalThis.Networking === 'undefined') { + globalThis.Networking = {}; +} +if (typeof globalThis.Networking.API === 'undefined') { + globalThis.Networking.API = {}; +} +if (typeof globalThis.Networking.APIV2 === 'undefined') { + globalThis.Networking.APIV2 = {}; +} +if (typeof globalThis.Networking.APIV2.Internal === 'undefined') { + globalThis.Networking.APIV2.Internal = {}; +} +globalThis.Networking.API.MethodValues = MethodValues; +globalThis.Configuration.LogLevelValues = LogLevelValues; +globalThis.Configuration.PortValues = PortValues; +globalThis.Networking.APIV2.Internal.SupportedMethodValues = SupportedMethodValues; export async function createInstantiator(options, swift) { let instance; let memory; @@ -295,6 +314,24 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_TestServer_call(this.pointer, method); } } + if (typeof globalThis.Configuration === 'undefined') { + globalThis.Configuration = {}; + } + if (typeof globalThis.Networking === 'undefined') { + globalThis.Networking = {}; + } + if (typeof globalThis.Networking.API === 'undefined') { + globalThis.Networking.API = {}; + } + if (typeof globalThis.Networking.APIV2 === 'undefined') { + globalThis.Networking.APIV2 = {}; + } + if (typeof globalThis.Networking.APIV2.Internal === 'undefined') { + globalThis.Networking.APIV2.Internal = {}; + } + if (typeof globalThis.Utils === 'undefined') { + globalThis.Utils = {}; + } const exports = { Configuration: { LogLevel: LogLevelValues, @@ -317,6 +354,9 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; + globalThis.Utils.Converter = exports.Utils.Converter; + globalThis.Networking.API.HTTPServer = exports.Networking.API.HTTPServer; + globalThis.Networking.APIV2.Internal.TestServer = exports.Networking.APIV2.Internal.TestServer; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts index cdf83f36d..67a89533a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts @@ -4,35 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -export {}; - -declare global { - namespace MyModule { - namespace Utils { - namespacedFunction(): string; - } - } - namespace Utils { - namespace Converters { - class Converter { - constructor(); - toString(value: number): string; - } - } - } - namespace __Swift { - namespace Foundation { - class Greeter { - constructor(name: string); - greet(): string; - } - class UUID { - uuidString(): string; - } - } - } -} - /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 67670d204..08601bd50 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -275,24 +275,6 @@ export async function createInstantiator(options, swift) { return ret; } } - if (typeof globalThis.MyModule === 'undefined') { - globalThis.MyModule = {}; - } - if (typeof globalThis.MyModule.Utils === 'undefined') { - globalThis.MyModule.Utils = {}; - } - if (typeof globalThis.Utils === 'undefined') { - globalThis.Utils = {}; - } - if (typeof globalThis.Utils.Converters === 'undefined') { - globalThis.Utils.Converters = {}; - } - if (typeof globalThis.__Swift === 'undefined') { - globalThis.__Swift = {}; - } - if (typeof globalThis.__Swift.Foundation === 'undefined') { - globalThis.__Swift.Foundation = {}; - } const exports = { plainFunction: function bjs_plainFunction() { instance.exports.bjs_plainFunction(); @@ -323,10 +305,6 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; - globalThis.__Swift.Foundation.Greeter = exports.__Swift.Foundation.Greeter; - globalThis.Utils.Converters.Converter = exports.Utils.Converters.Converter; - globalThis.__Swift.Foundation.UUID = exports.__Swift.Foundation.UUID; - globalThis.MyModule.Utils.namespacedFunction = exports.MyModule.Utils.namespacedFunction; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.d.ts similarity index 70% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.d.ts index 67a89533a..cdf83f36d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.d.ts @@ -4,6 +4,35 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export {}; + +declare global { + namespace MyModule { + namespace Utils { + namespacedFunction(): string; + } + } + namespace Utils { + namespace Converters { + class Converter { + constructor(); + toString(value: number): string; + } + } + } + namespace __Swift { + namespace Foundation { + class Greeter { + constructor(name: string); + greet(): string; + } + class UUID { + uuidString(): string; + } + } + } +} + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js similarity index 91% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 08601bd50..67670d204 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces_NoGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -275,6 +275,24 @@ export async function createInstantiator(options, swift) { return ret; } } + if (typeof globalThis.MyModule === 'undefined') { + globalThis.MyModule = {}; + } + if (typeof globalThis.MyModule.Utils === 'undefined') { + globalThis.MyModule.Utils = {}; + } + if (typeof globalThis.Utils === 'undefined') { + globalThis.Utils = {}; + } + if (typeof globalThis.Utils.Converters === 'undefined') { + globalThis.Utils.Converters = {}; + } + if (typeof globalThis.__Swift === 'undefined') { + globalThis.__Swift = {}; + } + if (typeof globalThis.__Swift.Foundation === 'undefined') { + globalThis.__Swift.Foundation = {}; + } const exports = { plainFunction: function bjs_plainFunction() { instance.exports.bjs_plainFunction(); @@ -305,6 +323,10 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; + globalThis.__Swift.Foundation.Greeter = exports.__Swift.Foundation.Greeter; + globalThis.Utils.Converters.Converter = exports.Utils.Converters.Converter; + globalThis.__Swift.Foundation.UUID = exports.__Swift.Foundation.UUID; + globalThis.MyModule.Utils.namespacedFunction = exports.MyModule.Utils.namespacedFunction; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts index 069c1628c..e938ddb9a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts @@ -28,16 +28,6 @@ export type APIResultObject = typeof APIResultValues & { roundtrip(value: APIResultTag): APIResultTag; }; -export {}; - -declare global { - namespace Utils { - namespace String { - uppercase(text: string): string; - } - } -} - /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 3e445992e..8522168f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -297,12 +297,6 @@ export async function createInstantiator(options, swift) { return ret; } } - if (typeof globalThis.Utils === 'undefined') { - globalThis.Utils = {}; - } - if (typeof globalThis.Utils.String === 'undefined') { - globalThis.Utils.String = {}; - } const exports = { MathUtils, Calculator: { @@ -337,7 +331,6 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; - globalThis.Utils.String.uppercase = exports.Utils.String.uppercase; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.d.ts similarity index 92% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.d.ts index e938ddb9a..069c1628c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.d.ts @@ -28,6 +28,16 @@ export type APIResultObject = typeof APIResultValues & { roundtrip(value: APIResultTag): APIResultTag; }; +export {}; + +declare global { + namespace Utils { + namespace String { + uppercase(text: string): string; + } + } +} + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js similarity index 97% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 8522168f2..3e445992e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions_NoGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -297,6 +297,12 @@ export async function createInstantiator(options, swift) { return ret; } } + if (typeof globalThis.Utils === 'undefined') { + globalThis.Utils = {}; + } + if (typeof globalThis.Utils.String === 'undefined') { + globalThis.Utils.String = {}; + } const exports = { MathUtils, Calculator: { @@ -331,6 +337,7 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; + globalThis.Utils.String.uppercase = exports.Utils.String.uppercase; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts index fea3c4b59..4ce689edb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts @@ -16,20 +16,6 @@ export type PropertyEnumObject = typeof PropertyEnumValues & { computedEnum: string; }; -export {}; - -declare global { - namespace PropertyNamespace { - var namespaceConstant: string; - let namespaceProperty: string; - namespace Nested { - var nestedConstant: string; - let nestedDouble: number; - let nestedProperty: number; - } - } -} - /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 09a2b0de9..5d70c39b1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -303,12 +303,6 @@ export async function createInstantiator(options, swift) { } } } - if (typeof globalThis.PropertyNamespace === 'undefined') { - globalThis.PropertyNamespace = {}; - } - if (typeof globalThis.PropertyNamespace.Nested === 'undefined') { - globalThis.PropertyNamespace.Nested = {}; - } const exports = { PropertyClass, PropertyEnum: { @@ -386,24 +380,6 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; - Object.defineProperty(globalThis.PropertyNamespace, 'namespaceProperty', { - get: () => exports.PropertyNamespace.namespaceProperty, - set: (value) => { exports.PropertyNamespace.namespaceProperty = value; } - }); - Object.defineProperty(globalThis.PropertyNamespace, 'namespaceConstant', { - get: () => exports.PropertyNamespace.namespaceConstant, - }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedProperty', { - get: () => exports.PropertyNamespace.Nested.nestedProperty, - set: (value) => { exports.PropertyNamespace.Nested.nestedProperty = value; } - }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedConstant', { - get: () => exports.PropertyNamespace.Nested.nestedConstant, - }); - Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedDouble', { - get: () => exports.PropertyNamespace.Nested.nestedDouble, - set: (value) => { exports.PropertyNamespace.Nested.nestedDouble = value; } - }); return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.d.ts similarity index 85% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.d.ts index 4ce689edb..fea3c4b59 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.d.ts @@ -16,6 +16,20 @@ export type PropertyEnumObject = typeof PropertyEnumValues & { computedEnum: string; }; +export {}; + +declare global { + namespace PropertyNamespace { + var namespaceConstant: string; + let namespaceProperty: string; + namespace Nested { + var nestedConstant: string; + let nestedDouble: number; + let nestedProperty: number; + } + } +} + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js similarity index 92% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 5d70c39b1..09a2b0de9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties_NoGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -303,6 +303,12 @@ export async function createInstantiator(options, swift) { } } } + if (typeof globalThis.PropertyNamespace === 'undefined') { + globalThis.PropertyNamespace = {}; + } + if (typeof globalThis.PropertyNamespace.Nested === 'undefined') { + globalThis.PropertyNamespace.Nested = {}; + } const exports = { PropertyClass, PropertyEnum: { @@ -380,6 +386,24 @@ export async function createInstantiator(options, swift) { }, }; _exports = exports; + Object.defineProperty(globalThis.PropertyNamespace, 'namespaceProperty', { + get: () => exports.PropertyNamespace.namespaceProperty, + set: (value) => { exports.PropertyNamespace.namespaceProperty = value; } + }); + Object.defineProperty(globalThis.PropertyNamespace, 'namespaceConstant', { + get: () => exports.PropertyNamespace.namespaceConstant, + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedProperty', { + get: () => exports.PropertyNamespace.Nested.nestedProperty, + set: (value) => { exports.PropertyNamespace.Nested.nestedProperty = value; } + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedConstant', { + get: () => exports.PropertyNamespace.Nested.nestedConstant, + }); + Object.defineProperty(globalThis.PropertyNamespace.Nested, 'nestedDouble', { + get: () => exports.PropertyNamespace.Nested.nestedDouble, + set: (value) => { exports.PropertyNamespace.Nested.nestedDouble = value; } + }); return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json index 41696d635..2e295991b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_asyncReturnVoid", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index 98c09bef0..ccb4cb289 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -259,6 +259,7 @@ "tsFullPath" : "Status" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_testStringDefault", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index d2ab06d42..52279ce0d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -487,6 +487,7 @@ "tsFullPath" : "APIOptionalResult" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_handle", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json index 3e738dd2b..9effaaec7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json @@ -133,6 +133,7 @@ "tsFullPath" : "PublicStatus" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_setDirection", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json new file mode 100644 index 000000000..8aeb6c78c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json @@ -0,0 +1,413 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "Utils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils" + ], + "properties" : [ + + ], + "swiftCallName" : "Utils.Converter" + }, + { + "constructor" : { + "abiName" : "bjs_HTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_HTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "HTTPServer", + "namespace" : [ + "Networking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "Networking.API.HTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestServer", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestServer" + } + ], + "enums" : [ + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Networking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "Networking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "Method", + "namespace" : [ + "Networking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Configuration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "LogLevel", + "namespace" : [ + "Configuration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "Port", + "namespace" : [ + "Configuration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "Networking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedMethod", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift new file mode 100644 index 000000000..ca201f3d9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -0,0 +1,215 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +extension Networking.API.Method: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Networking.API.Method { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Networking.API.Method { + return Networking.API.Method(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .get + case 1: + self = .post + case 2: + self = .put + case 3: + self = .delete + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .get: + return 0 + case .post: + return 1 + case .put: + return 2 + case .delete: + return 3 + } + } +} + +extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload { +} + +extension Configuration.Port: _BridgedSwiftEnumNoPayload { +} + +extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedMethod { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedMethod { + return Internal.SupportedMethod(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .get + case 1: + self = .post + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .get: + return 0 + case .post: + return 1 + } + } +} + +@_expose(wasm, "bjs_Converter_init") +@_cdecl("bjs_Converter_init") +public func _bjs_Converter_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Utils.Converter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Converter_toString") +@_cdecl("bjs_Converter_toString") +public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Converter_deinit") +@_cdecl("bjs_Converter_deinit") +public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") + func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_HTTPServer_init") +@_cdecl("bjs_HTTPServer_init") +public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Networking.API.HTTPServer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_HTTPServer_call") +@_cdecl("bjs_HTTPServer_call") +public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { + #if arch(wasm32) + Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_HTTPServer_deinit") +@_cdecl("bjs_HTTPServer_deinit") +public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") + func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_TestServer_init") +@_cdecl("bjs_TestServer_init") +public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Internal.TestServer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestServer_call") +@_cdecl("bjs_TestServer_call") +public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { + #if arch(wasm32) + Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestServer_deinit") +@_cdecl("bjs_TestServer_deinit") +public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") + func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 1ba8279e4..94d1bb061 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -402,6 +402,7 @@ "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" } ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json index 30ec6a35d..4bf1644c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json @@ -457,6 +457,7 @@ "tsFullPath" : "Ratio" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_setTheme", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json new file mode 100644 index 000000000..bde86c44f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json @@ -0,0 +1,180 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Greeter", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "Greeter" + }, + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils", + "Converters" + ], + "properties" : [ + + ], + "swiftCallName" : "Converter" + }, + { + "methods" : [ + { + "abiName" : "bjs_UUID_uuidString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "uuidString", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "UUID", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "UUID" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : true, + "functions" : [ + { + "abiName" : "bjs_plainFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "plainFunction", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyModule_Utils_namespacedFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "namespacedFunction", + "namespace" : [ + "MyModule", + "Utils" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift new file mode 100644 index 000000000..f868fa111 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift @@ -0,0 +1,144 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_plainFunction") +@_cdecl("bjs_plainFunction") +public func _bjs_plainFunction() -> Void { + #if arch(wasm32) + let ret = plainFunction() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyModule_Utils_namespacedFunction") +@_cdecl("bjs_MyModule_Utils_namespacedFunction") +public func _bjs_MyModule_Utils_namespacedFunction() -> Void { + #if arch(wasm32) + let ret = namespacedFunction() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_init") +@_cdecl("bjs_Greeter_init") +public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_greet") +@_cdecl("bjs_Greeter_greet") +public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).greet() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_deinit") +@_cdecl("bjs_Greeter_deinit") +public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") + func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_Converter_init") +@_cdecl("bjs_Converter_init") +public func _bjs_Converter_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Converter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Converter_toString") +@_cdecl("bjs_Converter_toString") +public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Converter_deinit") +@_cdecl("bjs_Converter_deinit") +public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") + func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +@_expose(wasm, "bjs_UUID_uuidString") +@_cdecl("bjs_UUID_uuidString") +public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = UUID.bridgeJSLiftParameter(_self).uuidString() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_UUID_deinit") +@_cdecl("bjs_UUID_deinit") +public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") + func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json index dc6134526..910fcfc2c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json @@ -132,6 +132,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_plainFunction", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json index 104b11d5a..eb92b21d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json @@ -157,6 +157,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_roundTripOptionalClass", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json index e54d0ad53..ccd504f4d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_check", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json index 99c5aff05..6210c8663 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_checkInt", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json index 946411036..14f0cc0fd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json @@ -253,6 +253,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_createPropertyHolder", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index efda4d145..487533b38 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -392,6 +392,7 @@ "tsFullPath" : "Priority" } ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json new file mode 100644 index 000000000..8a2923a02 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json @@ -0,0 +1,334 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_MathUtils_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathUtils_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_static_add", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + } + ], + "name" : "MathUtils", + "properties" : [ + + ], + "swiftCallName" : "MathUtils" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "scientific" + }, + { + "associatedValues" : [ + + ], + "name" : "basic" + } + ], + "emitStyle" : "const", + "name" : "Calculator", + "staticMethods" : [ + { + "abiName" : "bjs_Calculator_static_square", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "square", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "enumName" : { + "_0" : "Calculator" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Calculator", + "tsFullPath" : "Calculator" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + { + "abiName" : "bjs_APIResult_static_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "staticContext" : { + "enumName" : { + "_0" : "APIResult" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "String", + "namespace" : [ + "Utils" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Utils_String_static_uppercase", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "uppercase", + "namespace" : [ + "Utils", + "String" + ], + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils.String", + "tsFullPath" : "Utils.String" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift new file mode 100644 index 000000000..7aa91b915 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -0,0 +1,192 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +extension Calculator: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Calculator { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Calculator { + return Calculator(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .scientific + case 1: + self = .basic + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .scientific: + return 0 + case .basic: + return 1 + } + } +} + +@_expose(wasm, "bjs_Calculator_static_square") +@_cdecl("bjs_Calculator_static_square") +public func _bjs_Calculator_static_square(value: Int32) -> Int32 { + #if arch(wasm32) + let ret = Calculator.square(value: Int.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension APIResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + switch caseId { + case 0: + return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + case 1: + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + default: + fatalError("Unknown APIResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + return Int32(0) + case .failure(let param0): + _swift_js_push_int(Int32(param0)) + return Int32(1) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .success(let param0): + _swift_js_push_tag(Int32(0)) + var __bjs_param0 = param0 + __bjs_param0.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + case .failure(let param0): + _swift_js_push_tag(Int32(1)) + _swift_js_push_int(Int32(param0)) + } + } +} + +@_expose(wasm, "bjs_APIResult_static_roundtrip") +@_cdecl("bjs_APIResult_static_roundtrip") +public func _bjs_APIResult_static_roundtrip(value: Int32) -> Void { + #if arch(wasm32) + let ret = APIResult.roundtrip(value: APIResult.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Utils_String_static_uppercase") +@_cdecl("bjs_Utils_String_static_uppercase") +public func _bjs_Utils_String_static_uppercase(textBytes: Int32, textLength: Int32) -> Void { + #if arch(wasm32) + let ret = Utils.String.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathUtils_init") +@_cdecl("bjs_MathUtils_init") +public func _bjs_MathUtils_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = MathUtils() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathUtils_static_subtract") +@_cdecl("bjs_MathUtils_static_subtract") +public func _bjs_MathUtils_static_subtract(a: Int32, b: Int32) -> Int32 { + #if arch(wasm32) + let ret = MathUtils.subtract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathUtils_static_add") +@_cdecl("bjs_MathUtils_static_add") +public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { + #if arch(wasm32) + let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathUtils_multiply") +@_cdecl("bjs_MathUtils_multiply") +public func _bjs_MathUtils_multiply(_self: UnsafeMutableRawPointer, x: Int32, y: Int32) -> Int32 { + #if arch(wasm32) + let ret = MathUtils.bridgeJSLiftParameter(_self).multiply(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathUtils_deinit") +@_cdecl("bjs_MathUtils_deinit") +public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") + func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index 705de9378..13f707bda 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -323,6 +323,7 @@ "tsFullPath" : "Utils.String" } ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json new file mode 100644 index 000000000..d7af99185 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json @@ -0,0 +1,337 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PropertyClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "PropertyClass", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "staticConstant", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "jsObjectProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "classVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "readOnlyComputed", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "optionalProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "PropertyClass" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "value1" + }, + { + "associatedValues" : [ + + ], + "name" : "value2" + } + ], + "emitStyle" : "const", + "name" : "PropertyEnum", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumProperty", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "enumConstant", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedEnum", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyEnum", + "tsFullPath" : "PropertyEnum" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "PropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace", + "tsFullPath" : "PropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Nested", + "namespace" : [ + "PropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace.Nested", + "tsFullPath" : "PropertyNamespace.Nested" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift new file mode 100644 index 000000000..72d561a00 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift @@ -0,0 +1,338 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +extension PropertyEnum: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> PropertyEnum { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> PropertyEnum { + return PropertyEnum(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .value1 + case 1: + self = .value2 + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .value1: + return 0 + case .value2: + return 1 + } + } +} + +@_expose(wasm, "bjs_PropertyEnum_static_enumProperty_get") +@_cdecl("bjs_PropertyEnum_static_enumProperty_get") +public func _bjs_PropertyEnum_static_enumProperty_get() -> Void { + #if arch(wasm32) + let ret = PropertyEnum.enumProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyEnum_static_enumProperty_set") +@_cdecl("bjs_PropertyEnum_static_enumProperty_set") +public func _bjs_PropertyEnum_static_enumProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyEnum_static_enumConstant_get") +@_cdecl("bjs_PropertyEnum_static_enumConstant_get") +public func _bjs_PropertyEnum_static_enumConstant_get() -> Int32 { + #if arch(wasm32) + let ret = PropertyEnum.enumConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyEnum_static_computedEnum_get") +@_cdecl("bjs_PropertyEnum_static_computedEnum_get") +public func _bjs_PropertyEnum_static_computedEnum_get() -> Void { + #if arch(wasm32) + let ret = PropertyEnum.computedEnum + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyEnum_static_computedEnum_set") +@_cdecl("bjs_PropertyEnum_static_computedEnum_set") +public func _bjs_PropertyEnum_static_computedEnum_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyEnum.computedEnum = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_static_namespaceProperty_get") +@_cdecl("bjs_PropertyNamespace_static_namespaceProperty_get") +public func _bjs_PropertyNamespace_static_namespaceProperty_get() -> Void { + #if arch(wasm32) + let ret = PropertyNamespace.namespaceProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_static_namespaceProperty_set") +@_cdecl("bjs_PropertyNamespace_static_namespaceProperty_set") +public func _bjs_PropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_static_namespaceConstant_get") +@_cdecl("bjs_PropertyNamespace_static_namespaceConstant_get") +public func _bjs_PropertyNamespace_static_namespaceConstant_get() -> Void { + #if arch(wasm32) + let ret = PropertyNamespace.namespaceConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedProperty_get") +@_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_get") +public func _bjs_PropertyNamespace_Nested_static_nestedProperty_get() -> Int32 { + #if arch(wasm32) + let ret = PropertyNamespace.Nested.nestedProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedProperty_set") +@_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_set") +public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(value: Int32) -> Void { + #if arch(wasm32) + PropertyNamespace.Nested.nestedProperty = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedConstant_get") +@_cdecl("bjs_PropertyNamespace_Nested_static_nestedConstant_get") +public func _bjs_PropertyNamespace_Nested_static_nestedConstant_get() -> Void { + #if arch(wasm32) + let ret = PropertyNamespace.Nested.nestedConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedDouble_get") +@_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_get") +public func _bjs_PropertyNamespace_Nested_static_nestedDouble_get() -> Float64 { + #if arch(wasm32) + let ret = PropertyNamespace.Nested.nestedDouble + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedDouble_set") +@_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_set") +public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(value: Float64) -> Void { + #if arch(wasm32) + PropertyNamespace.Nested.nestedDouble = Double.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_init") +@_cdecl("bjs_PropertyClass_init") +public func _bjs_PropertyClass_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = PropertyClass() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_staticConstant_get") +@_cdecl("bjs_PropertyClass_static_staticConstant_get") +public func _bjs_PropertyClass_static_staticConstant_get() -> Void { + #if arch(wasm32) + let ret = PropertyClass.staticConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_staticVariable_get") +@_cdecl("bjs_PropertyClass_static_staticVariable_get") +public func _bjs_PropertyClass_static_staticVariable_get() -> Int32 { + #if arch(wasm32) + let ret = PropertyClass.staticVariable + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_staticVariable_set") +@_cdecl("bjs_PropertyClass_static_staticVariable_set") +public func _bjs_PropertyClass_static_staticVariable_set(value: Int32) -> Void { + #if arch(wasm32) + PropertyClass.staticVariable = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_jsObjectProperty_get") +@_cdecl("bjs_PropertyClass_static_jsObjectProperty_get") +public func _bjs_PropertyClass_static_jsObjectProperty_get() -> Int32 { + #if arch(wasm32) + let ret = PropertyClass.jsObjectProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_jsObjectProperty_set") +@_cdecl("bjs_PropertyClass_static_jsObjectProperty_set") +public func _bjs_PropertyClass_static_jsObjectProperty_set(value: Int32) -> Void { + #if arch(wasm32) + PropertyClass.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_classVariable_get") +@_cdecl("bjs_PropertyClass_static_classVariable_get") +public func _bjs_PropertyClass_static_classVariable_get() -> Void { + #if arch(wasm32) + let ret = PropertyClass.classVariable + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_classVariable_set") +@_cdecl("bjs_PropertyClass_static_classVariable_set") +public func _bjs_PropertyClass_static_classVariable_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyClass.classVariable = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_computedProperty_get") +@_cdecl("bjs_PropertyClass_static_computedProperty_get") +public func _bjs_PropertyClass_static_computedProperty_get() -> Void { + #if arch(wasm32) + let ret = PropertyClass.computedProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_computedProperty_set") +@_cdecl("bjs_PropertyClass_static_computedProperty_set") +public func _bjs_PropertyClass_static_computedProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyClass.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_readOnlyComputed_get") +@_cdecl("bjs_PropertyClass_static_readOnlyComputed_get") +public func _bjs_PropertyClass_static_readOnlyComputed_get() -> Int32 { + #if arch(wasm32) + let ret = PropertyClass.readOnlyComputed + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_optionalProperty_get") +@_cdecl("bjs_PropertyClass_static_optionalProperty_get") +public func _bjs_PropertyClass_static_optionalProperty_get() -> Void { + #if arch(wasm32) + let ret = PropertyClass.optionalProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_static_optionalProperty_set") +@_cdecl("bjs_PropertyClass_static_optionalProperty_set") +public func _bjs_PropertyClass_static_optionalProperty_set(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + PropertyClass.optionalProperty = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PropertyClass_deinit") +@_cdecl("bjs_PropertyClass_deinit") +public func _bjs_PropertyClass_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + #if arch(wasm32) + @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") + func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 + #else + func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") + } + #endif + return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyClass_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index 1c5cdd6a4..fb3a12b6b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -326,6 +326,7 @@ "tsFullPath" : "PropertyNamespace.Nested" } ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json index cf6b0025e..bec03d8fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_checkString", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json index f34a04f9b..86221037d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_checkString", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json index fc99462b7..9f1f934ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json @@ -105,6 +105,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_takeGreeter", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json index d6518fc69..2a8a64040 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -1062,6 +1062,7 @@ "tsFullPath" : "APIResult" } ], + "exposeToGlobal" : false, "functions" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json index d85339150..9b2e61044 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_throwsSomething", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json index df3f5041f..508107ee6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json @@ -5,6 +5,7 @@ "enums" : [ ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_check", diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index 9576c2b76..ec9840439 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -613,8 +613,7 @@ struct PackagingPlanner { let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: $0).path)) return try decoder.decode(ImportedModuleSkeleton.self, from: data) }, - sharedMemory: Self.isSharedMemoryEnabled(triple: triple), - exposeToGlobal: true + sharedMemory: Self.isSharedMemoryEnabled(triple: triple) ) let (outputJs, outputDts) = try link.link() try system.writeFile(atPath: scope.resolve(path: bridgeJs).path, content: Data(outputJs.utf8)) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md index 835cf6bef..78b5d2d37 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md @@ -38,14 +38,51 @@ Later files override settings from earlier files. This allows teams to commit a ## Configuration Options +### `exposeToGlobal` + +Controls whether exported Swift APIs are exposed to the JavaScript global namespace (`globalThis`). + +When `true`, exported functions, classes, and namespaces are available via `globalThis` in JavaScript. When `false`, they are only available through the exports object returned by `createExports()`. +Using Exports provides better module isolation and support multiple WebAssembly instances in the same JavaScript context. + +Example: + +```json +{ + "exposeToGlobal": true +} +``` + +**With `exposeToGlobal: true`:** + +```javascript +// APIs available on globalThis +const greeter = new globalThis.MyModule.Greeter("World"); +console.log(greeter.greet()); // "Hello, World!" + +// Also available via exports +const greeter2 = new exports.MyModule.Greeter("Alice"); +``` + +**With `exposeToGlobal: false` (default):** + +```javascript +// APIs only available via exports +const greeter = new exports.MyModule.Greeter("World"); + +// globalThis.MyModule is undefined +``` + ### `tools` Specify custom paths for external executables. This is particularly useful when working in environments like Xcode where the system PATH may not be inherited, or when you need to use a specific version of tools for your project. Currently supported tools: + - `node` - Node.js runtime (required for TypeScript processing) Example: + ```json { "tools": { @@ -59,4 +96,3 @@ BridgeJS resolves tool paths in the following priority order: 1. **Configuration files** (`bridge-js.config.local.json` > `bridge-js.config.json`) 2. **Environment variables** (`JAVASCRIPTKIT_NODE_EXEC`) 3. **System PATH lookup** - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md index 427dd5971..0c4027b77 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md @@ -73,18 +73,20 @@ import JavaScriptKit } ``` -In JavaScript, this class is accessible through its namespace in two ways: +In JavaScript, this class is accessible through its namespace: ```javascript -// Recommended: Access via the exports object (supports multiple WASM instances) +// Always available: Access via the exports object (supports multiple WASM instances) const greeter = new exports.__Swift.Foundation.Greeter("World"); console.log(greeter.greet()); // "Hello, World!" -// Alternative: Access via globalThis and through its namespace +// When exposeToGlobal: true - Also available via globalThis const greeter = new globalThis.__Swift.Foundation.Greeter("World"); console.log(greeter.greet()); // "Hello, World!" ``` +> Note: Global namespace access via `globalThis` is only available when `exposeToGlobal: true` is set in your `bridge-js.config.json`. See for more details. + The generated TypeScript declaration will organize the class within its namespace: ```typescript @@ -114,4 +116,4 @@ export interface Greeter extends SwiftHeapObject { } ``` -Using namespaces can be preferable for projects with many global functions, as they help prevent naming collisions. Namespaces also provide intuitive hierarchies for organizing your exported Swift code, and they do not affect the code generated by `@JS` declarations without namespaces. \ No newline at end of file +Using namespaces can be preferable for projects with many global functions, as they help prevent naming collisions. Namespaces also provide intuitive hierarchies for organizing your exported Swift code, and they do not affect the code generated by `@JS` declarations without namespaces. diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index c1877ab35..69564e72c 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -4469,6 +4469,7 @@ "tsFullPath" : "StaticPropertyNamespace.NestedProperties" } ], + "exposeToGlobal" : false, "functions" : [ { "abiName" : "bjs_roundTripVoid", diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json b/Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json new file mode 100644 index 000000000..b1b556981 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json @@ -0,0 +1,3 @@ +{ + "exposeToGlobal": true +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.config.json b/Tests/BridgeJSRuntimeTests/bridge-js.config.json index 9e26dfeeb..55a95efaa 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.config.json +++ b/Tests/BridgeJSRuntimeTests/bridge-js.config.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "exposeToGlobal": false +} \ No newline at end of file diff --git a/Tests/prelude.exposeToGlobal.mjs b/Tests/prelude.exposeToGlobal.mjs new file mode 100644 index 000000000..47e36b4d2 --- /dev/null +++ b/Tests/prelude.exposeToGlobal.mjs @@ -0,0 +1,248 @@ +/** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ +export async function setupOptions(options, context) { + Error.stackTraceLimit = 100; + setupTestGlobals(globalThis); + return { + ...options, + getImports: (importsContext) => { + return { + "jsRoundTripVoid": () => { + return; + }, + "jsRoundTripNumber": (v) => { + return v; + }, + "jsRoundTripBool": (v) => { + return v; + }, + "jsRoundTripString": (v) => { + return v; + }, + "jsThrowOrVoid": (shouldThrow) => { + if (shouldThrow) { + throw new Error("TestError"); + } + }, + "jsThrowOrNumber": (shouldThrow) => { + if (shouldThrow) { + throw new Error("TestError"); + } + return 1; + }, + "jsThrowOrBool": (shouldThrow) => { + if (shouldThrow) { + throw new Error("TestError"); + } + return true; + }, + "jsThrowOrString": (shouldThrow) => { + if (shouldThrow) { + throw new Error("TestError"); + } + return "Hello, world!"; + }, + JsGreeter: class { + /** + * @param {string} name + * @param {string} prefix + */ + constructor(name, prefix) { + this.name = name; + this.prefix = prefix; + } + greet() { + return `${this.prefix}, ${this.name}!`; + } + /** @param {string} name */ + changeName(name) { + this.name = name; + } + }, + runAsyncWorks: async () => { + const exports = importsContext.getExports(); + if (!exports) { + throw new Error("No exports!?"); + } + BridgeJSRuntimeTests_runAsyncWorks(exports); + return; + } + }; + }, + addToCoreImports(importObject, importsContext) { + const { getInstance, getExports } = importsContext; + options.addToCoreImports?.(importObject, importsContext); + importObject["JavaScriptEventLoopTestSupportTests"] = { + "isMainThread": () => context.isMainThread, + } + const bridgeJSRuntimeTests = importObject["BridgeJSRuntimeTests"] || {}; + bridgeJSRuntimeTests["runJsWorks"] = () => { + const exports = getExports(); + if (!exports) { + throw new Error("No exports!?"); + } + return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); + } + importObject["BridgeJSRuntimeTests"] = bridgeJSRuntimeTests; + } + } +} + +import assert from "node:assert"; + +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function BridgeJSRuntimeTests_runJsWorks(instance, exports) { + // Repetition tests to satisfy testAll + const g = new exports.Greeter("John"); + g.release(); + const calc = exports.createCalculator(); + calc.release(); + + assert.equal(globalThis.Networking.API.MethodValues.Get, 0); + assert.equal(globalThis.Networking.API.MethodValues.Post, 1); + assert.equal(globalThis.Networking.API.MethodValues.Put, 2); + assert.equal(globalThis.Networking.API.MethodValues.Delete, 3); + + assert.equal(globalThis.Configuration.LogLevelValues.Debug, "debug"); + assert.equal(globalThis.Configuration.LogLevelValues.Info, "info"); + assert.equal(globalThis.Configuration.LogLevelValues.Warning, "warning"); + assert.equal(globalThis.Configuration.LogLevelValues.Error, "error"); + assert.equal(globalThis.Configuration.PortValues.Http, 80); + assert.equal(globalThis.Configuration.PortValues.Https, 443); + assert.equal(globalThis.Configuration.PortValues.Development, 3000); + + assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get, 0); + assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post, 1); + + const globalConverter = new globalThis.Utils.Converter(); + assert.equal(globalConverter.toString(99), "99"); + globalConverter.release(); + + const globalHttpServer = new globalThis.Networking.API.HTTPServer(); + globalHttpServer.call(globalThis.Networking.API.MethodValues.Get); + globalHttpServer.release(); + + const globalTestServer = new globalThis.Networking.APIV2.Internal.TestServer(); + globalTestServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post); + globalTestServer.release(); + + assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "namespace"); + assert.equal(globalThis.StaticPropertyNamespace.namespaceConstant, "constant"); + + globalThis.StaticPropertyNamespace.namespaceProperty = "modified namespace"; + assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "modified namespace"); + + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 999); + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 1.414); + + globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty = 1000; + globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble = 2.828; + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); + assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); + + // // Verify both globalThis and exports point to same objects + // assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, exports.StaticPropertyNamespace.namespaceProperty); + // assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, exports.StaticPropertyNamespace.NestedProperties.nestedProperty); + + // // Verify enum values accessible via globalThis match exports + // assert.equal(exports.Configuration.LogLevel.Debug, globalThis.Configuration.LogLevelValues.Debug); + // assert.equal(exports.Networking.API.Method.Get, globalThis.Networking.API.MethodValues.Get); +} + +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +async function BridgeJSRuntimeTests_runAsyncWorks(exports) { + await exports.asyncRoundTripVoid(); +} + +function setupTestGlobals(global) { + global.globalObject1 = { + prop_1: { + nested_prop: 1, + }, + prop_2: 2, + prop_3: true, + prop_4: [3, 4, "str_elm_1", null, undefined, 5], + prop_5: { + func1: function () { + return; + }, + func2: function () { + return 1; + }, + func3: function (n) { + return n * 2; + }, + func4: function (a, b, c) { + return a + b + c; + }, + func5: function (x) { + return "Hello, " + x; + }, + func6: function (c, a, b) { + if (c) { + return a; + } else { + return b; + } + }, + }, + prop_6: { + call_host_1: () => { + return global.globalObject1.prop_6.host_func_1(); + }, + }, + prop_7: 3.14, + prop_8: [0, , 2, 3, , , 6], + eval_closure: function (fn) { + return fn(arguments[1]); + }, + observable_obj: { + set_called: false, + target: new Proxy( + { + nested: {}, + }, + { + set(target, key, value) { + global.globalObject1.observable_obj.set_called = true; + target[key] = value; + return true; + }, + } + ), + }, + }; + + global.Animal = function (name, age, isCat) { + if (age < 0) { + throw new Error("Invalid age " + age); + } + this.name = name; + this.age = age; + this.bark = () => { + return isCat ? "nyan" : "wan"; + }; + this.isCat = isCat; + this.getIsCat = function () { + return this.isCat; + }; + this.setName = function (name) { + this.name = name; + }; + }; + + global.callThrowingClosure = (c) => { + try { + c(); + } catch (error) { + return error; + } + }; + + global.objectDecodingTest = { + obj: {}, + fn: () => { }, + sym: Symbol("s"), + bi: BigInt(3) + }; +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 77123fec1..640a65612 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -341,36 +341,20 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.StaticPropertyEnum.enumVariable, 500); // Namespace enum static properties - assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "namespace"); - assert.equal(globalThis.StaticPropertyNamespace.namespaceConstant, "constant"); - - globalThis.StaticPropertyNamespace.namespaceProperty = "modified namespace"; - assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "modified namespace"); - - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 999); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 1.414); - - globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty = 1000; - globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble = 2.828; - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); + assert.equal(exports.StaticPropertyNamespace.namespaceProperty, "namespace"); + assert.equal(exports.StaticPropertyNamespace.namespaceConstant, "constant"); + exports.StaticPropertyNamespace.namespaceProperty = "modified namespace"; assert.equal(exports.StaticPropertyNamespace.namespaceProperty, "modified namespace"); - assert.equal(exports.StaticPropertyNamespace.namespaceConstant, "constant"); - exports.StaticPropertyNamespace.namespaceProperty = "exports modified"; - assert.equal(exports.StaticPropertyNamespace.namespaceProperty, "exports modified"); - assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "exports modified"); - assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 999); assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedDouble, 1.414); + + exports.StaticPropertyNamespace.NestedProperties.nestedProperty = 1000; + exports.StaticPropertyNamespace.NestedProperties.nestedDouble = 2.828; + assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); - exports.StaticPropertyNamespace.NestedProperties.nestedProperty = 2000; - exports.StaticPropertyNamespace.NestedProperties.nestedDouble = 3.14; - assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedProperty, 2000); - assert.equal(exports.StaticPropertyNamespace.NestedProperties.nestedDouble, 3.14); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 2000); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 3.14); // Test class without @JS init constructor const calc = exports.createCalculator(); @@ -440,21 +424,10 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.setTSTheme(TSTheme.Light), TSTheme.Light); assert.equal(exports.getTSTheme(), TSTheme.Light); - assert.equal(globalThis.Networking.API.MethodValues.Get, 0); - assert.equal(globalThis.Networking.API.MethodValues.Post, 1); - assert.equal(globalThis.Networking.API.MethodValues.Put, 2); - assert.equal(globalThis.Networking.API.MethodValues.Delete, 3); assert.equal(exports.Networking.API.Method.Get, 0); assert.equal(exports.Networking.API.Method.Post, 1); assert.equal(exports.Networking.API.Method.Put, 2); assert.equal(exports.Networking.API.Method.Delete, 3); - assert.equal(globalThis.Configuration.LogLevelValues.Debug, "debug"); - assert.equal(globalThis.Configuration.LogLevelValues.Info, "info"); - assert.equal(globalThis.Configuration.LogLevelValues.Warning, "warning"); - assert.equal(globalThis.Configuration.LogLevelValues.Error, "error"); - assert.equal(globalThis.Configuration.PortValues.Http, 80); - assert.equal(globalThis.Configuration.PortValues.Https, 443); - assert.equal(globalThis.Configuration.PortValues.Development, 3000); assert.equal(exports.Configuration.LogLevel.Debug, "debug"); assert.equal(exports.Configuration.LogLevel.Info, "info"); assert.equal(exports.Configuration.LogLevel.Warning, "warning"); @@ -462,19 +435,16 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.Configuration.Port.Http, 80); assert.equal(exports.Configuration.Port.Https, 443); assert.equal(exports.Configuration.Port.Development, 3000); - assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get, 0); - assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post, 1); assert.equal(exports.Networking.APIV2.Internal.SupportedMethod.Get, 0); assert.equal(exports.Networking.APIV2.Internal.SupportedMethod.Post, 1); - assert.equal(exports.roundtripNetworkingAPIMethod(globalThis.Networking.API.MethodValues.Get), globalThis.Networking.API.MethodValues.Get); - assert.equal(exports.roundtripConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Debug), globalThis.Configuration.LogLevelValues.Debug); - assert.equal(exports.roundtripConfigurationPort(globalThis.Configuration.PortValues.Http), globalThis.Configuration.PortValues.Http); - assert.equal(exports.processConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Debug), globalThis.Configuration.PortValues.Development); - assert.equal(exports.processConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Info), globalThis.Configuration.PortValues.Http); - assert.equal(exports.processConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Warning), globalThis.Configuration.PortValues.Https); - assert.equal(exports.processConfigurationLogLevel(globalThis.Configuration.LogLevelValues.Error), globalThis.Configuration.PortValues.Development); - assert.equal(exports.roundtripInternalSupportedMethod(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get), globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get); + assert.equal(exports.roundtripNetworkingAPIMethod(exports.Networking.API.Method.Get), exports.Networking.API.Method.Get); + assert.equal(exports.roundtripConfigurationLogLevel(exports.Configuration.LogLevel.Debug), exports.Configuration.LogLevel.Debug); + assert.equal(exports.roundtripConfigurationPort(exports.Configuration.Port.Http), exports.Configuration.Port.Http); + assert.equal(exports.processConfigurationLogLevel(exports.Configuration.LogLevel.Debug), exports.Configuration.Port.Development); + assert.equal(exports.processConfigurationLogLevel(exports.Configuration.LogLevel.Info), exports.Configuration.Port.Http); + assert.equal(exports.processConfigurationLogLevel(exports.Configuration.LogLevel.Warning), exports.Configuration.Port.Https); + assert.equal(exports.roundtripInternalSupportedMethod(exports.Networking.APIV2.Internal.SupportedMethod.Get), exports.Networking.APIV2.Internal.SupportedMethod.Get); const converter = new exports.Utils.Converter(); assert.equal(converter.toString(42), "42"); @@ -482,27 +452,15 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { converter.release(); const httpServer = new exports.Networking.API.HTTPServer(); - httpServer.call(globalThis.Networking.API.MethodValues.Get); - httpServer.call(globalThis.Networking.API.MethodValues.Post); + httpServer.call(exports.Networking.API.Method.Get); + httpServer.call(exports.Networking.API.Method.Post); httpServer.release(); const testServer = new exports.Networking.APIV2.Internal.TestServer(); - testServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get); - testServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post); + testServer.call(exports.Networking.APIV2.Internal.SupportedMethod.Get); + testServer.call(exports.Networking.APIV2.Internal.SupportedMethod.Post); testServer.release(); - const globalConverter = new globalThis.Utils.Converter(); - assert.equal(globalConverter.toString(99), "99"); - globalConverter.release(); - - const globalHttpServer = new globalThis.Networking.API.HTTPServer(); - globalHttpServer.call(globalThis.Networking.API.MethodValues.Get); - globalHttpServer.release(); - - const globalTestServer = new globalThis.Networking.APIV2.Internal.TestServer(); - globalTestServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post); - globalTestServer.release(); - const s1 = { tag: exports.APIResult.Tag.Success, param0: "Cześć 🙋‍♂️" }; const f1 = { tag: exports.APIResult.Tag.Failure, param0: 42 }; const i1 = { tag: APIResultValues.Tag.Info }; @@ -555,27 +513,27 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.deepEqual(exports.makeComplexResultComprehensive(true, false, 10, 20, 1.5, 2.5, "First", "Second", "Third"), { tag: exports.ComplexResult.Tag.Comprehensive, param0: true, param1: false, param2: 10, param3: 20, param4: 1.5, param5: 2.5, param6: "First", param7: "Second", param8: "Third" }); assert.deepEqual(exports.makeComplexResultInfo(), { tag: exports.ComplexResult.Tag.Info }); - const urSuccess = { tag: globalThis.Utilities.ResultValues.Tag.Success, param0: "Utility operation completed" }; - const urFailure = { tag: globalThis.Utilities.ResultValues.Tag.Failure, param0: "Utility error occurred", param1: 500 }; - const urStatus = { tag: globalThis.Utilities.ResultValues.Tag.Status, param0: true, param1: 200, param2: "Utility status OK" }; + const urSuccess = { tag: exports.Utilities.Result.Tag.Success, param0: "Utility operation completed" }; + const urFailure = { tag: exports.Utilities.Result.Tag.Failure, param0: "Utility error occurred", param1: 500 }; + const urStatus = { tag: exports.Utilities.Result.Tag.Status, param0: true, param1: 200, param2: "Utility status OK" }; assert.deepEqual(exports.roundtripUtilitiesResult(urSuccess), urSuccess); assert.deepEqual(exports.roundtripUtilitiesResult(urFailure), urFailure); assert.deepEqual(exports.roundtripUtilitiesResult(urStatus), urStatus); - assert.deepEqual(exports.makeUtilitiesResultSuccess("Test"), { tag: globalThis.Utilities.ResultValues.Tag.Success, param0: "Test" }); - assert.deepEqual(exports.makeUtilitiesResultSuccess("ok"), { tag: globalThis.Utilities.ResultValues.Tag.Success, param0: "ok" }); - assert.deepEqual(exports.makeUtilitiesResultFailure("Error", 123), { tag: globalThis.Utilities.ResultValues.Tag.Failure, param0: "Error", param1: 123 }); - assert.deepEqual(exports.makeUtilitiesResultStatus(true, 200, "OK"), { tag: globalThis.Utilities.ResultValues.Tag.Status, param0: true, param1: 200, param2: "OK" }); + assert.deepEqual(exports.makeUtilitiesResultSuccess("Test"), { tag: exports.Utilities.Result.Tag.Success, param0: "Test" }); + assert.deepEqual(exports.makeUtilitiesResultSuccess("ok"), { tag: exports.Utilities.Result.Tag.Success, param0: "ok" }); + assert.deepEqual(exports.makeUtilitiesResultFailure("Error", 123), { tag: exports.Utilities.Result.Tag.Failure, param0: "Error", param1: 123 }); + assert.deepEqual(exports.makeUtilitiesResultStatus(true, 200, "OK"), { tag: exports.Utilities.Result.Tag.Status, param0: true, param1: 200, param2: "OK" }); - const nrSuccess = { tag: globalThis.API.NetworkingResultValues.Tag.Success, param0: "Network request successful" }; - const nrFailure = { tag: globalThis.API.NetworkingResultValues.Tag.Failure, param0: "Network timeout", param1: 408 }; + const nrSuccess = { tag: exports.API.NetworkingResult.Tag.Success, param0: "Network request successful" }; + const nrFailure = { tag: exports.API.NetworkingResult.Tag.Failure, param0: "Network timeout", param1: 408 }; assert.deepEqual(exports.roundtripAPINetworkingResult(nrSuccess), nrSuccess); assert.deepEqual(exports.roundtripAPINetworkingResult(nrFailure), nrFailure); - assert.deepEqual(exports.makeAPINetworkingResultSuccess("Connected"), { tag: globalThis.API.NetworkingResultValues.Tag.Success, param0: "Connected" }); - assert.deepEqual(exports.makeAPINetworkingResultFailure("Timeout", 408), { tag: globalThis.API.NetworkingResultValues.Tag.Failure, param0: "Timeout", param1: 408 }); + assert.deepEqual(exports.makeAPINetworkingResultSuccess("Connected"), { tag: exports.API.NetworkingResult.Tag.Success, param0: "Connected" }); + assert.deepEqual(exports.makeAPINetworkingResultFailure("Timeout", 408), { tag: exports.API.NetworkingResult.Tag.Failure, param0: "Timeout", param1: 408 }); assert.equal(exports.roundTripOptionalString(null), null); assert.equal(exports.roundTripOptionalInt(null), null); @@ -604,7 +562,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.roundTripOptionalHttpStatus(exports.HttpStatus.Ok), HttpStatusValues.Ok); assert.equal(exports.roundTripOptionalTSDirection(TSDirection.North), TSDirection.North); assert.equal(exports.roundTripOptionalTSTheme(TSTheme.Light), TSTheme.Light); - assert.equal(exports.roundTripOptionalNetworkingAPIMethod(globalThis.Networking.API.MethodValues.Get), globalThis.Networking.API.MethodValues.Get); + assert.equal(exports.roundTripOptionalNetworkingAPIMethod(exports.Networking.API.Method.Get), exports.Networking.API.Method.Get); assert.deepEqual(exports.roundTripOptionalAPIResult(p1), p1); assert.deepEqual(exports.roundTripOptionalComplexResult(cl1), cl1); @@ -671,9 +629,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(StaticCalculatorValues.Basic, 1); assert.equal(StaticCalculatorValues.Scientific, exports.StaticCalculator.Scientific); assert.equal(StaticCalculatorValues.Basic, exports.StaticCalculator.Basic); - assert.equal(globalThis.StaticUtils.Nested.roundtrip("hello world"), "hello world"); + assert.equal(exports.StaticUtils.Nested.roundtrip("hello world"), "hello world"); assert.equal(exports.StaticUtils.Nested.roundtrip("test"), "test"); - assert.equal(exports.StaticUtils.Nested.roundtrip("exports api"), "exports api"); // Test default parameters assert.equal(exports.testStringDefault(), "Hello World"); @@ -744,9 +701,9 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { function testClosureSupport(exports) { const upperTransform = (text) => text.toUpperCase(); const processor = new exports.TextProcessor(upperTransform); - + assert.equal(processor.process("hello"), "HELLO"); - + const multiParamTransform = (count, text, ratio) => { return `${text.toUpperCase()}-${count}-${ratio.toFixed(2)}`; }; @@ -767,14 +724,14 @@ function testClosureSupport(exports) { const addDr = exports.makeFormatter("Dr."); assert.equal(addDr("Ada"), "Dr. Ada"); assert.equal(addDr("Grace"), "Dr. Grace"); - + const addProf = exports.makeFormatter("Prof."); assert.equal(addProf("Hopper"), "Prof. Hopper"); const add10 = exports.makeAdder(10); assert.equal(add10(5), 15); assert.equal(add10(32), 42); - + const add100 = exports.makeAdder(100); assert.equal(add100(23), 123); @@ -821,12 +778,12 @@ function testClosureSupport(exports) { return value !== null ? `Got: ${value}` : `Got: null`; }); assert.equal(optResult1, "Got: test | Got: null"); - + const optResult2 = processor.processOptionalInt((value) => { return value !== null ? `Number: ${value}` : `Number: null`; }); assert.equal(optResult2, "Number: 42 | Number: null"); - + const optResult3 = processor.processOptionalGreeter((greeter) => { return greeter !== null ? `Greeter: ${greeter.name}` : `Greeter: null`; }); From 0f70f64d6c781efdfae9da5a32d5f518348a921c Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 27 Nov 2025 10:34:07 +0100 Subject: [PATCH 040/252] BridgeJS: Properly treat exposeToGlobal on module level --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 124 ++++++++++-------- 1 file changed, 71 insertions(+), 53 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 23884608a..bd32169f5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -12,7 +12,6 @@ struct BridgeJSLink { var exportedSkeletons: [ExportedSkeleton] = [] var importedSkeletons: [ImportedModuleSkeleton] = [] let sharedMemory: Bool - var exposeToGlobal: Bool private let namespaceBuilder = NamespaceBuilder() init( @@ -23,15 +22,11 @@ struct BridgeJSLink { self.exportedSkeletons = exportedSkeletons self.importedSkeletons = importedSkeletons self.sharedMemory = sharedMemory - self.exposeToGlobal = exportedSkeletons.contains { $0.exposeToGlobal } } mutating func addExportedSkeletonFile(data: Data) throws { let skeleton = try JSONDecoder().decode(ExportedSkeleton.self, from: data) exportedSkeletons.append(skeleton) - if skeleton.exposeToGlobal { - exposeToGlobal = true - } } mutating func addImportedSkeletonFile(data: Data) throws { @@ -929,7 +924,6 @@ struct BridgeJSLink { // Type definitions section (namespace declarations, class definitions, imported types) let namespaceDeclarationsLines = namespaceBuilder.namespaceDeclarations( exportedSkeletons: exportedSkeletons, - exposeToGlobal: exposeToGlobal, renderTSSignatureCallback: { parameters, returnType, effects in self.renderTSSignature(parameters: parameters, returnType: returnType, effects: effects) } @@ -1012,8 +1006,7 @@ struct BridgeJSLink { printer.write(lines: data.topLevelEnumLines) let topLevelNamespaceCode = namespaceBuilder.buildTopLevelNamespaceInitialization( - exportedSkeletons: exportedSkeletons, - exposeToGlobal: exposeToGlobal + exportedSkeletons: exportedSkeletons ) printer.write(lines: topLevelNamespaceCode) @@ -1076,16 +1069,14 @@ struct BridgeJSLink { printer.write(lines: data.classLines) let namespaceInitCode = namespaceBuilder.buildNamespaceInitialization( - exportedSkeletons: exportedSkeletons, - exposeToGlobal: exposeToGlobal + exportedSkeletons: exportedSkeletons ) printer.write(lines: namespaceInitCode) let propertyAssignments = try generateNamespacePropertyAssignments( data: data, exportedSkeletons: exportedSkeletons, - namespaceBuilder: namespaceBuilder, - exposeToGlobal: exposeToGlobal + namespaceBuilder: namespaceBuilder ) printer.write(lines: propertyAssignments) } @@ -1157,12 +1148,13 @@ struct BridgeJSLink { private func generateNamespacePropertyAssignments( data: LinkData, exportedSkeletons: [ExportedSkeleton], - namespaceBuilder: NamespaceBuilder, - exposeToGlobal: Bool + namespaceBuilder: NamespaceBuilder ) throws -> [String] { let printer = CodeFragmentPrinter() - if exposeToGlobal { + // Only include enum static assignments for modules with exposeToGlobal + let hasAnyGlobalExposure = exportedSkeletons.contains { $0.exposeToGlobal } + if hasAnyGlobalExposure { printer.write(lines: data.enumStaticAssignments) } @@ -1182,10 +1174,8 @@ struct BridgeJSLink { printer.write("};") printer.write("_exports = exports;") - if exposeToGlobal { - let globalThisLines = namespaceBuilder.buildGlobalThisAssignments(exportedSkeletons: exportedSkeletons) - printer.write(lines: globalThisLines) - } + let globalThisLines = namespaceBuilder.buildGlobalThisAssignments(exportedSkeletons: exportedSkeletons) + printer.write(lines: globalThisLines) printer.write("return exports;") @@ -2243,20 +2233,21 @@ extension BridgeJSLink { ) } - func buildNamespaceInitialization(exportedSkeletons: [ExportedSkeleton], exposeToGlobal: Bool) -> [String] { - guard exposeToGlobal else { return [] } - let allNamespacePaths = collectAllNamespacePaths(exportedSkeletons: exportedSkeletons) + func buildNamespaceInitialization(exportedSkeletons: [ExportedSkeleton]) -> [String] { + let globalSkeletons = exportedSkeletons.filter { $0.exposeToGlobal } + guard !globalSkeletons.isEmpty else { return [] } + let allNamespacePaths = collectAllNamespacePaths(exportedSkeletons: globalSkeletons) return generateNamespaceInitializationCode(namespacePaths: allNamespacePaths) } func buildTopLevelNamespaceInitialization( - exportedSkeletons: [ExportedSkeleton], - exposeToGlobal: Bool + exportedSkeletons: [ExportedSkeleton] ) -> [String] { - guard exposeToGlobal else { return [] } + let globalSkeletons = exportedSkeletons.filter { $0.exposeToGlobal } + guard !globalSkeletons.isEmpty else { return [] } var namespacedEnumPaths: Set<[String]> = [] - for skeleton in exportedSkeletons { + for skeleton in globalSkeletons { for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { namespacedEnumPaths.insert(enumDef.namespace!) } @@ -2267,7 +2258,7 @@ extension BridgeJSLink { let printer = CodeFragmentPrinter() printer.write(lines: initCode) - for skeleton in exportedSkeletons { + for skeleton in globalSkeletons { for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { let namespacePath = enumDef.namespace!.joined(separator: ".") printer.write("globalThis.\(namespacePath).\(enumDef.valuesName) = \(enumDef.valuesName);") @@ -2280,7 +2271,7 @@ extension BridgeJSLink { func buildGlobalThisAssignments(exportedSkeletons: [ExportedSkeleton]) -> [String] { let printer = CodeFragmentPrinter() - for skeleton in exportedSkeletons { + for skeleton in exportedSkeletons where skeleton.exposeToGlobal { for klass in skeleton.classes where klass.namespace != nil { let namespacePath = klass.namespace!.joined(separator: ".") printer.write("globalThis.\(namespacePath).\(klass.name) = exports.\(namespacePath).\(klass.name);") @@ -2645,25 +2636,60 @@ extension BridgeJSLink { /// - Returns: Array of TypeScript declaration lines defining the global namespace structure func namespaceDeclarations( exportedSkeletons: [ExportedSkeleton], - exposeToGlobal: Bool, renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String ) -> [String] { let printer = CodeFragmentPrinter() - let rootNode = NamespaceNode(name: "") - - buildExportsTree(rootNode: rootNode, exportedSkeletons: exportedSkeletons) - - guard !rootNode.children.isEmpty else { - return printer.lines - } - - if exposeToGlobal { - printer.write("export {};") - printer.nextLine() - printer.write("declare global {") - printer.indent() + + let globalSkeletons = exportedSkeletons.filter { $0.exposeToGlobal } + let nonGlobalSkeletons = exportedSkeletons.filter { !$0.exposeToGlobal } + + if !globalSkeletons.isEmpty { + let globalRootNode = NamespaceNode(name: "") + buildExportsTree(rootNode: globalRootNode, exportedSkeletons: globalSkeletons) + + if !globalRootNode.children.isEmpty { + printer.write("export {};") + printer.nextLine() + printer.write("declare global {") + printer.indent() + generateNamespaceDeclarationsForNode( + node: globalRootNode, + depth: 1, + printer: printer, + exposeToGlobal: true, + renderTSSignatureCallback: renderTSSignatureCallback + ) + printer.unindent() + printer.write("}") + printer.nextLine() + } + } + + if !nonGlobalSkeletons.isEmpty { + let localRootNode = NamespaceNode(name: "") + buildExportsTree(rootNode: localRootNode, exportedSkeletons: nonGlobalSkeletons) + + if !localRootNode.children.isEmpty { + generateNamespaceDeclarationsForNode( + node: localRootNode, + depth: 1, + printer: printer, + exposeToGlobal: false, + renderTSSignatureCallback: renderTSSignatureCallback + ) + } } + return printer.lines + } + + private func generateNamespaceDeclarationsForNode( + node: NamespaceNode, + depth: Int, + printer: CodeFragmentPrinter, + exposeToGlobal: Bool, + renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String + ) { func hasContent(node: NamespaceNode) -> Bool { // Enums are always included if !node.content.enums.isEmpty { @@ -2845,22 +2871,14 @@ extension BridgeJSLink { } } - generateNamespaceDeclarations(node: childNode, depth: depth + 1) + generateNamespaceDeclarationsForNode(node: childNode, depth: depth + 1, printer: printer, exposeToGlobal: exposeToGlobal, renderTSSignatureCallback: renderTSSignatureCallback) printer.unindent() printer.write("}") } } - - generateNamespaceDeclarations(node: rootNode, depth: 1) - - if exposeToGlobal { - printer.unindent() - printer.write("}") - printer.nextLine() - } - - return printer.lines + + generateNamespaceDeclarations(node: node, depth: depth) } } From 4a682aaa0e44542c56f45d539b49cbfbfd6e0c9b Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 27 Nov 2025 12:12:13 +0100 Subject: [PATCH 041/252] BridgeJS: Unified prelude.mjs tests with 2 test targets BridgeJS: Extend snapshot test setup for exports <-> global this by including mixed module test case --- Makefile | 10 - Package.swift | 13 + .../Sources/BridgeJSLink/BridgeJSLink.swift | 26 +- .../BridgeJSToolTests/BridgeJSLinkTests.swift | 21 + .../Inputs/MixedGlobal.swift | 8 + .../Inputs/MixedPrivate.swift | 8 + .../DefaultParameters.Export.js | 8 +- .../BridgeJSLinkTests/MixedGlobal.Export.d.ts | 33 ++ .../BridgeJSLinkTests/MixedGlobal.Export.js | 254 +++++++++ .../MixedModules.Export.d.ts | 54 ++ .../BridgeJSLinkTests/MixedModules.Export.js | 292 ++++++++++ .../MixedPrivate.Export.d.ts | 33 ++ .../BridgeJSLinkTests/MixedPrivate.Export.js | 254 +++++++++ .../BridgeJSLinkTests/Namespaces.Export.js | 8 +- .../Namespaces.Global.Export.js | 8 +- .../BridgeJSLinkTests/SwiftClass.Export.js | 8 +- .../EnumNamespace.Global.swift | 53 +- .../ExportSwiftTests/MixedGlobal.json | 74 +++ .../ExportSwiftTests/MixedGlobal.swift | 61 ++ .../ExportSwiftTests/MixedPrivate.json | 74 +++ .../ExportSwiftTests/MixedPrivate.swift | 61 ++ .../ExportSwiftTests/Namespaces.Global.swift | 53 +- .../StaticFunctions.Global.swift | 19 +- .../StaticProperties.Global.swift | 19 +- .../Generated/BridgeJS.ExportSwift.swift | 303 ++++++++++ .../JavaScript/BridgeJS.ExportSwift.json | 537 ++++++++++++++++++ .../BridgeJSGlobalTests/GlobalAPITests.swift | 78 +++ .../bridge-js.config.json} | 0 Tests/BridgeJSGlobalTests/bridge-js.d.ts | 0 .../BridgeJSRuntimeTests/ExportAPITests.swift | 6 - .../Generated/BridgeJS.ExportSwift.swift | 11 - .../JavaScript/BridgeJS.ExportSwift.json | 17 - Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 18 - Tests/prelude.exposeToGlobal.mjs | 248 -------- Tests/prelude.mjs | 50 ++ 35 files changed, 2316 insertions(+), 404 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift create mode 100644 Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift create mode 100644 Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json create mode 100644 Tests/BridgeJSGlobalTests/GlobalAPITests.swift rename Tests/{BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json => BridgeJSGlobalTests/bridge-js.config.json} (100%) create mode 100644 Tests/BridgeJSGlobalTests/bridge-js.d.ts delete mode 100644 Tests/prelude.exposeToGlobal.mjs diff --git a/Makefile b/Makefile index 453b0b648..c46431dd1 100644 --- a/Makefile +++ b/Makefile @@ -11,16 +11,6 @@ unittest: --disable-sandbox \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc -.PHONY: unittest-with-global -unittest-with-global: - cp Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json Tests/BridgeJSRuntimeTests/bridge-js.config.local.json - swift package --allow-writing-to-directory Tests/BridgeJSRuntimeTests \ - bridge-js --package-path Tests/BridgeJSRuntimeTests - rm -f Tests/BridgeJSRuntimeTests/bridge-js.config.local.json - env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ - --disable-sandbox \ - js test --prelude ./Tests/prelude.exposeToGlobal.mjs -Xnode --expose-gc - .PHONY: regenerate_swiftpm_resources regenerate_swiftpm_resources: npm run build diff --git a/Package.swift b/Package.swift index a8518a5a1..ddf2e36ef 100644 --- a/Package.swift +++ b/Package.swift @@ -180,5 +180,18 @@ let package = Package( ], linkerSettings: testingLinkerFlags ), + .testTarget( + name: "BridgeJSGlobalTests", + dependencies: ["JavaScriptKit", "JavaScriptEventLoop"], + exclude: [ + "bridge-js.config.json", + "bridge-js.d.ts", + "Generated/JavaScript", + ], + swiftSettings: [ + .enableExperimentalFeature("Extern") + ], + linkerSettings: testingLinkerFlags + ), ] ) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index bd32169f5..7ecc2086f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1127,13 +1127,13 @@ struct BridgeJSLink { } // Generate wrapper functions for each module - for (moduleName, classes) in modulesByName { + for (moduleName, classes) in modulesByName.sorted(by: { $0.key < $1.key }) { wrapperLines.append("// Wrapper functions for module: \(moduleName)") wrapperLines.append("if (!importObject[\"\(moduleName)\"]) {") wrapperLines.append(" importObject[\"\(moduleName)\"] = {};") wrapperLines.append("}") - for klass in classes { + for klass in classes.sorted(by: { $0.name < $1.name }) { let wrapperFunctionName = "bjs_\(klass.name)_wrap" wrapperLines.append("importObject[\"\(moduleName)\"][\"\(wrapperFunctionName)\"] = function(pointer) {") wrapperLines.append(" const obj = \(klass.name).__construct(pointer);") @@ -2639,14 +2639,14 @@ extension BridgeJSLink { renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String ) -> [String] { let printer = CodeFragmentPrinter() - + let globalSkeletons = exportedSkeletons.filter { $0.exposeToGlobal } let nonGlobalSkeletons = exportedSkeletons.filter { !$0.exposeToGlobal } - + if !globalSkeletons.isEmpty { let globalRootNode = NamespaceNode(name: "") buildExportsTree(rootNode: globalRootNode, exportedSkeletons: globalSkeletons) - + if !globalRootNode.children.isEmpty { printer.write("export {};") printer.nextLine() @@ -2664,11 +2664,11 @@ extension BridgeJSLink { printer.nextLine() } } - + if !nonGlobalSkeletons.isEmpty { let localRootNode = NamespaceNode(name: "") buildExportsTree(rootNode: localRootNode, exportedSkeletons: nonGlobalSkeletons) - + if !localRootNode.children.isEmpty { generateNamespaceDeclarationsForNode( node: localRootNode, @@ -2682,7 +2682,7 @@ extension BridgeJSLink { return printer.lines } - + private func generateNamespaceDeclarationsForNode( node: NamespaceNode, depth: Int, @@ -2871,13 +2871,19 @@ extension BridgeJSLink { } } - generateNamespaceDeclarationsForNode(node: childNode, depth: depth + 1, printer: printer, exposeToGlobal: exposeToGlobal, renderTSSignatureCallback: renderTSSignatureCallback) + generateNamespaceDeclarationsForNode( + node: childNode, + depth: depth + 1, + printer: printer, + exposeToGlobal: exposeToGlobal, + renderTSSignatureCallback: renderTSSignatureCallback + ) printer.unindent() printer.write("}") } } - + generateNamespaceDeclarations(node: node, depth: depth) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 989d05e2f..c81a224f8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -91,4 +91,25 @@ import Testing let bridgeJSLink: BridgeJSLink = BridgeJSLink(exportedSkeletons: [outputSkeleton], sharedMemory: false) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global.Export") } + + @Test + func snapshotMixedModuleExposure() throws { + let globalURL = Self.inputsDirectory.appendingPathComponent("MixedGlobal.swift") + let globalSourceFile = Parser.parse(source: try String(contentsOf: globalURL, encoding: .utf8)) + let globalAPI = ExportSwift(progress: .silent, moduleName: "GlobalModule", exposeToGlobal: true) + try globalAPI.addSourceFile(globalSourceFile, "MixedGlobal.swift") + let (_, globalSkeleton) = try #require(try globalAPI.finalize()) + + let privateURL = Self.inputsDirectory.appendingPathComponent("MixedPrivate.swift") + let privateSourceFile = Parser.parse(source: try String(contentsOf: privateURL, encoding: .utf8)) + let privateAPI = ExportSwift(progress: .silent, moduleName: "PrivateModule", exposeToGlobal: false) + try privateAPI.addSourceFile(privateSourceFile, "MixedPrivate.swift") + let (_, privateSkeleton) = try #require(try privateAPI.finalize()) + + let bridgeJSLink = BridgeJSLink( + exportedSkeletons: [globalSkeleton, privateSkeleton], + sharedMemory: false + ) + try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules.Export") + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift new file mode 100644 index 000000000..f65abe3a7 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift @@ -0,0 +1,8 @@ +@JS(namespace: "GlobalAPI") +func globalFunction() -> String + +@JS(namespace: "GlobalAPI") +class GlobalClass { + @JS public init() + @JS public func greet() -> String +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift new file mode 100644 index 000000000..0f99fcede --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift @@ -0,0 +1,8 @@ +@JS(namespace: "PrivateAPI") +func privateFunction() -> String + +@JS(namespace: "PrivateAPI") +class PrivateClass { + @JS public init() + @JS public func greet() -> String +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 9f56215d7..fa7a7c06b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -191,6 +191,10 @@ export async function createInstantiator(options, swift) { if (!importObject["TestModule"]) { importObject["TestModule"] = {}; } + importObject["TestModule"]["bjs_ConstructorDefaults_wrap"] = function(pointer) { + const obj = ConstructorDefaults.__construct(pointer); + return swift.memory.retain(obj); + }; importObject["TestModule"]["bjs_DefaultGreeter_wrap"] = function(pointer) { const obj = DefaultGreeter.__construct(pointer); return swift.memory.retain(obj); @@ -199,10 +203,6 @@ export async function createInstantiator(options, swift) { const obj = EmptyGreeter.__construct(pointer); return swift.memory.retain(obj); }; - importObject["TestModule"]["bjs_ConstructorDefaults_wrap"] = function(pointer) { - const obj = ConstructorDefaults.__construct(pointer); - return swift.memory.retain(obj); - }; }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts new file mode 100644 index 000000000..7b4cc95e6 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts @@ -0,0 +1,33 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface GlobalClass extends SwiftHeapObject { + greet(): string; +} +export type Exports = { + GlobalAPI: { + GlobalClass: { + new(): GlobalClass; + } + globalFunction(): string; + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js new file mode 100644 index 000000000..453057fa3 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -0,0 +1,254 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_GlobalClass_wrap"] = function(pointer) { + const obj = GlobalClass.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class GlobalClass extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype); + } + + constructor() { + const ret = instance.exports.bjs_GlobalClass_init(); + return GlobalClass.__construct(ret); + } + greet() { + instance.exports.bjs_GlobalClass_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + const exports = { + GlobalAPI: { + GlobalClass, + globalFunction: function bjs_GlobalAPI_globalFunction() { + instance.exports.bjs_GlobalAPI_globalFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts new file mode 100644 index 000000000..67a6eebcf --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts @@ -0,0 +1,54 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export {}; + +declare global { + namespace GlobalAPI { + class GlobalClass { + constructor(); + greet(): string; + } + globalFunction(): string; + } +} + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface GlobalClass extends SwiftHeapObject { + greet(): string; +} +export interface PrivateClass extends SwiftHeapObject { + greet(): string; +} +export type Exports = { + GlobalAPI: { + GlobalClass: { + new(): GlobalClass; + } + globalFunction(): string; + }, + PrivateAPI: { + PrivateClass: { + new(): PrivateClass; + } + privateFunction(): string; + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js new file mode 100644 index 000000000..0ff8f450e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -0,0 +1,292 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: GlobalModule + if (!importObject["GlobalModule"]) { + importObject["GlobalModule"] = {}; + } + importObject["GlobalModule"]["bjs_GlobalClass_wrap"] = function(pointer) { + const obj = GlobalClass.__construct(pointer); + return swift.memory.retain(obj); + }; + // Wrapper functions for module: PrivateModule + if (!importObject["PrivateModule"]) { + importObject["PrivateModule"] = {}; + } + importObject["PrivateModule"]["bjs_PrivateClass_wrap"] = function(pointer) { + const obj = PrivateClass.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class GlobalClass extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype); + } + + constructor() { + const ret = instance.exports.bjs_GlobalClass_init(); + return GlobalClass.__construct(ret); + } + greet() { + instance.exports.bjs_GlobalClass_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + class PrivateClass extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype); + } + + constructor() { + const ret = instance.exports.bjs_PrivateClass_init(); + return PrivateClass.__construct(ret); + } + greet() { + instance.exports.bjs_PrivateClass_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + if (typeof globalThis.GlobalAPI === 'undefined') { + globalThis.GlobalAPI = {}; + } + const exports = { + GlobalAPI: { + GlobalClass, + globalFunction: function bjs_GlobalAPI_globalFunction() { + instance.exports.bjs_GlobalAPI_globalFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + PrivateAPI: { + PrivateClass, + privateFunction: function bjs_PrivateAPI_privateFunction() { + instance.exports.bjs_PrivateAPI_privateFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + }; + _exports = exports; + globalThis.GlobalAPI.GlobalClass = exports.GlobalAPI.GlobalClass; + globalThis.GlobalAPI.globalFunction = exports.GlobalAPI.globalFunction; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts new file mode 100644 index 000000000..193857072 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts @@ -0,0 +1,33 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface PrivateClass extends SwiftHeapObject { + greet(): string; +} +export type Exports = { + PrivateAPI: { + PrivateClass: { + new(): PrivateClass; + } + privateFunction(): string; + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js new file mode 100644 index 000000000..e422b08b6 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -0,0 +1,254 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_PrivateClass_wrap"] = function(pointer) { + const obj = PrivateClass.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class PrivateClass extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype); + } + + constructor() { + const ret = instance.exports.bjs_PrivateClass_init(); + return PrivateClass.__construct(ret); + } + greet() { + instance.exports.bjs_PrivateClass_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + } + const exports = { + PrivateAPI: { + PrivateClass, + privateFunction: function bjs_PrivateAPI_privateFunction() { + instance.exports.bjs_PrivateAPI_privateFunction(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 08601bd50..24022a438 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -185,14 +185,14 @@ export async function createInstantiator(options, swift) { if (!importObject["TestModule"]) { importObject["TestModule"] = {}; } - importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); - return swift.memory.retain(obj); - }; importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { const obj = Converter.__construct(pointer); return swift.memory.retain(obj); }; + importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { + const obj = Greeter.__construct(pointer); + return swift.memory.retain(obj); + }; importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) { const obj = UUID.__construct(pointer); return swift.memory.retain(obj); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 67670d204..e2f13dd02 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -185,14 +185,14 @@ export async function createInstantiator(options, swift) { if (!importObject["TestModule"]) { importObject["TestModule"] = {}; } - importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); - return swift.memory.retain(obj); - }; importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { const obj = Converter.__construct(pointer); return swift.memory.retain(obj); }; + importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { + const obj = Greeter.__construct(pointer); + return swift.memory.retain(obj); + }; importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) { const obj = UUID.__construct(pointer); return swift.memory.retain(obj); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 9a5eec432..e946b01ce 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -189,14 +189,14 @@ export async function createInstantiator(options, swift) { const obj = Greeter.__construct(pointer); return swift.memory.retain(obj); }; - importObject["TestModule"]["bjs_PublicGreeter_wrap"] = function(pointer) { - const obj = PublicGreeter.__construct(pointer); - return swift.memory.retain(obj); - }; importObject["TestModule"]["bjs_PackageGreeter_wrap"] = function(pointer) { const obj = PackageGreeter.__construct(pointer); return swift.memory.retain(obj); }; + importObject["TestModule"]["bjs_PublicGreeter_wrap"] = function(pointer) { + const obj = PublicGreeter.__construct(pointer); + return swift.memory.retain(obj); + }; }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift index ca201f3d9..cf4977501 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -120,18 +120,19 @@ public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @@ -161,18 +162,19 @@ public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @@ -202,14 +204,15 @@ public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json new file mode 100644 index 000000000..21e78b120 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json @@ -0,0 +1,74 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_GlobalClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_GlobalClass_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "GlobalClass", + "namespace" : [ + "GlobalAPI" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalClass" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_GlobalAPI_globalFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "globalFunction", + "namespace" : [ + "GlobalAPI" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift new file mode 100644 index 000000000..774bf075c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift @@ -0,0 +1,61 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_GlobalAPI_globalFunction") +@_cdecl("bjs_GlobalAPI_globalFunction") +public func _bjs_GlobalAPI_globalFunction() -> Void { + #if arch(wasm32) + let ret = globalFunction() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalClass_init") +@_cdecl("bjs_GlobalClass_init") +public func _bjs_GlobalClass_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = GlobalClass() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalClass_greet") +@_cdecl("bjs_GlobalClass_greet") +public func _bjs_GlobalClass_greet(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = GlobalClass.bridgeJSLiftParameter(_self).greet() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalClass_deinit") +@_cdecl("bjs_GlobalClass_deinit") +public func _bjs_GlobalClass_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension GlobalClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalClass_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_GlobalClass_wrap") +fileprivate func _bjs_GlobalClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_GlobalClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json new file mode 100644 index 000000000..d86712af6 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json @@ -0,0 +1,74 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PrivateClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_PrivateClass_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PrivateClass", + "namespace" : [ + "PrivateAPI" + ], + "properties" : [ + + ], + "swiftCallName" : "PrivateClass" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_PrivateAPI_privateFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "privateFunction", + "namespace" : [ + "PrivateAPI" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift new file mode 100644 index 000000000..10c62bb03 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift @@ -0,0 +1,61 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_PrivateAPI_privateFunction") +@_cdecl("bjs_PrivateAPI_privateFunction") +public func _bjs_PrivateAPI_privateFunction() -> Void { + #if arch(wasm32) + let ret = privateFunction() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PrivateClass_init") +@_cdecl("bjs_PrivateClass_init") +public func _bjs_PrivateClass_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = PrivateClass() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PrivateClass_greet") +@_cdecl("bjs_PrivateClass_greet") +public func _bjs_PrivateClass_greet(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = PrivateClass.bridgeJSLiftParameter(_self).greet() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PrivateClass_deinit") +@_cdecl("bjs_PrivateClass_deinit") +public func _bjs_PrivateClass_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension PrivateClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_PrivateClass_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PrivateClass_wrap") +fileprivate func _bjs_PrivateClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PrivateClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift index f868fa111..3e7714464 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift @@ -58,18 +58,19 @@ public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @@ -100,18 +101,19 @@ public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { @@ -131,14 +133,15 @@ public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) { extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") - func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") +fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 7aa91b915..81ea282fe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -179,14 +179,15 @@ public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_MathUtils_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift index 72d561a00..e34f26f8c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift @@ -325,14 +325,15 @@ public func _bjs_PropertyClass_deinit(pointer: UnsafeMutableRawPointer) { extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - #if arch(wasm32) - @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") - func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 - #else - func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif return .object(JSObject(id: UInt32(bitPattern: _bjs_PropertyClass_wrap(Unmanaged.passRetained(self).toOpaque())))) } -} \ No newline at end of file +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") +fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift new file mode 100644 index 000000000..8e0c5f187 --- /dev/null +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift @@ -0,0 +1,303 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +extension GlobalNetworking.API.CallMethod: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> GlobalNetworking.API.CallMethod { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> GlobalNetworking.API.CallMethod { + return GlobalNetworking.API.CallMethod(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .get + case 1: + self = .post + case 2: + self = .put + case 3: + self = .delete + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .get: + return 0 + case .post: + return 1 + case .put: + return 2 + case .delete: + return 3 + } + } +} + +extension GlobalConfiguration.PublicLogLevel: _BridgedSwiftEnumNoPayload { +} + +extension GlobalConfiguration.AvailablePort: _BridgedSwiftEnumNoPayload { +} + +extension Internal.SupportedServerMethod: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Internal.SupportedServerMethod { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Internal.SupportedServerMethod { + return Internal.SupportedServerMethod(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .get + case 1: + self = .post + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .get: + return 0 + case .post: + return 1 + } + } +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_get") +@_cdecl("bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_get") +public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_get() -> Void { + #if arch(wasm32) + let ret = GlobalStaticPropertyNamespace.namespaceProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set") +@_cdecl("bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set") +public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + GlobalStaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_static_namespaceConstant_get") +@_cdecl("bjs_GlobalStaticPropertyNamespace_static_namespaceConstant_get") +public func _bjs_GlobalStaticPropertyNamespace_static_namespaceConstant_get() -> Void { + #if arch(wasm32) + let ret = GlobalStaticPropertyNamespace.namespaceConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_get") +@_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_get") +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_get() -> Int32 { + #if arch(wasm32) + let ret = GlobalStaticPropertyNamespace.NestedProperties.nestedProperty + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set") +@_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set") +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set(value: Int32) -> Void { + #if arch(wasm32) + GlobalStaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedConstant_get") +@_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedConstant_get") +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedConstant_get() -> Void { + #if arch(wasm32) + let ret = GlobalStaticPropertyNamespace.NestedProperties.nestedConstant + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_get") +@_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_get") +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_get() -> Float64 { + #if arch(wasm32) + let ret = GlobalStaticPropertyNamespace.NestedProperties.nestedDouble + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set") +@_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set") +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set(value: Float64) -> Void { + #if arch(wasm32) + GlobalStaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestHTTPServer_init") +@_cdecl("bjs_TestHTTPServer_init") +public func _bjs_TestHTTPServer_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = GlobalNetworking.API.TestHTTPServer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestHTTPServer_call") +@_cdecl("bjs_TestHTTPServer_call") +public func _bjs_TestHTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { + #if arch(wasm32) + GlobalNetworking.API.TestHTTPServer.bridgeJSLiftParameter(_self).call(_: GlobalNetworking.API.CallMethod.bridgeJSLiftParameter(method)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestHTTPServer_deinit") +@_cdecl("bjs_TestHTTPServer_deinit") +public func _bjs_TestHTTPServer_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension GlobalNetworking.API.TestHTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_TestHTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestHTTPServer_wrap") +fileprivate func _bjs_TestHTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestHTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_TestInternalServer_init") +@_cdecl("bjs_TestInternalServer_init") +public func _bjs_TestInternalServer_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Internal.TestInternalServer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestInternalServer_call") +@_cdecl("bjs_TestInternalServer_call") +public func _bjs_TestInternalServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { + #if arch(wasm32) + Internal.TestInternalServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedServerMethod.bridgeJSLiftParameter(method)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TestInternalServer_deinit") +@_cdecl("bjs_TestInternalServer_deinit") +public func _bjs_TestInternalServer_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Internal.TestInternalServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_TestInternalServer_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestInternalServer_wrap") +fileprivate func _bjs_TestInternalServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TestInternalServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_PublicConverter_init") +@_cdecl("bjs_PublicConverter_init") +public func _bjs_PublicConverter_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = GlobalUtils.PublicConverter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PublicConverter_toString") +@_cdecl("bjs_PublicConverter_toString") +public func _bjs_PublicConverter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_PublicConverter_deinit") +@_cdecl("bjs_PublicConverter_deinit") +public func _bjs_PublicConverter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension GlobalUtils.PublicConverter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicConverter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_PublicConverter_wrap") +fileprivate func _bjs_PublicConverter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_PublicConverter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json new file mode 100644 index 000000000..979311c86 --- /dev/null +++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -0,0 +1,537 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_TestHTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestHTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "GlobalNetworking.API.CallMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestHTTPServer", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API.TestHTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestInternalServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestInternalServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedServerMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestInternalServer", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestInternalServer" + }, + { + "constructor" : { + "abiName" : "bjs_PublicConverter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_PublicConverter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "GlobalUtils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PublicConverter", + "namespace" : [ + "GlobalUtils" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalUtils.PublicConverter" + } + ], + "enums" : [ + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalNetworking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking", + "tsFullPath" : "GlobalNetworking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "GlobalNetworking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API", + "tsFullPath" : "GlobalNetworking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "CallMethod", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API.CallMethod", + "tsFullPath" : "GlobalNetworking.API.CallMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalConfiguration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration", + "tsFullPath" : "GlobalConfiguration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "PublicLogLevel", + "namespace" : [ + "GlobalConfiguration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration.PublicLogLevel", + "tsFullPath" : "GlobalConfiguration.PublicLogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "AvailablePort", + "namespace" : [ + "GlobalConfiguration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration.AvailablePort", + "tsFullPath" : "GlobalConfiguration.AvailablePort" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "GlobalNetworking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "GlobalNetworking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedServerMethod", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedServerMethod", + "tsFullPath" : "GlobalNetworking.APIV2.Internal.SupportedServerMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalStaticPropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "GlobalStaticPropertyNamespace", + "tsFullPath" : "GlobalStaticPropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "NestedProperties", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "GlobalStaticPropertyNamespace.NestedProperties", + "tsFullPath" : "GlobalStaticPropertyNamespace.NestedProperties" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalUtils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalUtils", + "tsFullPath" : "GlobalUtils" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "moduleName" : "BridgeJSGlobalTests", + "protocols" : [ + + ] +} \ No newline at end of file diff --git a/Tests/BridgeJSGlobalTests/GlobalAPITests.swift b/Tests/BridgeJSGlobalTests/GlobalAPITests.swift new file mode 100644 index 000000000..19087ff55 --- /dev/null +++ b/Tests/BridgeJSGlobalTests/GlobalAPITests.swift @@ -0,0 +1,78 @@ +import XCTest +import JavaScriptKit + +@_extern(wasm, module: "BridgeJSGlobalTests", name: "runJsWorksGlobal") +@_extern(c) +func runJsWorksGlobal() -> Void + +// Minimal set of @JS declarations for testing globalThis access +// These are namespaced items that should be accessible via globalThis + +@JS enum GlobalNetworking { + @JS enum API { + @JS enum CallMethod { + case get + case post + case put + case delete + } + @JS class TestHTTPServer { + @JS init() {} + @JS func call(_ method: CallMethod) {} + } + } +} + +@JS enum GlobalConfiguration { + @JS enum PublicLogLevel: String { + case debug = "debug" + case info = "info" + case warning = "warning" + case error = "error" + } + + @JS enum AvailablePort: Int { + case http = 80 + case https = 443 + case development = 3000 + } +} + +@JS(namespace: "GlobalNetworking.APIV2") +enum Internal { + @JS enum SupportedServerMethod { + case get + case post + } + @JS class TestInternalServer { + @JS init() {} + @JS func call(_ method: SupportedServerMethod) {} + } +} + +@JS enum GlobalStaticPropertyNamespace { + @JS nonisolated(unsafe) static var namespaceProperty: String = "namespace" + @JS static let namespaceConstant: String = "constant" + + @JS enum NestedProperties { + @JS nonisolated(unsafe) static var nestedProperty: Int = 999 + @JS static let nestedConstant: String = "nested" + @JS nonisolated(unsafe) static var nestedDouble: Double = 1.414 + } +} + +@JS enum GlobalUtils { + @JS class PublicConverter { + @JS init() {} + + @JS func toString(value: Int) -> String { + return String(value) + } + } +} + +class GlobalAPITests: XCTestCase { + func testGlobalAccess() { + runJsWorksGlobal() + } +} diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json b/Tests/BridgeJSGlobalTests/bridge-js.config.json similarity index 100% rename from Tests/BridgeJSRuntimeTests/bridge-js.config.exposeToGlobal.json rename to Tests/BridgeJSGlobalTests/bridge-js.config.json diff --git a/Tests/BridgeJSGlobalTests/bridge-js.d.ts b/Tests/BridgeJSGlobalTests/bridge-js.d.ts new file mode 100644 index 000000000..e69de29bb diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index f5268b4ee..ff3d9dbed 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -872,12 +872,6 @@ enum APIOptionalResult { } } -// Test functions for static properties -@JS func getAllStaticPropertyValues() -> String { - return - "const:\(StaticPropertyHolder.staticConstant),var:\(StaticPropertyHolder.staticVariable),computed:\(StaticPropertyHolder.computedProperty),readonly:\(StaticPropertyHolder.readOnlyComputed)" -} - // MARK: - Protocol Tests @JS protocol DataProcessor { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 572890b0f..9923eedd5 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -3265,17 +3265,6 @@ public func _bjs_testEmptyInit(object: UnsafeMutableRawPointer) -> UnsafeMutable #endif } -@_expose(wasm, "bjs_getAllStaticPropertyValues") -@_cdecl("bjs_getAllStaticPropertyValues") -public func _bjs_getAllStaticPropertyValues() -> Void { - #if arch(wasm32) - let ret = getAllStaticPropertyValues() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - @_expose(wasm, "bjs_formatName") @_cdecl("bjs_formatName") public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int32) -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 69564e72c..75964debb 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -7402,23 +7402,6 @@ } } }, - { - "abiName" : "bjs_getAllStaticPropertyValues", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getAllStaticPropertyValues", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, { "abiName" : "bjs_formatName", "effects" : { diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 0f0d01556..e69de29bb 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -1,18 +0,0 @@ -export function jsRoundTripVoid(): void -export function jsRoundTripNumber(v: number): number -export function jsRoundTripBool(v: boolean): boolean -export function jsRoundTripString(v: string): string -export function jsThrowOrVoid(shouldThrow: boolean): void -export function jsThrowOrNumber(shouldThrow: boolean): number -export function jsThrowOrBool(shouldThrow: boolean): boolean -export function jsThrowOrString(shouldThrow: boolean): string - -export class JsGreeter { - name: string; - readonly prefix: string; - constructor(name: string, prefix: string); - greet(): string; - changeName(name: string): void; -} - -export function runAsyncWorks(): Promise; diff --git a/Tests/prelude.exposeToGlobal.mjs b/Tests/prelude.exposeToGlobal.mjs deleted file mode 100644 index 47e36b4d2..000000000 --- a/Tests/prelude.exposeToGlobal.mjs +++ /dev/null @@ -1,248 +0,0 @@ -/** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ -export async function setupOptions(options, context) { - Error.stackTraceLimit = 100; - setupTestGlobals(globalThis); - return { - ...options, - getImports: (importsContext) => { - return { - "jsRoundTripVoid": () => { - return; - }, - "jsRoundTripNumber": (v) => { - return v; - }, - "jsRoundTripBool": (v) => { - return v; - }, - "jsRoundTripString": (v) => { - return v; - }, - "jsThrowOrVoid": (shouldThrow) => { - if (shouldThrow) { - throw new Error("TestError"); - } - }, - "jsThrowOrNumber": (shouldThrow) => { - if (shouldThrow) { - throw new Error("TestError"); - } - return 1; - }, - "jsThrowOrBool": (shouldThrow) => { - if (shouldThrow) { - throw new Error("TestError"); - } - return true; - }, - "jsThrowOrString": (shouldThrow) => { - if (shouldThrow) { - throw new Error("TestError"); - } - return "Hello, world!"; - }, - JsGreeter: class { - /** - * @param {string} name - * @param {string} prefix - */ - constructor(name, prefix) { - this.name = name; - this.prefix = prefix; - } - greet() { - return `${this.prefix}, ${this.name}!`; - } - /** @param {string} name */ - changeName(name) { - this.name = name; - } - }, - runAsyncWorks: async () => { - const exports = importsContext.getExports(); - if (!exports) { - throw new Error("No exports!?"); - } - BridgeJSRuntimeTests_runAsyncWorks(exports); - return; - } - }; - }, - addToCoreImports(importObject, importsContext) { - const { getInstance, getExports } = importsContext; - options.addToCoreImports?.(importObject, importsContext); - importObject["JavaScriptEventLoopTestSupportTests"] = { - "isMainThread": () => context.isMainThread, - } - const bridgeJSRuntimeTests = importObject["BridgeJSRuntimeTests"] || {}; - bridgeJSRuntimeTests["runJsWorks"] = () => { - const exports = getExports(); - if (!exports) { - throw new Error("No exports!?"); - } - return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); - } - importObject["BridgeJSRuntimeTests"] = bridgeJSRuntimeTests; - } - } -} - -import assert from "node:assert"; - -/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ -function BridgeJSRuntimeTests_runJsWorks(instance, exports) { - // Repetition tests to satisfy testAll - const g = new exports.Greeter("John"); - g.release(); - const calc = exports.createCalculator(); - calc.release(); - - assert.equal(globalThis.Networking.API.MethodValues.Get, 0); - assert.equal(globalThis.Networking.API.MethodValues.Post, 1); - assert.equal(globalThis.Networking.API.MethodValues.Put, 2); - assert.equal(globalThis.Networking.API.MethodValues.Delete, 3); - - assert.equal(globalThis.Configuration.LogLevelValues.Debug, "debug"); - assert.equal(globalThis.Configuration.LogLevelValues.Info, "info"); - assert.equal(globalThis.Configuration.LogLevelValues.Warning, "warning"); - assert.equal(globalThis.Configuration.LogLevelValues.Error, "error"); - assert.equal(globalThis.Configuration.PortValues.Http, 80); - assert.equal(globalThis.Configuration.PortValues.Https, 443); - assert.equal(globalThis.Configuration.PortValues.Development, 3000); - - assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Get, 0); - assert.equal(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post, 1); - - const globalConverter = new globalThis.Utils.Converter(); - assert.equal(globalConverter.toString(99), "99"); - globalConverter.release(); - - const globalHttpServer = new globalThis.Networking.API.HTTPServer(); - globalHttpServer.call(globalThis.Networking.API.MethodValues.Get); - globalHttpServer.release(); - - const globalTestServer = new globalThis.Networking.APIV2.Internal.TestServer(); - globalTestServer.call(globalThis.Networking.APIV2.Internal.SupportedMethodValues.Post); - globalTestServer.release(); - - assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "namespace"); - assert.equal(globalThis.StaticPropertyNamespace.namespaceConstant, "constant"); - - globalThis.StaticPropertyNamespace.namespaceProperty = "modified namespace"; - assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, "modified namespace"); - - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 999); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 1.414); - - globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty = 1000; - globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble = 2.828; - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, 1000); - assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedDouble, 2.828); - - // // Verify both globalThis and exports point to same objects - // assert.equal(globalThis.StaticPropertyNamespace.namespaceProperty, exports.StaticPropertyNamespace.namespaceProperty); - // assert.equal(globalThis.StaticPropertyNamespace.NestedProperties.nestedProperty, exports.StaticPropertyNamespace.NestedProperties.nestedProperty); - - // // Verify enum values accessible via globalThis match exports - // assert.equal(exports.Configuration.LogLevel.Debug, globalThis.Configuration.LogLevelValues.Debug); - // assert.equal(exports.Networking.API.Method.Get, globalThis.Networking.API.MethodValues.Get); -} - -/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ -async function BridgeJSRuntimeTests_runAsyncWorks(exports) { - await exports.asyncRoundTripVoid(); -} - -function setupTestGlobals(global) { - global.globalObject1 = { - prop_1: { - nested_prop: 1, - }, - prop_2: 2, - prop_3: true, - prop_4: [3, 4, "str_elm_1", null, undefined, 5], - prop_5: { - func1: function () { - return; - }, - func2: function () { - return 1; - }, - func3: function (n) { - return n * 2; - }, - func4: function (a, b, c) { - return a + b + c; - }, - func5: function (x) { - return "Hello, " + x; - }, - func6: function (c, a, b) { - if (c) { - return a; - } else { - return b; - } - }, - }, - prop_6: { - call_host_1: () => { - return global.globalObject1.prop_6.host_func_1(); - }, - }, - prop_7: 3.14, - prop_8: [0, , 2, 3, , , 6], - eval_closure: function (fn) { - return fn(arguments[1]); - }, - observable_obj: { - set_called: false, - target: new Proxy( - { - nested: {}, - }, - { - set(target, key, value) { - global.globalObject1.observable_obj.set_called = true; - target[key] = value; - return true; - }, - } - ), - }, - }; - - global.Animal = function (name, age, isCat) { - if (age < 0) { - throw new Error("Invalid age " + age); - } - this.name = name; - this.age = age; - this.bark = () => { - return isCat ? "nyan" : "wan"; - }; - this.isCat = isCat; - this.getIsCat = function () { - return this.isCat; - }; - this.setName = function (name) { - this.name = name; - }; - }; - - global.callThrowingClosure = (c) => { - try { - c(); - } catch (error) { - return error; - } - }; - - global.objectDecodingTest = { - obj: {}, - fn: () => { }, - sym: Symbol("s"), - bi: BigInt(3) - }; -} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 640a65612..cfd898b31 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -88,7 +88,12 @@ export async function setupOptions(options, context) { } return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); } + const bridgeJSGlobalTests = importObject["BridgeJSGlobalTests"] || {}; + bridgeJSGlobalTests["runJsWorksGlobal"] = () => { + return BridgeJSGlobalTests_runJsWorksGlobal(); + } importObject["BridgeJSRuntimeTests"] = bridgeJSRuntimeTests; + importObject["BridgeJSGlobalTests"] = bridgeJSGlobalTests; } } } @@ -897,6 +902,51 @@ async function BridgeJSRuntimeTests_runAsyncWorks(exports) { await exports.asyncRoundTripVoid(); } +function BridgeJSGlobalTests_runJsWorksGlobal() { + assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Get, 0); + assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Post, 1); + assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Put, 2); + assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Delete, 3); + + assert.equal(globalThis.GlobalConfiguration.PublicLogLevelValues.Debug, "debug"); + assert.equal(globalThis.GlobalConfiguration.PublicLogLevelValues.Info, "info"); + assert.equal(globalThis.GlobalConfiguration.PublicLogLevelValues.Warning, "warning"); + assert.equal(globalThis.GlobalConfiguration.PublicLogLevelValues.Error, "error"); + assert.equal(globalThis.GlobalConfiguration.AvailablePortValues.Http, 80); + assert.equal(globalThis.GlobalConfiguration.AvailablePortValues.Https, 443); + assert.equal(globalThis.GlobalConfiguration.AvailablePortValues.Development, 3000); + + assert.equal(globalThis.GlobalNetworking.APIV2.Internal.SupportedServerMethodValues.Get, 0); + assert.equal(globalThis.GlobalNetworking.APIV2.Internal.SupportedServerMethodValues.Post, 1); + + const globalConverter = new globalThis.GlobalUtils.PublicConverter(); + assert.equal(globalConverter.toString(99), "99"); + globalConverter.release(); + + const globalHttpServer = new globalThis.GlobalNetworking.API.TestHTTPServer(); + globalHttpServer.call(globalThis.GlobalNetworking.API.CallMethodValues.Get); + globalHttpServer.release(); + + const globalTestServer = new globalThis.GlobalNetworking.APIV2.Internal.TestInternalServer(); + globalTestServer.call(globalThis.GlobalNetworking.APIV2.Internal.SupportedServerMethodValues.Post); + globalTestServer.release(); + + assert.equal(globalThis.GlobalStaticPropertyNamespace.namespaceProperty, "namespace"); + assert.equal(globalThis.GlobalStaticPropertyNamespace.namespaceConstant, "constant"); + + globalThis.GlobalStaticPropertyNamespace.namespaceProperty = "further modified"; + assert.equal(globalThis.GlobalStaticPropertyNamespace.namespaceProperty, "further modified"); + + assert.equal(globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedProperty, 999); + assert.equal(globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedConstant, "nested"); + assert.equal(globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedDouble, 1.414); + + globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedProperty = 2000; + globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedDouble = 3.141; + assert.equal(globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedProperty, 2000); + assert.equal(globalThis.GlobalStaticPropertyNamespace.NestedProperties.nestedDouble, 3.141); +} + function setupTestGlobals(global) { global.globalObject1 = { prop_1: { From 94762ae7b1929519f1c2f64602b795c58b80fb95 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 28 Nov 2025 13:03:10 +0000 Subject: [PATCH 042/252] Documentation: Fix docc formatting issues --- Sources/JavaScriptKit/BasicObjects/JSArray.swift | 2 +- .../Exporting-Swift/Exporting-Swift-Closure.md | 14 +++++++------- .../FundamentalObjects/JSClosure.swift | 8 ++++++++ .../FundamentalObjects/JSObject.swift | 2 +- Sources/JavaScriptKit/JSValueDecoder.swift | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Sources/JavaScriptKit/BasicObjects/JSArray.swift b/Sources/JavaScriptKit/BasicObjects/JSArray.swift index 876a49985..9f24f48fd 100644 --- a/Sources/JavaScriptKit/BasicObjects/JSArray.swift +++ b/Sources/JavaScriptKit/BasicObjects/JSArray.swift @@ -19,7 +19,7 @@ public class JSArray: JSBridgedClass { /// Construct a `JSArray` from Array `JSObject`. /// Return `nil` if the object is not an Array. /// - /// - Parameter object: A `JSObject` expected to be a JavaScript Array + /// - Parameter jsObject: A `JSObject` expected to be a JavaScript Array public convenience init?(_ jsObject: JSObject) { guard Self.isArray(jsObject) else { return nil } self.init(unsafelyWrapping: jsObject) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md index 83a1d9f4c..498e6c077 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md @@ -15,22 +15,22 @@ import JavaScriptKit @JS class TextProcessor { private var transform: (String) -> String - + @JS init(transform: @escaping (String) -> String) { self.transform = transform } - + @JS func processWithPerson(_ person: Person, formatter: (Person) -> String) -> String { return formatter(person) } - + @JS func makePersonCreator(defaultName: String) -> (String) -> Person { return { name in let fullName = name.isEmpty ? defaultName : name return Person(name: fullName) } } - + @JS func getTransform() -> (String) -> String { return transform } @@ -83,8 +83,8 @@ export interface TextProcessor extends SwiftHeapObject { } export type Exports = { - TextProcessor: { - new(transform: (arg0: string) => string): TextProcessor + TextProcessor: { + new(transform: (arg0: string) => string): TextProcessor }; } ``` @@ -111,4 +111,4 @@ Both directions use automatic memory management - no manual cleanup required. ## See Also -- - Complete list of supported types across BridgeJS +- diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift index cfdd7b418..baeb29847 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift @@ -49,6 +49,8 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol { /// - Parameters: /// - priority: The priority of the new unstructured Task created under the hood. /// - body: The Swift function to call asynchronously. + /// - file: The file identifier where the function is defined. + /// - line: The line number where the function is defined. @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) public static func async( priority: TaskPriority? = nil, @@ -65,6 +67,8 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol { /// - taskExecutor: The executor preference of the new unstructured Task created under the hood. /// - priority: The priority of the new unstructured Task created under the hood. /// - body: The Swift function to call asynchronously. + /// - file: The file identifier where the function is defined. + /// - line: The line number where the function is defined. @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) public static func async( executorPreference taskExecutor: (any TaskExecutor)? = nil, @@ -171,6 +175,8 @@ public class JSClosure: JSObject, JSClosureProtocol { /// - Parameters: /// - priority: The priority of the new unstructured Task created under the hood. /// - body: The Swift function to call asynchronously. + /// - file: The file identifier where the function is defined. + /// - line: The line number where the function is defined. @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) public static func async( priority: TaskPriority? = nil, @@ -187,6 +193,8 @@ public class JSClosure: JSObject, JSClosureProtocol { /// - taskExecutor: The executor preference of the new unstructured Task created under the hood. /// - priority: The priority of the new unstructured Task created under the hood. /// - body: The Swift function to call asynchronously. + /// - file: The file identifier where the function is defined. + /// - line: The line number where the function is defined. @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) public static func async( executorPreference taskExecutor: (any TaskExecutor)? = nil, diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift index f6a14cfb0..238b88055 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift @@ -174,7 +174,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral { } /// Access the `symbol` member dynamically through JavaScript and Swift runtime bridge library. - /// - Parameter symbol: The name of this object's member to access. + /// - Parameter name: The name of this object's member to access. /// - Returns: The value of the `name` member of this object. public subscript(_ name: JSSymbol) -> JSValue { get { diff --git a/Sources/JavaScriptKit/JSValueDecoder.swift b/Sources/JavaScriptKit/JSValueDecoder.swift index 08e29915c..054c6c8da 100644 --- a/Sources/JavaScriptKit/JSValueDecoder.swift +++ b/Sources/JavaScriptKit/JSValueDecoder.swift @@ -243,6 +243,7 @@ public class JSValueDecoder { /// /// - Parameter T: The type of the value to decode. /// - Parameter value: The `JSValue` to decode from. + /// - Parameter userInfo: Additional information to pass to the decoder. public func decode( _: T.Type = T.self, from value: JSValue, From 4de8df387c70d28d37c4e7200808e0d86d17ea7a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 28 Nov 2025 13:30:57 +0000 Subject: [PATCH 043/252] Documentation: Add debugging and profiling articles --- .../Documentation.docc/Articles/Debugging.md | 59 ++++++++++++++++++ .../Articles/Deploying-Pages.md | 2 +- .../JavaScript-Environment-Requirements.md | 2 + .../Articles/Profiling-Memory-Usage.md | 37 +++++++++++ .../Articles/Profiling-Performance-Issues.md | 51 +++++++++++++++ .../Resources/chrome-devtools-perf.png | Bin 0 -> 252150 bytes .../Resources/chrome-devtools-swift.png | Bin 0 -> 391140 bytes .../Articles/Resources/chrome-devtools.png | Bin 0 -> 924899 bytes .../Documentation.docc/Documentation.md | 3 + 9 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Memory-Usage.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Performance-Issues.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Resources/chrome-devtools-perf.png create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Resources/chrome-devtools-swift.png create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Resources/chrome-devtools.png diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md new file mode 100644 index 000000000..f766be2ed --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md @@ -0,0 +1,59 @@ +# Debugging + +Debug your Swift applications running on JavaScript environment using DWARF-based debugging tools, including Chrome DevTools extensions and command-line debuggers. + +## Overview + +These debugging tools are DWARF-based, so you need to build your application with DWARF sections enabled. + +Build your application with debug configuration using: + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js -c debug +``` + +Alternatively, you can omit the `-c debug` flag since the `js` plugin builds with debug configuration by default: + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js +``` + +## Chrome DevTools + +When debugging a web browser application, Chrome DevTools provides a powerful debugging environment. It allows you to set breakpoints and step through your Swift source code at the source level. + +There are two DWARF extensions available for Chrome DevTools: an enhanced extension specifically designed for Swift, and the official C/C++ extension. For Swift development, the enhanced extension is recommended. + +> Important: The two extensions cannot coexist. You must use only one extension at a time. + +### Enhanced DWARF Extension for Swift + +For the best Swift debugging experience, use the enhanced DWARF extension that provides: + +- Breakpoint setting and Swift code inspection +- Human-readable call stack frames +- Swift variable value inspection + +![Chrome DevTools with Swift support](chrome-devtools-swift.png) + +To install this enhanced extension: + +1. If you have the official "C/C++ DevTools Support (DWARF)" extension installed, uninstall it first +2. Download the extension ZIP file from [GitHub Releases](https://github.com/GoodNotes/devtools-frontend/releases/tag/swift-0.2.3.0) +3. Go to `chrome://extensions/` and enable "Developer mode" +4. Drag and drop the downloaded ZIP file into the page + +When you close and reopen the DevTools window, DevTools will suggest reloading itself to apply settings. + +> Note: There is a known issue where some JavaScriptKit types like `JSObject` and `JSValue` are not shown in pretty format in the variables view. + +### Official DWARF Extension + +Alternatively, you can use the official [`C/C++ DevTools Support (DWARF)`](https://goo.gle/wasm-debugging-extension) extension. However, it has limitations for Swift development: + +- Function names in the stack trace are mangled (you can demangle them using `swift demangle` command) +- Variable inspection is unavailable since Swift depends on its own mechanisms instead of DWARF's structure type feature + +![Chrome DevTools](chrome-devtools.png) + +See [the DevTools team's official introduction](https://developer.chrome.com/blog/wasm-debugging-2020) for more details about the extension. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md index 96789f206..1de371e40 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md @@ -11,7 +11,7 @@ Once you've built your application with JavaScriptKit, you'll need to deploy it Build your application using [Vite](https://vite.dev/) build tool: ```bash -# Build the Swift package for WebAssembly +# Build the Swift package for WebAssembly with release configuration $ swift package --swift-sdk wasm32-unknown-wasi js -c release # Create a minimal HTML file (if you don't have one) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Environment-Requirements.md b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Environment-Requirements.md index 6483e4ca6..f0672085d 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Environment-Requirements.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Environment-Requirements.md @@ -1,5 +1,7 @@ # JavaScript Environment Requirements +Understand the JavaScript features required by JavaScriptKit and ensure your target environment supports them. + ## Required JavaScript Features The JavaScript package produced by the JavaScriptKit packaging plugin requires the following JavaScript features: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Memory-Usage.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Memory-Usage.md new file mode 100644 index 000000000..bf14824b4 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Memory-Usage.md @@ -0,0 +1,37 @@ +# Profiling Memory Usage + +Profile memory usage of your Swift applications running on JavaScript environment to identify memory leaks and understand memory allocation patterns. + +## Overview + +Memory profiling helps you understand how your application uses memory, identify memory leaks, and optimize memory allocation patterns. This guide covers tools and techniques for profiling memory usage in Swift applications running on JavaScript environment. + +When profiling memory usage, start with JavaScript execution environment's heap profiler. If `WebAssembly.Memory` objects are the bottleneck, use specialized WebAssembly memory profilers that understand the Wasm instance's memory allocator. + +## Chrome DevTools Heap Snapshots + +Start by using Chrome DevTools' built-in heap profiler to understand overall memory usage in your application. See [Chrome DevTools documentation on heap snapshots](https://developer.chrome.com/docs/devtools/memory-problems/heap-snapshots) for detailed instructions. + +## wasm-memprof + +If `WebAssembly.Memory` objects are the bottleneck, JavaScript engine's default profiler typically doesn't track allocations within WebAssembly's memory space, so you won't get good insights. In such cases, use a profiler like [wasm-memprof](https://github.com/kateinoigakukun/wasm-memprof) that understands the Wasm instance's memory allocator. + +wasm-memprof is a heap profiler specifically designed for WebAssembly applications. It provides detailed memory allocation tracking with Swift symbol demangling support, helping you identify memory leaks and understand memory usage patterns within WebAssembly's linear memory. + +![wasm-memprof visualization](https://raw.githubusercontent.com/kateinoigakukun/wasm-memprof/main/docs/demo.png) + +### Setup + +Add wasm-memprof to your application before instantiating your Wasm program: + +```javascript +import { WMProf } from "wasm-memprof"; +import { SwiftDemangler } from "wasm-memprof/plugins/swift-demangler.js"; + +const swiftDemangler = SwiftDemangler.create(); +globalThis.WebAssembly = WMProf.wrap(globalThis.WebAssembly, { + demangler: swiftDemangler.demangle.bind(swiftDemangler), +}); +``` + +Check the [wasm-memprof repository](https://github.com/kateinoigakukun/wasm-memprof) for detailed documentation and examples. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Performance-Issues.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Performance-Issues.md new file mode 100644 index 000000000..77ad013e1 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Profiling-Performance-Issues.md @@ -0,0 +1,51 @@ +# Profiling Performance Issues + +Profile your Swift applications running on JavaScript environment to identify performance bottlenecks using Chrome DevTools and other profiling tools. + +## Overview + +Profiling helps you understand where your application spends time. This guide covers tools and techniques for profiling Swift applications running on JavaScript environment, focusing on performance profiling. For memory profiling, see . + +## Chrome DevTools Performance Tab + +Chrome DevTools provides a built-in Performance profiler that can help you identify performance bottlenecks in your WebAssembly application. See [Chrome DevTools documentation on performance profiling](https://developer.chrome.com/docs/devtools/performance) for detailed instructions. + +![Chrome DevTools Performance Tab](chrome-devtools-perf.png) + +> Note: WebAssembly function names may appear mangled in the performance timeline. You can use `swift demangle` to decode them, or use the enhanced DWARF extension mentioned in for better symbol resolution. + +### V8 Compilation Pipeline Considerations + +When DevTools is open, V8's WebAssembly compilation pipeline behaves differently: + +- **With DevTools open**: V8 replaces optimized TurboFan code with unoptimized Liftoff code for debugging purposes. This means performance measurements taken while DevTools is open will not reflect actual production performance. + +- **With Performance tab recording**: When you click the "Record" button in the Performance tab, code gets recompiled with TurboFan again for profiling. However, the initial tier-down to Liftoff when DevTools opens can still affect measurements. + +> Important: Do not measure FPS or performance metrics while DevTools is open, as the results will not be representative of actual production performance. Close DevTools before taking performance measurements, or use the Performance tab's recording feature which recompiles code appropriately for profiling. + +See [V8's WebAssembly compilation pipeline documentation](https://v8.dev/docs/wasm-compilation-pipeline#debugging) for more details. + +## Performance Best Practices + +### Build Configuration + +For profiling, use a release build with debug information. You have two options: + +**DWARF mode** (recommended for easier symbol resolution): + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js -c release --debug-info-format dwarf +``` + +DWARF mode preserves DWARF structures, which may disable some wasm-opt optimizations. This can result in performance characteristics that differ from actual release builds. However, the DevTools extension can automatically demangle function names, making results easier to read. + +**Name section mode** (recommended for accurate performance characteristics): + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js -c release --debug-info-format name +``` + +Name section mode uses WebAssembly's [name section](https://webassembly.github.io/spec/core/appendix/custom.html#name-section) and applies the same optimizations as regular release builds, providing more accurate performance characteristics. However, you'll need to manually demangle function names using `swift demangle` when analyzing results. + +> Note: The limitation of name section mode requiring manual demangling may be alleviated in the future through improvements to the DevTools extension. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Resources/chrome-devtools-perf.png b/Sources/JavaScriptKit/Documentation.docc/Articles/Resources/chrome-devtools-perf.png new file mode 100644 index 0000000000000000000000000000000000000000..c26898a100d0f1238df69be53ae5b564058eb5cc GIT binary patch literal 252150 zcmZ_01yr27);~N90}MVmMF(i{BE@}hDeh9-i@TKK*5WNt3dP-_cyTXoMT@(;>o@0~ zbM8Iw{oilade$RJc9NZBXUi}1L0M566O9B7003ah%1EdJ03av;0Nep1!@rpP)}jFb z5Dcuv#g%2n#i7d14i?t7<^TYFoLg+=YoIZ4Pdbyha%OlaG71$5uz0OH5&Wu(o(${t zV8)7IIS21ZOk)IuEHJbuaa$=ine@3;!4s4XEm=1uNKdZpYC`U%w}@~WCHB$T=_wGA zDulfgCBv3q)54DLd+O4MYeO6fVuV3)b@h}NW_$`SucscJDXARo6wh?>Jw6Y2I=RyLwx)0z-l01M%dq3(v{(DSOaVWhNq^5yY#pY++=oPiCtJ^0)+S z>c+;D{Bn-;snD=?f2k%cJVp!1i$v(@*ZZkfhnWjS86p?ZYkk&KlrqLPtL8n0ePAbg z+X15*^TyWqz`d#~6VLuf=zrXS!}i$6vo6(ghEhT&XI)>wq&{ z(_CBDLO}t*2!93x5W=hhAovpk{33y00082rPyh=2jtjpeGJt=lf}k0Qe?J3v{>Uh* zCN3)rzpI%#o15FaSUI@HIsnGuq^7OawOzFp{yJ=98AnvJnbC+C;|}l`C{)nd z%z|H4Lh7&L@HZi9D_2)XepXfw4-Xa(4i*PzOICJ1K0a2qSFEpIy@cm@>EdPYYV7&a z-i78*B7f77Fn2L^wsv&2cCd&3LD$&C!Oc~On);85{{8#2o#vj_|EbB|<*#nRJIMM+ z3M)Gc8|%Mm!;1?3@s(fM+SA-tN5a|;&K`Ij!aST@g8$0@|D^n<#($L5{!dAEHZJae z7X3%ke;3toF?SYsu!Gm>D*T_J`K$0h6aOkG$ofau|G|ns`TVc1a7GKG39|ls(1g)U z>6+XC02n}4LR8%oVP7A`hd>f9J$Uimkp_ghfPP#w7mXVRV$j5g#4~Dm;}PH^ppR=n zAP5M#=;49sfq_{vM=#=oX@l2Oo@nptJsKLP)qcwRdU@0})@`)9Sy*m${0uZPHSH`j zXx3$AX1*Mo(f$z@6u)9am^Jf;uw8r~-v-AoDMatB^Y@PD#2ZQn^~i|gAH*RL5C}mO z_Mh844&r|*8U&^8Z1O1^;F!;Z2!c?*T-B&vYMj(rJ#9Z0W79QH#o;-vS zC9isR`t_TpI%Nn2&tFpnqNFO|z^tCHGyXpm{zZ0%X4&NAAn5rgrEgH`11mx?jL|uW zwcDIlxxq66a`J~f-^AkoQTty_dV~VHL$|m09?A@&Lez68SCvnU4Ta-~0+$ zm-r7i|HE784Rx#_62u3zR?e*RU9)4Fg~H+hg{KqJhc1r;dtQDUJO4lHe69rgln(%E zR}yy7tc;CKlh7$GKiB%742FMnWP$=_#dT}Zozi(iJ~a5I4!^Gp9)7AwE+d;$>T-Yn zDuG_MVOLO$kCZd}*mbArLk|Hh?IyqEV{>fQrJuAG^(Fn4yw`xrrD_!YyBj(N=J~qo zEYmFO?zHmlF!7~{c9(ak$gFakEU#-m@?_9%=&H^+erZ*;xJW3)ZH;HhEu&B=a~>nE#9o(5>@Letf)h zxZTN5->LoGuU7MR(zW7wqd}8r-0(L(@ep*Pyz`w2z0I}d_MmtH5BvVamnpd-WI`bg z?gu2~!ahlI@${nB6SQwW+b*>Px$n=2a=lg0|871omq$bKH?v@Jl7R1F)lGy<_PXgW z=#|cAIb4lA4dpy;pKlB&rjBp0!nDUFrS&s@vgS?9at#!A`H#i3D7Ao&bou7%os*-> z4i%r-ljSt=y;8Y-<%D-zV-v>Ue0Aq)Ji?=XorxOH?c!TJjaQ%A?42B1dZgHE8m*eQ zuS5SXdY*A`$0pzEu%)p2vh5X#`a9r8-@5)I?sF*CUyWnH4X{kNQ!={eBw$cYdbaet zK&Q$=z1j-rV1L@JJuqZYd!+8Y$L+awJeQ58o}UthUhTbv-{TF@g2z%b6%H(z-&eoI zX8JMPe4r(Ff3}JNq3iMCZjxj71wJs`v^RPpPa&m1Ia5r%SW_W23N&41IWiuMinmkV z>dw@9eC$}HRn8*xbnn6<+NC7&Ai-fdtO-QB)+&4R!TWMw^ecy@d-s+?lJ$gew%gv+ zgx}MHw9a?4JX(ch3B9G@^m~qBbb{C#VvQ^oO+H(9$2l?t@fd#qI3#JAJ6 zV_NMz0`#u-vFW|;Qu}*xi)XyMvX={a>`!3g^tlGlRc#q23tYMEP8QR3cXiP#gxdYC zRgsVYC9oPA94LNa(u%eiNmKY;`;ZkaYBWv4>3OW@`greEgC}eR^V{Gy`>8xvv!~>} zTS%whc$>tLNfqF!lqT4RVQWn=5`-;Wuo&=ke`7d%TMP?Lf2mhHy4t-oI+oo_FC9(h zdenTSoWgBKZz^Sr0a6?VC-J!u9xOKN8LMWBA$ecU*0LO+#~WYn^Le6NjZ7F$v&!@vkJBWH(ZS!x z>C)xbOmU@u-SK7tqe6P3NEu4QUw>gy`NE=~kO&Oc8m%~{9bD~>(C}IK;ij?CIrjN# zG3BRQL()K#uu4QJ|^9d>fyOtKB>zc-Zn3&>9d?u9s(`wBUQetf)Q5R$Qz zGtifgIeOL-nGzVhFX)u6_tb3q<~VY`E)a=ONBb3oj(J&|m+=v$5Iq9pIyp7QLgKMe zaCl+Gqcb33cSh3I79&eNu7KBR#GMgBw>l9265WpXI8|JJ^~IkXuwyX|Kng#S-D)I_ z_fFjC2hq!0U3Oo$-Crt^d*L`V38A298!{2!K;L_(2yc`@5n?^IitY#^Eqiwn4vWF( zWE1tSJFh6S>tikt7xIZm41I4Tn^*gmh*@p%o9+%l{O@n8ah=!AGw(hUFzuu`w6G(e z-N7eVF^CGSA9V;T9@Cv96yuqcii!#-6L{z(kzqBKRkEX^ifREJL{Lb*jq@gIyrO3U z31&;jWLiySRnve$Sy?RKp-|G_O1u(Btxo}Hy9}&~+HF#Zr`Y|;ToJgmCp^8@H>U)0 zuva!y%o`{Qh-A5*2Q_8qtxpef#hRtGR*Y@PpkQ3+I;!i{f=97UBD2n$+Gj>b2aTe{bV;j6jMD@$Ab-@tX+3h|id8 zXvWOU;Y5?&-}={OHJRu{}yPm?1qL!P+u-B3)6j`3cv6cSEw*GDPxne|EN| zH@n{*xtc9w0T5{1i$|xZ3|~2uRVSAH@eFb@fI7M~PkC#H<;P!zpX-%}zww-vPlP%t z$L6!~>4@X!EOiP68~qfpHG(Ap5wqJUK>=T4|5g$mnP`?(0617>!fC6A_z@$oP%I8- zv6)*`1=~`243n3yt_cE9Q0D_P8Zt~p%^=Qg9L&rLZvbISY{E7O#)zvDK9#%rzGl+R zypfXrq|Cv`)WTsoU9bNVnS?NaJUdtyM8qmpxQ6W6gVh>W(HNC_3Ky9ZS4-uqtoZke ztq-;ONQL^1wd_`b@7NMYeSUu9`;03L1wCOsQtRqL^Y|yjT8!+YR5k zzRcE}x{J$XA);V0k|Ih;D*?mB!&cqz;-tacF!O;#6(G1PKZ+%hQKO%$ZuL5h*6KC$ zoBCMjFLvDMx)~f!2G~!(XtLQG?E$1*omB=_xO6=xK~Lr8l!C+D#*;rFgG z>r=hG-E)Xn&VBu5cvl0eCeGcX@`;&UB7)`zkZtR>VsKrN*w1rm2A^>r6KngrIEg26sAQvj^0x>rQ}ba!Bq4)~kZdgSIVMpUTw{yh z1alg~AiDdD4?GViy+`V~{R_;z^p32L0ASLQ|h4y_(X1~2gab>IK4 zwfn{5I$3nZaEElw*dcVKt`f<$&jo8-UJ0XAeS4z(dFh8+3ZuZjgeUdBeW%QGTgEoR z4t!j=mEtHahO--NQyt$dHAdUfO1Cr96pv!FFrV;wavWgeqZE18E5>Nh;MvkRTe z&xJpu!uy0E_SMkuLBZNly~wrEB;KhB2qgAF0zN|e*Ub?p;X18K3f^>?z7__*aKKLa zF~ZGRJdu)iMj4Ek`)t;7B4G%F824d2J4PS*g;OL_FNLEz5;BxZd9KN;%Ddcoqkng< z!WdDQ_6+g&+;#MCMT~>rb?ICdEQKRkZ>c`;7$5g(ftwfo{BZqD&JYObaIF@b8ssdG z7X19BDUI4*M#H|P<%(0eaM?;tpKWRh@EWZrtRlKx%T4=J8Z}aV5>dIJ zM5jOH^d6+j<1OFcNXsc+>E53I8o}&X&j3|!VLWByCvu7_3niclzL1FO7m^IQIa-}P z`$nfvHVn;qcG3|RfkQ+uLXah8o_>m-dX4_4nLZx~{=;NX3J{lEP{d3MX^M4!h$r zAmmxJY}+N`e8vr6MSLtvvcO?!QEnz+L|bedC`Bs$hBL^%tMePr`(K^=hYYM~75;1p zZYWU-#JjY3R7cL0~vtFZ6aPgfG*w_}x~cPhiTx9|yIkyNn`#+l+0ckuYs_b+h@B zedYe`D$DJ*k}{S-)C|%K>Oc zZZ1;{qM0r?upA1DQ0G;^A$em-y`g#HHJl#&mq{h_9=yDb6pasi2f%n+0Y2&Q&rS7i zrt>ouZiB7iB|yM!vBvaZX-pVfqLt*awD7S8m?o3#x;k%mfw*V-U4D~i5K@PgD9Sz$ zfQMtn3VELw#so|z*9@j19ZepS=DkM^G8JYE)~RP+PWTYpm3b92^(c<1@4!1N31wkiP7TEfML=}{lHcg>M5O?{=t ztXIpN*2p=@FqV`YZzF20e=@rvGmrESmzB&Lkb&olqf2X!Z`h%f^;n&y9Krki3 z=jFdA!~gMW72*c0zw{r~Bvmt?l*#;Oi~eo-!i6u?3GTy_SY2i={I^>8f2kFcAmG4q zc6YyY{IwAOJKu*Ocw=x;EM+DCX8b?t!yqz~;BWx7hE^-S!T(PNGLQryj+gf}AVH6!f6><(?WBK-KeKED#H5gDddjIHg@XNILu(v+DG za^C+UG{5^tGj`r;gCMeD%{k0}j=-N@Ks=x`s1ud^1n>XQ_)j+iGN4dkct#t2+<$le z?>7450jd2R#iZ~5-p~Fq0sch?N)OJ#lw)RK`*cjoK~JmDi=X7u2R8x!*^EEm;9ejo zaT8o&e~@f+KX4Wu{Vs_<{oc9dL=JE=8HiMbLH}!FL{R)?n)gRX5!V^EjmN3wcKfTI zU^apTOV$IyIS-{0CT0E=6Vorak z`Hwo)6j6k7gJ!uU7DL60z3Kcnd@j0)Is%6abun34S=)z=hvSOTTBc8K81!kP;>-6p zXVos#ibdXr8vU_U;-jkx;i@da?hIl@`Xlg+^wya zcSqTg&p2oqpC?r>rSJxnad3e9(`W=Rx2Huk(286si*zr9cPF#+iz%i`^j}l@oua-M zw#4$nRWH@AOYF?a<*%`6T*ST{f-BtHL9&#pN7Ysd3%}Vb6;lF14mF?k}Yu zuKyq&El*D|eCxSA+sH%C=Nz1OT>n+T<1hn%mRCAZmfv?(0tN)1310nn_`NgWb%uYI zK=TaM+f85s8d}BHBJpAM{MKf^7oG6eu>G{r@*1HruJHUa7ocZCi{CBF+ij25SP_@j z&Yr_Xecs(_1fTo&mSV}l@5N_WalX)*Kh20^?l|{_kcwZyp+3I@@q{=zcIe~ zNKn1CAkldJ^g*fDKMt8sN~=XFc1g0U-l_j@}FpCS=Y7p+RiOtDNE z+6-PQAMGYH*-xlY;ji3L+zyNKNdAROLoYu$ zYI(iUpP2i_&^yk9?lIegPCmnFt(VToQ&qJAIJ8%5*E*^s@>BwH4@dvpT378oq$`(B z^rxeDBV)`{ zA-^+TmgP4P;iCL@-Ysy7Bp5q`lG`q)H$^1xFz9BY+`%yYwpn9t(+g`*J4l)$6CS$I zK~i$&0asD@mGJ$crV{!-aA6V)hUdM%|6tw{7!YILwYnYZ-!R0i^CSMd+0dsFB*+hd z<{2%gIAI%jP7DFWnVxcZ6C(aB*1g3@D%|l}rgl|h zGnuu;@2dPZQ%&SCDI+?j&y-G&<)vC4XN}zhhQjso`;U>4s`5H@W%?R3h$z@asm3y* z5kyQcQ_#WHAg)-G<|#9O1H`abFx$~Ot&W7)L-s6hxi$R?9%%u zA<<@X^e%-Ip0Rr*^hunk@m#sF;&RulEXj}jiI{yEKIp9m5?@#ishYx0H=?xmK%09! zwi!>_NaR8OsXZa&WuYdZjmw#nwIT`%6E~T7%;1m>d%~X?kD0W#VTh;UeGbo`h!|9Z z%ic7LmAmg0^}8MkU5)Muwq>Tc&V;ALS`d*lz~C zT3gglmBo}`7q~O8xFg#xhFmE5_Vn<4Z{Y_6m+C%=Z}(bT*iowzJUWnxdZeU2hiiq> z!;8K?qEwpht9!w<@MYKOoqnA!VrIGU&GnkSS2EW-Zo9=(8q8;$NoXN5%V4e<_?Dyo zB;zxG?cs&vntZx7k`KZiXwfe_{Z-LU^Q-c`z@)qI?YdgWNtVrYnbV?Q#*r5Dn())7 zT~ZE<;j9Az-+XqOu!;7dFe@|;{@-;D`QMo_Y^G~5g&h4f2n?qW9Y#|<)bk7cpw-O^GnREP`E=g&DIwmq%5DrK(12$whSJ0b63d}h zQR-W36wQmCsjn=D<$vl)bm^ce;VJGto7UyB8Fe8SaC{euH)B6v{nev*i>Zh5ppvdt zt3Y|)o(;sNxuNk4Yi#7IxFugppgGH=m$=4htp~(_WGau6c64SxMJe!g-$<6x}8t{+arU3NsBgVi^ZTx2I8x< z)i7*rJNbU`?IY(FN7BfsZAT@`ebDA$YVl^{g5OiAW3gU7)`$aBLaZ+erOMcKQ{VgV zu6?S^UB0r-b*GI-zsPuRf@EEfN2zibJicv_SWVaX)ux(cKp-9R%K;bS@Sxu|Uk_&E z>H`Xv`WkVMZRa-Lsv<%j6`*vlypA?lQkvk;d-`DK7>R8$kEG{jUPH z5C>7MD7AT>^?L8y?{S}<7CSxoQH*>Zjoj`tm-K^Ao|jh>w`hrll>w1(Fib5Syjcr##lelulk^`$vPAsz}XULQ z%ak?hF6vr73n`D=?YLfd!qrPGd5zSqTRIY*wVZ@L61pv(mo^#GbP?JA4vt#lzy z+jSZ5YFRZ+=~7XV$LnlddH)pueki|H#pxp0GV zW)9k^PmlZ_RoiH8++e^i@QtmtPUlpwC4G8S|?4b~Nerj`@2 zY9>vW>&47fz)++qGwh6L>D~+(Bfdwj3JDP;v~kg{!9!P&cZ?Cduh4}GtT?8Ah5TYC z1ZN~AXUg3mh;7sT>g%HP2CvZV6*(XB>;vW%r}Z_ZyfF@?x-9pR zT62Xgo$Bk97mOP&f{8v?4{s0EcD}~#mELMzP5)qQMUD|1JgPP`?lRvUYm6cBxV=2g z1(7u0U8(_}fh7D=Ij+zNd*+qw(yfO)B_=9Od%w2dDPAZyGt+ycLgbv-eAMe?kV4b-N9ZCAHd;*#bP9C)jd@+0LttFn1B7 zQ9bqe5VPiYml(8#1o<L%?h3yT9cN z&cds3`k%Sb+!FU3PL-x@R^IX4#xEfbEuT=V5%j!_yptitKuz*G6AU|Nw+Q^!qq(qE zx~X*GOnqT4Zrt3vE0DHMopQ1JZUtE zNpxG%6=6B$YERQvA%JqrJ8Ta%g)#}HLJtK25o||^K>-?yYrUJhZP^oH_l#?S5V0UST$?YFcf7<$e}3A-Js04Hj!RvjGxX z;n5eDd8}zW*m8_`_$W3bBRqX(4i9V2gPVdyHF$z1CMMc4wd}GQr)~}VW!kJ6P1-zJ z(LF5>+$%|x+-(`N!3`%JAu`i@qmN<@X%==3KYyajy(UPrU_M8OyMD9pW+_CoLot8N zx#2i?`hS};RCHUd&g%?C1f{Z`_54mvV49F_itZp`tOR!mL84{(N;6~W8f(7bv1mR} zNdK%5E;lR}=JLrwcxfI*rl9z~qsVUWYJHayXz05bR`OVC5@DX%nezcpygx!LJcA4S zoJ7k;nD{JbflV{WWBQ1=6XYCoO-1Bi(J9BhY&UOU4THYIpOOvC(hzG>;C&I+X;1OU z)!Zk*YY`Q$QG%dc=EL_TnU^@zt%>6a|Fxs2QC799^JMa*dZn0T&0eH_D5Yl|0!Buf zjDhcof_Z(R%nJ3c{3~REeX&5c!ewT`oV@Z%+P3H=kK?S$+Hs8Q)Tq(P0t5XJ0l$@| zAE9T_0y)bw8zHVd_`w|EP&!jJJ;UrHU3H_?>ir>Bkmhst$>?T?Sjq{T8~j{W%xf4|*~hn~SR9tAH+cNxMa^ z7y3GH4CY1~ZP&i1Y$>&H;Xg={Gn(PjmXM#aLxUlv^lqbpHx=` zjc&0fW|6*tJzb7LGygex*!$HJ-Wtz+3sD-;iJ-|Hr6hMu0RG{6O#`|xAQ!XHD)&Qj5^&IkPg!}s*DezhFWoz z=+t~-D>I7w&~#sA8FSi+oz~byQujHufyWPy15%za7p>G1ae#ZdV4$3y>9(+pLYkxilCUo^bXAxSJ_Js~E`5Cn)yS%PK{^pd% z(R0LE%Rj`PBqAqFjQoqdE&{=<@wT49+fGX)_l#`Mu{@xpzO z6MAIzq#&kfq>~^|qC)SUD_8V|l(9hY2wu_$dcE365&<0PW_~x+T8RIVuy7vI&^Uk1 z9d+jclc6xf;J~ji~(P^Iq(`QPE5D92A}F#61PumnLT!{@%Cqi2hmY$T7B{G{&5 zlMBaBa$CcRvmQ12}S0g~iuS_EPjnibnJ3fne_|2c;(hPKLDXq5JYH;O_e zPqjNr@tfAE3$9#l8varef1(n z4V>d7yrfh7W=4BrK!ELAaR=s6povS;>raAkbCHjXZk&R=BIB9ov-vcLy%NvUW9Oih|fk^zvcf@Qc3$1 zNi+OC5c&;}nQojJLmth0f>=l{wqbn@4=?BZ{?yL2UDxXL)Ft9R-!>z@hkCx1?pL_i z6LlC!vhh=7w7@A#e4Yii&6MHllSq(67HP=aG1L#CP_Gr8Ll(2pL_rc&&iy*XVM%>m z@KZo8DO2!rM)wp@b@JXaoe_2VE*hAYnlSVZ`^W zb-7#o?q;RA4Q280)oin(=p@{eU-&#mO{5DQypq=|bby_pYsD(s7S!!=@fMpgRQV3& z4o#E~%y>Qu0U!o-*IDo{YyEI#c!Qr{LIv3VwUe?|Lec2Y)Ng8bs%|ua{i`#o$AF4= z0wjgM^)^!{lOeIDT`;cIB{JU=@kFHO?Vj=u@&t;p+?MC2ey{ZlAAd^Q&&!@jAZ1=> zq#{CAt1c`iPK+|c#%Q{}il|)59$6Sc z{>`;>LNKEEUhE9;qwM0&`GPWFl@=kGr-$J|X{eDW(+ki-icBlI+*rc~>&@_TI#%T^ z3-D;`6=1;G_GoUPrm!P@70cU<3xl4yFWm+QBR!D-^c@}0;#510RJ&n^5*0;Q36+W^ z+`Fth2pejT{IIF(ZjsdvGpF+z_Vldo4F0!W;N0YJNem1z-*##4bC!=vabDmOBBYcX z`VUSjA6$HSF9TfelC~?7ra;ylKPQ$ye5V;9=da!}Wo|t?iBL*-2xMr2^>%spRG5AU zAPa6MA1s916>dpJ`s^R<%r=2V{RN2cqwx)W+Qi0D!`K$xfT9FMS@8pd{=7KDBMzIX zb_yy@rXeAwl8dEXhcujGjutaA-YX}4zhZu6;WU~kH*{m=kBt_cq#7-*$&51T^EZ~< zP}@7~_WtyrciYl`i_jeD!E#vOgHmk1R7lLdKWr2i^U6dNq2oq-2E83??&fUkjXNYh zzgtPNw$ESI55JhN^=T0l^RP&bR-Ovi@B0FWdQdyG3LI0$9e2;i(NXW4oaoir>?<)R zZOC*)XPwsbETVW1=p9xo&^bPj9GKR*O+{Mw@80^ii^oG`!onn~nAznF{V!o9^NhPimX2@WN3KaRp5WY>>T2!FzlQL8vJmcG6xv3i-# ziiCK#diGd@*mym3$cu*1|Lh4>gl)jcehj-B_AKJ9!mX!N+PqgaUOJCRA+d6GO_k3e zP)v-jgE-2AlS(ntumBM}M0LD<+F$%O(qUkZW-)eRW_Rc=6O4H9T{?yPf@zn(1nGpv zPXi6;W(!@O7Xtl+U~z3_f4i18B;}nhdFHl=)2iBCu}uU36+2mQ?DP*mA~S{VbkEexz9!U+1*h&=@8X+YYYP8O zlAlGkKk-0}qqN=pn1KR@eY~wObj)ibVFX_{weU;C{t~3E#>e^GO{qb@nMuo0{aDZO zU@nt@FZ;Xm)(;!%bnZ4kPE30X1>G(06gN%d$_B%hkuM^I(J;kk6gpK5tVH-rGrvt4 zDAsG6QwBb%hiDt~Z zx8|jyDa^4puQ9kd_Loh1LAuyR7{4o%Ie)PU;UEjicNqCP4P)%yq|R-VLyrKqPck@Y`m#-3ygYhtf`e%c>i=PT zQ-|iak0r1INRWkKc&!MYSu%4vXT2+$&sNv898Sw+qvUWext&8MB-XeNAJ*Xphu2r2 zqti%_oHWQWkKa}#@5>k%Sy%*l>LN-Uc?;wcVTf2gx^5|rJ?m3@SRYP(ZTvx!fN*k@ z7T5_U@Lfi|c*_>idfFlS1*MVM%J6fZe4fx7l=Pt_3J<}xL&lyQym=nG`QSyfJJhyA z8bXp6NJ2krpJfDoa5SBmBLu zm?Ask-4UbRJ;kro8}w$s`Xjvdd2jM7$*ClOBc7;k1>ef6S$2sL!~N@+{qaSb6ebBR z7&nrgd=25(;g;_SU%K65uI*VH#i$V00pvZ-15vF`#-`01&*wkQ{IS?-L%k3~-#eWn zJl!&3>T&>OGaQVCJI2r=tLQ&F4JKVbqR8!`S=LfD`74ipFzQ8~lS(T0f9*i=xw_v) zeh~9w*Khh!t^U~>`-qE_NPgucF-z|JwDBF05k)&>vQ$mW{Ej4M3CiZg%N^>Ti;4`M zOzL%aS8v_AF`YTaVM);lXZ>V{(3U14G{sm=J%|nMYW=ElR)b(vTp`6nmfwEz!FobO z&4qnmbtZ1%evK2GH=)#Og_^ODb#qAV5=hAWQH`MX_0oQ{aHxB!N6HGek7Fdx8K5OF z@y*XB!bws-em`O+HlAn_jzqhVNR1wbG1{gVOw9X>Zn}PalOGn6v5<+`%Z#GJ`G6$! ztf!T*nN?W~u~czH6MoX;F8)qy%#G?x=Z@|ovWmN)N=S;ERT%GOPG6zYHk&gh1@P8} z`1Wn&?4f5UyL`n_0xaN;Gad+4Z__xNU+%0?2KdgA`|w?#8I_a9)((fYZk)>@cI<#d z6}5>3l@-8MTuS8Wiqd*lT^#p=kNj`w%e6CB4JYtyGf)XHqJlYEcmvrUQ$6B22y1zz z?WHvZLT2LpGbIbsFIPEypgySpjF8l7Jai;wF5$Y+0CYSNW z#Wd*MYEg*Z1|V?l8?6ZPL^=gl(C;iBaJj{FQwfiuPI_LOW>C(wrhhLh9a$>&52cL9 z+`^{%;2Sey9e8Yzp4R+JDALS$3uCt*YGq=DzSmFn*o&%VT5mKjZnChm@kLv0jibg& z`diX3l%`pwm%HB_VcKLD?a}K-i(WszATdMtgy>WU>v~-I{1N~==ZCXuxrhq*Gn6+U zTlrr(Ec(0v?A*S!tPwwVE!LESjel)z0tPC8zSYSyi!By?@2A?=@E4p^q7haE1z-?P zaLg!^w>$?3U?)|$wX~1=JUuY}5b)h1aO&VjZfRnV)fgME1YjBB_=g7T8;)=EVv(~Y z_eM@VeA7}|(wsiJ@rgQW+`KaKJmo#&z1k+=L57JhUrg`!;x=Ii1liL;MkAkb1upt- z33)$uEAEC%m!~;YBpiL*%pps6^O?_hQ#3icKieOe?oOVb|LMhRN6OYtcC3R!+bP$B zLHUa185tzOdY8Y;gIoF1R3#Hr3T53eBhJQ}|sodKX!*qE=V z)!pWexEHbS?wQFokFX(jBffVek0;6jVJ!tr+twz~2tnYmB5XX(<5-ka6cLNfe(DDH0XwhgSV{kdE;MF%YB-7Ngi5~~+#1In?PUr)P$Or%?Tub-&U z^-+$sSp7+(V|L5cmp@*&soT8c-+W`N&tu!=xI3_iOolKf=H$YA#!S8%M=PVkokYO5=@lc2-*OOl zcx~AUN9z~-ke#Nw$^+uYPj2oSZRN^ z%UXdaytjWvFgoKQFhjM>ZY${wr+VvJ_~Yet;xw4Da>dmOzPonXW15rM4BD{Ly(u}3 zWbGs4#lN}`IM<1EVw1;q)+P1Q?bXhGVSfo$FTY`)Tz*=Y;*HAq>bH*BflO94>cbDh zPG+6b8cIhgW@c1S!$8PSg-PgKt96 zdOR#Eae8cGI|s0nzFEzLE#XWXb}hXlSyvM@NI*D!+lKUvR_QU+sfd!e^^C4u`KsC2jOug{6CNm)YFN}3lqGG3*tXL)3c!KhP7 z(I@D0I*ZlD;I~d#@8^@)`|~1sZZI^GEN`w!TV_B#V}kBMV+h%yUL+fx^QPbY1UFFE z<}bGQ%0_N?j<@%$?%YkGi&d|C;nAa${BtIZ$$*kg?RrzPZg$1Bq?j6j@ZOtRd262R ze6Ry;lLJ?JQs>un71jcQMxSS$0z)E-XZ{+q5Z0FXfDyG6E@+fB|AOg3Rt%jH3Po=f zkWXwaUbEmHY85m}F2zCB6pY|PHs+Nm!n8Y(UmK!v&-G>6E5BlAh^DE27p(-~!`*3gYd=E z7@98Yij@u=n)u;^vh(|9rCtr16M}8%bCb&tL^+5F#UugYnrF2}ke@YqoiYwlm+FHQ zf^RSO?&67}LU>sDCL7dJmxUS|pq105iW{!F;_V}4Li}* zy+sHXpg4X0|AN;3L>^MXpllHqR6k=S{)MYo{P8h#qKo&E%&A-gX;H}C?z>d zS~bsv=1SguAIdh9|7Qz+Mf+R9axMv>8$|Gq#6kfpol~Vt;m1_Zw`n8s#VD3B=R^K4 zzU~tp(Aqda?eC*=_2B#OcCwB%@iR?gfciRXjjrMf+`kh40>nX`aKI4_6r?HjvT|?# zjo$k&h+FI&B$kG_u(T()>3?T|;r;;#d=Ak6g#W)GgQ}!(JfMsn7t030zcU1wMYZir z5cW~ZXsawW*pKS(kyzFghuX<8j9!wr7L^>%Jc|6- zJAAhT2c5|>=v*W_V(bOC-hc;zp-;^6SgSi-Bh&bceTKP(2W=QCF%mV z$el3KM~>_-<^)jrH~4DaznM-WvTKL%-+iV5lS2L5DCrFseX8v{`Q2E7V5FeG4>Kh} z*iM<}m}XKgdN|L?P#iKg@5GQMi7v3?m zHzJWsa@qg{3*_h5_mgOcbI@sr&2if6RT#T4+(p}lZchRjjD40Kg|kZWbrgyF&g%|i z8G?fL78!G7PJum4RGZCe8B(4ALo~_~i%V1d{rkIi$m{)6osITBg*ABi37MAcKw%nv zSKH%Nlq6e-K8e=Z1^g&rwe^AuulC>n1#pH8M`0?+ePL;y6DmTIYyG$ z@!)5FhS-PKm!COZVjL{heK~AA3V1%ENWV+nhn@g>)@F|*GvX#2iRD3|v-1*KgT6wq@~<|yo4e9~yY=p81Hr}Lm-d{b|gaqRUV+*9dyxt~We zY4h$O8uYK#*`@_L4{b=Rs)p$IBBtd%it|j{*S0yvsz>jAm_9VO&L_+6|To*C#>N6_<_{JxSP*5A^g!Ky}*u5^| z^U+r+1C|L6!DC)%Qa2^z6)qFjHunK2hjEnG3m=1>GdcF$|3ALoGAxd7*%!tcBrv#J z2=4A4Jh(dq2$BSMcL?qTg1fs0cL_3hg1fr}hqsge-glpK?t3m@cm}$AR@bUkUcV{| zMyF+1AQ(Xxp$bB#Kmhud3v(nMRLs=PWQ?CZ&b2sC%UbAdHodDcA3ohnhsQaEpPthY zLWUD)ZuKu^t>+#ov>=ze6O&~InRx>W2g=jZhpOK!va*4e!sf?q>N|3%F`%-`+IfyBW?z(bT zzPmgEow_{_mvMJILm_r%aZ|dP=>sMlI5e9gI~d#zw0fC#f1;Td{+7D{gWGg_dZy2i zc0c(52hC5*%^e~YN%)S4=d<#}^YhV4dqn1^Ntq~=SA=uf9Z!ZuKwpI$$?_H*)*d3M zk+|&MkG<(M?#Jq6DTiPG2y+k)Od4Jw9n=}k!D`o8V5tAMosV(opQ`UA)}A8IKayhD zcauD)u^@B?aYos=Slv@AHip4VQ=C;%k>QGYxv=Bn283t{xNada&EZVM=y6XaXK_y^ z4s)oBIh#C<1y;&XPVdVxJ|nmz;}ZO^z$vQKH(1xb>{-3gDOevK`^w!z{b3>V0{4?| z6wg9j((edn5tkt+1Is4kU8;gX9*c1cC*N7?HdEK>u(XMnD*>u<^AI1d^hS2nMfm;gMn%eq(jU1;T?0Fl`jybL zw!Fu6k`3G#g7UCqQ=l$~JaQ|sQ znw~6)VO0_q5ml{pFL32R0!XdPH#|jso13mz64r9;p^e@}Ez&4=Ln35%<4mI0km^rR z7m-h9bixuX-|ny}1V9@?2Rb?8S-F##T!~)o@g#=hGAV*u_YU0?lLqsFPCDiO@T9$d zyw+j^lSm$*qg~6*Pqy8SO)kphdyUG93@_c@z~eyKq>kc zN@=w7oj%8Ur(r_JIn@~s;f9jWLT=ye@r&NcLBn07X2yVaw)lHRqIrQ%%xL~|{eV30 zX5SVyPmlB9aWC~U{v2kYo!^HmOW!nyawiYy5&xoDp)2;Q)}qKnVgU30OB^e6+vss2 z?u5}-*9(VK6dd|@c+BZ)-4I)rx&iVX5HUmg%eHC(W~4j9=R86()5s2=W&DCe($7xk z8+Yp2#wN4AmjJ%Ua_e;=;z?Cy4^Z12Cj9V;UQ)_X*>qgS&|-u33*VR~)8f=p3&#xp zTu{UBol#wxRyX21hm}wFc2gGg%&qo-+p5Ac@=vcG8fcFa?2&=E@)qmXVXP_ObY=ma zzZ`9MZ1yoa74Pk%wk;vjspZPZo=qG2Ehr=!HF)-2p3CKKI6RjO9)22{Oa7CScB@_H z5_G1p;X2)??C0-ZJIHU_GHUDFY5!@dIWv14`93AT^;^R z0*7-nnHQ=&O&v2SuqmRB@+21M$soeGM&Y$L?U`*&!GeICuMRM5NxEpIWVTL)ARER0p%$I zheZ~P+Usr0SEO0m`^ISj1>$(`ho_BV~INQ~{Tx;?l+F zrDT!EGokza-La7g{Z0sBx38rNKf78ikh2ldJ2)y+$h`!ggB-&@X|Jty zsh|$j?)7~1LOK)Fdnve&AN|q?NQ!DC+Zq39uGA*?@S#+MR3*|+-u3L>;Dhk1F|%@pI-}yun%LIyh-2ud&=P~i za2$HNfxV_x9~DBR&gbt6Ol#GL;m|M(uzU_%>ZQx*LNm(8$dWZoNJl5eO|>S0g-Er? zIZ|qKno#Q`?QZ(5zdgCKXUbKi@0?E_`4u)vaw-ix&MLPhw?meTN^dmsG*(}VGq05< zbNd-z#dI4RiLG>7_m=*4*3NrvaDO#(H#<+~`y6nu5gz_s)Ha4p)`D`pIAi*KTOR#Z zq@SiMN66IE$X>GkX_410f%nC}S=vAv3Yo9q7i2uT(t0RkTAbY`+bSo-hR@R~=Dt_O zH+xNP6kNpo&K?TKu^Z2MRAj}=BLh(z_}h4yzQHTrwx}qy2$L5$^4gHu0ji&VxV^f# zBeNEt5y39w>$1|4@3e#fe!=3P!?nz1zQ+430&(PrUdZQK(9fDP2Zl`hw`H`%veV`Z5 zmI4Kr?S$lg4j9$uw_9G;AwEKo0AQiz+ZcGVp{+B{xU2m-gER_cOTzo3?R8so?em|$ z{g~$k<`wJR{=ImbeXO67(DKZ1_A`W%4u6_lu;RDqtLw@d9~4~Lw*r`SMG*WR;>sFS9T`FGaBlWhPtK)6y0?rOmSW~5Aa@lL*T&O zAMjOZv56z_HrJ{+q8T1Vzhhq2yxQLDjlt@2nZ(DVb1`XizIo#Xs`pyip)Bdy@6WI) z@3xWeNJa@D&A@xIQQg{yIwcl&^9#lVMJlS`vLBg#$kuN`9;r|t{#Lqhv*Ot45J(L> zGhkmXu67k=>3!%jHh~&f7yyrgQ63U#myEZ7oCZK^6$HVsGS8)RQM;UpS9so}B!P2& z-i;Ev^GHGayKXYA@a;Rs@I6v>i(<&G#@Rw*&&-2G^a)GCuVh?Hc=CyxwMJV1qW4#9MqT=4|0C~u-cTU%N_J_bCpCAC=-^7z%5rlSdtQ;XmQwf zL3*VuWhrmjgLa6tLg8Jn<9(c8$;%$p5%kjHXhF;KxHXp>=+*pp9QGVTV~fvjP9} zcUdW|>MKS!I7ip3pBUSkxqV~yh3X|!HX$fc*C^#=?#*l{(H%6z6XM>&qvC45!{aM4 zY{H}MywCV@BU!5phS6$i&uyF7M%9mYS2>c87=(`Lyrt0Mo>1mr@ZJE35tCF~YNUl^ zmgDOpuQxb}=zI(tfR?g@Qt@@|5bAoN(UkjQiXBQ&?=fhw@G7Oyj<}eY%wEuGFMF!m z9|0?J(|SFR4b3!7%C*e%FZ{cX)90l&qGMnJA%oxZ2hDND&yf{`JV=KJ)nF-#nR0CdJW} zPP5~Mpg-b;j^{CF(X7L6Ak}-hxXUV@=z{!#I7R|{OfkbUcl>KIWu^JZSj89YtiZwC zQscI@wcGPNW{GHJ$9{3&gF*WN;?740B>%hp?g8TIpg|-yC&A20uvEIB`w|Z7&Cl6B z@mC=SQZ?snAS9ok&B+6G1LD8fw+*D4mprZYvBBJZ7i7gSL@bMso9G9m_9izVxE}`! z-vkw9h)!5J=MpsLO^TISur);QWc{EPN^Po!3trv~C8uWT93tac2#dL@A!Pe!j zucB?;F;=>{>uXDH;tx{qu%fN~!p}~ssW-g}3Cf>FXEqtIVG*wK`;C070;z`^-k!(H z;ll)`t}?%bXzXrA8|{yZCLk?ezYBfyZ6yQgQv>9mHUjE*%AMzLv`&g)MjG$?PDQdyRwi3>^l7f z68>tS7*I8%_nM{sr_PuFSY3QAs6_&WJaQj<&7HE_%l#ssEo||LPng=@r#LtaUx4+d zYX^1eYmd};PH^yM7(-|4T@p%@%m&%}cZX^u2&Vqa&89q!mi`6N5|w|WYWNrs$FDkJ zXcb;(iR7F7;E%l|k5#K21Kay6Ul7>~O`;L4)(vQoT`#T%&d!wv#IS!D68%;CL5qG&+3|N$ zHjI$z08Nkql^6RZrDoK8B%W}?mx&yI<9ZZny87R+Uor9VdMoSVs$)HyeI$Cu&w$Rp zU4tV8IcMCtu?UVj*ns=%=BCiHx@%e%^{$*8iXKGxm_f2DHOH6pTUAU%KmKd!$7`(m z&*{gVcI$1mLIJ@73)n%(owferM^YQSlY49uC98g<$t@wr0b`H9M1F$1wTOf>xOKee zaQw?OHh&9VnwqDh!T9sEJSnE$cbE%GN&n;%efcqr0RA{%TGrO11KNE%G|0`}0qW+v z5H#7~rD~hj#e@WOX~9AU)>m^i)cVi5&fZWT*$Gd@5*PQYO+bpgIH>`*k-4{t-w2`| zplr{*IMs!L$@+;^{NweV;#2fp8k;FK7wOt35#er>V+Q=wASQf)9+jwfk1G$4(T(uN zcyr?hC|4T3>kT29n@5!{=Rs2>J)zD-bLTaF&N=U>vzyPkD2ZGAbIg7o?a#lwGDjDS z*@c!IXW1Q!3+%W*a6D^@fmt;%v@q`cK{!(ntrU$_<6)-k^2XGx9Fa97Al%PYmufvgI3g&K5 zy$V2VM^k?^ZEM}3Jg;QQcPAfvAY9dWboF}t;3|0Nh5rnVjSn$96WQ8l{xPy25o$o>WGtw@o&w#sfy^l#;7+v^r3ZqlGijdy6=Bmh#hb2W z#vs;E>95Ah?+bAvAE{l4A-tlkWI`UGvS=kOf#|0PbPXxGIK1@G(_gJ9LbJIwBf6&C zC-Cd~q?$~@V$Fpya~hH8a5yXAh?~T2p`d;=tRQp}{(+3Dem*ZRcvv_+%+)I0%8fw| zTpa+4ZLp&Dy~xKo&JR~;mv|s4TAruN8xdc+Ry4Pe3Zy!P@b173_0#KlPI51No)5V` z29?7gf1qTcR@s+K$c0%;BFF0DN4eJF-(eka}L?bZ}fGo#1 z#AhWDSop3Wia*!!gfjA#_$vy29}%12$tS)Aj!y*jr{J4AVNj1p-MJhCGD_?ILj1AR z8VKQ@ELyyqH6sbRaUJIw^*E4zDK_UxJ=5e;l*m$Y6tKJ`fu1ch|8*?6Y3Rr+a_+ZC z0Z{0>Q{Fkov%!1{KL_1XI%&`PHtkLQCdnEy*@M^@SY;{-!a(&z@3x`g-Iz~aWCg+W7TsPZWEe&Z5atlWKKic_ z9Gecs`fz&wwxH*ZM6Bw-qfoRWNaLqp>J7v68Yg)P z2a-@k`MjiIe5gTu@)JgGnmzt*iymNMzsL0ioR{HCsto`oXalnE(MuEBuirFDqV_B5 zq1%RwJ!h6K7GtxHqWC*J2&$KiGK!zM&DQLeB3LYqJdbQ?)S8wb&8Uiyx6Ohviy3_> z0}kQrCOOhvH2ptGF59}i9)cgI`~9N!AamW0WD*km>l}Ec1%x1K?|Gd z7I(1 zHVfL-9?*@F(If(e!rj*WeYrv=Jk#H}{i`92kgNo*!ca=$$w{6W46?k|B2V9Y%nSd< zauJ4)im+KfW_M>*eDGZ*eXo-O4DdP%(aY;TjFrx8d3$SxA}SJad^n?zHt9vAJ;u1K z0h6Q@l^ISL3l3@nvAzmuB-c&i>{D-@iQB1^(YuUJ);ej5fT9v4BE3FK#Rs#o7;J@!7}SB;NCaRSN~DPU;Y=rE`l8vNC{^yMeTHnOR=ndv?F3DE9j0kE}WUs z@>!1WIZil|ixm4yu094PXu7;Ux?ngN2jRnm$0_=?{`fBb5K8b+y8n{@`MfwNL(gcJ z=_zx0me=(_!Q*U%oC)=uN}&o4?2;<`&J`O?0OMW|8QGUXrTPb+rK#fZ&wE`LCwhi} zE#>)$U#nVHxd0m#(M$x07GuP66IusRJ&S_7#<_)QP@R48OBBYjBRlesMc_*BV$<#A zO53`nQ0r|T+1{tAyC*vVm^*880GNwoNL; zjQ^GG{&&**`cJxgMr~eI^?$iw_zwzDyci48{{r$;g6Lmg-A4DnX8r?2X)$CxcShky z;#)Onr(>Ii$nExzyh>ov@u@C*wA) z=Luo5&&D1Bw4;!lkA!#-40K7Ta`u5|x+;2yDQ-AVKB>5W>8ZV(&~3C1?Mkc%2)?vq zknVa-;DeR7ujI-<_&W9gqyvS*PkVZmHuB)$;1()E4153g?^(3(`v(S8`+jW(-AIDg z5xxojC)55<(SmG<-%mdo_B|>SfHr4AP@H5JTjOb>w|+Od%!Y++?he}bV%q*UN1QZ* z1w{0|AgQ2uQec7kRj|YU|EU|uSAOu?f7~W&p9q@IQfb zQvkl@X2~%N+3{dYHjU4bU-E5w&cW=e81@# z3$z_C6_75iUG8_6kRII!lB~F#2%8Uuc6}H_+$?*(C)kvU^fc!79^ecQkIVk;v zHW>hX#a@1)a(S_Z#zm;voI6<9O$~jxT_j(5Z@Jccy$8TFa74)9^G>TZpHKu4hO=Sd zQN9PCH!REh+67LOA=(~@-3MwZBTzx+BXA+VSAFtwdZnqulpPG!Ux&!WJ zS{$|L_4AAM_+6g5=kM(!)Jd1XklP|8rMx9FD~O-^M37VnT#Riiv*Cg zm43O~a{^EX)-%Oy8l~!~)QVmy&r1ynHoKk*VV3}y^r*5~ZXE`OdcGxF__78}q#fG?!<63n9^5}{skry;6|mVy)g6k{J3U!A@3bdp*wYy zdFnHTtY!g$wqRdYN}Qh@a5G8tt6~#^({t>vTc7>9TrO)Sg=Ue+A$9;LrktM7(mNm* zl-GLF@y%gpR8l&II0pzSmU{ZR?q;}7#`T8oH7?RaYBmS=(R>hQOASJwpFNwtLA}1e zcP8Zi#G1sSm079ZB1gb(X3P{$>#H z(wh#Ha(X0-Evke$Eq<57N!IrYkf40XC&lc-i49Z}`gt8nBzUgd;JJ_ftO3vI_b0bz zI6kx~flr3P7Jr3ENtn}m^Ou~V?QA<13xZ{&rtjbHp|WsaZjG5<{dN~lwjX{aTty~0 z8+e6Sm4ix4J{JqY_TEln=6t^efwTWLhVF8_GQQkwPklHC$I1{YiGl~o8~ZlR()mdq z+*K)Zt1F_4j+E`}*lhPKXp&LyuNN~_*Y0YGhmBD&C37(*<{N{>i0Ir7M> z`rj{04H0R=3z0nIH;~59dL{DnyqUO2Kd%vO??Tlrg4m5Zyf{6sc<0QD%LttSq~pD= z=O=4dcKVA#gD{yBDDCnO6UkBInF70|qY)|0swYb=1{3!P=Y{LR*!6^Vg*Z32^E1^Z zl;Pj|q(wr|3W1^$%UyNPew%74Kt!sdQ&=%HK6NA50^Fw6d!8q4H5a)*bKP)~$fic! z6qYa2+>J2>ocGvgu#9+hJ2ulnwFuk_ZF!r*Z&{yxV*zd}G8W_oxGmI}{D>Iw zYe~|mSrVg4`12FbiQ_a_ok;dR5F-k*Jdw(kaMF4stbv}wY?#{{igtd!{;?A7^Fv^{ zo&i4mW}$i6+)Rm@g>a#(NW;gMbpAq%$oWPQ86kWVZ`zxM;~|AFoovIW&35U zc|ZK7hvXz{e1Auv1@GqR`1q5}dMcmp6_K!d# zb^;D1;vWs;J*H!Qh;A{So>QVmqgJG4=)AZ+b!|L<@<;i2eYUq>7y5JPUhJ-~D@xQv zw)&sMu62D@u7!Ms6^BksM1D4S3b-0wCM^t5wR-q@2uH`s`JOev-;q8`UA-z*$-{km z9z?spo`0cZ$}kXkQO1z|8%hInD_rKtx^rBs-pXnO(A*y4=1E5>-$W7dm@9-fQ^I{-Y|K*< zzLWXoLObg6>S~^?jn3t}lf4V+^TVk~K!dWSQdfnUSK3OSJwp&u1W(_uvKt~!>ltnH zrRhJEED7z>3uqxt|3@>gY%w?d4sB`c^$ZBkNT5+tW$pg`?niP3z$iQw)NUq!L|5pV z$uYKCAVSpMw32XPd7D}Qi)w=vkp))Iw`XIX=btSC+Y%22bN0iPq-V2Lh@{0*kmzbX zmS5|icPndLz84O74E3X>F9k%0Y!(+{>cpU7pbBjKWu+DxCFGT9=F zJp24J;2oDz#>b0hlo3;IZ%6WFPt^e6ZUf~%%Vxe_3m88oD*K~cUECI19^&b2?|X-P zIkdI4WF$W}UP2LpU3?Z0`uqb2OGIm;JIoj+dvs?54O*KVmC8M2IF;kcDat%#DxWBj z){v~?yZF=!N9kXcd7S+*Sk9`xM_&8kpW#%KeoB!b!%28vBdhdpqk5tMUj^J$YW(4G zqd^8Ehy5{+;gs8WPwhmW_|7+9DWw&YG=MerE{+@QAih|WG?JfjNq9|8mi}XBEeOq8 ziCW%X=Sqtlmg(?jFPk(7gMrAg7_rOwp_9$_VbTw+Vzk8-)_4-qKLSVU>an${6tVT$ zI25Q+Vd0B^2Go7ZZ_Ltaz(NQv-*t=HjMfmkN|1)<}DLoQmqHjg$%(aJ9oqShsWkMPLg=L7~>p*MzO#HN9fzttmhZ>O8GSsz3V zAJW5OejMUqvKbG@7Yt=RR@{E58QDh3Xboa)0v3!=p@bnXbPK071XGmk0p+J8`0KS9 zF9M;xbqS)E%Gl~1g>odIcXkAi4Q?SJ$g}CRhjWm*Z%sAwLT(Z2mc8(Gq^cPhBM{A~ zK4u`il_M@nRwnv5;CWg1i$(n|&h7s~Bkke=DwEfV3^8^8i$C<=Ff<=U0WZkMkGkrA z+VB4^ruDN006u$o+TPRyR{0xtnCh<|rJwJA_0ydEpDX@tu7mmERFAb-#Su&T{zTt0 z!L<7MVV`5M2GP~J#rqRqg2OJb?SJEM4`*oT=<{?WGJX8Ok7e(Fu`?Xkg&y!FtPYRP zaqc3KGR9kX;8u0Yn>I?R@D1^ss=r^f6b|AYiyO{q8*u06+mhbt+fqh}4^0dcJ&MX7 zZUE3;5nN^esYcQS zz8x-4OAnMh)Ta_ob0r^qAKXMv{$$H;HY92_mG3xC=KGCPKKYxu3mRj`zo>O<$^z)Plcpcn2 zkx}5^st0c-8Yr(4@RXi0pSz`BF4MWH<-h<17@4{Bn*7_P)HpyP{U7GDBaa1>NzhA{yTa?m{M8v<*_b=`;)fBo{_tIOSu;)uRBm$xfdbIYB=kX zj+r}zUbFP=FCCo&ez&uJ^-e?1u{5p>-Fiy}SOiqHmd`+rsPXeticRynV)#aVq#{}l zXD-DJKmz4bkmxxSQyH%ac#VTkO)cRmj9l#BhsIwG-Cr=7thTm|#W>xAD}@jVrdy0$ zSXh&eY@y-wEl=&nS|QPCZg|^TgVVmaMF_?x9Q!9{SK5ATlhDJku z`#a~Ljt|=xDCJM(8(}a#$OP_xVC}`E$%AhqwllF&KrepG+3D$wFS#=R3QPDq1VjB+ zjJS;M8czQN6#WJP=kYd3RIyQ_Bhrik@fhHwlXEnOhx8VXJ4VnTZVlQo$p|vZN=g|m zxtEx1&!3Zj49YJmQq@iSL{I7UWghm*{o>6M^Z|h{y;i9>P*Ilmry%fhr())TRT!IlI-7TlxeYyrw$g_7 zc_6iZ>F*Q4#Bi!=@q2r5f$6+tmgI{6kx=QNp%w&1+P0Pa!Xjl(u5&^~m_K*8!sX@> zVUD}qdd{*_<@916W?h%vR%?aEL(_HnLbBKUG0TiPq5DY%e z8dXllZGq*Yg7p9HH7yOO3+6S;#EX#YcD{$|yMJ#|mjxU$vKd>iMfIC(@-=8^uZoQx z6qZevA8)6O7*c4rVTF5tRaN!g=L9V7az@Esi`cSiRA~mzUF0N&5#iuS1|k@mp>DL{ zp@3+x9sZE5AXv1KzgHA4Bz~RgHVIYa3)3H3idw$TR!EVkbIQ>uT}n@f(8nf9foXR^ zYYAz$Ba#SYK}6k)G?7`5w!PdROdquxthv4)9DKX|!I=tIV7xt|!PpxPA4J8uK><9h z8_)m_Smjqr*G}gKJ6_LU{twjh^C4*M9i9E3bI$?;c=ygK!nbK21#(G3^klKo+M>7N zg+YHV)&qC_hJNfz!uCg|QV`wvKXIyUQvXe)8uciJ&i+5_>3_ZtD|Z9*S2%u56PwdJ%PB9tl<$61&>~L`QM(- z%o8u{B(-Vs^V<%#gP^JIb89+chV|2~+MPAik7-5w7lb?}^lA~tL z4-E}v*K_XIzd(D)6A~0sQ?1$}Dg%x@nb^|e{|SEO_(N%) zn}2(62@#k3yH8@|jCFQo_Tu7Rb`G)X{}MR?0bT175AOXm8gvu^@&0fAHTh0?1caUF z;8UdNLN`pKm@y)w0OzlU53MO`meDhtPzr2^C@qEGF^rCmgIlfv=kV?^qwMgP_s}MI z+40eTb+LJ*pVv069ZVOyaysybAYqvC3A+y;K3w#PCSv3$vD4)M69X`Y#xaCVY2Z2T zz$ScZy^3$CnEsxG5j5yCN7|Hr_z+R4kWX~zsC-|jK#8OCr?;M}~*(cLE)Vegs?aCZd@8Pg~{c^9!!*v);MirPsn5 z1xfSff2r-+_v{NMv#h*)%WsL|X4@yeO4%`vb>kM}u|YB=O>mB;n1X)8ue2$&LC)NB z$o|^byK0&{8U8#DeWiP!)2@Hwmel>A{+#sLu6f>y9946tx0f>G+D~NVuwMO5f`|_QdHrB>Kv;Z}thsZp z4@171jhM3q|9R-D@(o5(DBo%ZFo#b|U7gBewp6`hL|fpV%QAnzU@!db{S=J50ta0V4{4=q&9Qg^!5Dd@{imfWta2KmO84P(mI^aLu5d! zl>*9=-g@rkTSFQpaYctnF)2a{g+x3wcM74cqTaQYun6XeaWX5S8qv(}<8HPtRX>8g z;u>odzccbHY=yR+t&}o`p@%BT7QUe=@x0q4@h>h8ALsUmn3&)ctC~lCku*hI3B>I( zYI>!BQjY;Knub3WQ(883BI@>B`p8eT2)_`ZsJ9zvH{iK!c;#8v5qLB3sPa3vQH67k z;y3_i$U$Y?3#^rbVZStJU@9Qx?!4d@a~2lisjq?%g>&MZCB@q|D8PFI@V>;oRAi(! z{*U6z$va9?OaClIJ<}pg=68!N(uY**%V#_@WOu&971(8p=LkbAFn62cIZn9@tg$RpJdNEzwa_ z3o=QhW#V!>4#|78cbdWcb*Dv=!LV7*XMEQ-#}})IA9W8B{o>g$UA|5 z_5JBe#?`!${C;VfO+KSAk^M<}s=EI~8^q$G-gfm%?jcY9HpBCpBNZ{?zV%C{kf++N z;<7#j8$Jky_~L)&to|BSW{d@5h&Y%y3CcK95nQ=gd{Q!TvCWTr*s(Hct5 zQ=rn~v<0^K^CBAa^S#*rbG`O(J-3HAp=c+083IjduWLMST;$~B)O|iL)EC`ak^L{m?q3!DFA}d|OGC-QH{-Nbg$Lop#wZYYm|X6STv8}Z~Tv?MJT+4*mEm?6=NJGl_G>DK=<{laY^UmcAmVRKA3LB)=1tJ$tcG^0wUk(|)R@;Rmh}L? ze~tkNrrL*^&gl%RnjF35Br1;@4efva;RM8C-9 z`(XgCHflx%Mlf1q4}sl#@ld~3L83#?QIm=5tz{Lbk+&2dk=Vml-Ku7cgbZV*#a@8< zgR%J-Q7D~ig9=B5(gANeI=ZmFp0iZHgA1r6n;dO9>eDS6U4Z51*Kk zp?z{fj4(aQATdGzR&Eb|c zO?_qtGKdzfdHcmW4&>DUIu+l&q|*T&f=fHp*<7RuM2GO&RbolVD)xM@Qck zA2LWT3p`5ox*t5u}U} zM40Wo#1Bs;KvpafaNaJ9z^`*4bU|U=l1QBom1Rb>*{ncBH{@Q-9*l=qR8D-x%)lT| zhZRlCm&-^ZDoRTYW)>DUq@w_AV2$QdjWT+aaG>%97mP5|0YfkS56{@uJs^;&+OB*dsG^^xq&Qpa|s- zEdF42=kO6~C;Fb(iKkvUShyDE&+3ip*!)RM&nphDnb4EPDwMV+NlCDcM#kSlQUkZ) z8cp_&i9VQYW%z=+f@HoWY#Q!uk@*zh=A%;-sCBea@6SjK1tw;(-4U= z2EPeXEP$$gr31?N1XY6_59UvT8R9mh0B(HyE#A%=)tJ8C7Z@hS*l64}0v)RK{<f&hB6Fv9ytUJb8NR(tC%Z?Rw^TL6B zJFqKg502n{0E78|g_^Uf)kY}tzD3-vT=T-Yq9Hz`j~o{sLCQGlW&cWtlo9Zy(%TB< zzkOPiq#4@bWh8ZgEB|IP87V1c|C`(xFXQb>T_~w$$xlg|)LmVQqg78lc(@LI|0;by zor3&)<#+EQ?_nf>K0&KekJtG)7|r5$es0Y`ebf|ZW*aIov=e!b+S+ZB<~xCXY$Bqv zd$q&43duWT4(MP-Zdk(ntsq4)n7JLZ|NiMX7Ymn-T)GRc-TiV0n9ND_P5ypWah#do zWaZ6;;n_lbhEu$|&G7zKu3uLXSCkw)7)4Q!*X;)yp@tVVriE0OSRBQ;A)IIezw-fY z8Fu@%K=)bIX|9na~>C#0)Mkqp?(>y0cQ3zyl@LDxM< zchT7gt0932kR|_mX~v1#GemZPCd$yRG8_GtG(ArE{@48Tn@fFolP@p4IACMdkqZhw zf-5n^JpkmNg6&MK{1`8w~{TSXx90uMKh80Y%8AOls+Al zYs6vncCH(~X*E{&du2`7QGfmuLG#=}8Jm&Ozc^O<{hb+?_tmVPwbTOsX?s7G?+T1Qz~lGqViEj>!GY0?hQt#3z8qkA#e(! zC_>C)zp?n?vCg}uqNJ@7(>rv76K?z|p!jppsWNzT8k^sq z#N}2s6Fp>~3s4QVWi?+A|Ay01IxM0NVZTUAY-5>S% zb(XT`0O)wj1UJFB`)h%erg8N;CU4mxQaA^9R-nZjXB$U7+fvvlPa^cUwQspli9Edv z1r&wXuc?Cin9dnaONjBo&&irJn#}|Q&|-?>>w%(vdERa>{yYmM>*c}yMV45Q?`2d%MamE^2%xFdwU);b-M%|Z2j)Noi1 z0RtPfVTMQW;OsySl8vf-KCe@gtF%k7!5w`GtOXHJn$S(3R~1`tPBsIJm8Kv$c%{J5 zNtN$TXUTeohQa`bgWrCAmV)sSn^t9wa?M9b( zNjT<(%jqwy_f&}+P|(_?eV5js(SD$NkDuhhwZX(oMk;?KsrK-T#2e6qqj>1n*T+p0 zkCKaaoN;g@G3t`zkCRa#;?W!lg)r>d=X2>Ecpd!oD~*m^A0 z4nzb58ZHI#=}Z`YYmg2JY3shUGoY-Cmqvc-3nK*s7Wx(0qw$S$sMh>?kQ8!A?0sI+ zE9bi(?6+1l^;0rIBMqY7Pl(C%*{Owk#fgd|>!MJ|h_vSj7xSKG8bVHb@QmTW#P*FN z>Dwtxx6EdUIFuKfQ}@rAR#&n{AG`3Q91UfS*(r9D)T*R@y;bdiiBTk+dXoz+z=Fb zrCwm#IYnlQND)Vrf==(098cs*$tbALV1+nWvH0&|EUMr8;ifTvU)=-D-D>3<5rcKl zXH!jFHYeWz;v92?Pg(w@GWTja%6)=Lk|>!Xv&A}U@DQizoFox4Qe=77rH{G+Jl5{w zq1V^pPB8ZVLrg;qv2Ol}EXDT76lFSf$@`D8d)Vq%5mYDYqGlh=rxqGM(y_6{UEKNQ z7LKJ|n9#c~?GZmf&N`@FD*=qB%XJdA^7RPS37N@HWKlIWgaYB`LMKr^j}1MqEhd{H z&oO>d`KWwK5$Lmz*~QEz76Ji=aZQlo_BX{*otgO$b{B3Q9^d(^nYg$#6e@vyPEO;D z`W6S}QbybazI(#oXZ74HsW3i&n#~GQ?60B!!E>9IoJvgLL@!^8J)w86X8%t7JnE`Q zIbZIaU1yRm5?!ae$3|5(Ubo9~wL|E5mxXV=Txhgt&Fop7c*3~7X2Vmw$e7}U&!7kf zh6E;~ccfumDcKT{Lwh?r!x(Sy0dbvNT>$QL9<|sVoFufdI#e#L`5`dLded-6N%5WBq12wbuFOMn3}Dku z|CySCm6F6Kq{DJVV;ykX92x+v2_O9~yeGAt1vLo2{8gXGwjJFJ)|ycI^#8}$TL!h+ zhHb*d9ZGShw79#4P@q6@cZcHc792{EK#RLO!HT;>ad&TUcbCnx^X)hL=bhP~nM^X7 zE9ZUMb%>IP;Om#BK~akNO^tg>I)%rI-ZmK#!q*{7HLnD`i_dT>}A5M?+%W zfgC>UrP$@_co5?+sWqZxqSC4A(@ey}KR`$4AA!qCgY2@31T>fN+_Y#D$s(#r7Nfo50rS3`z{b6mz9;uP#wDN1f5? zVPlnY{!ef3P{rM*&}F?`wGx%SHh?(2tG@V2#U$e_gQ+29ZoD9y`PF<*;JJPv%}$_1 zP);2hQ=}@b00AzxQH3%C`q3X!R5H{Zjb|GcNtG;aJ+%suP4NE4)v3L?4jL;@kZtZwL}bq#bZZhr{Ib7<-Q z-(D$JMd&b4ldmw>O@Ap?{Yvhizt^~oSEc@L@bdz()&^7;5dG<6o0cqm0US8ELuiIo z*=XnQ_;?-+ki+CiQShyKQvd;8a#|K`6?SIMfNau$FvXpa7;*Yswcqf{S6_^2K=#Bx?O$XCEOmM>wuN` zFzBs`nf%&UzaH3of2#i9XpF;zo*Amxb9ZcuFrEEBPd5Meoa1Pn&OnV>hE#~fAydNf zZ3-?<_aod+Ftpgzxhc;w{2$zeljPalCs8QJa9$gQK+kOW#fd0A+9v7$whqX z`mAN(yCuHt;{)t|yM)DGsUy!FiJGLU*gPZdXubE&H7CxEr{(#$^U)2R(M6k3YX3W$ z!Z&Z!Oz}waq%d3|9dSHWO7Y@fG~wnZp^8b93C-cEUtsH6$SB685!?T_u6-h;c4P1* z%|X<3`zgqwLvTLYkxfW||3g`F*iN_gnQdpGr2jpKo)MQEux&WuUq7)M0bodfjId~{n31G^fji^UaX&V=GioLo#CMlJ|GK~_&_7)JnIo!!cO*ko! ztvu{H^<$_^w5TGhfM5Q|PSyA0jhggjk5gmN$%4pb&s%)6x0}-frOjGRCNxl1=9YAsM79AH$MqUpMmLqxNL9@;wvSr{868Vi6d-nbhw_9P2T+Q?* z(y5?+xjhQSEp^5oQho|WqZiiv%oq9O?(FhnkBD18w>Pnyxzul`tyrY|>M}^R)F^uk^#!U`vlbl+u*iSXOgVjnCr2Fi%ukUNJBNqeD2dZ5#{ zsZO5?-BEU1q9~i_@Y~RVf|~A>xU4iqa5}&9fSdrK^ww|O$UD-Kj(-tvp?Ka_>W~db@=*8k(p(t?%zhEeeW-r(Jig-mrkoe#Q%ii5vrI z)f|J`86cVn#dG3?CUfpc*j?rG>wb`gjeLKt8F}QcbHSgAu<52xQ@u~vs+q_)vnf%Q zBM7lu2i^VseX8gS#foksyjkf;V_VJ_`$4^kX@S6!Y-fG2h);A)Y0iGoZAONdI5^+J z`hd@D*YZX&_Q^Yg|2yiP^9EDaldt1JLjChQySRS{@l@2VecY^9I^)5RaF6}d(fhh2 zven+CoqNlH{Hv4=@>Lxnmm*=p-0^((Y%b_j3mfg$lo0q!rTK6zHf3Rwy(9No9g}frOeYDI1aYfZ>Z#J{gO3lkN9yS1ttEEor6gg>h?<49bPkks z_cs$J9Z8DzLYZ3BpJ}dy$@c>x?P>b1n|+Ijv>6|r?6Zs)AO=w`uC9!6NZn4Fz%DVT zu5F!GsPjcaT0-7*iApP7u}*djg^)O}4)rXaGpbg-cMs-5or0V!&|h3yD^s4C>iolS z1Uw;rn_w+y?dT{AIRO(}nLL;}l+CkSu2X`dyf%+cm|2e&iW&Y{TiXR#>*!%YCyF;` z8AKeCUD@dSdYFo))@n#mrkkIJXG?({OiJu0p*cVyhIV3b+RmG^?wnk^Qz+jup}Hq)e# ze>PiU5W>a9l?e-4onJ;lJ)fAAIaUhC>mW6fg3ntf1Fr=~IaL+_mWaewt53?upr^M>%EX6brv)k z^h-Im{anF&5Pcl|3Ci8EC9S)Ae{rv%W5sdbSKR0K&lFIEVZ`tY=wkP$(Yvx11}ct^ z5^2f|WKc$PIQ+)@OBb&oRV#kG;b9~U&$tmXjhejpy?ICC3j8`$!%WU^@&d5#JEudV zTuW^@{P@@|($ZX#5T+*tDG2M1Ixq+;vw@Ir}jOQD)79n;( z8>3&%$A&4E9=nahq-ud-S#YS=3wO*M0es!3gcG!>fd=42^jBUsixyk@WdWE$Fo&pC zkluB2lnram(E;vDgV1?5Blj;5W3Bap43f$}nC8mMKt1;unpx!gS>x`o0)f_F+f%~F z&R_-Nzz#l5nG|Q6WQ(V7QRdsPW{?oke3Upa9x%mg7A>eY()LO@#7iunQ-`WC#m1jY zJo4&nC3d4jiU7`19bFVB*e-orejseMnE}~K)L!Z_wn-n`hi(=M1JO(moxeCsIzdA? zIc7aI+GQI}aQzf9QyOUZq>%t2_T-Ex{Ss}N?NK$b^n&Abig&wUEV3rd+0hL%LHZMx z& zVEeo^*Zof?^*|?*rMM?!P;KS9Z{!OV_nyoyH^$jn>zCo}ENN<2>N_5QNV+Wcdxl98 z>*R^z0T7-qsj!t$GMPl$$6b zgsGV+MkNp$@(x4(rd9($kb@Wis89azSud}ImNlL}Lr$GT;=7VL3)tU+A#$Qo^W*~_ z#r22}ONNjoQCMk`WGjoUUC3B(nRXQE5K4n^CM-7pBXZ=VvRapsjD6Jc#FiZr@ir=p0J{9EK@Ne6cD? zn85PxDP_fePoI=XLacPi2dRoz*2*l>03h~+axyW+RS-iGEmFF~aq)U1akO!AK)Sz` z!v>4>DYKOg1@cV^gUu8)-@U6XgOGQJ&aLh2>@xdTZG5s9m?c^i<9tW%!c|MKF}DS3 zHf1T%%}0i_WH{L3Xehb(H3-NL;Tn{8hEdU32*v0(5l7xPL95?K{LGopTxJYwFho4x zEv9LGf%8zF-S-HN!Tz|I9&(9*XU_o2QUA-NuEd45XR)X2F@c( zFuajZ5YC~+Cs)4D9i!OegTaI<1}wDAO~nhQ_aq4z<~DN#LR8`Zp!RH%#4B(US+$Q% zPoE8|`U{L>e0v?nVYrKcMnC|S$Lc)?Er>o?l9b?x3aOb&PP4@g=RdkoH6#R z+9unVOPY};hQb*#F5%RLjuVQAis217-@Cm1VZ-vPptzv)N9F)Cp0>!JL*uiTaTjo* zrk}F0&_rWjG+>}^a=3=WqcV#-W&LX|#`{~V;fwZ}we{aVS7BjcDFNHs4?h{vMXv*{ zeXf7aERQ;}vVYR>4=)jY6ux5=ldcZl3`006&Ji&)7R%JrPW}`up02im8yuDk%1ry^ zh9konci67rP>nZxH%B%lQZh{A-i0Bqhb$0Q=gr^+{FsIxHkLolHSQt&(PEd29PXvf zI%sUMYg1!N>P%f{7G{7JY616Pz@}uJ%M(U3PnA5;hF8A*z6l_hkV~s){blLb?<7SO zuU0aATqk0!9DG^m5J!S}3Zj`fCQ3gNWbQp*W}|*dM-`~;O-!guAf#dPAQ1%1L=0Y%0{>Xq#<(qThFLFbTFk2;$mKIV-4*YK4hn-7$8E5`a@>*7 zClMuoi-+dMc-?9S*bf!0ggUOkN2lMQH|;&J0Ex@i=OP_AsR9*^y78Qwta0zJbm({$H1Rq z^Au?(Bas>FLF~$!`$4QCl-3jjTz)xO*4ELn03fx$-?$-@-;vj5!`0JE;uoA@qXhHe z`5vdp8KLn~f^T(HDNicKzKBJDazbIQX{X$!fNow_#-W%FP1US051euVmfdcocuNzO zi@w@w28jl9N1&)!YNlp@jTP=&E5^i&t}fQrMEH%3VF|79F}=> zUse(9m)d0d1MXja6NrZEyrEJpZuensBV(Ve7sC*&ddQ&aWG=C`x8(9|ZvI(L+_$xo z7`tj!r)&E+T7zXnct3y0n7HNtIMh#i-Me*eNOquDo+_paD8biH=d=H8CVI43hSZpC zKJL%=*j!v{bY|#wOCngZTG7P2st({2gT}Rj`>|hQF9)kY%V~vARhj_Ir{t&1wW#s^^)R7&o6>XN zvlD&-oDj69&+JZ!H6{1tUMC{=t4h@08!k#=$XYqF&(N;m!C(=VDhJ=Zf0M zJlnUJh2L`k5TPnWu?V!nNWGa7Yhogea)I%5wf%~w zhUKQqx?uZ%IBN%La;e-Jv9;DZYf02v_alo_$1NKW8SkMCsrMMc?9uh0g6<9^(y`UP08^w*%KnQ_|j9pk@ zL+}L|q2;R(Zzbohg-hV>%wpNU@#1*xAWT}F56lQ%(BGnuNe)pXullA-4qy1qTDx9Q z&e{r>kstrHvfM?t-MX|uZ_^KacD2H>DcsJj_}HoLhUIv+gZ+87+x*>Lc(qiylvuz} zs_}Or;&^@=vg^!plm_6PUKy%3rDFHPFX;`><$uk$r{YE5zJir}Fncs&Pr$l7g)qze zO&u72tbSg6HaC+p3-iX3%l{YB8&kgC>_HC6!E>N*3oH`C|m4L6+HswMH zVUiy^XU|rvHgy)4;mmm-NgM2Q{Uaxke_M*hyxRzO&s3u{{Ktf2=FjW*s7^aV{FG1` zvdi16L)UVjmpjghdIR(_rh-mqj~~rM4Oa5;I2=bQN;bxv9gzObKsi|IsU;>FtDXF@ zo^}4?A7en3e(ra6z zjfuMY5FU@pO^C^sfgQ9bvIiNEpi39-Jmfm zjV4LXSo_&4%E8$U*}(=ytJO|gfcE*n2o404+>dN*N$aGdS<7{{N2D&WR3!+1RX@V7);(}u%76Qo1LLwX=?7x@OQA%sziryvYy{yHY!e92;xR|6 z(FK$RzdVls(i)x6PL`YF37>&V?n1|RVZE<9n08&-gT3t(<7&QQkL%U`(PVe4*#VkO z40LCj4B!zDO^=f$*KaS;V(%@lxs^&ia-sS1ct%vxmYH)=7H@#q-O+TV&KIHN2FH!E zJRfE?j*DsYyU_Gg%g$G!a6?MrA89=HWy{QuBy>(bPl~2AXSRC?FMM_zVk57*3Rgs| zxzbsnG=k7XhKR8GZi#S#r=?XRBIP}{HFYxWKVBclo_2_Io7_moGDWkC{2pjw{0+Vw zU?AVmAxb)+l^O>a69YsETw& zd%gDgf(x}#kmsPhV z*aCF-iIz4qr&;u6f7|4=4KY&f6OJok&j~UBQ*X9z65AgEg%a5u-1%R6-VCWKsQCcD z(z2Oz59gS5x1vvabF5aj_T|~tk>9zEbggQ`yX>_@xcXrJg@?C!rPGofiyZKC{>qW8)x=r=gmVqmK){~MVN(xd_L?qK*FgiXzsx!YD^ zFqa8}h3pCuR-1k%#HGm-VR!!2gcwRkC9!DSoK4jh{~`YN?PqZ}5jJgIYCwa77P0#l z5NYcoYKW@bo5kz=5S(tclElihSFFS2%RoR~knBNAO z@S!F19rV)^4&z6CB!*{b3P_sac#`k}(-svqvpOMa?}Fd~%7PmmyWITra^EXIXTkFy z1|zTHM!2f;keRGm;ko+-I=bGTc;`HTlycxK*GQr*;?HZ3p6S_*ROkG}rrTyp+c;*V zE!d!YQ!KAJDlzbmuzGn4TlNdYE6+&a7nAaik|{9Qhs2`0$d?+FBZAlcIQ_2K}iT)rZ8jHdv>NV6!JFGC_5c=R6#s(2f~ zZ@!x!&DXA0G6Z?9Rvc5M19Atdc3E|&!q3|Cy{^wXUu4N%AHtI=bmTV1?|&+u7e;`J;I~bpHv%g4 z3kMuU8qBtk92jFIndc#9%?{!J=rG+_O_-_&9Fl6o~8Q)!Da!8LABEf6XxIGV4_POC@i zr73F@nI>)G5Wz_ z*HVhc;tESU_g;A8T9bOMDiABfH&ro1pc{J4p%Jk8Cul`HmU}#hQe>QZ^N+&_Usk%K z^5V5Xele*MOqxUC&0+Q12IwjzF5>sVYPSESCVuww7{PlMz`wu>H$HhNwo3XdL% z0QLTFb8tAuPu-P%!w_7H1>>Uk32d#~=sxE`(i*#1X?*HQaKz`-ZW2y?HX?MGXb`Ke zO_f$d`<-H~^PI%ii=^~YgQr_Ig1}$Rb~~!;9lw-9kg;=F_`LfIP~e$K=|_`)z0Smn zil4Q=5oWqt;Ivr%eb*0SqvZP8@@KBQ$=NK?1DE2Vd?u-&NY@@^`pb*N8fN zks++~t@a`eBXLt}`)UhrhbJ~V6lY3t2c${V+te;`Dg9D8btCMm6CRHb9#BYA)<5P9 z!_xd5ecI~Sp-FeTu;vy2AuW(u(}{W%a64M7{*gvLHPY|=m43F+%rdcquUXQNz4Kbs z=Vph00QlHZu5}Ke&zdy^}#EDol}+lPhFYE1Ih3UsWDeGQ$ung3)H{9Pii~wrym7Z>hj4p$Yc` z3|U;tev~mPDl_N()-H4&Q!^$%WSo2cQP$k`*20cAIKmsA*@p)Qp<(fq12!$~>kL@@ zeb)eJIaJlXSl|l7sv917FV%@=248uE@7IAGMJF-zCi4mPFbIteU}QWQ^3m4K zfR4|XUyDuh2hh`bb|*?iSu{DYPq*P(_!{X^u}fL@)%R-2I5+`47B!;&Zz5|hBbme3 zyu!j!!1QMV4A359v=gB;U#vl3UEh4k?LLxf zA~l#UZWANrJKJsaJ`be+{MPW(SV+Qw(Ks#mEhoShCFngmwsDAzAU0;5?$<9=M;?y{ zJkCAB0JySY=%S4KWQih%R_&u%ba=Y(lQb{TOp@T_-_=CX^e+r{RsSeLmYj0wn1bMV zq}c))wU*1Ya_g;U?_s64Zm+Ni78begkc)KgCwiab8k9tW(%%d3$j(V2P3d5j&2|CX zzUU1bAlQF%ym;#Ez4Y58PIr1B=i}z;29b6{x<`UYG>#&#{p0{~Dn*}U zDUq9kxI4DaZJNj9UL1{pV1iRlV4NTgAefERxkgs&4Gy?$^5=GVk!b&zvbZ$yto}%A<}Wk57RZZ* z-Hu$uOZ!6iZ&Kr`3q|I7X}%4A7sd%CfOI^C4nnl*&C~PPn@=XqpLgNdRybgA{$1c) zGhN4sDQ3g%J>(D`;(jJukYWkT{BBNtn9 z9w3(rEyy`XxyPr89vc2#6_Qi|uV$t>sJ+=wqH#Z@yF_C4y21(I>rYD1 zwR7SPtWz7f8rLgfo51CvGVD4TT@$(7N08l}0WC7(G&;yY>0`{ozQz4>-H=Z|JXWfP z>1w()Es~?UYKx$_OwdnSLiN$1u}^I*o#Jq@GYSc`OWo~HiFU!YHPqRGv3uF0JH2O6 z0=`(lMM4inRCd0RkIvMGd-tRDOc*Ug74mamO{o@e99z4Z94NK+OQ~Jq=T9{h(Sxs? zXg&0wa|@Ah=MGAbBL?PjsCT_8ed-P-{fT8t3XBubxe2q0H@n=%n4B1XrB_5JC z{qav(3W!9PhokE2!xyCKQ~|0+9I*9-q1v(ebp4 z-+&q)k85HAoSW?Xfg>L9QD=uTH%dQ_=4gyF^x=HX)2rVeuWG)ix~Pf2{q3TdEgCI? z?!x8+;!2pD7L#3;&o%Dj>0ow=^%WsHnK6#t>)mnf^+?;pY=;7h&+kUpvf<^wqg?$f5ORsAil zZTMuq5CXKi)Hng#Rq~hPN|aNr7rR&SaOKE9`D;0ECXz2!t16M^VRMo!zo2-K`wwG8 zGaVXudw{HuEQU?WXmv6GlHTvvSEV!R&UYtE5{;|=;kqhaQIvpv))y!ay}=|~tm|7e zlrI8d&7zv`rIlocfKSbvpv=DYwrtF9wYq!BBKn0Rzt6k##m^zp+jqz;ptmjyJE*hNp93<~kFF=bh<&;-C_B2bzj9_N=uK?(u9yyA2aU&Z>VwZ)MWa`u zTY`0f&&gb}!7|p_eDQoVN+{L|_5D9gigON3#LWsPsrAyUIcKMSO@#cA>0T&ea(16P}7iz_1@qjni8`4cz(rR@_~vlMVLOBwZva5QsEr$-mlL;(fglX zg#(t4??1%;@ZGn|@-&9cO$n%W;H7aewqdOm$^H2rPte#YxQ&kQ<9yv3d6cje46N?1 zSt?bb%kp*B1qek>a^rniMdq_`>V7Zobj26_5kuEW3N(lDiXa#M=6f#oQd0R%i7F|= zXM1;V8btVQ_XQ?Ti*>jWyh4Y3zB7_EH7)w)bYc4!B=8X!)RBEdVNa&_H~i^37bgYh zlY*yzNR>_ChH(+nb#H%Xuc(&}Do z4Bl@Ow`ThuGR|3$)^G@d{(gy6iq<+YfaVRJuC)!L0rizj>{NNa>rZ0m{OyUPc*O6x z%xnB?6GZ4PLDlPldNQfCI(Ude>8)NtV-^?4K9XZ^@|4hU>0BzxT;x;jf?m3AxGVgo*nFkIUOIq_$|ISo+7HoQYJ|6CjK_L8`UmIPo9mY8;cQ{K4Yyj6 zLa_zp%kz1Nr`1HIL6TX5aOWI|)IC_7N{i6^byYDJMcynTXxVe)>T?bn7P&{R+Bo3viPV(|^d5y0jD`h)R@Dp-Etq{+|cY(hAVz{7(A|@{VvXE z2!^@I+QMYE6Jgvs6BeY_yL*6P0mS8vUT?J&SK0heb-5pdP?wNz7D+KPylF_~|eYD|xYEVJ{U&N|{>jZ@#RWC&e>D$K8vY+i$E@OZv@ciWoYKLgjY zd8(YV>E+4ae#oWE0GwBcYOcT8I!aA1|QMWD0Py6-BMyit5T}imGmBFVMt^m%l zjEDF?%4yy9=-7B`PMUN!C~y?aiB4%!R`JRL*c5#F_E-Bed*r}?{L&AVV=yI3yJ}si zOv#*i%@KNe`m5dJ%R{meqyN>e@7Yv5#4Usdzx*&H9MioUR%{H_br4*QF$|rLuoh-M z#fo;@ZP^=$DxzK*=`^a|Sh3=0tP_2YBuIDD!rqkp@t5Vf?j5J>m9Dlgn@QpP<=oNS{aiSGJj|(kJ{8ML zjz*~|@?uMzvclRlQXy9#VMqEnHy=Gc*@#$8e%IB)qDid90)S{w;KtuO7`aCp=e|xu z5xVdPYkSK`CnA(pK#$*1Gg1JN?-H*rooewBGllq}np-8FEWwpn@0)tLZYI6nURtzD zL>t5AFOhce#=y2lw)+;3l+hpzb)q{n6S;8S_*4C#29ri^Rq;eY|A^+~@1ED~(yEUJ zn?(jl9iGXyK9_)xEn>ZUKn|tH6qsy4PXcjjp ze6=0vxsgTp9C!U}2CdW9ZIewtb4;3xeGHVyQJnc#v)OH9xzPvOYqlK+{=7%7n%2Y{ zWZp>xKp_CW237kVo5-k3rbiJ-ph~&53W30|-DD;u@&5Em?k{NhfG@@p+J1{OpfSM? zc}!#rC*f-WXybeC^)4$Jv3G2%`W?;GmqkuwK1C9VnTkGt?0De35-F0pIp!uDJ?7iw#UC3qn3pBRQ8rpgNFc>e75elaye5^5x zZ8SM~`n2S#^Q$dlzRGCO;%oa*_6tx5OSsY)ILQF@ylcOk`L)$M2V+cS&VF^=yS1l0 zijAPw-w;2csIz-{tSv;*V@(k>s%hRDNGFM(1O4bZsQbaHI6O_VB9C{vDl#Duf7A%R zb#1+m7{ec1M$$Ac2E7U@q~3yiZu*l4r<4ud)A`&Ztu;XXwD`->HSjPI&rd0`ChnvT z`;xuZ(p!Q=FDRIKM~)pjIyCi1%c*zj*cweA$%(hSL!O+=$se_k8YIgDTMYiqJ|6N? zoZ#)+X%BTXQR_3@(rZ-rh*mRsy@nCZdBC@kayV5l+Yt1IRMM}$C)~YhGz?$`H(h^d zIT>#~AD-1Pt96GgcY*k3y}>o`E%t%qDFs->0)LnIAkV80=a)Nj)>obBim(ny)h@U{ zTyEI$i{7yr%x0inmn7@}LWv~uKyop8rwQBO_((`c=d7G|=;>G)*W93+Od=`5r@5!kr3o2$S{mRnmaF<9_{PQ zR|rX0-`cq1ZKHP_7Aiw_h+!maGE#x>)oF+y$0tpCt)3d}$M-ufO}OoTp$;&}yL9CT zDabs<*BbM!HT~tYyMeRi{tL=l1`AW&e#U{SHE1U;RJKK{XtotGvSW7}xE&M@|0}0- zJej(zq#t#AxgiLjYZ>9)7p+!gv~8BUVhOL;crgVq|KiKvG0~wRF! zr^3gXSuy7YWM{!-dTW}u=He8n~hD)lCm?; zV4*$Ui%E8m1hZ&K%c?BQ3tSx8U4Oiyz*%)|oc@=m9F9Yo6L9}4x3X=Jl=;)d%UQs% zI`*y$ua_^yuK4B>%aM4GH@#l6^A z%xdPOdkq7HsN6{O@4i0A3)Q~6%MQ521^eHU+$`yvFOP;R`~x5~`9lyhZg=qA(^z@Z zHzrcVUM8q=o}XXvWEXReyO4>^FLA{0$HmRbu`MLityY_Agz7iY`Lz}G1Lg?a6gT{@ z@71u?RFqQo(K2;XlzWg-o=;bfs^3l9Bg|8moQX@UR9{{VgpVGc9jujxVjYrT0_})8 zyCX9bueP#{j;mSNLm}=C;u_D5zCu*8 zr&GVLCYY!7bF>rAI`2k*dvfgTmn9w)3==Zq27-X>n@In}OV@IqrR*Tzg+pt51{8tO zplCL6QFSoGbljn5kRe77MG^D2TCO+BjO@E%%+C>CLpx7PWcUwM>`1f7)2OQb z`QsVWb8ok3i^G;ln`&2i9xEx&r}h0l6!hDFXfpOTOL2F82L2V?8H!PzLh`?H=Y!L+ z_s$5+%g9w!cJ`S0vJT%aF`!net-1bUC)> zRUJvNIY;#cL2@{i_o#OhWru!Frf+M?^_1oHA{3`qX0IHbC}nlS{Yj+EU|*o=F(hh% zFaC%Fm!~M!7o7g&Ym}Y8$U{U2{QY~W{hE}BT3JW?6kx7YN?izOT<{;RU3NjQlp zf}O3*#bdF?$MUi$KZ8d#-L(0b z-TUK7odc$h=#Li)H1|wr!~>Ee>Q7dJ%@V3!hSXXG67Q=W_*F(@iC#G;V1Y-m>(J#{_DPy;J&H{DBIY0-<|PZ~YSIXrcQB<)|p9(gNgV{1(J!axK9y&c3!sq`9a) z?7`BhZ34xi+SQ5tF;r|D#`-jk!O`!q-q-mPSU4V(Gj|H(Bc5I8_0q2kVXp@6e(;U2 z-WXPl|7J8&(7RPmA&{z*UUhW$7>S_nwNAui$XO?OLFoMrTXsAodx51>7~l=6*Xw0_MjEfuL-u( zPiL3(eDMb)z*PldZ7<_sFmUHI2d=-FNkC(1t+3#8`ApD>7592Iqjh@3cO=YEJx|NN z+iZ7R>*JIuJBO!qZsK8r5hLa9AbXBCZXu;6lHSB?;Ns%FDi9?6GB14gIp1PKZRLD> zPtL#Nhu~awP5f^b%*_9z1%Q*x%jeOMI=$UXyTjX2XAn?xG0QfLM|JxH>;4*+6DEc? zKf|C#QA`3}b@YZ&4bE{B)MXP!p{Pa7N3Y*$SG?lFMe50fYnW{9j*pc*Of~150tZeP zz0xJT%ic-{!V$U$%Qj%W8~bIEhL9Ikv>!u$9C)yJ0qqZYx{LOcc2a0ghlU8<|7)%njwk=wxZ)ho)^TW$|15S!6Fz8~w726R*{U(1K8r?Ec+jaJAo4tH9bgKEMOX48y@o=?`!ws0mV2Q#+Pn16nlt z-?=juhbl*ojqOhcV(fXJ?TH;(*1d|(9X<2XfDK6808me+EY80@dTTUb&0zJqYqR06UYh>h9L*xD$xe{8@+tTrM|L?83CRB$|ePoAvTAJei|8 zIueUqFFXzYA;~uq*=37igcpQvBxl)3g`9_^aIau6Zz3X@s~sYdtNuCP;$q5$b$()+ z`_S+@{o-PR9~J_8kg-`z=B8;3#(I*a-RM2>;ddf-48(NfWV9RR2#JU1KY?D`Hx$of zd+5&;#)Ct*r>PV7PUr@{8x^Njtl7@LBz;_%=5`$&ThoR0q%LPZiO?pN&6k{7vb=>* ziT+k{w?(nEjeIL)Tq9N}n=LNVI3yTxo4N2i%p~A@ZAdmH@$%ZLkk?cR(V@EoavQFMm2q<*F#h z)sFne7SseBtskSXs{0#9FBFdAn);d$Wo6`xk|k8SU*||m!ewhy!>bmE>>_pjuji`osdO# z$WN6@Yx!Ke4|>1LdUji)YZv%EU!|?U?)OT_YiBXhfEBP3#U{s5<&l6Ef@75#pQzyI zeV>8uw8VI`SeKTdZdoZ>UQ=_KW@fP;)&!b{&ohJ z@a>w+Z)A9!jH)GSoQ(5ZC)-p#q=r?Fau+*;;)E`FVmjq^y!iUONo6+A!1j(sKa1$) z9>e|2m2S>)HjqnoX8$+yS&mGnf>wCgz+m5W6H0cz?OAi;`2NNqt%4ZYsfw9$2p!h`I#HH#wx+~umBLe(Ii|1UtiWMc zo9kZH9rVJqTyLSN3=6_@ZP0I_S?MQ1~+_;+*U^d-G1nch}T=5XoZNjdUw-GXplYM zo!wl&z8NkUj@zayo*W!_4wUUJsaZ_2&sYjRg%r2dwQb4&jU{6SzCaf`oB#5*h*|^f zN5!8GJUyDd>%S1_aRpkxvgFfHjP)w$xE4?IzAo= zj47_va!7r`6CGu!NJxkfl6Bu#Ueey+aM&L^=d*lqMwoWKMsKrYJv4EZC~mr{MRjkF zR&(6ge+}I;y4r3+3$PjdZRT&7r3zeq>Ks%z(-(YG%Bq%UD+;V;$`(DVYP&*ixt{;+ zwrzzBe(HS7Zw$E4pt*nAy7%B9Pk>hjc9|CxswLWJB)U+?c0w-B%G`P0S_QBB`iK$& zzN3w+1fJiHbF*LZj|wZhn8wNC1jNN==Mafzez{4N=?S~g;;p;d4(CYMdXsqa6hw5R z7>p_JJn4@Cv=_oSvAc?yLnzwwIeic>$0elgGe?q>W6L0XVuXi9-|XC?3VnL&A^Nz) z%gv13mnhoum*u-d=^J^L$Q+)Gn}^2PK2udS7BMQL1lk7kvEJ4H#nxK}#T9*P-ncsf zfpH#(qo}HvyZ66GlKjr&ZWQ?%K-PA>Y?l8?$2QdKu z+JENo0rErLoqlyW{(k=G1bC%ZVEf&lxe~cNvo+QBD!8Pm^#y65CV zl#EfTGp;|6Z7`1K(xQ4JP0G%yB6vNq(Es-S>^97deta4*a~;l&7YA23F|>U@4!c?K z5f;L88%zyldEcvd05-J>A!jK|F0WaiKdR~%0pv%KdZ%J#vF^KhRA{P1zl$hAmxy)R z6PD{-5lPd;fGIYJ#2@=gcnBUZvq*^5ecJ2*Xg`$=<5t8xH1_jce2kOUd{J0g)l?XUI5h@h5OHwNi}A~(GLwi=xlX^PHhoL>SoB(Yu! z{vVJJ+&i5Li=>AxW&X1!%bMyn{sUY8>bJc12zw5X830L!qu-OZBCu{s)MRLdc? z1pOh7s94qmdnT4cavGJhlJPH|g>!*e5>&F6S3Wx|L{o&NxpAHcM3r-!Ia)oNE#dj` zO7E4LH^tI|70Tkl*VP-e*nO}1+`?{=ZZa<_;W)^u*a$nZ=HvktC?_Ur-x&}4NU=kO z^1YEy=_*6?aqdg7FLZ$CG;HO{snV{a^G_;Nh;)gz*sesLC%Dok$-C|IJ_Oiz+@WyXw2K@4x!uS%ci^{J%mj zU$*w7F)t+_1)(2QN9K+#f~q=pD_O*9yF-+bpWRmwg%Tw<*7H-Kpn;U(5nNOl}zw- zkElKGu?^&&pG%U*v3K5g(f{}>lsaMbW|oXBaswFsUMKjZMczJ-Z@OrGd2+dYf76mZ z&%S}+N4<=QL1PiVT*_0h;hK0@Quuc=R#t$Qwcy9&#jGn=ZJthhsL4&$cbl26fBmQq zp4TY6{p#qB7N|T5S|^s!L$3#w<$EW3Db9p+WGY+l8IE=!)d6Kq_Jc~G-vH)O&mb&s z^@`#X)t0YP=7BLHyn1uL&+LwGjnB4wZ|db3;`<>Tb`r{^pzuY9dp=*DS761BXI5HH zVaiqApA$!IixRYpmD==yS1`I{p`7>fhMqGaU*?O=hFqfWZ|sW)PT(e*{&{=J|3+AB zFXnnJXVSOIZ{7Fcud5Z-Ww7XcIICyIX9}9vB`yi?pp3-tZux3lmYjH)zE6F;`Y>AX zCWJxe)EODa_xP{ak>wgWc;DM+ahbHJ{Beaj#5atDmo1@HJ07rMbki0!8n`=aZB%`Q zWF(aC+j&7XC}N`W{mG%Z*htFah=}%`K9Gb|Zs{5gWd|-@IIF;+zl5M~WPLZ?&=>cGy)w zy=RG|4I)yW>~q(L>-;L8ow$_*Jz0QeV4?}1|)plUy2-ZxW z9Ja*fH=$=YB)0(>fWDw3`*$CPxG!wPig=#s;a1)19(MPf)>rEJz@aB{vUJAVQ2fTC%Ep%ak%H>$@dQ!!wk97iMScrVXTwRAY+QR>?1peFPDd{owf zn%*a0d8)xfJr|wjZb$CY*MY2L95ku=&*yTSZ-6n;ksrJbS0spm8W$o}zKn$@*sb5KE~}l8?eg3HeDHxxLgRRNRT`rn%!VA=e-9LUObE z=(FOF(sx? z=4fo&4XuSIpFPMp8Qw8d+i5Ur7UmC>ZK%KZXjb=Jt~97*j+)p^jlJ2I)o#AX%02Sm z9JLjV9>?4e10PT~q#S(j3NR23Z`1ImJH3&QWiWfcejZ>EW7Y~*$HL00?j{iIVHG6& zOWJ09yf#4MI#>MkEiJ|pVVD=GOpW;e=mz((C+9=H3~RFJiO z;(57@$cQi9TUYpgVWD5}vNc=6-r{UIfB@fi+3nM?jawP2z;E)V2oU*jlF?bRF9uK7 z|3y5NTk5%YPE(^3g+|Fi5r(zN)24>v#xyodW=oa%J|am^zai-$`xS_Cv8fOf@TvxT zclJtzSkMjosG`Yb4NU3DIsP{in2N9I-o^DMqrR>yb*8zKn44LBe0}hY>RBkLS>3U0 zLm(&lNNjB8muJ>fFI!8qM@2K40MACrQayN_{nT5BR4c$)r8|v?!0-naaU6}i8OX)&C)N>cWX>k@`aPnD-*lSf4wVX=|A_cMUkOq z?WP8qNrP$XxM0r`H`f9AeR_?iCA@5dDg-4+h7{lS!?fM3*$h6?^1ik?yq^~>z9kH2 zI2?j}7=Tx04wazYAr6utVKhIU!DoZa4F7|tYaWGzBtAV&0;kRB<<;hnor|KkiSHoR z>?T3WZ{%(IUDgmf%79C z?HK7404YXBvg5(OrwbWQQnP)=I-MZpg^Fc%22+ieS6y>k9KVd1>Rm#Xx5_}+qyD>u z41*Z4+21Pgk!(d9CaxX{+$AM+m{Xoxfas%B**btOHIk0<-}q>q&t?-Uxxn`#8glsw zn&W6^w~;>xQXSZ>cfjg??PI%NmqV>^B6177J03kk?JxX19K9?>FtWwNg*u8#hbH9% zB+*-CN}HgVRs;%PT>3teQmAf!b^~kYH5_=L6fLJ3SQ{+ygs#?lWU5O|{*H1Yv$I#} z8t#6*k`=Yzbq5_+kfC;)LscJupt2NkJ{ z6_OJ&XIKyECiib9UZGm=qQe{(}E|?n!GHy6|t3E{1YNZzOL|br@?E6ebHxwC@ z!92ZGW?xEw)lBy_gh3-Bb&eYDWC!3y2e(Qzw(AO8H2Xc^u?Au$x+ntH1N13tlSve< zhhQiXE*Op$b7CS;U+)&C`Kz3>dwGd+Fc>Z4be#Uxl|8z?c`4ZI(|7pPx#q{0Ha=s@ znn{jGK_)-EBMSA~DpwK(E{XD8&C4ZB1*s@5q|)=x%SUR<=C+ZdZ1_RsAa{R%xi$S} z&h`RPS$*cSX~5lWvumP)L7xq1xTDnsV3tsT0_wMHdqY$*;Sm3CUx+Tm2}^o&Z^e3l zWG7?fE&rSuu}o8_x&dL|d_o&8d^4b5{FN1xMcA*0+Ow0=$%sBu!~UP@L;I!4RjS7; z&#;|Xgz}^a^>dzEBZT*n)ozS=9evVw!G)H%*zrFk;(wj-T+WU|N)C;uSIq+-*6Zhk zN2p$!0x&xXH+y~3AMKlRpSfu(OSjBOvCqaZvD22A^rdG1`GHe81~!h$N4G)NDF-el z#a6nWopRh%-y~H91}cLsg~o3~B&1Hg=dtdO4O}rGsQuB&jlbeDkW`|QuTgehN2MlE zzH_?+*odoq_h}H!K~S%H$|QuIa;QeLQdn5GwSdO^rnI(fTO6|XRKK`|xwA|Mq1_;k zGUAhBspKWl+Wt4+)3#;mrNabq2PcQZ0i~0oq}2Lme#8H4kpkdW@g&e(z7#1@KY)mh z9KTx_NVKNzfadBuQ)3G>ktqAnaUVZLs{NM{C{$`v`CSvWpBCl{HPBlZ{MtA}Kl{eY zE{o}xvLQf_6^0lKMcFWWrCamv(fN!SS2#ZH8*1NL#6rl%Uj2a2VB3R_$= zQ5zE7jUwoR4|&sSRrB{(2iz0ShuvahyMQ$|i6@&Qo?%+ho9XsTW-mvkTiu22J196J zL<#(^f!N*IfOWNeBdQ-G^;8x@QE!WY=6VL(g);ej&XSS_aL{QE@~-jm+d&6o$(zADJ&e3~U!-iy8f903;H%N@TS0M!9zj#o5hOE%ucf^dOVdt-BsL zuba-dZ!$aJZRu#kEskZ+91<&X5BcVJGn#gA_7gtm`^?@nrePUm5U+2j2P4K9stSb% zI0PZ6y)++UI|TX=mZ4T_l~xcp)MtwI(Ii{QJsj;iZC1}z2;CKjIE4+LDR1FSN=v~> zd*ZMU?bVUDEyoHb==-WQz3wIi8-bWjUi%ss{jS#C+Imr-&#Nu&$w*0MA#YKW0DcSN zJP$P~3uVFjTDMVUowG9zsupO>$C(`wjLQJzntPO7tZGVstl!RarffKK3U&MR)Hil; zf!OCe9in+=$Yn@|tGPq?vTN4s=2qJQTPV28#fktbb#sLly0X~YirE5o<_3R7g*Vba z!-hD-L+QfT1{v!$2cG;G`PZARUa*A!8nT`Jk~D1l5;?QDe)BEami}QWga^lx#t~3l z#=h3=vuXK+G-Mbg9`WXICv(Lz6o-o(bdjuz@y+^#zVo`qZzJdTyIs(yFs1{$CMdgR z_Jip{;77&~Li!BSH%jpce=2*Fsr~+q6Rp7s0%mKyh=AamNNmCN2uKGDz#6YyDkGNO zo`Z0F1h0Sf@Jy|XL{50t^gK~Yz7rB&_O<#NR6pL!B4ZKh zN#+RBj-No61S1XrTh|hitfG-A{n-7J!AzKz$uH19_&oKSE&C5+(@T@kttGWhzhoDM zg+D#N_ZqDUB8P@&6Ty+UhE_sTUXsR(ZY@&Y$9PRx9nxUVU>-EsFijO0SOZZHdhZRB zc!%o1B2*0qZH|C<658l5=pv535dZ-H)}pGN`xkVd**u)-7kS<-EdW22%}2ka|7f7( zmd<@tLN?nI-tG;)h}GOCPzjeG73VYe%)8C;>X`1$P+dJ6#)G4+KA--Pm*<7#aaBA! z)+#0ZgR1J>ND2nm1$8oAa}sTPF57TqvTG%t&dn=Y<=1(TtH(fM;ZF=o@qe0I9qzd( z4r_F;gk2sB&U|TVLs|>N=~je!Cy4W~O~G{4&d?s838nf=sjbT7aX zCt-!M84!T_kwFHH=uBzd{1MVl_HGzpDuQQF+-Fefuje`6BsYGrww68%P_5jXEL0yM@tiOfNHl2BNj=VaZ`ufTkDz`;iuda3Re~B2?NdZml#Z%pbfh(l!c#Z z4rA)s#amEMA{O>JGZ^)AM5G+83yAx#!8n&1QpM{hqCzT7H#K$?bY&+&vPjr30vXse zL$#GSuzvUh3Ep2say&Uz)dmf+LolL(wuU+yZ`wJlhSfnbI->5=U{l5(P;Hsx(+tM@ zX@4Tpy(JCRbt)4Tj!Kvt}PzbQx0KBeKd9e>jUEttw zJMNfasSs#OV2XhurC@EoeYM}S-K#3K=e?+79Dl^C_%DQjO~LUa8C8;uE@lY1cl?38 zNxx1-1@rW;KsvFU=mTM&0TX>nyX`ANZQDBn{Yl_{TOG~fF^ z=%F-*CIUr&AkP|U5x+Kt?Q#4XOA?}TIJAfN_+Gq&>I9|k!Vg;wmes0hL>jtRNnNMv zHIeONi^h8A+3x!KgTZVWvd!w9(<-e>Kb9COS}etNsCYn=8N%b$PBs0N06QDNW!ER- zdbDCj%%Ru4^{}j-s4;<3#NF1+ta9jtrwpbaJ4hsKd1n={4^$xjI8)=fGuZ)79(^9N zB#d~2WkLmph(pQ3_7Ofzw8!jDetYg9(oF|z+vV!fG=kD#(#3xF+O6;k_8@haZJ(_~ z(=8|t)?bRiG=Sf(#?367HCkpY4+TRdo;RVsE6-mmP3by3sRsW83EL*|j+*5|n;9$^7j&d9Q*}m$awFGRY*3sxsa^3?}$~6Y};#Gr}LU(7h#c$9akdo|!wVjvD zq{ufJreMdJNe^{}_z>(*al`K-(#`%HPx3}*dwRr2y$lE|w3lDYwR=VG*L!s6?3l&MKclz6%9k zDks<3gnh^rnGQBD1{eR#jwkCxzJF+_Jr6k&C9Hg#xrw#<$~%oe7kJfiQyfPxZ@2A% z2n{9s4U+dB`(e+t!fV#O5TVGuUojs!X4;AJhh&s=<8!0Y%Iy(0Rc*kHMSm0EG3B{W znasP&GKI2HZfxZ49NPJAWG9h1j8i$^Fjz(rx|W$hWKAs+n=Sl#wJ(230GbhQXr;@- zhxBh|iO97EIE0EnXZ6wuXyzifj{~RvdP#Gm9sa@HH!9o$;s-I!QO|Vn;Mi5yhj!ff zo;-_9e{d3R z9k{5I8ijCj7p<#SMB$ty+i*MN#^gT2lyDl!n&@5j6IEDSb zNDjZMx0irqHTs@{1$NQ^^AMJ5!D+U#?jbwd?;G48rg<^WYb5>Z zHP1AJgDTt!C553l>7OfpTj3@1y_cSU)5e8Av;4;&(_nIVtEI@Ol*A2^;zHeBV1omW z`g=mrNmqREOdMY`#)GPZuEtP7Py>(Jh-*sgpJ_L!s4*AIdAu8`$z5OG(0M|(z9Tl9 z8ytFw)hA=KF&mVQ%%rU#WP>7SxIoQ#g&8#v1}d6AoljgY9g_9#)krMvoLAW55kw5q znAi<05keUL%L*lD_A8CI{hAC%C?$Zoy4(4&FcLjvbVbYShK8=)8)1WoW%R7Qa3ixsu8qi}(&3fZ)aar^i(kT=;4?C}dZ~V7f8@c(d zbc*UV@dun;C5AXKu&tu8piutAE(IzEM0-=JHuuSYZ6or$cfq15PoIk#1ypS?~Uuh3^vgK%o=4L9A z(|d0?vgh>95c!1PF*I2o{bnqk+iETLnV$2&NX3}pSBDi~a?6|h$8`FgY)S9q=R@VP z?<%)WA)x8T7;3{ zaMTMxhJWf0GE{G{F$Usq?5StA>tOhXO&EC{RDZDoe#4Pp(G&O{-OXV9xC055j25fT z-d!;FVzzLal$PMwa9{OQk$A$g*^+PgY1r$2^P1%OvoRL4p9ihSn3kX^~ww&nz>TpQ+rZpfv>tPQ*q z45s3cJsm-y;Q|(nXa?DqLQUyf9K~GbihXMzoZ>&AFq|-sX#qVh2^)_38*KaY68!5c zm&Z3&0lHuJuVkahBT;FRWWANnrTX}Vc~8G3WmbRja_?STURw$XMp=N3%Qz)8>(r>g zuILdMtOFr*2~PRY*T4?yq!x6T62mz#ec*<2fRIu++vR%1hfZk6x`2I`OrbMSbI0ao zs}kR)H=~t_DuC|{MHGDdOmwxIe3e;-ZJ__SorqXW-@`L=vkk^>cLW8~R2P5e2jC5l zs;Ov~cFpb4IuxMvl0T}&+kT&dIz~y=+X4q+hU+&c!)LgC8K@F-`tF4(NY}g;Cp(oqMgQSZ?u(iwJlz~x#`h0(mUGENf zPM#ug#RZJJ7W)c|Y!~&k{;Xmjj_Sfj+v>yZ<74x2nCZc+(tA!0bbdA^T4yra$jD+4 z&Z;vj>D<2X?~I9Pop=dWz`t>H*s0P;7%tjUIxsl|diyH-QI;3q*8FqYJDs3?9!O|3 zY|=06T6t4EgU!?4L>{i=d)KPg=zenVUF;Cs+st(vJvZ#9XDEIx8=YKWv30$Yd4ETz zx?e7U4rPieEL*uZ^Ql?7_~mnC?RTZ(PbQbP@EHbUN3gSxdhfOjF_7N&HpzeII`zEw z_JnOGP!h*9s$jWn2ON2XFo64!B1nyVN^hi;mH<>=MQ%DVFF`TG9) zEZ9pNFubt~{CqVRB9Yr~w^p@3lJO(waoF;ag5Q;R|K)wA%>}xh z`N_fk!6NK+&ntLOKaV*gHDpf2+3OM}DmL|ZF42Th$r8Zz$oH&kO$9B0m zehlZxx9wSr$)66HsbjB#p_R;uUT0mzD-nM!R$$3g@Ob1!Lpb9dliDHIV8J(l*2pgIn zLGv3(fl;Xsv|`{f5dY%~1!_YY5?@jEO6C9S!vFlGaEWjvEeVSK8bgms<&XSsA+PPo z=gXSMcA>A4)`F|`cS&C|-ll7QkMop1(x%nc)dyk(Znjxb2%Uib!E8UbQU%if!E1r* zJs;Heg=Vf=gBaFyd4NZG4ig*kme0SPtnEJ^RH(%0o0A(lt%PQ7JRh4v9>=#Qh>YoX zO@Vw@8g`i6Lf+TE{O&h5zTS>mo^}d!JbOJKgHi0a_SChCL}vklchb3OU4}o6uJ~I$ zn>>!GZEie>7;b!tYw~73*0}6}FMAeUt7;Axgmvad-6;mSH?&Fe>W5S79u2f~I&g}8 zWeAaEohX0HLnOty^n1O
vYxxRYLSF3TsF+I_I41TlQErbn4JP|41Av~N@aDKFh z_f)P2!nA%W>1up+EaZjz-qyM`*II36ScT5sJVPuo>PkquUp$E~s^|L4gL@oi)^_fn z`#y0HTDY<0G;m%G29XwB0>u mRY#(GN@OZPk*9}2w(rs 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

>tmAGgdyV43A}_`&pcB)C#y-Cima6D+Ja> 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

?5i!vec%!_F$X7;@K`vz_WS{uV+1ox?IAmvuKQ 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

mTkkF_^=)f)e3)>c6gKtz3e$8?2?%wU*?e*>T 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

LIv+(dB?bx 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

6roC@no2w@W&Vt5)0eRPF`mN@BOb`-aNiFJ# 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

VuaJxOd0=3e~c8afU* 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

7lYot5h|E`u!sWvB>hgU&R7e%0A)@+Vt__zqdQC;DOy7$G6Z6m%avHhXN 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 z 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

6ZG-$1?lk zWUzv+E$M?OLI7~*><`4Y#rWjy@l>^3I{dpN&D?N5--BKCMzP!{0$Ip55)&~|wh9Aj zrBgCGgDCceDodX{iPke*?DA(1 zT)V#u6>9J*Nrc34wpmzed%7w)6q9^@b0B%l<5dS(!h6k2yVvQkY~QV6-Ap4*NoYti zaqA7~Ps^AKSMRpJ>G)^8H!hSAYxCIN1b}Qob??IO`bo1Tk5rlc=IFWcw}!fwM#4Mj zz$oX2XY&BXfZ6`GPHJ8A`rXJkUcvE451R+(TrPb}7I&ox55sS(hj9*P0C)RA)USHX1IR4@J5$^zDrw{zldMPC&rbz6z4QkRuI*pUA=FbbT5 z{9l5b2-nR3>Y+{OhPd_)+B$9*xkOsYO*YE~BTv5Q8Cc0T3nt|z33!N4$J@6jhq!d5 zu-o)EL`&Sdv9ubrUR*n$r;qjyVRW1sKh{*Ou~$6Yb3qhG?4K^PAFUZJ+a4tFmI#P= zHZ41Q-{Es?FdOKIWoPns|uXLLu))DC@_#pif=Slyr`hMreAo#gJw68^~6 zP=S2Dp6vy=v{EwtEQg7KwKBzaPnL_HITE}L?IIr7Zs5G@!mb8Qv>({JMJ&E&{rpaX zq(3VY6z4F%g-fz=EwvE++G+mJZmfDvF1hx1#M12FZS%pG)0wXAY&^~S zd)o^M4{U$Er5*gHXw4u{do-;q0W_g1 z0gTlaB<7C zAM|noUZTbZY?I^}!K895looPk#^UUSR1`g+*e!ok2^^!gYDSVwJhPX{aFoCXV18fP zUzLbGN^kOcYvoh#KP3ND?YW!Q>3&-p^scTyg?Aj9V6gBvaFSGjy84!@D#hi zk9irtA#>>k(?Rm1-|88h2nSH)+>B>^W}tkBn)!@D@eOY;stP>(qFmTb7(?3>oaOkJ z-&6j!QslfFY>94K3vS^%A}Dp5>*{=Oxq8AD=_qqr>T0^cvXE(W^2F4YaxgVklyue9 zcWo7DHdKCa+9U7~rJ- zMi1C?6!*UUpffzOH)bTGTZ{CDW1x}P70jwL2rK&PO0qC{6nEv%owj%CSfE;oF#!j% zƕFnv)u2T#B@02Khbg@p-SR1zgd&Pep&!^Q)?G-z_eJoK% zNDS`hMgn|Y0-=C45!5X_3ttoI@jE<#gmDb#I9{y+t}g;C=v6VM2^cSQ;<*GM900T) zd!1*(zE=vyR-Z&5wTB{cX9Fdpp5H#NFKa*+v5yH6g3HOjDmca~*^VJATwU>KWPmpZ zfsAbZWL;L9eK;tdD2o1|oo1cole_HeKdiLa?UB6Fn$^?y0q$U8Lvu!HIYzQ z81KHKn}r>utK#LCwR<0hJ%aIUPs-4aV zE`_Jg@0asg@(W@)?l(SwOnkx#<$2zCX_A}wz4hv~3Ki@}HX%2vF>jj7Vj`3@3QDoM zzErcZsZzf>?f+L@+`MI(IDb*ha*g))KI>ISyX)l8xC)QRkqLXfj+%JxtgSut_S0p9 zT(1_I)VdJ6#w)?;X~9?S-S2+fMB&)o&!Mv{LO(lt`x!I$3%v~vXSw&g-&sq87V`dg z3@J7D)rB~bT(LQ&@h}=_R)`KO`{3K#|23EYF9&+Fsm%%TdBVBbn2Jl!%t54nCzQ{p zcyoL||N7t~p--b<@--)0 zz?i{`aPJw_h~$lzM#|)ccvC2rXTQQmkpl&K${`$z)<3awojx$!G&>kJY_3107_={a zp-)qnz-ZVFX1W&=RPk!U=`{TsXwTKk>BS9i(ENQJw zp(a{+Y4VN{^>;6H+r6pwRtb1F7H{;U+x(AzIE^rl^k1g>YN9bz& zTURMck1|UO{^ock=@;Lnk42%nk^fOw#PH64G*rQ=C-5J2M{RT${zpUqyLIaD!$>PM z6^B<6Z3}C9T737y|KpLQJ?ioUeRn&j`+mBX86&zDvvDl(TTGxjp~%H(&Y$&X5vCTG z!R8@SPWj6yu|`R|`!xYcT>^dBp0Je)fIKf1bE^nd$P zwS?mdENuNIX>y%-^d}NH2C1zc_v)KiSxws=4id7LO=jzH-pfJ85TfO!IX85`(U4qB zoyR0{%}K7P;@~=g7;(qejO2_9HGkj0u5PiPgXR?f(Zcx8Fnk}6{f}i=bd%}fe}sDX z4b8^CtFWqFWLCsNT)uaW)bbG})OR7%k}f4W&(Q9;8KGZF@mpRtE+)kqdy=!FA#QX4 zcXk}*<>Y(ZopAlN>g=mtuyvQyBbNKy1v*Z=P%(#M8g1pWhy({5IgLHxyz;i6Tn2Pf zyTFu6NBI8a%U-=fWZ{e}@Hg+{47K4GC!Qg$CJ}Vu#Ko~2G@{=s5^?&|pxV!_#Esn7 zB~Y~R_k5-5(aivtQu5CuKS^w#!aV&*ET`?-#>oOpaYA|TDea7lCzgCfRK_gOJ^WT+<($oYM3^Li zL1vpPDCrLZ8U7@fd2XX;dv|xMLDJ9nwb)eNh29ZzsrOj-x9EdRwz5x`ht0mEYQNCeuDa%i{II?e+tRWCM1WkbFib_Gy^ZpNKK9 zBlR9n%woysdVEB>lyUV-)0+tKhPq;4dLEjJuo4XSUOaDyK6Q&w-V8yRlGiP z6)zIjT)Kstzu5QB_4N|5=S@K37I^&m2JAhO)HUF&5hz&jgDb05^6IO==0&!~8_)a- z-04SSgWHS01Sc5FQ82i0CteR`)rv*vYR1M1t6iC8vs6xvTDj=8%ZJpVviqHY%mC_k z&cHiJV;~n;4%FDCSS5)~$N&kX(tl1O(*w?s-z>aCrDE2cY9atcnlb$B<8HzxEe7SI zqxo7b)}V!-2=gI$NZ7`9GTRrs7LJM{K_ zN8Q^$S6Eq7!l?^%{@0P(+q}Ii_*3h}TRAIb7Oe1%hYxC09Mc>)=nq}Py(AlQ6u#Wo z+vBO3;%_cWePm>vrK#n2s0fCHc~4~YnlKT{_^1VEx;k)hE zH);Jvq_0k5=DS>r(=9L z(zo~Y-vJr`&PwMm_8!ON7n99V=U^nV4_gYt;qwV|L5}5aw8(=giw~)xXvli^68e>0 z=*6EtEAzkDvScZv-&ap@lYTwbXkd+F*>$rxonzC52#X}kjWXDy(pc>;v}yk$`}Rbo zG5{^oiCkV4z^Yb1Y`5jo?r2ymOPQFVa*hd9B>nhepLYb+x>gb~I+^S6>k4U1@*Tyuw*Fd2koe@{;$oRT=U%6ELK=Gi0>$W7(_0nMU0Ja4v#5)P-E=M`1o(Z zgFsUw^-@iraZ8sXWiG5k28Ck*&{&gUnsZRpv-BqZIXPOYSuMcFL89q@YAKg=IPK~i z)m!;6(n9Uhzt^Bj#8j^yu_juRn@_uZFyAS$kaUK!@7oZ0j3QsD$hDOw3G4d+=eL`9 z0$yp*(>E)nvgTprO%WAxzuNGf|2eWp`j%3+bsreUcc{ExXo_-6Fb;${>n5N<<<;W1 zbsZj!TbAFt?M)uL2g$fDUCn8;4+6CEx@=$m$Ef5IU33$0Oh%D%nq#5w)EN0*1mQ&o zH4i?Fklb6ENI}aXe4*K|U+|~O9d9pvq8sK>6LAXZg6*|Gx&6588uLUYH4Q`w{%ov~ zCaZHPhPBNeafp88K97i3)`8X!(8Oqnda{!>jX_ujudeSCPy-HIa0aI`W3#+aYiDys+25T0EI^f${(k zJ>gtHK0WB@PJ&&{a4!)9s{^{la>L*6VZR+aJYfBr7J5{oBkb|LaM<(uQ{-V^hsm|>Awsr~G}&nz`7 z3u#WL)s4nyS|nFewM+uesea6rC^kVdoALYS<<)E#SUt^`22NQY;Q`PJ3EE485POZW zjOaTcXl6lAls^Mbj^sPQp?>3H0vhc$fyMS{=MBw}wKEK4gTZR@*7HdI`t?^(7})?Z z@y~zwT-;9bkJZ4Vd(Z9)>!r-LRK> zo2mbFS?>BPUA&eJ0@tz&l(k&?md5=v0}^nhi8wg(kHt$f4A-aC;Hi4T;}X@@@5BQ0 zwuPl$HuHE{BULE1 z6G;?Q%V@{MqC)ym99}yoI2$d6<$dVc9)s_B6W(UAhI*u;kAL7;63JQX^ZIFrx?8PF zkha3TeYW>Qa&%Ay?YcoxLl}jjYfnckW#6;pU++ERFVWwSaB?L{megMtsCO0zIZF!h zp z_nuSdp1S9pz5n~Sw?E4BDqMe&qkn5j=KeG&Xv&MY=^FWfugodjHuR7WbobeR^9c(K zdD8Fv>sh3=rttUSbN5~D+MoBv+ALd4G+ujlEUCJ!;GA()%YT>sXX*pn_?SG+cfCCf zzWq*Czn^Cm@~ghT?m?rOP#`C*j33;TJWcbhL0I*DXBoHde}=MC>&#H{TUsU_&C*6< z9cKrQCXcb=Y1+x<{tUVyTF$R*bTc}AQoG!~z{|~sH6D||V#(z_Lp`ytt}!tSolM5P zpdR`hBXaW^5sw413Jvpb7r!(qGqO0v<^H?5qHn^{C|(gju-SEDj0Obc?}(;}dTZf% zvrymF2E;a!eSGRk#O_l2?TanT5EQjLH`d)j(6VT>*bWH_7`W@4)NnmR2A1QylM@-Y zo}J(hXuU1}Rx$Ko+|ifVTMEB8PvXMdA3faJ>Tjc=8wlJ&ZiTvW5nO)HYu(fh=bB0n zp$>Wfo|jImev%ouf`>Skw3-6~x5siT#!Uw|^Ra^=$Ut_JR3WN$6fb zpVx*?wSLRq3fb3HMVOG8D-SjIHD7g~rILT1+;=d{qJqmPxfeI1S#Or-%ftnyY)@_~ zn3IR}WSW);F_nwrk;RIiZ$@2{!Bmtle=vgOmXJ2@BZ(N@4=q1;{Os{kYTu~%Ln*dq zd))`VK2)18B&RPh@=ODtWTCu7;DYD4OuC-NbLOm;&X5rO#~r5l90wf>p47%2O8<_U z;!dL6>%O#Ygxj?aN#8^uyaYIp;7oV)^~CNQ^}%I8Up}r;6={($WlY$e4ar&>GFa^W zg-3fFx%kaMbFU}`0jFvS9MeGS69Eq(5>GTKm;!bVAGSliqH9PxE2fd*Hm*S!LZnd3 zNca|fs7W=byb7QkCg`nf^O5@Z!t51A=v=42Nb01sdNGY$R_zUb@( zJ%!L~dKv4qQ+jfk95)gfs0L0W;Hn+m@Ec(CWAg0~twPSit4MRd8DlU*mC#@Bmr=}$ z_r|8(SRfk=B~7d@2m8{7d4o~xL*wnC`?!kFo_%-T$oi~b=l7tQMg$!QatE(#n1yLH z@qlTxIWrhV#oH*%8MG5*wzR>y#sDcINsSh2{o^rh6F;>naAS^kD)=(|ElQrGSGWCH zYf=3WM$wth8ydmt_xqM7Dgr@^WfG=kgen|si)a}4leyZgmv#vhyO zny2fINtQbDBifNfCjFpW-*e~<%?WQ7q$94V7FxzN_dGxJmhKN_R=AP9zV4WLatVRB zwj)EQLyHeL3%D&@p+9NtLv;@Fy=z9*kdFjjxP;fxtOf3#uGo}yYzwuzig8^%#QhdP ze2%1J@L^v^qAV)9OMS%rJ=-N$(Pz2HKr7yQ(aB*L+U2^|+T(^|qOrZ-J9;*(z4+Jm zUfCn$310@|$brPuw=^22IcyMzeC@kxhJ<6&2)8;K#*S-Gn2nXng^u;Vj<^rCEX7=a~@5IT7a_WHo zz~jH39wt~KvXJt-r*sy^r^<>OM_1)rD2okvJs0*F!UhG&V1ZZMy+qtz&@0@R$MwfG zGUpBtGGEB}TMQn`{+Y+4v5;Lb5$%ugGkc_NG z+IrLea`|%VycQkqCbdvLA%v%H>D?81zv*@Yha6yw@Ksd6lOs#WB;42abl*kKPVpVs zf)XH(s(k_D)t)P>$b4pGrW$#3YIJ9iWp@LQ_Vp7)SQ5AWF*GYRU7B9Ir-KWeC*Le* z$0+8}@dUixYy_?(Z&jJPYJ_tQ3%B0lef%I{esWhYRU(dQIpjJ-i)LRT4%Jb&6!bCn z^j8+xstL7gmcp#~`2imyb3o67^HdtA8-R&Mn*h+o!*X^vJbwk|;n!pL#cAmpMFPjo ztmQ8F-;M1{UvKCjUKF}}!qTmOtt@$i6b1E=5EX1;)KE0oQ*QND!nm5&4D&b1QP67y z(S1>!(u$)kIyHX}nG1a2I8;PHyD0fn@GeTVJbad*oRkhA^aB35NA?k#=w6!qEx!3$TNYm@}oVCTUs3{IHb_J@JeS>RUGTF{@n(M(Iq;&1yz00b za*J6}+%e(3^ftDCKtZ{0ju6CT{oDtS_Q~b0nv^PZL5O=;_9~TjTS!H~LD9)Tqgmd2^2enNPe+FBj;Hg!IIG(*jo8tK|touPOc- z?Dp{dT?RbDMtn*b{MEN`EF_TU!64xcK5R>+Ef!aL2aic+tKW_nyAzVAv8%=!tC%+( z7_%?*_*m2JJImhV-J?%}q-RThT|9g(JBE1VEqIFS?UaRK`0dVzA1{0A2KoQ^AWTs| z$Ep7i`-aKV#O+Cu{qGh=t*SaMY~|~x{eM0F`%Lwg*XPlXXdOf{-s-EJ)x10XJ<7RT(Y{MNmAa=bl9o3`C6oPTs@a+&bYX5 z@ORCcs_9}`W`OK3| zqRp^4{MMdkR&xw=yl%jm9D(J!BIgtZv3m<4i60KOR<9I?c>rp-yL_p=MC5~PM5a<` zsayW$RJm^cBe{}Sd?TJ?l-U+PndDOYbjh*IA!65E*|?x(-134|Re6s?vQh+X>a97? zR7Gdm;zlN%l?MBj(d$4Wn5j09>LyA_8+!uB^}0)h+6IY!U!1R)LBZR#O3Cr8&1%Xr z8@ckCA{{kk5Bax&V6>Ob0t6Pae-adLvYBP>kFKfUDl?La>4Az^3UBGaOoj-j+k>RA zWal}{Dg2Ag&3>O*wo?irfyWvT+Bv-j3vD~k83OcuSrtiuqC z{JmK-3|zbT_sfBobnaAPJ5ipmXo_^mH|n@8Vu9^6e94K!Zb(Nu&$(*q)sSR==YXYM zzjbnXDS=5}-99M=)HQHYqjQs2tSq~u_F&1q{dDknD^rH6#qT4zu z_a7rO`x+{AkmY^(SXfYm><;YGCol5%54$jrm9rczqAaXtcE{^BQ=c`d2V7pHzMGFz zgJgqge%~un4_Pv5k!L9dEn@PSjpD^)E4ES%E#i67{lV~%7a0^Rlu#<%zT+W>*00Z< z7yu_3B~zCscBIvvPcg2v`wE2CLpC}t*ZIYWy;&GfZU-P04=s^vZsc<4^``JqFK_sO z)6%3<`G;;u_<=lN{iFYx5&sV6Fo#;dDd1SMwH&N|EN|!;gV@Ea=-3w+UpGnz`{p%I zmh;YcbN7#DUmD?~<@4jceJAP}(|bfnPG_P3>+}_DVa@wzOv1xW5FnnuD?clu)%DTYMG)yKoHu(sX*ZeV>Q9}G zyh4bu4;a}cw|OT#j9!z`SB@RYXq)j~E&r51FBO(j0LUHk<@@3~bgh4Vn{;g&6}IH< zVDYri#EEkJfSe1Cp4iDe#3VBgxAZRHkyd9F2zx^fIZ-`s*qFT0w*XV=zKHlJG<{oe z=ZnN*d#Vf{axj3Va(;Y>En_Su$uvY}?5ow&pw)`P3akqZ{>j+!=*;!fK5 z;fSdIQh}UN+rL6M^%bsk8RDuVEwf2sT30H|3+#v%8X(vrG*HwvwAai@ii{0?-AY)| zG!aYfX-i#h7UgL=TosbO6Z9Nm8N_{Gx|AI*Udj!eEpD1{@ET>$H$brH<+{7R$FgtA z&o&i7B$D}Rsd?xD3bVYrmT09!sqYL_;m+tHU#UVM1QU(P+@#Y_cCL2+6wVXyv80xI zExdj^fLK=2v8UslD7n0dcBPH^r^0Xw;GJL zvZrN9Y2KSXTEMm}{w->ERBkh`9@rM})ipm~Viri1p0To&T{@MLyH$-s9uB56%jhBs z_~{9949H5DjeT`aTq0U@XJO1O*_&$J2<~ly^L8-unz94|KWw^BCJi2~<}LN8ic-(r zqa~=5MZr%GHJ&Xv`+Ig*IZyKzZ6Yj~=f&}q+H{WKa~OH-oH>_Ub(Fk$iBR=wfk`6Q z@dS>VgBDHL08^rE{Mziu9Y*iM)Uf88;CiY@Tm&jV8-m^`=lQDo{`V_7dHQbHJgJ1I z(yR|Y!>cc@nshMcL`0IEk`EALZ|(6fKwb9%S~~;2J8Dq^G^n}_a2l5Y9u&CR7;vgO zhXH7FmYQ`jLEofM5~>e8C|Jq(;Rd6weOL*wwM-NpgW(#fBFI&afc5W4!!#+}5MzsV zlIy+`GgfJa&i|W{&1qn>eNIvqf>{52Jb4hD>$MzfC8x??y7c+b0>0{{d`Ef9-JV(H z?FKZcXh*UOFGmOoFzQ%;_dkZispgea$o8~F)G9{Pasc?Col?( zIM9g6YANgPA826cJJT&%I);QLP*0jTtoTUm4Qk1cUCpynUr_k2nGN6OpzSInyYbLHwHuUiv`@R_ORqWF{ z@KcXw zNfYsXn`6l#We#e&3RL_9iHD;TSO@bcI=nA>V{9`BOubsPH=7+ZNFoa#8xPH9P zS{ZW|ktsQgR?y)?PubZ`rq+r|*=%aSc2k4ye*dM`Gb0+~5x+_s`6^FTd-@3&wSKw? zU%X^t5Jq3Na&65$uI#*$w}DS@DcNqiso?rIAqV;9T=G;w_dncT#Q_LG{1nE>*%zQ?p%nz5$f7Uhcd1(Q4?CnVliM)xgOvQCc=_z6vAK{u{I2|h zxlN>2GN0wJi`$goE7Sf$0WLi#X?$YSo)E?vtSI(GNPGh{OVDY{%uP3Z>IEs`7~X1( zwN6Q+Ns{I1G@;}U9;to-gmxy2o#4Q0-mBI1l+ibRf8)}~G!BLQp*3&zBbrrSzu_ih&9a$D zDg5|l(HrfJzr26Eu}6p4J9LQBTj3yq!SP8?p5Lx}h002L^eO1A0pPoRUd(srt|D{a zAa^yvcz0g05na1C4+qx#Y!4J7X8aa}K{^`xd;Ur91q#1cd)f2QF#8O{|%}Bg$xU3^m_{)y=jQNfz7%hs(-?PP-$_bNlkK2mX``-Krvll5aJ>Mc-u@$#!EMG1=Pcn& z^qPnoyY4!a$Cw_p%HAjJf3s}+=P>qnwteLzqa|ybyd92dzU41-(% zZ#X1ar7>o`Mf?lrRFn(htW!P$NVIa^3#aa$n)X=ZmS65_$&puY*yg1l+7=3X7=5vW z46(4KPSJ}Fu#bfA%fGFfnrCy98;AdR8n9cKPguxX>;EO-W+o_YZ=p*!LZ=s#4r-Sh%GE6-f+nThZXqS+n2SaFXeL@jl4HJmypy=}OQsS-J(vxDA!cMUbLqH;Y)MPTUX6mGT^9 ztmt`K^2~$BR$BMX8HvXg5{LsVy{%@Rz7i-dN+dV2I(A6Ny^(B?)CS$)j5PtbKV<7G z*~861u3K)fixYRi0K0yRY0KjIJ4f~FPr$%wh`1niw)E|VGSL^olN>|IDO}xFeNN&6YUkh3# z+1YM;3DM>`TF2Y7n+0*AG?`*g#^bYR+=~$0jG{S8+E_0uMbNbsd=PW!I=H4-HoJKGE-M@H4>WX}@v^n5P;w zP@$BMkOR2oYk~xr#k!YB8q&<;*1}rvZq{oD1_YAj8Xn8TqxN~Bm)ASX7J94?_CPA3 zIvCH^rK6dw9lhlJOV0P8eC!y;@_&W9%X$yWg*(`v)@t1i0n<1N*QeJ&2`8AfFW`Buaq)q75!jxWUkIKDI$o(}U zHfv#7k9o|~N*$tz&;{F{7xT}6-U=L*!Iq;qCq#ZHCAZanTtdK)BUoOIL;#X-ef$nG zCNu3$I|KD{@$iq(AjdscD{y)q)9;ENe8O?jwTGjiluNFM>Q2aA6_tfP-uwD0n z+nkNQIwG>$S!t)#%b!|LDL@A$GnYE|tmO&Hq03PU~K54KlaiaL)xvf6^C+aS1p zefYMe-zXhJ#7xc&;g;vOY?}b~uF$L)T;?(vha;lL%rDaB54m^FjZLdF@AhmzCO^Gg?$2^0p!fw`wF&7bcq1}+vjSh$VdpoaBy9i#KBm322{0ier_5v-C zW}~NI;mN#l$4$r28re8A&!+&OV8YACSb+L^Av(|6nAj_B9g&>jB9qAO_4|qf_*NP< z1jAzUGiG9Dg13SvyvNMJr&N{yxY%Up<|ctl%_H_Ld{${2y%QB!x+6Bo>8!3GQz}K@ zv*lFjd&dB=>S2+Gz3t0{%}y(+PkldvgFD{|$5pxLRBy|YJDa)b5NV)_Axv>8rm`z` z#f1EGF{+E6CGe{H#zJ;w6qiEk+J+_@AVH-M_a3zvqDVGx5v(4nS-wn0J=X6=tbo^I3 z6<`c_jtnE!fhHD)npMV`a~yVCl=`7P_91(0dR_lZ(nh`uP5dY8u$|-6Og5(U6Cw4* z1!~naEYQSYzgce%_$lx1UjL<_($K|UyiU~4JZ(Z4T@xDPjhY-fL4K|@4<_b0y+^Hw z^e36R=!WmF_emi%EpB$w(+-&IYH#pNGi5qgO&GvnhsvU3~k z=db7!P#DfGBiZo%=o*(|xF}9`D~Kt)Q|&qCQe#c{7#4&S)HiB4HDI)`o!uwdLK7&& zWVw3gj{$i$%DY#7H!?5xdC+cro0f86JPh<}B%8X{N8(&ECtaFmdIQETTxnXp(&E`y z|2Bh!$882N^7x(mdDY{mEz5GOa*T~BO?sE8c1Rb^W`dtEg^$n>LM33GT-+dA6oMXH z6}tNErf{_x9r4|m&z9$4p-6A0mdI!8Nz1T$p118k)C?V&YlM1_>-5fs`%xumHoch` zme!A1e^d+>`f@)4+nSOisKxe7x~0-4RER<9_nB1lBQ30;ks?XpQ_Y&*?>FH7g%xXHAvjIl&~3>KdEfQMK)pGgdyH(fB5|9K=OOiUx;HIzkjIP<*?BNWknBDgV>;O!A4(WZ~7->H1p-xnbVt4JGuw>*$y#|VdlZY3dH3FiO~FKuJ!w@ z!;}{#F0?_0?NGJofLFAPjZp`W@41$Yq6J8%oq&rPaj-&%R915qp98J;8&z)d-;Wet-#>1Uz%&!Q`e}nTD6crqLnVk520~HNyq8w}BE!}4}Kx2JHWRF|&kp29a1CSB>TKj@k zR=a-4ug6lHXiuFpcLgj-$zHOv8L8!5Z&I8uhRo~ns_L~dgbqJ=EL^2>o9_O_rhvaL z!#ZbQpDAp}>nNq3#^O1li8ooUUtaVzqTY0CygL)!^77Nkec1fim*Wp_Sv3xw2i3Fo zOtn;p4^&bERf}vQ`NHR<@dTpi_(M9Y6`;n1%%{BqU+TdkOpM?waQBzWNk{r-tD<#t>mRg|4o6on?+y_kF7@L{aR;{2J3 zi&k#;-rU?k2<6GcHP$||5RX9o@9H2yA02zRE2;2zbX6QkpmZv7=3eBb|z`; zNg}4=Qe$T)6uPMmVWb2-C}?WW03cQ}2lKkEfF{eJxor$rqL23(UoM$)PHe zTr_DHt!JMo@&=$05U-umIrN^<>0@N*XJxvk%j^msn`OyS&L4SwP_~V;YKTC zf6T>|SDwV3@F&21EH2!^Isp@YFpCMl+T`kMb|WlUchTCmhNmrPwXh+Fp}N-8r9L!y zxpr*FrE$e1HGf2&OR8$bF$|^$_g^e6p_m7JhZ%(Zs>^C>eG!w_&c1oO2^t;y^?BGF zsh(=ud44nR(`M)Vv+b8}<)#k5DqK*y-aac<#xX8q#cgb@Q zl@0H6fvhn%ntEaj!EMZl+Y`g1-~>=mD}yC^BGnG1eX)$-E}Tp;0oBPdwqLT3#&|A( zm3rptQ}QSWwTht{ZNkfkC|m2EqM2|g@XE2UezQz`<99B-@UV{(k32xf*cfyvxFvKz z%umLt^RfvDv`~)JovgS-s%PKS87+DaR4imwY%twV*M8Dh=kf*MKT8rm-npf)*O~1# zy)RvF4U?L33zj`t=DX@hoJ6Y*#tQi}20kXHhukRLYW&*W%`7Rdq%Ky_7dG0!RM%5i z;+`TvLGK8pFDbsRiy_&qmYT7CqG#mrIQf3wc%^vBSw~rvyOU-jpWH~1!H}^L{F%@gP$<@?p&tYc-;@#4H*6%s9nRNEvLay%$ z5x8`-AIm!i|GpSH6>gqOF>m+AS0iJVPt< zH?IY3&xM
  • rQrs`Fmc#G&Lw*BB+958Ks|yBzH%_Ev_!NRk%IM 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�>?3>T; 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

    os$gG>|-) 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 Cxxyd- literal 0 HcmV?d00001 diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index 13a6a3215..47937ad43 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -53,6 +53,9 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex - - +- +- +- ### BridgeJS From ee4d43145b96802fd12634364c80fa015609f877 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 28 Nov 2025 13:31:52 +0000 Subject: [PATCH 044/252] Clarify fatalError message for unsupported platforms in WebWorkerTaskExecutor --- Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift index 1d98f4e26..b827ad980 100644 --- a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift +++ b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift @@ -451,7 +451,7 @@ public final class WebWorkerTaskExecutor: TaskExecutor { swjs_listen_message_from_worker_thread(tid) } #else - fatalError("Unsupported platform") + fatalError("Unsupported platform. WebWorkerTaskExecutor requires Swift SDK for wasip1-threads target.") #endif } From 4b327dc40d3931c2236ed43c6b47325c17c88afe Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 28 Nov 2025 13:59:30 +0000 Subject: [PATCH 045/252] Documentation: Add Testing article --- .../Articles/Resources/coverage-support.png | Bin 0 -> 902617 bytes .../Documentation.docc/Articles/Testing.md | 185 ++++++++++++++++++ .../Documentation.docc/Documentation.md | 1 + 3 files changed, 186 insertions(+) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Resources/coverage-support.png create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Testing.md diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Resources/coverage-support.png b/Sources/JavaScriptKit/Documentation.docc/Articles/Resources/coverage-support.png new file mode 100644 index 0000000000000000000000000000000000000000..3ddd9fcb8801d283ff7e2c4256e8a61934b2a1f7 GIT binary patch literal 902617 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
      HD&|E2C%v8zsHMpL%rf-E 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

      r9IO`;RAptf`u~+{6nksm+R@Zo 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

      nZ)V!~`Y7>eTmQ`wH~Cq9puvmo*~N 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

      2#IF8klIDOg#iEesSDW>?Q}`@7 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

      >y24m@4>e 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 #2&&`O6(N|9y+~A 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%0A@Su6B&#Rg*X)c@>_N?AW%FE9 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≧VtG z?4&lZ)3C0Y^QC`LAXr^r(CE5#5UgL23VWN@%lI4T?n-Z-{hfU2@6p}79k1y?mKefw)Cy!TsiM_b5iL``k#NGFg} zGcq6r^69Mm2ACpheUO12OvIxT$NYjDOklaDQoBkE{~M!eFKDgXBc-y!2mIW0W>6i`!SfgSUNQ zd6Tz@YmxNzg$95fPS8s5_4Aax{mF8cXCGyz#z1Df(fI8EJrzM8*VZ9HG~G!$LF0GH z0(Ua&z%ZVC9fSYVi5l8l4*s-)yp=++R>G^t?3E<_-TO zm)hEs>F^Xr@i1B}M}Rb-9Zrx((@XK)rM4S`?f-%ZuVeomB79(fRLZ$2V(=TtBjjN3 zq}cy{0?M;aJj%K(bO+fznrt*p2VC%9h_z!zv|aDKnJp;o!T!T<2PQ{FZfKgs5~dS- z;*uKputM~e*T_zFntp|z9XO$mV4RLVz-<{%X_6#1|6b%}iD{DN-cpUZ+*ec}r|!jA z27mV+jteqON_*-M2t1pod~ptvQd;{Af&l4!Rl`TZpK)A>;aC&Aut%!Z&7|v-;j|t8 zJdblA}dtKaUcL-FK~Tjlq5Td?k9PWIRgc3lIwxWKPl2Vel^sdp{PT zFE|XdwX?;hkQSXQhnYD`0&;oXs_)>_vYXBboNf-mxZ$n6nj_|?;1{d5y-G#u%&ECn zV&f71BK;|eR0ijn{?zBs7Rp)7^$a$T^EM&V?&67{a@STSn_T-KYK-SY21$oliC3Ts z9Py)ynjH7ge8K6G@{-Ppbx#EZ`C-cvb_B6ZPo0us5Zmt4TZuXB*avRRV<#qWCcrne z;d%2_A%4JN8!TGl*wT7?Ord(6JiNs-D~^RO3MFoTMh@HLJYraXy`9+5m8#Q5Y4n&D z649CQPM^s?p8!Mp-g&v<=Ju&f{!?Y6b~|p6*w7!fSemcUkFlb zfwVGNkT8-r$9Ma=n5{E2a}gIhZF6STI7Rd?NT|IC+w}>nAK-+1I>uDFP zU7rFz?5%Ap73a_V43xSQsw?x0-WcWEX=2_CRlTFiv0bz00{xy4)~_*c=IEcl8VLyz zx6(~h@rm#o!{H}bqWLNOlY#o6hecmG*Ub5K)-7CwrNrXPv%A4%TLyoKb5;%2=256+ z+hpJ~SY2*SOv5+9vCUa%8sSrI*Te?cyF`)@-9s3hQxs~uEX**5UusGY#NH8Z37;Hys-+?ujlu3pm!Z+ama=)GXrunljzC3bQR81!~=%?8*$DeXj~0vwt;{` z7N*r>8fvS6sU#9E|DnsPs=ef4AszVAzn#L%*M_k+<>Y-mNcX$g;Jp>`f=ffrJvB;H;i|iPF9=zgP?Llt6{#|3 z=wj@ri46Ft!Vncj36opLGi8~MXzA~tm5bo$J7_GwvO&`e8Kq~VLn6p*%OESQN2UA^ zUqlaSW5~Lxh?j73H<~57HDK|RjJebiwZ|WzRk|j*0yJc7kA<4O8f0I6Y?byC-eg<> zaMngKuw*J>v+N#ayo%#0~n9G{9F@m=DLTo!Y&=G-#0BiX1PQqDv4GsnJ5 z;B?Midy$dV#Zml9V&P2#tUbi3n2ODaleabZYg;O3#C|x%LUI@aqfB~!j_8rN9Uu!s zZX)$y&su?`M8-PTOo71vUuWF)Q{nVT+CfcACXy|f0w{CcZ@G^U_a#B8!wJU3 z(}+e&-MM^ka=!4i(MWx-8lA__N_JafYXqf@%7~3^x~^~E^kIr8E%(d}(|wX=-Lt?} zXZ4hn+)ioMV}= z(ZY9S_>r5Ua#+kswni_MNag}T`mVOJ)dfT(H2h1_t1O)8M!ZO_n`8oIHD+S>3YbA@ z5^d4IlaG>T*!oFSbYuimc*r4G(6?!IIAOJpn#}VNuXjumQc+?rs|-nzX3HtWbeP2I zhXbkVd`St=`rC)NS6c`{*Bf?H%Cw-zWiQGKDuaxH0PG0F^8i1w?r4#B;ELB2@}eI8(|7Fx zV>m6awVmpaX_QfgZw)Wk`7ZqVOTac|s^*@f z&kwzTQu(}mEfF$RzaXer$f!ynoRhgO?w28Oe0C*(jkDzY^Hneph%pl;6~!UW8Op1BD-KSJDkIY``o$Nx zJ=z?N>bc}v9t#>@0qN@P=*kO=A_&2;h?8fh+x{N%pjb!6Q6gKxU{VE#-Y1sDPo){1|MNSpb`25@u$G5%dfb|{Z?3rr$^NE&8jD)Jw~m9!-5h=i&Y+y z)W|5|Wu<7zmqIjJf<2TyxsKfC~j z_fyu_L3Aq}!5$fK4jbYW)pI06SIZJU%+&1maK5;uQL9slD9(X_zQ2CSujA-_ot zNeAjTmGmaPwh*!RgKX0AR#~s1@npRz(Rm)By=f%T$Jh0368^I*WB-VP`I?b48C0z} zA`@mI!(XO8H>uuyq<3Cz)qGPM8~q`E-*wqv$I?o&4SFkg{lKf}dr3KVtnqmWLhbvZ zfOoB`&D6vGaGT&nvQW>S=DS+Cx@Kt9pd3wvh0=U^5({K=aB(;(^uUiV?l^1E+hG&3 z**leKelr$W8SOAkfIO6ac+QhXlVS)9$ne_qS0vo^j5P{qPyvg|#T!Z7)`l|ukZ_sx z>I++74CAYQ;*SZ1VzDF5eHwG+I!0he1E#e{RYxt5)QJ`lqs*@?2&n~?fRi2U_SSE@ z)qy@}`F#Ej@z3gzn{AGO03NSO1Iu(BMh?QdO6}_(SXyQF*ZVy!iHoe`BH3DULuT(^qo zxY_#9$p%}^x_u14!w0gRKZA^xd|G%)w;L~PDUsh__?t4=jjA59`78@?%UO z&Vi-v=rTJsMB~p4YnSXc{zW(V}7gRF#^eC1yXTZ`1Q4z7BM=RasITgK8xR0Bui6Cig2CAs{Q{Df>2!O28;*gIcZr`hh=?*`W9OGBj-{G>c%Y=y8dE zKSvL{pzF64Hh8Z8$#AuDl$!H$^Lh50y?)pnuxhJWISFH}anC-J;tu8}@VA!dt|*xG zfje@L{G}z2%OBN1@co^jv*D9$UVw<)o8gv#V0`-63*j5mx+k;nyeR5DVAbH+`;Tmv zF;dZVn!|m3%s@V!$D!!I5eF@LFH2SU(D@dV9W6wZjkK)k7CmhziTG&uW_z{!@@ypr@-8t&@zZjDw1FBOEBEO8BT{VrgTKIUFs0AMv(tx@T8Z@sZQ-#~kW#R27ivU5Y7GK4$*p&ec{VQr@6 zQKFL>=1psjFm;3+Tn1b%2cEHe;6toOd8=OdAEfGfL$=G`Al*tR@;fdQ@!FW--%FHj zF4*t-1tyvvKb5gcsC>cpX{g*X_xnf72cu+u%lK@0+>pR`xj{<>D*Zz&QPB39bJB?X z##79)VMH@ev^7G)?`qQL3_-1GXv}40ibpCTA=tekgtljYI5~sQ-=&d$xo@CmktLZ( z8DXtWb$T<#L_ST>L-(3d@XNO~!meTKsD7#4p6?7fkXc&Zw1v4coR+=VYAN)+gK(2K z;T5;w%kC9E!IcQ54B@%*eJWffhcRM{O8n}pzwA47G7cSrJS<@MDRFFDmM<{ewkj&3 z3FM7^#$TeV09G$(f1@%lzfMgAUkkH{h^!;H zV4bO4fk5GEsYVKy7hqK0(^wb^Z)B1@Ji!j9WE>j~ym5dQbfZxh}g5132W7kQ$V`~Wxf-=sS78@|84o=9C~r$3n_P0#^0)F=Ouj{xw( zv14iT)$PAP{+M%v%7up~KTL^}o{HXKbe2z-u2NGnBlsS&McmGKCx_${2g!2}fjcX- z_pDzS%dGSKm~XID^vJxqRM4)oF$~|*eawcYQ?Sixj~i+wvXB@qefzi1pfHa``7y*h{MHv%_{9T-Ain{`XaD$1(TGFZ{HhCvD)=kylc; z97NikvK0T^RWhA|sUq+tkYknhy!cJ?55<>N=M4ewJPn24{XBE2W{5b{9^8?11bi!uZonA+92|BSv zm>Hd{-FfYu9FbQffp-l`q9t?fXYWZiZcBoDRQf^RoQwVT9a$vnp2ocDr-yz`tVLq& zNFxVeLd$c3c3it&3{HJBg! zJLoR3yDN#_!qhekFLtDycsiuCyoz1?dFU6j0cm0=ZEDl zVGDA5poC+g4Ob+fF?)ddIiXn_G{I!Kywcn6MKbUtS^c}_@U zjz(_b`J7XBj+n^oOLe1Jp_F+yAU$Vmkd?~}xA;SoZcYn;U>dY-0^05Vs_m=o#M7P^ zoTpg__SnHR`I8}$jBE?rB3_brj@0jEqM~`u!SoOC*1r#5@RA=)V}ygbvK?VI>-zsUmIA4~C_P zLLKe~k94Lry?&{K`?I*pk*q|F(YX#mgM@*P9wdCIq(_6aO4NZi3o+1nf7&3k%l%}| zDO-xe?&M}ehd*&2wK71SSbnPmkrXB{lq5$USlJAY3#uARmKOj=OI}7N%}m5DpV^}F zdcm%-elDXu%y3mqw7b6JhUdx0|HIr{hE>&V{r|Usbb~Z(Hr?Ibt%Q=&DcvB#2I&sz zMi2z)Za2~m(riMcl@yTN#D8tid7g8hbDihS@74c}*R=)Ko@=c!=Nx0qF+N|$!;Z$? z$lv8vCuxwhy?UJ?T-kuwZM-`lZCH1Wxp9RB(ZSZLwRG9-xKbIuqb2i$b+Xa)?Y5-e zxMjg#qR1Qiu}n|v`>Pv4)Rzs%*0pDxKi5;)7;ynnL(W|DZ8UfS3DRGK&)M#il3FYD z6p2Mw2!m=WvR^%Q6Pb%4PB9?y2A%ju;e8us6Op~|ooEDokZ*qK09|8y(WY~e_WS;@ z;tW5~y8>VCl-{SO?fDa!Xo7@soZ~p2{=&?&0JE2huTnP4!)!{fj8d<&^**g0Sjrbk zk`Q3x&{Y}}br}>r5b74|2T)7l#bWwNu1&CVI1hg_SZR0#h0Y6RZm#+I9GSP3C)Qm5 zdMmYK1%0ys(JOqF$l2^RHws(00Ww(z?@@2n6cnD=(|_tpKIOmy=IE}|-h&0khDF!Y z+ob7R)bG%!k~ZlMRJnWIn+7}Jy_2b7I7b^`C^Q(8#C>V*My1SLF!is>{*GKI75zO7 zT-`9I_j2ylJYH|s3(oO^id0m_@(d^V*=bl4u}koO{Iz-xPi&wN4*nZ~>HACD(>5ek#p( zFj^*!kozlIhx`=wIoC=2xYN^Z!L|$%jOLDoaCRdzL$8?1Wg3Oo?q#0HO_X1-8xC>D zGDjUhGg;fqHXu=qA?hK6Fs{&B5!y;!C%Hjlx!PYD)HzY?CWR@TW5^Ky!ccIcXJlI! zfhE+-McYi1$`MFeg3MEv&Mq7!H(pw)8f>PHdRKvG)E1TEB1ypVZDC;#T9ib35)N-z zOvAH`TUb)NTQfwqv=89G{+g7Pwz&1Zt?4eCZNwZN`^IGPdc+T{js2iATg0;5#YSskw%M=~f81aNY6bX&n8w zGSF7&lkq~dhAYbE`X;*g%3k!}6I+1p20$4JYqIQlEbqJzW3$N%P_9mjrU@$2y14wn zD5nsv)Oj7vJhreF#I5Ma0e&5ggv1aN#NC`}-*U0!_sKoJw(Cr@EE`{==v#9Jgp_|O z@H_pU?KErFTV)99lWfc7DIu?I-3xh|1AhONippBK2@{zOd0h>jZ1c2U^ld|I@j*f( z24XXOEc*w)3a@xEyqyYW)xg40>4%$9f!Z*_x&lrvS)}({;hZVIS8F2ML2BY;n4&D( zv%(dCL+rK^vyE4>n&?yYqK zi_vG=a%@Zc#WKvGKymM>3%{F6Y@aX<{T9sw{;Y zvL+z^!?6GfOR~ksRm}R-#aL`iqJqfivY$T%O~RA>*h z>He9#?^rM_VW$3vHnek8_M35N7_vzM0dz34i*ji{jM5gGB2kQlM(&UE-Ni z6?QU7A@74-kVe0#3&6ToIttFiCRdw%8v?XI1=6m+k7~|@kW&aGWYp&4EAzOBP=6-1 zF9zDK$63+qXi`TRa5lTY;gM&nn*8djj6d%!p0P{0LX5m`XL_j0OkkRzUGTb`3!<9eU>_n7lW-o2|x0%^1AuL zy>a_!IEGm8yf`~B+_8-(8@SN}Dog&_V*b@Dk`H*l#`OTu`j)+>b0bP2uvNb+NwYYt z@$nSP82X@!ielXU^NABz=hnp9<{2PPf{@vn#eB$&2#yb{z-Axyqk~4ewc%?s9(~<_DGfKypvwPbBUVnYSUD$8kjDO#!&(VU_7}Ke3rI`qjWV54T z0nBeiJZ~|`MN>ASY;>3$epcw+Imr8Pd;?nHi!^SlY=g``pb*=dEha{2DG~|RlvbU> zFLXgj;c3iOId`95SLg~!!`L3-)L@1xyg{pYanTBa(UdOAwaFbysbl_h3evZ7Pr00y zasVf_+Zt@!V=MBe_9rhItMBBv1|!IzwS@z5kV;~#fu(w8p3NFK7jibv#jcXTp|@t!b(p3Y%l$y2fF^C~Z(4Y8hEQO=U(!=AK7^Ve3I$y{^{g&HrrblbOnlIUa zStgam`P8{vykgN-?8*Nc!zDz zERP+mZIwiiL58EuL2nH133+`{X>FMWa%NQ(sCcjPSUYCENlGCOT@%1(ZyuiY_LG`% z7{W?G)u$}*V4@x>)p1fUj0v=7&G#Bn)-0c%emeEncIGc#?TkrPMd1*^bBK`S9rMiX;D8P8@^KnP~Skuf|pM+l<@Z7NO( z5=)=H{u@1Um(oF^>?$m)#^v#&pL}pZ*02Jbbi)DsbfOLHFjfGWt$|L7Upln82rfFI zebh^uoDequ0n#%aEtl1(3jfX+0r0ZZz%RmES!LTpsLrR9L8^5Qqrg_4q>B#zkrTEh zKg>erPkx$;{{x-*buy`t1r|Is7=gfo}+p1X#x9A`dxZs>arS ztbaz?7G<-7AZ72w5p-pH4h#37-@634Mai}%i!4wH4{{HTmZs4|UAAwNbMAr8?_HIb zeOnO<%96j(vuoZy=8bWrjh1B*Uxog%q|#yvRcT941ML|6I1|*Bz7+wjHE?g*R2Dmf zE#0}~ic#qI z+wyzu6M-ui9d{6pfs8vci|K%nCu&9-_z|!krgUltRWGYUvap4S(69P18IFt3lxjR z&Uh}=2$s|a_h?~>Htfl>4PR!kFRq#7|xi5V>?hb@2bW(G=hwnjf3 zXv3PaU7r_wAR{V$K)c+s3)w__ z|3M+$<0}k^2Ktt9geKuM$VSvw+c(rJcBzEyl1DpS!yhC%1r-kMV~Qx+?m}jGHEb2V zhLv1=*;1S>ejqN6?Xh6=ts^KSbJHvve#t9j)bm7$fh{7NIuJi(a4_AvyDnP#$XdEc z(U5Hnapc;p1##3-^jKd0HhCR)!X8>!I6Zl+pprWDI&eL})%Fr=oo0=Hth{FU z>oHfP8U@!H?<02x4Inm60LQlVCyw=J6y{M+aE&s*Qg7 z!9&S=)W6bRI<;-58w$QRms-a6=^Gv(80{J2!slk#GB;Qrr17sziNzkJ$0@>0AO{?y zwlS&)py8&}nUnxZTb52dPrUdf$6zN#qUVBKL;g|qXGmM@<7k`i`g)uT;~^;y)BQH38n@#*%;3FnXy+A`CooKJUAIA-*-_#&RD#6|oLU+_o-!Y1H zAWG{hBU|tO+Ae!8-}MyG;yMeDBNKADmrpknZlxiW6TqqCXf60IB!bT``6@8e{Pb4j z=RL1GO$4M{=1L=~NEL_ffZRupek`CMg}aW!Oq!rM=qbP@{2RBe%n60-K*fbxOZy^3OaLVpC5G{a+VV6#Th`yL5&EO=?6e#7RWAm;5c?gp35&7DaM*Fw$;`r>jAtkuDf;I3uG_i(B$$( z{E76hmZ}FB@IbfHcwryKaG?LpbQYo@x42!-eQjn)Xk>Lv|I`eetThlOFtHG_YxLr- z7Jez5u7EMM$h`e{-}9hm5yP&)cr%0bx6#@1+b^G8bs6G-ewGnj(@dT&>BEa z-!nV3?CJP+%FD0FJ|J!2rjmx}8=IUytHZ1hlTWPweqAuSz_iK@r?it6IJQ;f3GpHG+UL)ZJk}Js0SJMsl zLNd*zy@nPtL+N`oQ)OK`<|CqTViHkClVeAudQE4L^1e7l7 zo_An&5Olv*GEwchS6#0EE#Ftj(HM|G3f94E2E3jg&QFqdo8=$e!hjZ;*<3Ad`n8sP zJtIn+QW2f3)JPN*Fy=WohA4|)cWnY-6|;(W&(OKz)`6PT1_zC6!cp@o<<&6JAZ@Ho zG4y;i*$~1Q9l2TtjXh+aWZF-%=o?0I!D__ix9zoi+K+$3_5!8uw!}WqK!2fIa%^km z6V1t}#u}l5OleUEOm^+7o64k;0vAkt+s?>zGQ+AE^X@nal1h{)gvvsO&L8`w)?hMN zTf42i!rRO~cJBI4f@H)bcvj#U_w`G_liJWbB#E)sZy{zF-)pXlXh+B#XF=MsXNj64 z{6}FNisKw(3+^0cQQ8?i?`IlwZf{YshFQoF9~U7$-wH-o!? zTLlBif1S(C@eqBwl-|jgbJR>WKvFF_-~5$a7sSk4aXKaJujKk}8}W)$fyOlR$qu}?F|h#c=YRKJT>00&iNvpBVjk9kXP$3#6fD%ipWUQE)| z9zRcB^3~IIt<|+uzLtGKAL0$}F)^nn|LXH~`eN19HD8z5)jE-2Q$p6h3~E&Jj+$&x z?rxn0&gJ(W0%8DrZRfr<4s9P-)El-Q?kCOI8rrVcYy0L(@02W2e#&^UI(L21D;ac} za|g1==DAX?y-Bl*>ztXBK7|X}Yw3;McY8Q+ zsPvlWifcvc0{heg;mx}<136Eu`>RU!1J4z(?wMEe5qCig2o7?c18o~lPRhel;U1}K z)v4nP3(p$PI9as5ITnB+AkM=&28mt23vwq2B_s1I(v`pte<=lTwlR?-3!i*;jXa*p z&f>J#nzVb=jKCk$c1m$P%Z7q2JnXY(C4Lvb;lUJEz7GW& z_r_-VlI(c~LWB1t$z{5w`ESZ&m39i$E%p^|z;TRcO;BF5$ZSI%wd7QbK<%Oq0#z&> zeQ?BAG&!PsV_wfx1$GJ-X)?NUy)86W;3vsTb_I|f1nOJ3*^HdP*2Mw_5W)A+NzInf2oS7q zYZAL7eD#O8mkr^tB<7h2R-)Y8`sTAjn%=J0vQV`w@KsghXeaIi28RN>XCd zQY(R+C2UB|ncD``K37ivy~5{O;qzX}MvK-PI&8WHEIb_iL#?Nq-ON8l)vq-6WEr|nsOedAKU_$c z?E{o53$h&L89D5FyLnvVAjCiGns15@{}bX`5+%b(II2dl8$QJ>H#ff3l86(mN;YPb zZam#sYr&f%=weL2wb=7RGaG{40Gd)|84>l_Nco!IWFx(}Rt`F?{t}UQGZhHXybbq1 zK7INe-n~Nyl$US0KuW@Q4;cD|gi_VP7bTDur5`K} z=Rvqp(~M(D$RSD!xgEVJK<9DZiw-K=MZzVl((qQ%{Z@o4~MYjR?qLIHn;c@?)iq& zM$N0$mde*?yDNJaG^1y(JQ{VWI4?=w1XXhb6`jvGHgn%%GlgJ`o$()M_eC}Gj|Z+G zE5G$~-#I9X6E$olT0~Tb4 z+NjE0O<cR&r_s^04oTGc@5sjvHQ%K9CWwL{jK1A8P zdG=zXY@e4EX*={U!d~HJ?wPs2yNX&Udmse9ImpVCOL+{1LXGUfE^Wc#d0i#Ggw~?p zO8Ka{^MdhArJZiw=+u4V-cgu*j~25bhw@d1hr~d@O(g)M|2kcdMHFm!A$HemTJyA$ zLW}T8VK}U%5l$D!9}|C7;G!2@423dh@G70y!%)<;?cHleZ}uGb2_dV#R7f7w=|wej zc9X5|*vC78n@09iu~CqqE4J3@uMbc<=tcv1O-11={jlxLT$uAj(%y~wrX(E|Rs0eC z1tu`^Sdc34+BZM6H6b9-4v$_qBRHWk5x|ES)DofMzqOdkzz{s^dP=@S1Z{Md5WwP= zF`73S{)w$602J&S^B?61hXvrQ4-9Jr2LPj{E=So10j+ZH zsQ@_k%Y+XfA$kCQHUM#g3XQV&14dJZh4{|IcEZt(lc^OW1#>`FXa~sec>DjDE{Qd? z&9ZTDcU@}y`&a%eS&5$rd^zxU#)u0^BQW3haZNOz5O+)spnvyq{Z|`+4;&J}cQpU1 zotFfpd1TfR^-?tA|9F!By4K(B330cY2x6)v`722c;Mzmc05#h~uK4jEb5e;1sM)jl z4#_ z2>LH2J!c`}UC9^$ul%E;);_@0lMzK^-#y3}4?h3{0C?QDqQK|Z0Ro7(_Fpf(_lJ7U zj9e9opq`5&sOQh38vjv5`3XTir;u|-R7H;@bjZ41xCrbC8O64g> ztgERf;*0+KuvzF)r0!ee#41ew4_vYuRWJ#sT4yLAK99HrA3DHg<-$}%2PPWUBgK^e z`Xqq=d>=^ntM0lrkfxQU33z`0x|x3!m13bc@^Cs7>i(IY#K9YgjHa8$bD~k=MK^On z1fToAUVH@Wk@Yb+y=kSy#?RZ>zv9n}dq%HoBkp@dZSpDXLmIa|CRDE+u%r7qG41Tm)>M zS;6SfgAATUz~*rZg%H1PgIH%q%##{p0aG^z=4lWiV(x&(|BpvX9Q+1Bpxzsn*|$L0 z;4_2`647z~`Dz&lgbhY$Q3AIg%!hdKHasdze+bl;h6$d)XVJf=o&K-aSq4H(o4~jR z8Uz!53&DhMTK$ z|7KwSPm5EzLHZ^Ya0|F^1z!GNCb)-&*dRfhmCA^j-iDazE^&=vf9%{IG1Ez8s}KmJ z?LUTLk=mGu7-Njh$?m@v;{R&hW&cmBo-W6zJ1$^xXfoMVh}rO8Z5iPV%q6V4*gNh!pi)(l|TJSj&E> zyaLTQgzDM6Mj39u9VcDOOe_Tm;3iJm4eJ+_Ocli?4uCT#K8sno^ojsK^JeVD*)Aw3 z+tyK-KVIM2IE+NSA==P&lJ88aK>sALOJK_E^=BQk4#aM{9Vr7jK{#=1e%h~o-T-t~ zA?NIC1l2o+z512VqIsy?I@|Rdvw)NEEGbC4p;KM|7@+25c6v95%Z8+i@B$=s{%v-$ zkp&|V(TGaNBlL&6;~>iW*?(Uv_qY)j+GS-nqI}=m2^#C>#1lFT%5{B{w>C=UHu9)s zW%UKb|9I|Fqs!;cm~vP84HVYc`|%SXLK}{lfjxCI*-epOQXii3G9S4WEq9l28#^pH z&3(M^(HrDk^By+YDc`K&Q@>l&u|0^iqVBFt=qT=}L5P;jBb6;#JD}{PAY8cFQuQL# zJ>)tkfY|-fW;A^VNCpW28c|Tu?bPRl7S9vHO(EyHGu0;I3qY$0WY!B1prXQ)hgYJ{ zA`DTG_EWl+M_+xL=WaHh)YW?<=DT=+cD8oA_Hb8F@Pc=LE#NFZOTa$a@8Rxp9LNTZ zW3pG8>zR1#Hk=Gl<^Y9bHBJdqE<4u8(0F-2?d7u8dLGJ+0xX06Ubpe&G@rUt%Ujt~i1F7V;(Ipu?j;_#V`({1< zvl>Odt~F1=)4PSW9ADao9HQ zci8fzfn4oGazXlS*|P`6%h^jmpPh>D04Vor?MY38fZ_ge3d)*wX5E)|pw*W?!fTN8 zyq_yI4L^nX+MLQZrWHox73*UDcz-s?zC%`jWR9j`O$VSQ7-ehfB_ zj)VHT+mM>B`=vwp=gV*WoJNg2Ij&H@jqC3Kd3IDIS7fRZsN1z2No93`O0ESu_$j`h zMQnh#QK?jQ2Y{e2Pb4VtwRKHFz^Q7(W`elVPKMP0kPo$}hTb@M0?OoKOrDFpGCZNh zP4J_RNSllo+4!R*Osbo}0wDan^qHVKXH%-^VdIR)##FIt3P<4rBI5&*9*hY zkk(#jz7;I!n~=O*QOIPnugJ7Hr9QJfdbwQw5(PMu`XPw7%U(lu-@}tJSsw4$bi4=CoL>#bm{iQ-)v>sOBAYJq(m#Y;&bnu@SgDrS&j1rOiAd>RPNb9 zgZ)nK^5M|x*jrv?xn%&pGyOd>McQkNU|zHJ2xaEvS3+eur!|UN+CkFJ%CpVq&;s~p z(WcE$3B{CDG014tuW+TgZy-Lk0nlZ8h^U>pU{$P{pWLY0Qiu)G+4IxU0G`u`}DJ&jsps zTQ+M3uZ_BLfl~cfsXK2<03nwap8`B{Ib)VMB%?m1nSJ#IT@SE>^McRD%jHJt;jKk_vkP2g z6OH#Svg+YgbN!H_6$qzF>1S!>cs(vNbxFuYoLtTCX&|4>O`yKTv_bsr9O~~ksUcyelAma(Ntor0Q0=SbkLB}fHJOtUeFp|c><@5Rc z5X2Su7a)t%cz9aE*1th*^brri~3Lqj=fF_aj+Odd*tL-2C!TLT9N#S zg|f+19tj^!-#*3$fk_R%i>+$ih~dJfEVteW=(^g#@rw|MkHEMkRuAU<2`qiW@%by_d3_}I$p z&3KoE-*%xmLS<7pFlO@UU5fB>LfRz(7h{tN$?}69jY;1zQrk5zv!+;?!Uc-Y8(8?3 zP%G)X-_Iv%xQx5YgFIGQ>c*567yce!mvNw|MH^g9u03Sp#`=_@)@oW0DRSh9`&Z{& zrK3iyNcV-~0&)dwW8S5vc3QICLMwst%3LWP^g%S=bxx#e9&ER;VB78HALC`i{+`T5}no*?qYUG@udMYw&}{cVM)`8G0D zmTSjdGrygN2))ncj9IP=s*{O{;+VAEH2!G7c4IBHSkf#M?c%E-UY2@7XCGtYYuhlx zppNrUMX!!@pvk>ne#uk3O0(_Y$LJWczT|iOwSboK@#uwuSF}5X6c?#^n!|)Hj+@3$ z_hYes`m^51r@Gy^!q(ztAGGhrX_Su%{2yQS)#vxV$@Y10CN+Xue2DO?(2)w9+1v@C zA#J@#Xgeiquq%+PXgVYsZC>?#IdeDmtBfS9C+;~;no^`UWjdpu=B

        3UKLj!8Nf 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

        `(kmc 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

        jxq>InuB9G~Kzw?(IR^9~ed{YTK6Ddp29ww_ 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

        >@N}DF%S>8wTwaUcPHXXUAJ$DvL5ulH4W1^ zH@noboYzIAYMPQdM?ANA?ckY{D_?E=A#i$zYb|ZzuqS>H*Q`?B?Iy!-Ef>)cd1Doc z7{@w(?@B(|3a3;>%y3vzndvXN$Y&f^q~G-*ali29rr1c@j7F2_GH;7*{oi=Dpnj245{d5e@DdxpT&#Z+r#uTG4Ht;1!_>e{JJ z>+OWV{DgRq6G4QdA?U05i{3qw&QA#9$?vK-RV#dv{g!y08>uMX=EE?vgeHCp`}$

        zJN0fAhifMC!}nLYC6bqn|nW><>|$jT*&scIkG1UV7`5fi8Dt(7LUGgrP|oF=M~ z!Sc_t(v{-+_=R)8vPG0wqLjxC&aC)D-CSefGp0F9%2n@3FF7zD1#-DqFiqK3nCP>K^RH7>x%wgYWbSRnQF-9;2)77>-X^EC zG1e`!YxL^17ocE^&D}PSno~q+;quU(3CH&ZY~IsBD+rY(bzYo~JNO!8RmrLKil))L zm?4uRa`D}r_@co9F3J#t$6|df(c5@DV!>!I4ijd7_sK|I7aaXIH||GyJ+N*W`RTuA zSZd_%z4sMx1pVC}9Z=O9dvx7I_<1z%tTgq8-~XYQcg}vjaj6+-+t^s|Ue?{S9-JgE zmySY_7Sl3L{k6k=4_0cW5oQ+Uob2fkDNE`#;T}6c3x!Yj2{m!-X75xlY-R*Q;7>W_ z=hY}o|M8pv2F6NUOaq>eZq@RpgV`k0H|#r}FaaGc-l`xp#Q)JU9V+$8C-BGS(%2YEySfDc*+wpchYBqU%=ZT0o>kffds{RT_siZ!GQIy_GIwPVLE})F( zwVb4Hk22}*)b{Vnw;m|fQSyod27H=T?&YJ8#__D;2I4Zhfpn|2#B+vP1SdBTZB~qf z(BvD~DU?1%!Z&aJ8H`>)svzg{@}7UDr_Bj z*el@;?L0z6LGso^!cdwX*CG)wnw{8X_lWY)z)7$v6pDpaE`B3dJGPb`=#0&%uVTH} ztsB=SrcvaM)0XDRFdeZkEl*hhiW~oo@VGGoj~_eYAtPAUK<#Va=;R8;i@O2!n3_8wDNy<2s&&vlgnWiiThD?FewI|{>fXys&k zPdGHOIQPQtKXPoyLm#3`0({?^b3c1Q1z?m*Rm2QY^X$0dX|MfmBiIrw(k(?mK7cJC zb$D^)^1F1AEn<5MJnP$bnvlptkhHfyGQu4zk>#V)TWi3UFMv)W5=KCA=IV0sNxm>` z1$|C_iQ46=ly$1MvNd5inI+g2>#0*CrX407)^8-9S&45+I)xn~r~7(Z4Vf%DETxFI z<|ENYPt<+tMb^Bu2JHGYUtD=@5V0X%b`U=4`j8%!U%{iUb;(B$vIFB2baorfUY-&6 zEshGsh+uPeA7=O8NK(az-DP60)^FX@jJOF+_t`kA1_DbY z){ms8M?7|HrL0Z_F|WxC=_|L~nFa%$!$@EuM(GI+Ajc5v@Y!a6=dT5-@jCObC;Vy3 z_`iJ^o3d~Dddosiw-zn7>+96GH`j{r*@w&?e{ZY?tN-Z1RI_)`vxwYou;PtGLNuZ& z>tgTNgDxu>Tn}^Vy+`KBymJw~EhvKtBj}@!Yad-1hg4?NiTabcRA9#yxcm*?au)%= znsA8JQscr5MwCs-joNLcLM%s5{%&a^X3a0U&3MOEc?;wM(om#IhaF!it2y}6I|dQv zAhRPIOqqC?sLh?H#}JYjgH67C?`8GVKz=1HVfedGj`@ihK|@P%Y)x2uKc1T;9H|z$ zKG(`8n~uxiK_KZc^UqUDvO~DmUZ>`T0gy4w^qEz~eSnU6l=;_ik7YMc!#tP&M;idP zv9H56xQz!uuSTRCGds)iw04A~$p(M|U3xO1xAZ+4B4jgP%4Z}Ahu$p7tYTvG^mCAv zW*@kaZ*i%b#=e*?rW38vX9=^2MKhD<%*AAcYScZ|zBVwckW{vd+ z^!URP;cvQZU-9=gicz7w&}-FMP2FpRBfb5R zVuvE1995MYG!hQcIJ}MvF0G#S2Wrk4;-t70`Q+?KyH(~EY z;Lcs7<>;c@g?U9I$i4rPfF^sJtj7a9ngpafuFlufP^JD6Bj-E-q@6r7_yn*lMT<`2+ zX&9D&|8Er$1PE}ml0BuX9qblps3|VE17RwW=04)a3M4(ti7PKms9K!St9kF-_CD&Y z3{L)0r&q_mXh6Er1mYMZwHEM$kXKq*dRW`a@pE#kjINvGw#(UgNH{&G^!`NkHjsSZ zp21SK%doG|XT$bo7H5{0K77}IugQ*ClW6dD{JCxCn_ClIe+&myt)J3{neB!#fhw7A zgYERRaL{f_k2qdVQYHRKW*%k^UpZeLex=r1uuGm3P&o3DJZ=wNiHx_D;}{pT07vjw zTOk~4?FF5~f}p6d<*$w=qIwnHoBcNge^L@Iv642cp2^8MrC4;0?N|E?fc5)Ne&Y5T(*E|X7PpoRHm;s%)WKJk&A1nwaZPox z4AQ}KQR5oaZdKcN>J2>~Y%Y|H73V`ozca7caMg#xyKmo;Xsw}1--tEJF<_~nwn!5R zPYsbELeq3FqZ61wp4Dc%wHh^YB&cleJI-=$s(LG1Cx#7`rKPWw#O~uKbS9R#dY?=y zicR{7>#Mg!-&x5uaXhEPTO!VV6K`l~s3qLu?B7%=@$KWNdy8LV&RIh|%5X=&?h7}6 zLh+2TsRog=3Gdn0iwxP#PEJLG71Mav3mVeZrAL$eJeAFb!)%s|OH*40$qtu|c*$13 zu93R;C1(_)T==Y<95O#|-g2MOgP9^lZE-Q^)R>2bt*<|puC>``5{$vd`?Ay+QnZ-( z>Y#f5A*bmsqL@4TE&J{5DCdq{p`p|`GPdS_3R2ZO=KTe*Z1n2+w#~*{rKuB7hX|*% zn}|P%-_&UtTaM;;p4`pjlMX+KBwXxa0R{qRo;H}2q7Z9SAjZNWWic`^E#$Js4jrQq zk^__-K?pmaT3+vW_-`TWr?AJY?aM=k*;@o-ZI5-*zXW{_1|k}@%F_MX2vvqlLpNsW zk031}C}t@H?Slbo6RmuNPABQ~)0`)LKEvQkyq*k@Oh|XasS_J5+#p>8M^ah0%jFD; zcR2>goYoxF~|f^H|HcYB1+Q}o+FP@nNs}^JUI~NR%T;5o zMq+mq!;EP)v&b_GG;4CD{HH1PhVTRS4D3`Bp$^f<; z_>Pzt-9C=4>{dt7ZWk`!onE;jq~|icVRp8Nz)UV7j-M9hdFEOV=0hJT$nn*DBQ;Pk z-jD~c5aq=LV2AKASD96rZ)(XFnnj=_8>V5zM2=s`QzKiCFaqAEf(A^eojQ%13OXReFIUC%+^#AV?@YCSCO9kir|X-{yC%YR9&F-HL2O;`;x!aq+U))$XUl2bx^Kdl^9(8MoX1rD ze!p{0-XX-3JofY;dz*#TR^yBQ2|YnW;RNc$wS($<*N?uX#+6INSA8J`X*ee|6(Mdp zR%U1@5xIY2;hH`XT3;qy;n~c2Z5+pHF!#DBxjN^-IQ1|gUEhcaKK7=gC-~SiJ_X4~ zHT!eB|75FdVLKM>*;BdAPyj8I?K(Jy5LzY0d^#k;8(M|N^=eIV^-LpR8o^$2*A z^VDv>ZS$7@EMJXIl~G@i=&)$@I7Xx8QgmE=169bM%ZG@rULVbu8xwuvK2-GT zW2txWcVWR%M+ROk-&l#I90Mqc2)IaFCCvj~m2_*A8X0jsuIU>1ImFPx|^gt|? z%XPYWL@okOiiUkx5qSsCcn1evqXYQ6F^t{4hqr482*wx@!8vY$2KtTdAh3GEV*x{ThAnhxDom zt6v@XLPR5bK31m=`t-@qdcJjn#ZqJjld0gw`7fs)u0m^yk!7BvCX?2qt@+x=gHNFG zZ;Ahu^D4!1(x$XAs{g?izhX|OGte#W6Fb?xxYbLdBAA3KBR@bz0o?nZTS;-uws}k*6x);Z_ z;3Nh+8YrUDwk}JjZ&AuB6BQQ{GiB9NK>RG-V4IQCAjYWmW+8Eq9zbKEG=rtWRv{GMyN+T`AZz@#Wf2O(5TW-1T+@7&( z(Y(^>m%-cR3R7SUA9PO#OqF7>mf}}{0Lo4pADqd`R=H@FY#{%FXO3Wk#mas3n_$t( z=(}ZwX|rq_4sumq zQ+Ut)+MY5oMl-T=*lpTQx!pjcQcOue`J(LE2wiE>qh34rmhNVyBYUu11mK7&168df zq4fI@^8ymY2g3#9w$1V=v3gOMFa3%Z*}46)bMo7vm|)$8&2$?^iIyz{-yf;Bx1p)b z;%A*RwFBKe+atvU-<~cLiesN*f~ekyy`M|h_NOVexG;G4xMOc~Jf!p{2mD4Fxd>q> zmFg;&Zj9poVoCmSXJ`<*T>Q#-79Cv@fiKqgAVAIY8+!3Qv02%CH#)G!Nw2Zj(x265 z{Efa6j6|`DhG4?Wt=gsUeq_&{gTG}zRAyC}(`Bfh1@8#7mCu?2@VtCpZEmk^^pqA&zw}4kP(^oGeYef?<{=74mwLD$|XMY5R zvwjWN)ShqYCMPD4{AngZK3l&Q%woxiAth(($!IV6b6V6K+NicDI#UcbfmVt?E;WP? zB$ny+YDEjS!}nai%&hBVIV&`q7Dj0DQKX{^V}Udf3}a|_O&pEfjr~>vf4@TUMX{98 z=!@xBg430~$m)taKYS-RcTZe?9#d!|(F@1u@H425Fs%t~J#Dz$$Y2sha*K+4O&$^b zOCa$pJF?snyzca85N=`49*u@1*SNR5kxI<_{I6|NTIe+dD_5TFTO`K~otez9>9HiVTs1?yqcVV_6aV6PHQ58oE40|^7DxpJsYA)-lDD2Go8h)bEd zvZTIOPGKzYR|0W|m}+FMIn6Aq{*QGgCrsqpJdS2|NQ@);q{mU!%2pslCHeX9wd(%) zNcWMl>;aohd<>R3dm++PBN(SKuHzD)u0r{^^kpL;5*JzIWtQz~(kyH7Q)N${k05t% zGNiuZDc@`jgFCqrTaqR8#eLzbK(eH;cOvD)O$oCb(2OJ2B8IOih)8u*{2kq#?oIxLB$geqp6;ZPj8*KkNIZnR4ai_+vpR6A( zZdg;RNo9jvQ%+Nxj8!*Q$*;JOD4jq-lk&X*YV{vwE&P|0bp{66xi^TtuCE#wf*+0K zKx+IQD8WAh>9CM$gVs$LM?wY+h;Jrn<|IE$38Bi7qU+TTv@p_lC_pLwlbFBRE>R-A zK2C39Zm7=YF<%R?YKUMt47{!`hYK4kZq(9{Xus4lNAhP7iZlCtfKt@szSLCdgNLn^ z+9ef!gmdca4eOh}&QgdNuQ6h>E7mTu^IEA@f}pjT#g$n1cQ)0Ohpi#{4(z%-rP}jN zqdvNRughHE@z!8m3_8kc{xs1d>JYs1OWU-HtFSLM;FJm6t%D#&20^<`gog1cFUP72{9J8F8<*hO~ps%U4{^Q?Ai5 zu%(|VzphiLyN64LKzu5|H~Jzv8#o?evO=S`0+0=SW2aF^)jRHSn~#3T@R!Q_3Y3&P+3WzD%lhQp9oQrTzDpEQEVJb^jxWDds5|Ij- z)f$_z`|T3D6T54nKr0_>J3L*1I3<|*Bz|t1lBtu{n_^jw>91$IC*3dD{jOy-0ewPMIVK0AE z=27ov3N%v^!oJ9JPw^u>Nq5|y~R>~rxwwqXdb2!M-G zVXxPv9sn(jI8$!V^^@Qal_{re=&ZFeVXq|`*b0gH0hGKyIz&TsDRy(Y8l5A)B1}Gy zr>(}9g>OIe8vVaG0?ZqFvFo1Mz`25foQV?UGK8}q@U!t>d}69J+09% zD1ch;cEfuSJ!{6`6Qn1OIY2k{he||zL0(KRH)0WO)KZY4IHJJ5jTx{7WrwmslnXIt1sud74 zSPvCN!21lSn#&~s*vl!(jb}-ug`=J70_?I zF8Y@Q>knk)vBS}e!-2sX%@Pc28RQKU-0yMYyafSV(bz&{d%w<8R@3f-%W`qL9OvrF z0sk&l^*&zqUP6y=S7D}m;G!}(!`x~OjXt2G-!e}WNMlCtE^r>O#3q7B2Yq}G5Wr{g zYvR_;wSIOEP8dlm*lVSKew~y$kz`QV5h>0|uzsutm9nvgW70a}oyFnt(v<3QGo;(qUdjRN*Yu5TolHU;8fBw8wrr5DFZw+ z-8${->+iSXal1Jo*<}cN&l)fXeVqaEbzU5`{_w{fP!sFEC;D(lJXZ+}E~i(y z(N9m*?1l4H*cbH&E-w~fm)b8}yFtV?)w=fo?AMI=_uuS1`?flkdji-8ywB4k8y{Ya zUj2p;6Ec?l7F}$pv~zMQwHk5Xu4vmYZ>TR%SqzzLSV!;R<*?i_D%9_FS)7=X-mBR% zU2!|kaG<8^PA`FsRvG>WNg1PNq8Pyik=Fwn?v{85%oOl`+DDt|ytV8}8; z)3`DncG5d{L=7;bL{bc%olSYgjHB!K++)-6lmZc+DiXJ65pNE8ZXjT52PVlL|zrX?LI&XYuhr(=IZJ4b)?{a;!D zh87_ai5OMMpmN=M0B0|zhe_MUkRl~6xf^ji^=2^Jea2cKJTRi7|uA!ZH126KqyaYyu$7!dVD_uE$U21uiulTczmw+ z54Z6ELMiLHiqEJo3`je*&Cpz~fzTzTrwFnwpI*4XnHDW8;~HVIkA%vL1>UGoE4kb=#IxW15Ok8bci`90bM5#K|B|7sQGli0$vx3fRN zOls-ZHDsr^$zkqulcF5M>(m3BG^31fV%eMcNK%sAqlHTmc}DsbsSR?Iq*|KeRp}o> zH2Oa)40VHi<)W~f!iu2>tFjWMyES52`{NObqg0r%1a5_Rsks8PA-bN?Snd7#8w*o? z1bGz3W=Zc*Zphv@x??wlbG7WHRrl8-`)H#S*6b)P+tQLglD^i1O1+~KzJD#EzL+a~ z0yyLcj5jzD{Nz+x`;WU3I_th~A_>Cp6DvN`3K>lx_=vFjTzAf-2VcmCi54pZp>UJY zcXFWjZ`5~bOY@wm1=SNZPQvYH_ISQW2*ETPgcUjy3=7_KAtj-m5l*^NitAxp4y^F# z%fg4(@UxIS@JGyM2A|D%5Z`XK?dx~WEpX=1~VY2QI_*U6CHJ*+r1Z#W-8vQmw=5|ex- zzXX#f!y!txAPSbw`%c9ec|xOYRAimDhpm-Hl@+~mOvKu0_2H_;4uZBf&Yb>C6Qxun z-vn-JFey&LA3;6HO)jq!OV_%h#pB;(2zM;8J8_+>pU(Puxq6e77g0Y)lFf1a^Ljwk zL;*g>kF`!VTl#eB$f1zF3$yV(F=v~d5@>BV z-(oKlYcsrY$uKuO;6iv!WwVVz*43??<-t;?O5QZW2AYrM@`?-og zikNX9mM;Rx6CM?A-c`xYpN4n=|JBn@1=`A3FG2_|Wg1@=oOj~D{zJv@U!5fHpR8pJsa*beEIN0a@`*%@(YGk^^1o8Nu$3uAPE zx{sh2Q!lx7Qs-<&>2eXMp{HEQ53Q3_Kv#NS<*JvI$OuhG>uM^K&SKcA*AbAWkmiv& zj21@9pn5AqMv)nS>y~AuWfOQat9GuMZI~qz_U4t~$bz}I{#;Wdtnclv6%aKF7fie| zq+kX#V(@t5QLW!cUFj#^1#5SO{>>(RM_Xs(PxfnnbFFP%4`$<|R<(KS z=}zWNIEB$?n`KxKJl~_l&8o>YBEqro9ft9|$Jg6z1Ea}oViFPYVohO@jPsZ0$B*Oa z79nqnU&+KPr>7vfz0h6#JY^HCNXoiu*KB&>NIRQDc)m*r8wm-!3@r8{Y^aYI|4g_! zDQaXFsRf`oH~2jp#FJszVZw>c3r2VD5-;O}#|5LGXC#zscKjI;YE2EEQSlV*uiWqV zLB1VX7(<(~i`_D<#O`Yh1h(d2P=xm=&H1PI@PNk#e3Ks*9)ePo{oYH;vt<5wJgJ9- zeYNicxUnqUTcSy4?TuB?=Q|=Eq26NeGFYA8k$ZU9?+p0Lup|iFA0M?>#a*xz31YSm zZGi?`7S25ivVT60bl}i-#W~(iuC^Huhc3MAH)lP2uK{9g$6xaIBNVgw2u1|by}w6Z z*2-GR>#T&AS9LzMTPtp@(`zLB6ICpF@q0x;cb(t1o4h+9?DJH%RSjZ#^$!3Qc?eo_ z2L?qL=)clkp65fh?5-&^u_~%W(~iKAM=(N^Gr%Xc%*j=!B@LI7#{#1D!|$C(u$BGE>vpBmaTmuKM`A%AS)=xe0y=Y#jr^k{Z=iKg?{-? z`}Lj*iIeT;t$;66BSKXVAvn@|AQ@07sQv<#--WZ(tXkAEeL9?R$*qI&9|vmyBkiY% zJhfJVe}Azg3rKyn!IoQA5H6o`ir*(l`?IFh2ckR`5e#p}YM6Q1o)AS;u>6`YsaR8} zOVhSAPhd29+F0M3NhArhc8&HlU~^6Awo$Z_H-cO#WsJo2uk>IyV0)L=sS^*`ges4^x*(dL{@I0Q`+PstW^mO}#vi`|ycc z^7MgR^4FIf@c4mcfb^(2`#(guKbbuYh>p(fbif`+J_7;V299P!Q(fTj-$ux-<-2pn zn)Ec`AznaNB!*KIF8RsrVj)gMIhJx6+r#a zkBZ&@->DyeaTIU!Zh0OE97F(TCP{h?<8N}4EyZJJhxw2nybm}Ej)yKZd6U>0_VBCS zH3`DN3&DGz#{cPhA8z90FAXO8dgtW>L1X=)IVkBg{vl|zpnDq6a|HUe0>`~W0(x~j zq-72I4-JN`;-P>4k2eN@#`*v9lAVB_uRVY0`TwE&9=?2s|KwMnhn7WK@&A0x7a9fg z??Py>$8DZ}54d?208j&FbHW~a6rH(!;9vDN|5ma8j|4O?pwCiHe@CAW{X6yKU-D0X zi-(^*AW}H1yb6KS{(u1=Nc!rWEYp!F(5C)(NQnpNXAW1(wja#yVN~4X9UM5`hL&&s zgG-_P=~Pa;lKpT#2(l=Vb>e=78Q_*f9>CiO?34Lwk1v>zxl zPve>X2{<_cQ{Ra~dgNgmH$M=Q+`g(E(LP{OfSRLKWuPG}eSH2q;qSk+_X+yLK#Hf> zO??<}1rGy`h*slocSz1Z3^)OJR=`6~JbpMXFk?;bVZbq^Bu_lNJX&k{m$~{6tM%_c zp9CMcG|me)9m>G0VpaeQ$vP?Q>0hHWC--H3&K>{c*F!r|JRB#uz`*$*{2G_%50Ab7 z(~SX8X8!Lb|KC>rf6tQte+-Ph&LPV4o!Ws?=eA^@KbU5U?cCF^OgvG7I{K*rp1{C! z|62#6AI{$;{CVDOm7w|OTvx-@-G3{*5!-IS`+T|*n&|I;q{OrASj%8`xB6^;a0qvg z8kx#>uW7A7aOpt2^hxW|l>VcEL@e}&hq%N}8{gRuPGhhD8vDEe?pI;Qq zzwed#ByBt|*HaT89^;ogHWC@&#)Y>?x=$s_|1pL7Q6>NR#HK+8fHQdytDKDA5sVp* zHIOMon@rml=ifNU0DLxR?SWmw(?g__@4u+EwZy?NvdYAR5q0Uiz1#fr<^I2P#sAir z3C!$;rJ^A(d7dvqx`7zoeUe9ZUgM&`?D_Swhxygxfb(@RsP$KXQM2%Fd@ZcJVJo!u zokj}K4uFW43d8NO3@*daew&BafJc_k+nST-dQl~qf5I&rL4Qj zO6@?yX(B&@XA|>tN?4z>D+qu_(GM)ym3?Ry6w6r(>0&BwOWC6l|2tkG;QkVQ&leka zg?S8kKLhKUM1~XtTK1)A!KJjannBi}`eIWKg-;|8>#PumANWHwzM_BzdsBg_c>qcR zaEjxm>lRoafL%zBBI9L*9StxgZf5(7lLdm zsPDLhens)3LYwx1O*pb8lB50ZjU|dNkkOWK_^Yp|1*o!an6a#e{1KRsH+?(6FaWS& zk}?`PJX!&G%fRy8S>p+xSt>@#A0VS7SI6(>uy0_d+KOqeg2Ecmr>?vEvwv`GR+Di4 zU1VQ1%kS#XTDnb^QejGRYg{eB6KaPHFr=zJ@Qg5UU_S%U5^yDMxE4`2%(HE{t_BF% z*c42us&@f`4YcO&YP-*!;pbN|swmW6KzLu`DgxF0fwR%PmE&v`>ldK;z(+dSLUYX+ zhtH3{rce+Q|M?y%!PvRYE%2%pVA9ZcT=Z~$coc6I^qq(UI3Fpn-W30aa^-Fn>h%s*s?=}~Iz`|7SL;vKg}ZwF7(;*U7$->Y7DB(8ky zQ;H3`lS_C0S&ML4zE5w990B^Ffb~^o8LtJISv-t$kM7K^33uFg&(&9n#x-Y9-Ij3~D%coSWM5zmnegC7$suwwoZ2%B_f5MU>7p(^<(c$>TLF zML!O<$?|mLwf68V1?T^*Q=eG$0l$vE)H{E0rm5YMAco zYgpB7+hsds1V}`24e#G8nO$^aa?&T=^47TC32i7c4s9%V)zww6nM_)fiHqhqhmra2 zca3rApb0J09)HgOi;jp6fLCjod9QxrXE>$Y{Mv0yG?_9LxxD0PNqRn3d)-!^c`${$ zc2U0Q7ihE3$+PFDzHvyF>Z9eu6J?xwvGp?1aNTg5#G$dgT;vS-8M?l|*TL5l6Qmu@ z-|Hq;WQUPBu@?;pOT+qdDAv`di@e`-THR|4W{C|XDD#M^trqRdC^7EB|mN47-;TUlxX**TsC1e87oXo}fLi-bwAafgS}> z-_SHp2rm1$)^t8)Tie_3eSV)3zF0dVE;8$Xf2+gjxZQthan zfWpysGPY(BFO@CN`0^eAVO0{vlC1{=u$$J8eOS_DnZ<=72Vam9>0(~crtmGE0YAlH zXkSt=w*So3)1oH5RrF}=-5U`q_1 zqfQz`SrtBO4ya!;l;-<0lwM0C*{r>LAiTh(927S&#|008%yPy>6Q}y|sUA_(TnqvVteHI^CiE{c3SvyXZ9*31v4^ zWRM>j>=}EFNAQ8`_tR;nzCmw69LpUx9)&~r@bXE~%Ej{fgifM2G(p6A-hWf1#B2IQ zCRDxZ8ih=TigkZ&bI{u%%jsg*nW@jQ(S*mcFr88Pi1X{7Iw)W4?7V}CS6#xlCP_8v zrAw|xl2)jIC_4^NroF)PZ5RIBUGZ$eJV;sS*No_uV24sg`*ub9$;*C`JFlbHRJH0; z=>~U>#tPpn*J1jK#wo*ZGVst-lh5aPu5*SXGppxc6Ea+fPn-tNWQ+7u4$e-S*a#B)E&r{Sfq>1U-47)H`~vayIZ|u6iz<^~Y{bu>r0GDZ++Q|n z%;armWejt6n>L2yA2ghGq}7S|WsuHp8PDx9?GcRaX#`*RXU6d!?Yxf`R6ipG1(L?s z1NCEz)kT(W@fSYl335bp4O{NwU$<$r;ujsduvO+My+8VKIyit#_Ca?=LlDrrVg0zf z$ChCFT2Y5{lahZt%+drF4n^Bw%;>G%N!cf1^lA^oD9xZFa_ z%poAOKpOSey;AYuRLWMWIaiRl(mFcMzHi-s6(?t%;nbj8k2RoLZ?)C~10IN@*+FNn zG-1%?)Ms-;YX#&xOUZcnPGx{7+% z1t*Ri9u9yLWt#%TZAmp9@l+u)n%>5gSjwHh;8^0XKd*$eyXyF#1L3q2!F=v88(7HT zTwbjBhdpaaf%65|O$H~27T>excmr!rs=(Pxp75AX3(oY1Nx1m>VG@d7*FByAmR1P~ zwwoUuDo)O^a$m$L2w#`JIH6gzEQ+-M67v;e)7jddF0g%B*bu?DshbVK#8O-d z(NP$B#rAoPuy^!R%MjyTh3OAF9qWD$4L(_liizkkT-842?*~(9O^#NJ~m1EiiNqDUFnLcPk+c z(hbrr(v9c!zxO`-oKLeBYw=-bz0dRBab3R)u)C^Gr&U9)uIXw&ekefPR+E_8RfC3^ z*K&E{Tv8DPHLrSM%POpNHo3wVRRE$2cr_wG!~{Gk4EI<%W~9ATXkxZ&2+z~BZPAD4 z)2F<(T=(6b@3Qq|F3miQnl(QIeB4@#j`JxF4Y#cXb>$Zu!WL zJl`I#QpyMx+DgouF4nPj4x!SVorUfhSjCAZ+^Zm0e26fyb%C8yuq|C=MevBy_hzb} zHYT1Z{@WxA)hN#l6$eN&Wf&7P6Om$`>KZxsiHS4YoPID={YIrB4lY^nT*(u0U;6>I zc#MH?byI!rGcdspzX@NVv2w0y=PeD{eVT3ROg7?-8vbMQDh(s@7u}AL`>;V$(?5y~ z640*`<%{hBV0O(XjxuP)dh{$xrA?$|z)cUe1`^KPJwrSV69q}B#o|pT`qq`?UW62L376t1Zf;#?l52$ zb_inV{JeOT@*=qkI4zWC6^+hGh~zhKRzI2>%wN-Q$u8Kw>R@F`VZnd;H{AHogh&7> z5#wKJNuzemhFOC~DvPE}!2l0=h!@zJv5BtRV$m<)NrpGoH%3Bmnr)8eJ5>s#RFDoo zm@Vw^paywAzY_Hl7uVg93bi`PVvb;E>PiMVR|w>HvLW-nc2|aG&zmHH)hXz<$UT}M z?-uWFHt#94Gs0<~s$@i|f|<`$^lysB7`VvUBBi~v#Rq{z!RB}A9vY8yke?$if1T`e zYdz9nFXNJ*_eFm|M;}Xfx7PuuG-z5MdG(waMzQ|9T@ZOTCipw;57is|qQ{j*8-5oNLX z#haSwv$Z7l`N$bLC{O5m47#O2P6U?O68Chq`mNLgXfthVp%=y6CmerFV^Y?UHa$um@T}iW zKhZosl`eF@yL&wJKTGVqB10NkM5WFQ{Xzej)3?xJKh|Ei)3gthV|caZqI7ru7A!Ey z)S?m&OlSZ0<L!bS^sh?GtL$qGmY>SghGU!px6^jc{!Ue~e z*ONH_+!Amf;w!xWdg51AB`T!)pv-*EYU*Ck%wNd{bD!?MQf%7wOKE5*CjXF8qI%}& z8eFeiYW46HP12q=KGd=Oq?7NST1hZ&lvsZ6R_L~J8q<87kzn{w#xL9oI+|{zJ6@R* z-1}I_J0UevL$uX?~Vi>Vyyby z_v$*^oj^39A3Q@Z-FS7D1-KGr^)^^VBWrQMX!pGQZosvM;7Qi%eYfR_e^n40pIsfP z7p-??s9*9VN-AwG9v>0XUY*}g2ny09ijdFgWFA1SEKTR0r**S=4}U#__yX^RYb}_} z#`N+WeAQ+M9%+gi;5JDL;hR@AcA|k^MGDrG3;*V`SYqm9=~w&=1PbN5K*SfF>ZzG4*yTYs$=r!JmiTp@f(_zu znlyrE$v}x+`{SK35Z22|m+~kEqMo%nai8iO7cvq?r)Ad%3&J4(2aS@dHxI{ZY@?Z@ z<&#~<#dv@!{}5DhB8O$61VFk9)mOu#^8Qv|w-cG^Ctv+xhAE0jP>dj|uTs!n75m{K zX(>1ZIIhZuf$|`==<4>si`Tl#{yyn1{iytMUMKw~9-Q84GO$eE`uq})MIe?(YOiN3 zvAWVw369x>{+}A}W4(}n255BFzhOyj`R-58pcCve@E3XAIeqCcKeV^^=%Wi)EHGJW zIF1(WkNCSs4rT25h`a7bUteL-{Yv9K`g{eLC*Z`~3rir2L~skC)gD~W z9QCNtt*P6PwMDsug?d$8M?gt@#Qb|D?%v^Yi9OAC7-DvY@_kmdl9HL;| z_X1h+JtG)-;`s#2sM!4x0b$5_4EYedef2=L(3!hy|-&P7D&O2h(d6m6cF zF%>{6VcW&9^ZS=2Jj~j=yGwsDW^up1-KBn=*B*co;0e!S#xN@uF2qbpkH@o1So)*B7y{ zjm6-N>fC5L*=YIkj#h!9qhH!nOKLhwToStrMKOhbzr_Az2ECD0{z%EUWPV$@y>nCA zyd?5*78aV%zO2J&#`0n}Z?v#u*MQ{x&siGsWrfWrjcb8d$K0ld)>-beT6hWkcEEV^ z#0M`IcWd=$3W2{y4GSyo<*!mmQcntx;Mk*Xb8sSk%XoS%@*dho4oNt^Xx`;akII+a(G zylF@gsJU6^U^>=kXVv{Hj3iP&&>X7qhKv6qgsbJY{G!#JI;>Q{!dfjK8e@MfN{t4$ zgv{Uy&}ef7Qd9@G58Ljod-f?C*%;O*=g6^|%i}>p({0eB#ERgqeM<}oyFtVDZ-?!0!9-oO zru8&6CEa=2hIV0kjd3F_R7@875ZQuHAF%^*G&kJudL9g+JEyN9?r9hcZ9%tgJf2|= z^yj*t2hKP7!N8DKHC%3@YW}8z*^lXZ!Mdq9Cp;^W|NXr8VPV_Rd?UJpgRr?;cOxe! zToV#k>|J|EV_vm3tVvSc5x6r*{43y^M`ch3OwCM06)`jFOkvsTV;ZbjoMZ?&4+WT^=g@IP~2cv+;%c(Q{ zGgKQ$4Hgum%aB_hCh%KLXun{&2OKKN8bLawDNbagi={!et=*!OA(j%xfV5B#M`+Q; zu2in=Ljp1@Y@w7+tQM= zTID9GZ`Gz~uepQ6M=iQ(tw0a|gbeeQd;BQX+R>nF#b~&j>-CDKuAqGoA3)k0s1HSs zN9T!psJ^AkC8K-3=<_1bDw5^v-f&5lbp_R<>4a_a{^QfBi}Mi#q+I(MZ+Kuh;pt-|3BurhuInjzLq(W`7sU^u;B|E#Ey)!5{w}k3 zl9Gl%TF#11;`pi7$1_R5QN1X-!vB*pYKi>JZ~M;j)h{YP&cZD#HXO(EgU#s!TLR$j z4Z%JtO4L0KZbQFY4=d{*qq3C7pYQ80X@nPgpP;*Au2+qqy~T_rxt>o5Gql+pKuv&L zw?~Hf$z;944R`0?a!fw=BKyzY^1oNak)S;WvxV$4RZn2CP~fDc9iC3u%Y#vXjFc&G z5=|vKu~m;f)6fM;xGh1y)Nu=N&vDNzYbA<&$^1%!hMdz}ADhLqR3P3X`Dbngg7m_- z!k-oA7<4P70I@3^10@_s;m@Moe{IiM&MILFNyXv^+%H`gJvt%Vj%O#vw8B~yOI^gM zD^_W>Piq#xPn^@FC`WpE%6@-5sBB{tmLudt<5WnMQ&xZmSBTb^au<6(itsS$UO*f< z&$oAt0{j#~e(HB(&`&xHDWaDfQG>b`-k3q$@W`LMld#Q)-{Fez+xFz-A z@~_YEFR0&fTreMV@cRW%`u@e9-SrNM=<60Nc%A>LFt6UGl^kK)F#=m5Ol=ZtEZiFWFA`tvA`-(QfZ*k(BvKzbRD{TIIv(@yj zRwUm_>UrGV#iCtRp$}}<6!eJ*XmFP%T1r_+5kgXe<&w2E_U>(*52~nDaJlLUM2cx^ z-df5H5oU;2O8NV+_TcYUe}e}=!Is*af?8I7fY}2~8;QBN6xay;Ihxf)xq_oFhg73R(u6nc`ijC3wWgxlhc6TDi;e!g0(1ZSoX7)iX( zpz&bIjeUAaBtMYyPEJ@}5bc%HydIWJV`1$d0hwd%#*Q^oua)-S(hf}<`|j}ydI|hA8AG)2~vkN zq%M+fJfg?SgS0GJUwAB`w*A;Y30_gb@SE>ZGx~rrU102^|?!Z!!nRDX4`HFYvgt4`AUAwDab2%>2fG zdH%t2-L=BNT<5qk=y=t|ec7yly(km_t8^hwm&}~agF<0@lj0z~ke9Vu* zX6*x5s}{mVk427Qv=}xG*iamB&F3c3&C(L|1_Hz*gq*Z?#($na%2j&Ge;qR)Y+&`zwW#QpV&>Ra_@wuM!NiQ%el||J@#0>IBU%CGUG_umDoH5Om@X-HP{WbllpXUM(oan6zC*M z7HU>FS;5Q9-&|mHUJ}+!8=-p}?KzrzBQRSmI<8d=50tOQ0@AjIKRl1)^}_7g`s_5# zqf>k7`rg$a%^9l$AiWkxiQ`LM&`oe|BuWX(coN@>iQsByORES=w~s^5c0ZyZX*=PL zPhjK*i_j3mn)bf!4;XTzC18mSpmyU+x2K+I>aPL~M|ip`@;WuzBkKCgWIoDgL|JkQ zkb?Dv`U3E9cwD^MqSvgMWqK0uBEyjJ69dBB8P$7(fz9jtw&CGId}n4)BD1uLfMwj@ zg=EO|$z>rw<$U ztBO2k2!#RV*C_q@vN4JQ3Do^+bexg4<*8r%x=H>7Wi)aZd+FmFMeEJt{5C)lOV<0k zR4fc?wGRk}aB1{g2K$cYADyf5IAcWM3~TNny-+41-LI-w)<$_8AfNJ_^!UPq0uvaw zr;HNK@#?Rk)S$HxxZ_7F(Z*&_)BeMzK~#~RQ}lncb$~MB3s#^pI7Of5c>y`}QM<+? zlR^7zj!z(gpNQcXIm3u>C@{dZkfgN8H5r0(g;N5iiyRk?*fZaBnloJBpOEZv)1-vB z4MqA+G%aGSJYjXX*wN}NsRn4IO^Wl`buzaodBFxFl2!KxkL@Rb-k^`cg52ZF2mxh0 z%g*#@RjF$gWKHK_#0QF%A+!3o*#tr8L}Cz@C0fLgvT%GQjMEXk-O-0{?$*VSvd@1X zA(a67XgZ(^;4qrN`t0jJzS`Vf8v`9g#Zsv~68KU9=369MZ4vl{6OyL8_Oa2Q1x9&> z)>vGA%eCZkl)@#8$j**-j~4<@GaXxcA&;|UzB3+dOQL!c|@>C zMpn;P3fUP$v;(wtVEw~{?@?zCL;p&VmBGAI!v+ciHSLC+0pT8707q)RSOy=ckJX=E zfj9EE{}wVIzwg^^&V`74$@IKBT_$g9a?=HIKn%gz(0*6H6K>~{Y%_4o?75S-Rsd(QIs(pVGx zWk{ZxV1{xbJyqjw`JtP=>Lv_#q?!JL%zlGgoJo{M}#L z5=Rw_1jWPTXnyC-oQatSAxgUxH^77ce>gK6EPz?Wlc;s6AQcir%4>x*LokdK8-l1) zl<)%oi5wfhrCE7b^KcGTNT3QrgEzQKoB03(0sHiCBo8BeQ_6k?Epirxr1Y(=z*$BJ zzhlyc9Yq4ik{bBIK?^i6z0F0M0ZG|!Kwv}@fD+u@YCBf$@ssH?WO(Zqq-Uj|00aSt z*P8)n`wXt0_agld#kA}6+586uIeyA55GAr?d4XdY_q!m!I2dZll6(1)KIVBk@O~lx zO1MF6YUL2FHuMtR9j<&-l1Cb;qWBx|Vfx(d7bSZ2Ed+%mw51UCo%eb{>yQn*i)}Mx zgv#jqza_Y8YwOf+Rf)I|vIZ9?n|jE+aCkrCb+4 zEH(Y?T)y=x)uU@Enacex`@^sjKSoNqa*gzRW3-Qwxp6R)XM(zak!9J@r5nYPTKj&5gq&s zcS!e~67vZ>Qg3kl3nOgN9ZTx2B0|0Ktn*q0=+qfX#Asujii9Ax98gg{Yy0~SAK9H3 z3Iuh!7I+jx7LAXSZlFqavosYn*IXdm0kl1kZ;?yuQ3V+>f<$?MQrJjVWo3C^#H&EwC3NB`w?pP3UqS&AY1tIjS0;?71|>)xcsCN-n!6etiA$`R<|}_U z5mM`)#D{1Dd%a5QxYEo1?~Y>l#3lLE(2Jv@uy|2zYumBE)=p_FY9fr1A2#Xu!LA3h zRQQTs`6RBufyu)8{e|7Hs+efi71-NRgQ!V7K24wJTbL3(aprwlmoj3*G*vAq?V)uD z+qut$>_~E zLw&^z*)CTxLQnZH7c7((Nh14h^-OOHi}X$SrK&X^ua>btdoD{SN&A*mCoH*`b!1&{ z)gBmC6G#(hrVdo3s~*gPQ}Cz~E^_f=VJGB~a{nCVsq~L43TC9Gu0W8(&2){9!mDGz zYTPU`6uV&{Z&2z@3HUg-USd)+uq4}IpIiSyiW2qcf;=AzwclEh?1ThSZO5Zu zFdn*a{m6K+>wsU2Lxg+SF6F!@4Pz5hm;YqT-IpP}MM>7bb+$20!n0tJ&gZ4S8ls*% zB^1X)kZV$eix%RCn###LbT7Q!1lAn={Ug9ZXd%~j#{p{M+Iv%x0KNjBDbCD&>o_&3rS* zQF8=pK}qVVHW_FaFW5_65KgAkn5`#k26g_~ue*rhsFY z_)c*RtX48!G5MSbe|<@g>jj%(bJaqLn%?6_++kq^D;!UeAmG<1P{_UJen^!*8{~aB zT(U&IsoQ?k@9Lj4bjBTv;`9^)J3`%h;yj;jcbPyle5LBlW_ZI>cfP}UaecAZ4#127 z3Rph+JoCAGdAhwMBLgR*&f5kmJFXVBWGBDYL<++33c!6dEk6g$y=;Y#d;oFfWc7Q? zTr8N1unr2V7fLRA5Gou^NLKp*?5E7o9~v*!sUh`adpoBI@HQeUjC6D!8~^dl(VUyj zr1>*cvHJM2LTI?c^#KZ=kSZDlLZg_RWStVw!7b01xHL5=w*HiqF3aTt9~MJN*HvGO zc{oa9dT24E*bpPqXs*5}zPy#!zd8!r`tgZYE7dF~LHXMgpanJ6RMgR|#VH`MFgKqq zv5skHBC3gQ?N$6F^y9p%QTfOexGLhrpFZ*g?5Ni$YU{+89^BgC>c7pEZNpf{-1O(9 z!$~T&l7dYd+YHG1JlJhW{N(CRk@(TEV^A$Zy1r|{6E#DkCl9fEbP zZO$S0j@xms+1aGg>=Zx37WYY>&sK6x{24Z#x9mXiL;0w>mN3)IZK*8kS>`~|f5>~1 z%SEIDWCQ+>dn53Bqy*r?^NBjZAEUD02INEN_+HXM^P;wM`uG4ze>8NI7K;&wQl98! z7^%}v#?)(9`DK*($*Y%}Au`A915O4Nw6;>7kwd~dgta*R_+u67Sy&r=p$kTX=e1-H zWwn#OVD#Ik1+Y}4>dKi|83L|>6De4sN4aYZ`Kxn?1;+{}B>^*gzP8=2IZtws8r;}T zd$AvePqq`i;=v|d@ZoP)$X2Lg4y#D6Zw>6FS@5jq!LNDw@aawhz6+(PK^*PFM(yFC zcYNcJx{DQOrEV5m-8-DUKc7!|IN#73LS$zHx^6bmllsdKi0@f8zvij)EAO5B`y)j%>N+XCXx?@WGQL>dw(sQ1tY&RJ7jZow&p1Kgh-wR7)`SsZ@duA@t<|DJJusd zS|Ek4ng(`n)q>1`6rZ-id9_ysT)!h3HffotG4vcNMdd4!?%lnz37zi4U!3E9?9cr`gF{8 zvb?psgXYHePyOBL8Ur+SW~s(J(l6axyVwbW2PDi)Z$umQ!&(>`zEDZqn?{2^l^!KH z4m|Yk!=Bx@B1Ua;|@@4u7pX{ZXM zX#OS1RAZHDiQPqln8{L#$ucr(CCBpVWE~YGswxtl9bvw(p_z&$d(BGuhxboW#pW$% z?Y~#~^k)V@&;&lZ|DTipT<#qg%})!ng__UC=|^m3Y22Aa0r-XF+V4stJA{M{+*7m! zabpY8y8b@$v8ZNuMYU?}J?n!0s3Q-L#2{uxDe*pq0*q77Ys+>~iq2 z;Cu_-^85WJ?_*V{5NYnKHx{)f6v`RlE=@vH3NK>eTbZ7-`j?1UKQS821}Ay5|Kt;B zNpE)y4FZ!pGp_~%YxU(+6XGLDqjjoIdRIFsObUt`*RUl>V5oYUXLzd&W!;#p)}8tx z8&A^Y*Fg%P*)3_+vyee%4du>m~jUk zF!4~=?Wqc1#&h(e*?e{~2WI}#6<9Mo|?lQ-+`AtIGd?T|U$Iy$V(U?wdPn_lZ=iVET; ze0Wb6H4;icBczkmId|n{NZz%n-T&bu&yozTSZZuDN*q^Qb#$(=vC^Sk`ayt3zQ$;omls2O_=b`iIP$XFDSU zOVQRQDNps`^Ri;c?QH)*o(g7Zm*zn}+C6J=oGpn~eR$z$aCxb;_0NIRA>ZZHO)@WY z^e2+Jx)GymvgF-r1!6kDoFc41wty@8B#gpE{_YV74p^067340H2<=Xb2})u_d(wA* z-Te+9XKM6cP$*E8`|bilH(9!Z1Hu192k6gmWIhe3Y|sN1h{5{=eZe7;8Z3M?I4asZ zoyB;PAEjn51swoS@8NJFXUg=q4`@sXo}`~Y_y@$uI?Dm1nK^g35Gc92`h{ell6K5N zXt5IS$P<7wLKd;4TjJC1Ivn=+@9+T2|AYqspl*g|`h)5RlYlaG@s*hBaMJYx>wX^a zcS;GOn%VOq3dg3)i0>gdtle%hUE_(#bY!!9AAU-{H}H$S?5qTAC^ip{18O36iD^HH zGONV18&nB~kLqj>iCzd{^O9;RL%I|FfOqzle$7yL@u1{v_tBM`R9`?N_848@j-~dt zUQ!F%TzCbC#sl29SA9vtoeyOz(zKQL-da};SQ2_TH|@gA7Unvy8n)t9IXUTV z3)4gQ;>AkCvN^hVcPWxER&R2LHO9==@qP*BFSU|D!~qf^x@P611eAI2HhXKID#6)Z z|GO`D1C)69!~Woc;A0+bGpHdjdC|AZ^uJrI{?}o9^Ps)6v&8x1XSwlrkK)oAn@FlN z2gpG{UdO#O5=d)INZuqfwtnmNrd9bYwj?^&s^N=3xf6v0U6gO5vHMKtPgi(C#xNW! z#NO$?*?HfFWX?a3m(?gm|u=aOa&psyLsSaa(@<(_Cci%Y7S(P^xalu-TWyzM0dimC9;$P$-{n zD=A7f3lhH1MIf|dLMfRAO~)f!b&8hYe47K}_t9aIto1gf)7Op6Pb!~BJLc`j+SWrY z$iZr+{SIAzwN3C(lzuK?G``e|VkV#azE6{)#pn^u z{A9N<*1BKcmC?rC1~>f$|8h9~TmAEc`;QOa%1q*i7X<5G=qoMJ(l1~kT?8`Brg6#w zVCAJ_2ZxWMcS~1Fx@b0*qTq?%5!UYQ_|Tk>Pq!9g`sJUthz(7JZ7$7wT%2aL~WG)BY{kO7bTwFL|uSRA@Jb z6K&F$kY~fdZng}NkDN-<{tR?_7W(Vk1;fb=TJsTofuh|kQ@_W9+D%XOip+E3(;!+p zUnbZ$E+us~p&vjJO)$|vZR=WEB~40lJS%|hkNYB>A5B0Rg*QC!DAhOt8VB?@B}a7k zXF|wIy@ReJhSt777^P3Fx-5QB4*+RnFs+e^gGSy{KQ9h@ z@O_*Vr7}?p+9tZG20DiqT>75E?LZ%B&jI&XRTWla`Q1wG#kt-!+;yha9Dv&i9$Ip; z!mXzzQ+D27>Cd9Lv{Obyd4lZWFisjG(|6eMRh5#n+6@xFrHthl^*X2NoPO*fUURgo zMA?2RrROQ$Zs|X|YHuVsBcx{qP}&VqKIt}BRd3Bmn>9~nnwe_&)vjOpUwWT9OlAl2<3j8Wt`_($G*s`VfAq2 zt6UM^dHeiOCnlR$9j`|$x>GF2^J?L-{b4-~%jLP^8#<)=GD`whcQdsIbGFN#0+n1QnOi5S*!kXH{DwqOpOp_8Kv|{yg!f$+RUNT^* zK+c6NZ-SxQ1QU6w>bG@SKHt^YyqjC^+L@iA7HkESkO6Pm`R$@P3oI+ z*TS_{j^zxv(dYV{|Ro5h4Pjeq{pTy=qJo5`5!im*szBff)9I2#!`Yms_l+t^{5;* zfq!zLk<>ssN)716_(Aen&K60^B|yov4^>l;r$ZB|5c2Z>?@#)hh+I zaBLE;Z>Vb_&k_oF3KlvP3L?N0!3@3ZkO+!(UB-tN(S)qkg6(Zm3=LY%!5xEr>&`tk z{Q=IY?Hk3$4q$5jVpHB3O0sFBaE%709pgIa~<(!ij&-h#tKvHd7j*Fs$Kv~yA$VqLVRy1nk|&_Lb3j1#LCD%;LyVi7;Npq@DY z)fz^1;3?dZ^IUJjhyhQy*~?A#hfHqt2o}pnN7go^%*=_yTh#pN3F@wJ`#3 zft}-#`*Mw)cErqiU+fX%vZ&)B7m-+teE2=sty=-bRDGbzNA^S~C0vXnhsirGREWN0 zp!ej*@!u6(@n&;FUvxO@Z%vX&5lobVV}m;>m7P0_k<^jWd?vXemKXVP1T_ZC@|~n_ z38Lyjmi&=g8ox^sXPE8+zvuLbHNLD>2S0L~EVX{Oq)pC9gAlo;czo9=i-KIN;DyXNwkJYSW5rgS>QlW zhxcvXTR*O((N7YEvmQF`#$==wY|l6GJxV8P$sFA-*IV(W_zxB_3SuY-jB(v zWX{Ku6x0&s#eM1Zj}U{Vir&3HSd!O|`?v-Vr>A;#J=Y!v=`VcX%+u;{9pMh682YE2 z$B9RB5K3IS*?WO3jWMZQyKBKPTbOKlh!uDx`z_pZpI!Y`Z!LS{e79t2AO#3NsD2Tr z=nODjHGp$%JU&pcY-jI1Pdn>N2)8Wn_mW!v^hwfIImvjEqRHy|N4yW>I~=PI`x)@0 zGyjn2mc(;NxA}Uyv?rd)X(M_PJ1O*T*@-{4b7XRsjqF)2G&sa1t(KDhRThs{%5Xh! z54?N$j!G?n#$_fH!fY!G8t#4qFF~87oN4RkU(AB^BeUeC{1E@a??5 z{nM_2*{5MGEGU(Up}e=;*MaNEeSfMeg{#6ij7nf9$NXCZ_3N=DWYZwkG?aAcz`s>& z#FY}-+`AW7A5XFc(EmYR5`pR--or}fjV27Au*s1ag_DpDiMJ!;jJutwy2f^CGQf#jzzkB6{l;`CC> zM51pl-rq8_ayYqq^Erx$+@Zacdi+H_(K60|KGLGr0f^-M+zageKPIK0YbB@G`4pVF zez>UZApU;WJhXxzGxg>JOnsm%J^6KW|Eb-CHQ#NZ+b8|$Q~#LkG=-LwX>nND&G6Ix z=PAVrl=_f)cm%=9^+cVU`~l)pCz?I=39~D9!tzit@?n|(os zVTVaq?HyetJ9ATkzRzus6z%JbT)YSpAGSM*8ds&olKNK03Sk~v#!TvSoEJJ2T-_lV@~)0C${KbbZ|+`Da=WNd@wN&WS3*a>zEuK`(bSCp1G&pdG-&J&2gQQ8`2$a+n^ z=AqCuWuNci7ZLG((Kq>N;GYBksSqxK z3W2fQU^?h3+!#mFF-`m~h`2C8D!;0dM%vUzmIZ~QbuW+Kx&WP3KuAlUnV^9@+$yPr zJw`8dDzV<7HcoYvaoD1CMvF!XE2@(*1dZGEqB}uCw3ifYUaba@@Ervl!!^q{m%(}5 z2%0`}dP;=~xm#*E&IWqRFVlf%-<7a-M+1;!EmH|$46;=>x zOMK6}ho?lRZnFU>b-XVy9I$G1kt|H-%I z+a-=ybRZ=4Q+z>flEdqG^g@oxU5>Y{H)6rK-7~7+ zd<^pgUqtj_e~J3VvCZRvYerhYZ4r8kenWs3!|bv#1tyI`=9Yes@~5>*!}@r4kKp3P zK>V_1vs@&@ApP7>zjJ1LFHZ;OIY=AE9fBBbaT1@N<6253{eMawb>u)RaLWF)?yu)C z8g{2nqYFsQk4dGbz~7Vamv3D!MrayMqzAs!l-dLl*)S(|{+jDWVPR6KiT<@5i5G#! zK!b$@!q5cust11>sL{RPPDKua^7L0s$Z2HAjH{Tv$n(Su&@r(bc1e4BeTP|6Y5#^y_i{^dqAr!h zfssWTxYh)&T-a?wJXYVmc*E+QJ!obkOKmRfI-pq^V=YFY_S z66iv*pHP37S%15hha0C(VL7g=}pbi&*CbAFKbNRbJ0SCTM7>#MK;9S(+RUz(#SO(hCIdtwTJmy z0|?6AvFOV2tbDCBkOM3m>SZ?~g?l?=#LFpjQf#eD{W#?By=eUOr*N-hQ-l5FCQSO| zIK& zM)M=O-Oi#F?{wO7B}I*n+rU8h7vS6+TIYLyTW>3_e&~`Nx;0|DFr1coeagMunE%9Y zVrc8t@>xlona7{NB`!%jqSx?34BTlDiyD7@9l6CeY}qOoM@3W>B74^0)t?Qzf#nk} ziFR)nGxOI;@S#{7`8X50#@FyK{p$H+xfpq~*ol{Rw9LE{=#1OW9O+O_Z5b))OqkQ} zio0#DAiZHA!Upq~Bk|$qt-%W6HseFvwium<`V!Y*Vrh^rBlj{6*fIoBl+&#;Eg){# z8A)?*C?jzO_!Tr`C+J#NdqI^8G_AXdL}3E$PGn;-mGO`HyJvh--#*UP|S>MmarG3Yk{s@c) zjSTz#cUO_j2#___yyX{iIf!{qd-LID!>bxB5jK5|QmYE97GMC=resji?H&mmQeEuQ z5sNjK*Vm^mpO=ev>s{{IEMFw-cD9`7`QOP17cw8xD4>oK!U!!#m_k@~vy+Cnu|@{3 z*4-`(Q(WSt1NQ{VQuJg=IXll|4TbKSs}r1!f|RFNU*4Ebgt0x!MHkoGc|FGTQ|>l~ zi?J&5q8XRTjhCv)Qojp9(LZ##oG@zc+&lR`(T1kbb|raHo-LcOsfWOoFHG$F9hDu1 z{>8LmkGD@p@H;0rhNL>_UOeBig|*pX22XfrWy^_f)P&RMMF>oB z9*FPO`#!srf$!$z;kpauz5eeb|5!v=1KGc+^uiK8u=jshziGg) zDc|#hPUfn=mpCzCd|85-Kss$OkauC*>EroH|q)6k@lo&F zA4nDW_wvsuKY)?#XpbN zYo2xWSa%`J>$+AqFYHA38I}La97i3}9HD{-QQcXLZJ6`~a*#+wZW#1#$UA5lQ!QJXd`+n3k9w$DRoj7GPWfTJ7WwUG!|%8(5U`qX z#=o4x(>(hRk>-^Aw}K(D#meXENPjif#RNZT4T>O=a^%9V|5C#{U;Jweif<&^*g=qrJo@{k3bzZSNbtF zZ}v8k+`Cgjb6(u&c0Y3)(Pmj}{pP#B8ADT=d%RX;fEh@c;0;!-JNF$5#Bo$P(S2m|YAzA#FwRl6?gd}JFLhbV^xGkk) zp#rKwMLi)uk}!+SARrQYrDeXI`e>kp(#YVU)@!NXX!HRm4pZ6w{-PM^CpTDLBJt*&*NJ+YE?!~gH1tj__RnS*iZCgxrrs$1<;dlW#4Xvft#-qJR zHE?#<;dQrUz1{?tCWL0h%jUxG2x-*QXrf`wx_L*_$L+$FGlD?oeMgG~_>2&%=~xt+ zl6?X+9PFQ{8Ip0ZtoNjdaeEZ*)zzg0VvE|HutXIrpq~!?NL`6{D8XweMXN9N@N7uKOtC5~Jo3qG&)QwM zULX{dA=1x$7<;XWfi`-n3Z_%B-Xr+$ZRel&4SAtA0%4^l4;I zt_$90X2PM-92Het_LW@L{Lm2pA+IbTV!1Ak=w4(sT`F*>T@p3FvuQEOC^u2G^&61! z;YxoWwf|KZ_6yM%DeFn^oS9Ty_fzyB@nB43!jsnErIuXkWsO)VhpzmRyRy1Sab`;? zP7bLg>4%(zsHn_kQOxX?^`aA3o%^_X@<$2?Iy3jiKGGZn@t0;~RFtW&GPA?e4UTf1 z8Y_IimlAYui~uZ4A!@Q#!H>o?i{oygBZ!GAfVzN~G=4u1uo_DAuz@t*{yA?8{ z7-Idk<60 z{%n_p+NnsX&F--zwi)4M54=)AAnK(^|L}x~!HW3V{CRfZm8o<(eJOss+rGoUFum-( zO(_mO8qLFwERB#3sP~PTLQ2s=OH&SJ~Jn^5*tFzBxsCm1#eUkal_1j6Yzt zit0RH-OXny#Uye3AP~CbJ?2VG)KzdvK6!Y)^EjD;WGv+Uu843Y5bn-NIaa#R&)x7 z<@*K*=$R25Zgt5`*&pg>V}^(bBTkP&zLw`KMjuv|$zY=fw-#(N=uukzo{7XyNe`2gV0P4M49nel|iY^eEIt0YlO68bKctQro+R>HQWiI+#Y zx|AwQ&#^kYtStM_M}{dNUR4bi&%U2&qyx zJc_H7btjuN9}JWf5yUJ_@(+bk+#M&Vxz3T72P9R$# z)J~>v9296L!u#^S=1_10)0{$Nn(u&%GniorziO!AP}9A9Z0;R2Sz=E6@=-^{#op|k zsW`DzdGYt**`dLIvW)s?#QFuyRH&tDh5wEtj*PxcOv1{Z7XpkeDe|WWMXG1U;qNRg zgFfHR%^6rw0PrC6ND55o&IZ5eW!%Rs~4NXzFY@yPF|D=d@DCFs4L9>iIIW%i+}+Ozxr%l{coH9D+Tml zKb(-^fZ8jTx!IvHz+AL154#U%7VB@a2vh8jmyHsfjql5ohkLmWvBcQ)wt?s)@Zk_|A&g-oWqgpeiQ+@5cq649m;1={7gxl>t7HAO1Opkk-gp`)_JX5fl2n z8W1IUeECkam+Q!?Vkd!h1}6*TCs8pe6LYZb{?`Wx+$J&Hl6#&Xt(7XrKdJHmxptW0 z_6YpsQ}=%RtMUI`rqYPkfXp1c7%~8xVbGme|MO+`cS`@7x^j@v6_KIl_FG;qwa${7 ze?E-kS9|O|pJe{@tLu-J{olV)12(5+ww?lP@dFFmi?D-r9h2P#V?G2IM$YeZPMfTq z`2UGT`2R2O|M!;n3r2ypt^UdK{^w@=XNMBP0ZYm`IBrUnu_vv!C_?_+1sMN9{k8$p1OKQ1{CoCd^7bq<`6WtS@^#JjTZ0 zWgvg!7XknfI(b=_{IBo?dVw8bygB*t7kDBC;3*U| z3;%aPV~PXtWPn%#1&jr}n1Jh`B8*l4fv2Jogm4WtXku-f|J4|>s;-aT!j_tN+g7zjye5f#8Vn3+y0R znDfd36Uz^NfhQ4T{D0sH2Y{!qBvmjk?i2LOb+GKQs{g>#{}-?t|Ac+nXVvCmasQvKciUg%4_je&3qz@{F3Z06P4nyV{0lA;*3{`Z=%Rftkv#hBqk9 ze+F-Ya2I>H#6A2qA1B8wKmPk2M1=rD*gHKpL#%f##53qPiohp}40W@$d5~$H@{~7DT?&4h&$u_+DNofC!HhUrxOHUL5NNDq_Q{NbsNAVq_06&k>g0vcHc}`JodS6oVko> zj^4LgsIxx;V%d&>T6=S{H$XnS$WlPkn>^WmU;=rV!F_J*>N_jq1aCRA zKN@7xsB(ZOEZL@XmKFMZ{93SnI^Acn>2g8a_U?PGtFGG7+7`qMm{>tYgc+rez-SZe z(Yx!XqT|MT-oeA`^z~ttt+a_A=iv!%Tuy%ts8%S4)*V!ddyBxu2g>y3`-1z`dGN!7 zPU@Be+knnN+HD_3S>3YFx}^#_N2cuf?gKrKbFLS#!M>|cY^Q=p&s)!eT*GbW zbvf#gxk0}9fr9(IlK6_*K-TS)mTCt)pR=Z<<@4*sVZnz5Z~j#)u6}~bI(O`}X@;6L zL))XFgk=kd@YMIm8_iD#R<*a#$&IjqNs_e|mle(tFK+$~C*9uhn#^ELRm?HQ>=3he zk)^kdhSt)(qXtR~-R;~bFurGC@Wk*jaQNW`S{p0^QM}D{RIty@&va7@Kj8Q?-xBt` z5vTCb=(^@nIlwBDsEbkCi|6SlC`|DAMk-G})oTFORtRg}FpOaVNckQl>NrRN3c$ne zmlgE)vz&oK{D1e^l*N0)Sy$k!@3QRe%4It6ZHA31gU@n;I;j24+X@)yMsh%daeW~} zI3QMy>%gJM7=h3!IzTnWnBU{#lk0-L#MoYgCZOq`*Vv9KxG)`*%)-^yYqOA1?{4^b zcX^JUmk^1hNgwhHbTpr*0Coj>3IvAXKXH+l13P;@y&KT~*E6lnOPvAecw1$5H9Wu+ z7oYBr(`(#SinX05RTo>HF3WVb&w%aDH0=}Tm`5TSSoi#}Eoci!CEEj(8}D3EVF#Y4 zoApJW?UcB>$FqK>V?aady+WYeLXX;p2ys+YkrQ!GHC?fyGSLhmGQ02?xtO~$_gZ7!g-UjK0JHxUOQ zSs%9W85$OyB|sll$_nUxTyXD*Wr(}pCc{{796C{}1x7GPLwcQ=lRFpCXQ3f0@;$9e(YR6nCviv0WU|} zv8A^TS&E7d;XXiK{A_wKQhwCsXiKl|*$-RmbpLj~?19%}Ye?qEN%Wdv&Xi-fUEX)a z>3Ul%4nlx|1FjincHPc#t(o=hj8Jn5=t4RBP|ZnaRh7ZN_q0FU(%>t2XQzPpxvqAj zP^MvaJGDvN?4vgexal-zzscOLWqrx)=&(k>ZD025?}xIaMUFh3btJ6{*u&~BHLITC z!n|mVYwe#C+fOyq%R0|*?zN9d=1<*9Gv|tT?}-<*Nfqt9G^Bm)aUOK7>z>Z*oTS2Ex-DQ|8ZeP$ zJe}rI(zwyHu`Lwb&`8h{HlKNnRo_#@h0-`0u_M?9_F0*PU2Nbj)-DZIyQ5)3HYEZ#mkzY+vzDGyT5Eky(V1p&#*py`MaJ;hrvj5qs3#A1i#GB)Sd} zzpBPtCA~J&jZ9NGulC@@_q1f+b8H6Uq+U>sz$5oK0gl+R2))IzXk?3S>k)+Iu_N#( z1UvHYX;Ov2M`SIP9eOu7=~3nDhQq&o33y$KlPz*DP^myyB#c2yDCO2bP-65YPUP{1 z6R2)nSpa%v?CE*z=BSy;fi4121*n%+-4FzcvbcbY3L>bAnV z6ny|XURcLTLQR?ZSAau}JwD0#cwl;pK%Q^bqZ(D!G{uf>&pCwt?vNQmmzh>wKxWaW z5~%&^WN3Cf>tB&J=`6`RPPgyEHOVZu4zN^kvkQ>r7-S#sq1-H>EQ!Z1{BBB~Na(iW zXM1z9x>@-pJc^dM(8MF<6HwPy(^~Ueg>bM6p}bfN3`|QoXciEadf@jHNK(yFfn)(^ z>6Vkd7>&g3r7`PahTRgibgQCE`%8DM1S?g$4%P|zQr`9VuG1#2)dgNyhO-RYi)(>k z=G`YEEY|(!!M!236XY`Fccu52Nsz_e#FZg=x(KTxTBz~{X@ezX@?>H@+Sp_8V^uV@Ed zuW+E=88UfpvX*(|MJZLa>{Z;AjV?Fc?1b4icWyZn$aJ}Q;3ud5Mx4N({b|0;xTezl zup#4ma~IU;3h}5#_Six7B$^l(ekyi`Fzkh$Pc;!et}gW-9zL>tVFlRex!!r!*fqHQ zu0&Op^P6?L#&NRa5TCow!@56_dQ!--SNXN#^%l9Q7kbd0V)5A3orIqC&WVnBOP-dr z(D?dtSYdPE@-#*ws~jAWqe)C&$e0Lmkd_KM0F zUE@z?IyOMb1@VK{5gb#Wq6F^pu@6axRBUwn-~GZB&5(cb=RHK(-J@~x__?s{Z#}-V(Uo4vP8MGsiF1tG0V)BrCw=fSvn?LLdZnMM@o42cVGF4c5s-4$OQp~ zpoMqpI;#Mmvqv>fO?w`w)X=2N<-jkOEg}(K`mp*&mDL^R0oYaixS$0|9)`UPymXIb ziNlzyv{;%PU{wRf9#L6kxwsayFS?*ra(E7@X#KQY_?GG6NFt*48l@7L#Oo6}x8@rP zzIQ5hR*g?Xj&>F`+lekVpHmRZrn)!zWE+pw6gn!NAFq8&?@Buw6hn3C>w-JACLs#5}T^ZB+&p?Pom z@V%S*^!|>XPqUiuT-FgB8>-Icp9(xQizz+)=O0ukpY-(M)KtcN9)_cA8{KQpjhm}$ zH2VqJw!TfYx7^Hxl|Jv4sCGD|(}>WI_gUCG)67BIF&fv`co#H1Q#Y|uz0LErO-uT~ zr(aEGjtvnfF#hh6J(a*i-hoAzRvV&`gy)(H-ir!R!VVqfcB1lDG?TW&jh!MfZ~L@{ z=`6tyNZWr@Q7>#htpvj^=HA=>m}@Nqdo+1ICtNSmCKsextKch5fW=#U>oovmTG z@~w)a;At*BKjaO&hB;|xKQxXFG-Vw*=Uoa6+D%>mZnmv_vhsEj{$`J723D^{oSnMcR^fNCxzS@<+}N-#5I^xwzC5P>oAjsIdq)V8F0s&64f(~!yQ1oakqJ(c7bD}(|aLNz}hry#I9O%ZZ& zlfdB1*nDHyeJ@!&*HD9LfFYVu`ghAYzHB+*72*Kr#RB6P-J?Gfcm-s=J-6$6NN0(# z>>3X_%lyT82F2;uDM`LijQK4(PwN7`iE>|)oVV2Dnsn0Fe5TaPViF-VlT0uO zAhcmVWA%ix3F(1?;NylWd{_dv$yF&Qu~aB`F!qh(*t|$pI9v0HezG*s>gIl~!U^u| zrmhMdXf`33E*)dzrsxl+BNHGwQKHS2t`_BB2Sf?aZix9J^JQPV)9QeqC?|>T^??}$ zgp+3H27!HMO6s?MtnMZa-xrlNJDd;k+8x|QHviHB=Y^PLe>LTsM;i<_xz&E`!nbqM zwy92F`dl^IP2_3))Rw!FHo2sIP;c^@Q@-zK;iWx|*yLrQ2SuW@ZduX3^GBw1mx^Or zZ~j1Fe`E`P5ehu?7LOM>jh5>0{MgO;yq+y|1)Nkq%=OZ7k$>YBLu%Rl6#dL4x_j#An+w5nTh*4r&&e=xq zowrq*q^B*D%eEq0c5gEC)Fz*^Oa5Qt-WeRV29VbsDkHBcae@9FWTONh18c zNJ;f9jh~Qi4B_jmLsEgwyklR7KF~vH&1n?-QIb49!?H)R1}pq^d0^_A0nCq zI)BaD)M(y)gGux6kRy~G|F;%EIWZvDo%3!8{w>}H(6R*%LeyuN1o3g-GVMqA++AvF z#5fxOddV$F)0KQ=eD*^iI+3=d|Lk-Hl$ueV!OsMup7%0-@oUXj%6jN=A-Wm$uR*@^0sA6?KDt=mAIT5M zYy&GQ%=Y77vPIuF5%GJ(+hsI>nwa{*o(C)n#>QzW6CzXVT;dQNAfzBIsP(i(kvLg6 zENMdQJmRV-=Xu(Ry@)PDzlwzWYf=gq+pInC?YZ?Wz+bIPIq=0a!Y;;ma(=7y<4L<>AO&kf|cC*hEv;<9_*R~v=!|5av zHz^V~EgX3$`=WI0Ccf_{T77*Q;*eRo1kkHCqAcb-kyVkn9ZTD~{7hea>L(+Q{vW8@ zU4iEZN3QJ@$Ghchp01XURu>BK)PM|tN0}P#k)ZwB2Uno8&u!;RC=EY0?m}}88xqLJ z4AC12I+2LBJF%PKXP=1Op_+k4AXs@My~gz72(WoTe)@i;z$VFeBY8*H{0@e&gGO>f zBwv0GOd&tycTe8EZiT%k#_KQ$R6-3mKkhUx{7sV=u^}G4b*EyB1{4?qd9Q00MU{}j@O|IH5EZ+kBesB4U!ju5zG@C zyuR$8>Tq-|ojawz#8Z^@Z$KZe_9&}5bwwg0x(AMcI|1*zs@u<>*PBk--q;lO+>$Y* z8L#D?-I&d)_my^amn)zFa;GfWT3yTwu5q$al_${lGy%I*UM1qstAa+{T{$|UH$inz ze`fsl->&zw_axqMms-VFpQwamn4gbS`5G?*i*>gQd+QdDk$q0vE2y|gj8=BY5zxbV zlHnUlW|5vQ)%9LI8lXRgdcLPY zuG$qy-cHji;v8m!PdFcGCf;XLR{~RYmv(-?Ug2&_Fo%xV_a&W$BHUm%=Vwz%7^M%XSCbMlzNR z3>?4LzR@i#E70=?RpwuxHZ96`A5BzD)hjGNP8?1YTzLL8!FIqFP$#7l!cB17|{XL9N{aHc1uE$?rb)ycyiqG$-QP8&oQ2^m&&1 z0H2=o0UqLd@4WbD6jr6SHX-6G5D!!Ke0S+8rq$GRgfX~c6}FH*J_nF7s>{vr{4Z-u zzlWII5t<~jf74k z#ci9evmtO(#H|1<-kU)EVTbXYhd78uur_>SmbUp`a<0s4MhpF-6o zVlEJOj}h_;H&-ykLR?5glGKAY)hBEPXB*J!Fx!>uJ70bKaT%^3zj^?~7lUtH7YS7j zr*?mRe7s*~H&O8@1yDXh81KXpS@M4Td1cWa$-Rb1Go}EPXIPG!wa{!-n{ z1S3P~w~pJ1V&uReG9Z6KjQ`r@EU6`uJI5aB;l9B4fuaX(&Jt))<5nx(jJ7u1_aUWr<*TYw6Hbv#=BP3DbX>&P%aycp05F@!tN$D9_L>D!M*6;XSm=kkP# zS6qn#PTtnj?h43%2Sx9i*;ArshU*eD2%m+V^QOQ)Y2j~BZq$kfm@|Hf{Y2OjcC$?i zaHO$G5-ob2g1^M-{cxz>En6VY5n`TzFF;g=|IowT{w#d+25J3*y*iX5b*hOF(d@Nv36Zb3e0&pUIqk}p>LG(&L>8;*q*3hk` zhb?Gt+^`M;x(cc0yd?0_nye;Xu8)_~-B&a{Zu(JRnaYzi?TaPli~3h0b)fnnRPfQg zmB#a;%lzQAb7IgXlZOJ++?H5ZhC`ZrT7BppH;>CG&9E1r6{T)jd{lbt@jlzME_a!pRC+>Vo(?9_V?J6DskA)0FDie!JYE5BXX zEHiyp)=koVV>oLfp}QrHihCHwf4QWxc!p13h8n}2Ufn|Z?o(?kc3rty#AOka_pWm7 zAM_kobE*0HvpG^l1>>MPw*I-=u)FxxdsNrjaBA-z&W$0GBPRUk938@!=}fT_=H5{B z4Xp$56x~Q|rYFU`H3}Q@U9zwrl#9Z}f%>VPUrzdJNGy2!pRBV~ju@)%l#dQ1hDz)9 ziDbmUdQBIlXf|}DlWzC`sj~X}4WZBGDF8do0PHvn4Q^RgF1-Lx*6Kvk;Q|QGXqSl2)NsP-L_=WPve{X6sNa67Cc|0CHcE zj~kR6g1$Th_?WN{YYOnY-mB0kIJXHdbut$72h z?y+2V3$SomDK;_BqX`uI{5KG#;?CcRIwMr0+lbJ|nOtziM>5~#fuM-XzrfKWx@2m= zdlHep>S7VeVTP&CzcL@6#_OPm*Pq0JqmtYDJR(J$_D4Y2@oysFa(`OECovC%`$ZDL zmb&rhkT7^;qX1|=d~a3$+lZa45M_9(;Od~bJ3HDTz z9mXUIC}8yCApWdt<9Pi9GUh?OBibhEsL;CME~rd%h-x4HJGde zV$YajRYL!!T=s#t8I2T7s|z9}u@V--d;`XF)*hXblD7K67dSkXjZHGQ0wG2M1R6== z`-!1Ld{Mx71#wqs`R`(KZ2|e8xINP!4uaaAht-QfpX=eXt9*ggvO35*-6^&{EQ`R< z7Y*^oRq!c83Tif~@~S`C^({Bx&}C3Azv*S9E0^6(4g!;-473_Z{A%uBv6lv+Ck9z z8k>Z-rm&9bR8PeOw4zi_NtgEBmZ4Gr?W6 zN%P zg4TR-XR&C#Wo@U-9v@u0lyAT;poISFsY-oO(DRsW+NxErc`Lhe-mNxbQG2*$lM&zT zyE@sNf&PbIycX!KNBhIgSC)n#c@(gFowi4W)Uo>O6d!kWIX>!Gy)yGp$Bktzj!jrQ zn=GGoT$fa~O^CX&-yZRE-wAUWcasodFfV;ddfR_9Gq53%q1l5X=G|wnO}I_ebgG1U z!vWS?H%)hS5q#dzRcP?zmj)}E`??J{#|$qtY_NsZC@VoyYL70rP&tr_v6`X$r#?r( z*CByrPvqDyR)5-l=SV7;(b3wZ|5#R3=hzPq@xDt??|zsr$+^bTR2?2#y0><{7puKj zUK>+4<8QW6_kCfTS4%1Rs%M+b?+c6;1Dx}j%HS73jG;3)JDM*B`lz{vd`3Q=sLU=| z02DL&%1H>hB+LU`?{H3`LwL`ZoB%?iyiG=NIrdti_kAMf$SRX$c%&OcIowjyj?p;@ z%kk(~I5+Nb&o7`2`5mhAculSIe`h0K8-7Qz{<=rFn+I{X0n%!FB++n)#UTAr@jhAt zfmR-R^1V-SBu%K|#PFOB=0BoEM#SmFR}PeBSKrw7y#8rn2s>buY8u%Pb0qE`co0VW zYL^9R#Q_5;fY{(xizNaIa}R#QY$}ix#B_(0kMRjr4uMBQ;uq8-#SOx~Jf6(UFLwQ3<_AHW|w%^jtZI*29XxD~5|Ri4&#NDvU! zEcW>Dl1Mu$n1cuOCGzIr%#;ZYFH9y1oQO3MVl;=Zlzp#A#HjaNH3&u}Al(O1naR{J z_6!b(Y|-tC(0)~krjwxl&>EiCTq2R-DzRB<(Sj`Ai+8VD!MlRU8k=4La$1jH^r1!- zkVViB;lIPgDp0J+FaSa#uDA z71eGFP)OIac8nbOg~wLjCmM;a{YekX?Uk;GBrd0<9)BiQ6WLk)fyxjS^`?KNwo6p7 zs>4Rx`1=J*A2EYTj)3xDc?GC{r&5GE(KD1lbXj{X`27!Rj4LW0a2Kw~P`jYjdTX>( zWWHQ1krMtoLKl*VWH$2YqIF&`%|lnxdQv{sHQerXu?%ZTgE$0_*TouNRkcfY!H%Oq zGKs2#RkMo&#zHk6HQU{|la62U&C`o5?#y<5HN8_P6MK2`V4I;H}AwI3q+rGcwD>1T-^wa z+Yh4_mJWT+j?OA6$AOIO;Nf%9Sog=K$fHfgul+`10iM&T_Nk3Kzrr4Va`ZCG=!U{y z|BFEc6ySQMR0Pc*1xpR9Xhz!2V*=#tzaZyVM6{##G~G`$F#qJ3oNU{*yP&ZAydhNs zikn(;v8nB&EaFz4HuN4o+~=J4WfO#4C@4X6vX3q|P?Z=zw1Rjyk5m?3FU~hVOSa#Y z_8&Pcdtat1oFhvqBAOgjZu)6AJO(BRq)5^QI7>WUQeStZD%=c~`W#zwZ9h1w&2{p> zB>hUZmmH#<((BfduJ6XnlCCuk6DSC-XK+nzA0PCVga&n-+f;2gGGcssXQR?|gUe~xA*N^5WAI|#Y3^Pn1oK^K{vRIYUetzk0=em2E=DEHJeYn8 zhHt|vu0;oTg5tJC6)Pq{kd;NML@{GBtAnqyWU;-WuHaauKsWN^2Dk13PnBL|;S|4X zFN@suDEl=Gi+e!0Dr4zy+&_%{Rk>{5&1#NAzC%2U@Eve$t++r>85ibH;pK_zL~KS> zLViaanHQn|GrAmc3vHsP3$ZQuOiAaKS~X*W0`hskqTUY_{?#M`T{xv21)f#>eT}qm zb{%UQu>`s>sqOM7O+7x8dawjt*8#DRZ*&OmA_7LnL$8 zqXo@SMg`|zSTLBv3M@#}r@V~1c;q5VZ?m7fas(5+zkcHYYAHeK`g2B78`N@!ufJbX zC!k4o#llPcIC%9_Ij?G>qk{WZ0}(p23q8+v2etTV$4FI~o^EdIE-ZjN0adknLUUJ8 zQwm!r8I=ElpOT&c{MA41D9a;R3%!4hJcuKPQnoc4;hY*ucw`*DAmC${P7uxqToO*9 zV06;A%{1iiE1D=VR>Ibs1Cc^ZKyY86q;NIqU%={dH309aJo!~z0}wYyZ8T6ObtATbINF;25mx|Zsqyn(loDj=T?WPu|m>)E#d zV0Fj#+Ovu!utAYvb+JtLHtX@7@ijS&mNeR?s>nuupoZFnp!)t_uS@A6G8-omtmUAULJnY9)9?X+W`}7 z8{EfeEFa8oSbZ`)#zj*(=NUF3ntP|G7@~0nu)UJHftE>1#UFCy@P|>t--?aO#^KJ& zk3Fs#;l_2{!s_acd8K*E#B5_NCdEBa37}+h1S*W@KAKfuJN40wZHaYfI1p94Z52*+ z_m-c_Lwp~d(`nNl-8oIXbY3)-VMGhP7BI34st8rX$Ed*VVE$Oo zOd`uH=oIzyXh`PRcfYr$EwAPhAZW2Y7IOO{^svZjjrZ3Nwe#c@NH$QMg^ zOIt?mEcC zZ0e)a>F!O9CnIAL^Z=p7!OB|oE`wI)Z`O0ZU|c@Ui+fn){KhFoMS;yZQTLG(K&EJx zt0OH^rY%*3J{`^ZUvGihW*6!`6_*s>ZdNoY#5!u+NCEdM1sS(ntE9&1G_OIz%2^ho zcFQr^8fbnE#R+We63?a^(N=u7ASCTo;6WlutBp*b>hYYnw%>kZEqbOtQ zg^!?(ZwY&Dtthl(Q9z9YD6w+pU!;WvyZ1MVt+okrR82*L6)iR@EiZnSE-XMmiNUfx zz6at-S{4DMM#I0G)go<-6ofOMatEd9$B)n5uX}k%q$!W5X5^OydwKPiYDp;n@HP%| z(s}1c#}|l1s>mIPnTf`@_TCY)9E*Zni5(FW6E(#m%h(K07=O5$n+6JHz0{IiBw7K! z)sRGr*e(@e?37gzAZ#D*2PMQD@dra3B=M1BZA_sYMHMytBltxJDSbO?$O4%T$K_LO z%viXQy>-cz(61;VJ9N#jE4Y@XztZC9Kf1;q>MJ_Nt($h2x39!oCvi>+M{=KO&o!?$ z@O7|`IqhB;D{lc=Nr6Y2R~rFBC+HwS$`2Eabi3ZY~{~eEC8B>m=FXw zWLitjAHW}6}s@Kp(4ZE3Cll*NB-m`T*xB=DPS$7VN~0AB>z2m{$6 z>w=32hh+LoU=`=J@`FLjPyMUwmggo}`4}5^G^+k2*$N2vWCyFVSsylJ)kV|iO-vS^ zp{CNaPDvENkx)htRsOheyXs49*Y95b_FD7SA6YOsv;^mH=<*LvbOp(jdBBJ6FeGGO z3h9!E#HYS^PpZp~pqF9cQ5*4j6r9{ye(>Y)Sh}pmriwL+y~CusF2J zeUyc|yW8?~K(!=_j*#aWlIFWxq>;$vbPg`KOaqh#$oSV!9%Z0+U?m84h=o$?7DJAH zvY_%HieNwA8-fRpTEw3n-uJVlhuc>UawH=dpVR~_womgPY%_U0k+vwLGkWvYXL=qV z9sQz1ag2`S{BDoYBKJ+YlB00)u`sFO8Q{r=sZx=BrFJW=zx*M0`)t&ZL>SUsrzo)C7L!QE{xIKcdQ}q3Q8ijHLt$=e4aDdC=5^!k3X5jC3d|J`x z+yt3pRfsC3SKNZRt_$?d9@@i?w(M-LjCGW(_zuq6`A#ps->2IL*?p?BOR>cKMO$qO zI4(sEwY7qLwa4{oCvWtUe!GQ;idEpfkgyl-%YGlvD;;yakeVVJPwQm&AXL}yXZb%l zTM+2T5i;_up}X$i*4FTFUhcU12-X6z-TVAf^@Rt1^@Vl$y1iwjV;uj(D!u@hW0Ip&rmk4!{H_7-fb z&gx!EdaQMMuiF6&LK``?VD*T$C+;l_X;M_*3%A!<`>osHbZXDF1byC0@qwdv3-el@ zrx*bY&DdbRD_T@Hz_)sJH4n-+1F8}dm)--hF3}paTk+y4rj$zb{ud5+nIXA_W2`=E zfRA+^tO%%AA31E-iH$UbX5UzP1;+s$Qkkcz6Rl;Z0KyYN>yrmbv}LfiP>7MZFRhgt!oPqike+Mj}{bmtwSWpO5EDi$3({tdV&ld*j$ zNkOz^tUFScj_^cqf0)ObOMajA8N@tY0}Fh2LcxBI{NrmwDq+3wkG#=T9T(M-zXTYA z`}EbuzI@%ll>?;1FgR#w(rIADm7tKvm-Y_74gbXy6-dl#g2zb?jI`km+?a5z4^x=b zbHNAJV7fQXRG4oq1pVjGPm*lbn-L4%mD3;gBiE;if{Or3!!sEU_(!vzqN&JFq<&g3 z{i6_(NZT3k)|WS+SP(dJB?9O5uX_A^Mr3)FsiN~deZP@9eNEBVvkn=LOa(e0Ubev! z_XSFQkmLzeD~L0>(UE$-1K6(j2)t9m)~k1|BAe7L%y+P@DfVw(tKBTK2Q0wbQ}&(^ zh9ePYuFO|eSfs?_Oy^`{nCiGpC{b|4WuL_*S{Z6maCBv}8rOq(3P}>*T@Fv)am&%a z=`C;|O2}P9sPko^jK5c*5X^iu$}#Hkc!d5!nfP_Du%hXv8%R0dl;_Z+=BdPLA$_|v#NS4ld!=9t-a{uPCov$E~u{*-UMm3(~{MuB(}N8cc8H@)rJHpb$V zqwQfW#B|VPVI(N%?l#kRuJH)sdsW?d+;=~hA7|t9XUq1`X6h>MdiFlO{uUdkPFQd@ zP>=9e=a`8Wi1?T@la_b5Tf<+B`71vcxn>Z5;r?)X*{e_xbB=f-{MJd<)P%6WXmo{$ zX8lUrKoCM;!7LSI@!$B;-`2>jMEm=En|HC*its?i$OWLc@E$ggKX^ZtCxaaWYH&92 z^MLFlVWCO&ugvB;^Tqv6a3r5gcBAEqD$$rDkzjX>2y2vZ^!-Eo@FF4hvJzvIgXG&L zpu~j&>vl95t=BmQz1O*VP~EY6*~x3I#)7W-b`9TGu<0f^tluIZwfRPW+9-<1qVd-G zz3!5fYs!Y&Ub%9ow{<|55O4?r_-=#KHO*6Jk^EMx0QYIOfnje~9Y7hx>fmoO9NRdi zG=-+i**5MH9YHfV;DZyz8U`w3n~4b;7sy3oQSkpfQJjd6s3ANlX=&>Fz4F49 z5?1mj&v)PX%*6YL6iZYInT+CHK|uvx2Q7?5rZfot)w0jM&9G_iZy9p zKsxe$8i1eJo?wvY2YyDz&bSE{1$|kVlK7aQo9NnMb4|5HiA|lgT*@)TBh4Ocu%pkM5sdfkevRJj?m~|`5`7!HcMp?K?U@j z0c<_DR)(gFv4$J9bM#-P26(rbST;i}=4CHb`=1V&W?mf7^{SYsYc&SnFVgusDt^gM zWc<-Adit6Tl1mA0*Ts-rhkrsxlvmLo>xItTHckfzSR-@e^KAJoHxGGC&$?hudWT8XrH-|<1 zLQ?QXmHf63p_;JXEQ_21)k0bD>fI)FYNAq}uE_$~qv(}Up_D}hK{`c;LMd)!h_EYne+5rQM&93u+B~q|y7AysvfBe;;A=5VxEu%XocXN^AZS zr3G+gF4j2D#f}*a{1Vc%Ev4v-uF~Xn!(QB%e0|k0vr6kT%{4?)avG#xCeNmLclb+HY&=p^Xn5prB{%h z`mUnQ6cA^&ctt z<&ZVY8eyrdnyH%*Eh<98h%1(_Sjr6)A|oL_RU--KR9?*cpquQkk(&TJ2J^ukN=#V1 zd8~UjG%le+5iJ=Y9B<~Wzj5<#LhmqnwTBk_gDz5|i}S~Ye;d;Le!TztjLs{=A0MGe z{62f*aAS^%0)Bkt&j9A1YyOmaIj_31OQlo@H}WY*2-VY2N=3Z(Ckj*+Od}UY^J(?% zjnNbLU1Z3Nfs>9@M#6eWjIM@W@7V?J#165nf&HF)LS(N85;X^2d3Y;wsG5ed5J)*V zTCt6|4kX>S{|9^KjOuV7PELoI8b9}Ac5t)zy~m{37Tv31AXR5Mx-}sYZiT?g;KTKi z<4Xs#VF%(Yy9@1O9##h{3RGe?EM|r5w~8Y4a@qSjZV0j8$}hp4I1Dg8x&eDRJ^5?2Eb@ZvYJA$Apd5LCxLE{lOnE#Rpz`s2rGzWj zH2wZ{tuHsE>HbHD?s(*pHN4$~V6Dx0ja5fg}NeYwFv&v`}FBa&^?b*7UX0UV9j zr>i{CEJWPv11!L$_a1uxZ1qlc$;W~~4fuL>3=(myO-0m60-FSR&@ef-o z=S=G(29Y>2o9{yAT(c#KJF>?wItBEOHYMMVBWE z_+sX$b;N^Z_)9%I?;t~5=hY<6#2eZ7PBd@lAvY(G1w7BuqoB#WUh^IOxsCryDTT_3 z)0zg-`OcuVEb4si5AZs-<0RNrU8*`ekgXfz`4>Q8@phSwR-9<*0N-fHL@i0;w`z2{ZFls-hKq(n{b-a%CgI;mF6GT9q4FB|)^QgQ#Sr7PxGO7u z*1v8cY^CwtTm+bGs^B%=H|Ai2xT}d;DPtpjGa#K=F>LP5_GS4V8850PTb&Ynn|F1S z;T%(7xDM7R=4}CPB=eeDtoTF3V;~~k=(X8tj*-HLK22T+mEF~~KQhPC;k7;O z{_IC)<{?+iiVo{U6trFW;REj<(~jFi3go{zO!r9Y0opD8jpVzq7ynhIC#k0<;I^83 z&`=slZ!+{lR@$Y7*8p4p?Y<3o~rNb zuM34U>vWv*w(^C`3^|Fa>r zSYz%xyqqI7zvGkAE6x!QGL0U#z2o@50yH;W`ERz%$flXQli$qiVvli^#~SsawyqR# zjgVN_9UzWvwGX;>K030TH!*VQ&kyofScl2}&>F4{+XcpHlby$ zUwXc_PX$N*HLj{23_BYMuAa)hXPR&9*O*(SR4KtmpaWv zj*)8KK>Sx>v)wvxdgBpONDw0n+|HYS%KBtMSs#~}EVSt3C}xgOntgP8!IU_Ohb7Pt zs~VJl58({?$@;k;-DOfy{CYnQmz@QL72}VJ+D;*jQ4CkMPKs_qh<|DEsxh?U%#{Y9VRp*2I@Q z@|oELhzK#M5hQbtzf~?(YWMWw)eD|`XuPDJOm`M^eOaQ4u?dhHbk(pp-*oO$Yl+tZ zK3_qp;I&cik*}t{>0|`AA!((^O;JO8vh^6l^Kp=J-yyR~tRJBzA31BJEbbV%pSa|N znv#pBj%woiQ$mrA-pT5#qbS9oi<4^IZp(Yes(879^6n(WH)h?e9Dy}5bEdy(bwsMD zzFFLICW_X?oY`24Kv%@x=)`Mq8g%-fRK^CQp$|~xTVQ5@MY?`$cTbTcz%5Z8f>-5b zFH;NXn0Y)R;Lhj?nXP29LZF(GGD);Enz6!@-62?np9K{!B*_wmPBaWdC_R2XQp(*4 zBaleaiNK@_DNahPqrjeku=m}vDx_R3`9O`HALsb}|7;3mi8}TJl&HOma}&Mp zLSDN~tb?Mq#Km2u>EJ>#?|R|w+4QBh`;(I05AO2vtYXJUFvJ;%S>g9Y6)VfGC96N? zc-zino;mR=l~bXK!~nC!xXW~I!R$@bO{Yx8?0s%uEO)SN({{hXk>R|0a$kS9S;vvL z@*r~?HD`BE=sB0O=X%`6Z2i8B{xHpGV@o#D8C|O4_o2W7fbdut(x#p%NgL{{Jhkfi zhmi^KAm?6=QxkB%d+x6DlWzX%Z>@t?nlO5nM)2jsPc7AeLcLV=1j?745Up#HCvGfVp9IS8|* zI|Q;x@4Gzr>q!-C{^4#HOAS;n_}zjr?yoKA2EcRz%lc$v% zQ#^x4m<%!YPVcDYFk|&GM4uv(QDY3z$j6bB&`4BJHy8I;BECMcCk`Wzz#!283=srt zRSi~uGS4#L#PyZ?WQb;HZQv5g^#9Z==;{5qLLx|Ga_tUJ?TZApJ{Lj zbOyMbgajpFSJPQly`-A*D*}xu*n9|e291Dc8>Nmx8sZ0E7F4)S@7q=4VzgMWadEj? zdX}$$C9Mp<>9DLG*-#J-gG4#BL~DLhqCRl|Z@ zRjp7nHjE)_$PovpWu^hqv&kBTDNJ&o>cf+prl=*@ALh5G1Gqu)ZxA}w{zjiiRK8e*U;(#;Qcu7SyvG&;bbw+Nz5x4Mx&SB*7)zis zr_qF=S1X#+I&uXqx1_}%B|n6!D80Kq77%E9EN+QuI&t}QC--B~oEwC09?_s@L$ONQ zJFg3;@>V@J?oH-nOPFQ@i>R>2e?&7t&LLV0XKb>}C37;w1b12ZRjcT2x5+Gh4FE4& zGQv@pWe2F0c#8K!uOO27TuFU1(?g!Zqq!I!rIYW|RCz9jcP+YBPe9>_UD0G;6`*uJ zK5#l6ktQa_nAtQMWhZ|{D$Hj2CbZ7<7uKRisI4zkwZxv7H!j{6_VJXrv7#D|e8I{ zQl}nECuLT8+RaL;j2`bdDflF{Nw`1Sk;#%ccFYkf5KpF0>Tm$pNsE<(e1$;E6v>W_ zSwZ4$8%K^H_GJBhM$ctU?d1?fuj3*K{8Qq79%zGEwpRc~!$&J&6eWBi2N`u40(Jr!=?Yh3^Inh+^H6jkys2jzz{%VmRV~nrQ7sKD78RA}~rl!pM z*|d`eeo{UmoFE^+CJdveWf}-y=I4&RC%mq-4?=Vx&gW8e=r;`;>t51OtwChjLfw3C z5w0LmvG=;Iy+r|kof2GjGbLfVvq8HrXm_~CYgvq5g$MB?SbEg@duJU+Ps?jb&_&mH zYwLxpv?Cevwnlj&eUR^cE$JEAE->>G7cK6#ZzeaVSA=zqwD+Z5vDPdzGuZ8X@5>_K z9m8934aXYfdmU@f{*|EWst>d(8w+ynwU1@x)GqwJKG5`zv6>;Nm}>3!g-8C&fmC;v zJDi-Cp2$wLy_|P2StN#;Sas+9+8H+`^7GjHxkiUg*6UF#-COO%kHjOUYHd)-&Y3HnGF) ze~y;Q@5XM1DR01|5K<1U zQW{Ln8L zp0$$ibLDY)9{+kX^gT4ZCePZ+zVWA2qRn%-r_(nggUlfx-9znO>H zB8x$Rgg0s!fddTJ<#;*Y#r|Jmr8%-?stb2kas`{uL1d2{PmPv;jjhiHa`{%G2T8b{ zHJjot;|kB2JS*A32GI0sD?-z_>C=aoOnuYY25cvYkjO31Q(SI(^LAHW_VyBn* zQxUdc4~73}&+z^2v-8MDmOibb;$UMqM#OL=Qkw0_Rd7?C8$9`yE1vXRw@Rh}ZWf`N z63>jsc32%mq0iAF{%M^y&$?ni#w}%IFidxp+w!g9`EJ26fm_hB*YY7(0M+bEW5mf4 z|9R4(F0)dQz9PXUqCep5evR-+U4kKOF2fiu12H<_bCRulu!baDWdnN@kg`a`zW*ZF z*+`{P>ltXT5JJ*GzE+i2r9lMtVMzuE0Mrq#g>i*R?*pX2-Hrc{a3F7QhkI~2n-4q0uV_!#AvLUMQtJ9k~zAX>bql{exvxKu#|b5RQA zZ$b5Ek_eZ?x!@#Cq_kolGUN1!DdHNmF92}!A82{I#;j2`xr^#JhADe*j!YcLgMHC%&)kz>?Tdtux~iCPn;q)I=lxT=?y4Gd!TWC{ zlz9{_rBwV|>#Sq7XdMbK3&H)m)Rg+>F@hMf_Y&Zd!8y*?;H;Yv0@#>f7CKw3B`|H5* zQ-U?tzRPUBg>t??6I>g1llTo>VVwTeT!tDGxF0XpMNmC#V<(D1C2>oBtak!y3Kd_y zsbRumhHEc|hXJA_B61)3;|?{~+>bk%scHQTg+KNsVMDUuLo4Z*D$BBcsSkFD) zUTfMU8MiJ58<$6UFYMQ^cxn7Na0YZXe!K;YDC65s!?_&JP|w0fjg2%)?R9TGP)lok zqCEd{!QI6LUeCVbyIX4Us_Km~*k$(A(VUXveE&{)pWmxt(VP9>TmY}$myeTJ5ISEQ zEU%>AwVK;bzU)gxu*?;}-QT!6B`7vtvb{h(xb>3?ohZitNN;vyz3W16bMeSQ$FBps zTB2FW3jY*=y( z3evWJUY|GR6TN!PZ!<4Z$Tj^k9)XhrPa~q=`n4t_;1aowP?rS?AFG6p+9;xji zUl7>2pJ75uC@g<(ZKl-U%Zf2Phx2{nVSt7~7Rf7|_0)uR`wn4iIZe?Joe~q3Dvv1M zfZbiK+~gh*bsUMJTN6MLNU*j;|C>)7P^#7_UXP$!Qm&7IDtWeBYn(#oIe- zp*M@*NouK9q1@!X_^XjwI95S?N2v4}6C;j)tUZw34(k6pNfal0ETmI2Z7_%_%yqI= z;ms3^2>d>AAz}O(v!b26nV?gk)4g5tFt+IGGbF36=ON5oV1!aI>$Ba0i*UQ0?r)BX zrTHxT64QJuoAT^cwg`zM0$==-Y$Lx2mV!Bb?w7wyNFQ#nc%oe0VpSm}o;E{`OP7lW zQn|mjhPTYw9X7PfzPm-?U!u&#^-J^_+_i@sNjA%CedRa}~M)?~jw&2L@ zV-zZzegXb9;%*yd5m7PhF@{8szj&C}V{<$|Y*d2>GnaId*TW?qY*ef~4Sbe+NM4Z>!5#Mf@Q{M` zTkr1^k3bq}Vt%=386@#2DATg#>D$)S0QBtaPI$TF-GW0Y_s|mcfWGOKObgdKf8)RI zH1&GcLQ-EDE_qv_SjC;5+5$+5XN@aJuJditv9XKQ{m+Sov{J2`KKn|2&5+7q6l3iPR*u#jA49FsKiIB(|+wd+TT$}(izdS7H2|m-If?3L!-ppS5 zPS52_e0j*PyVGuO=Tr*u_r`wd9JV|eHAZ<)unMBQ(XcCSTkQ?nJeo3?Ak6TY(QIYB z8-o&7FB#w&_(+seNwq2HxX!Dhme`a!EGd<~(Vk^Z#u?XVc$VdVwkd5 zi7;Bti71B2U*FFi0(Q2vgL_X66Ktf(pUzwc@Z$Z;_I1ZK_>gk`hacp4gK>od6HW}Z zRy%%`St`eXoJ;<$Z;U|rgHZ?bYU%N@RpE!6C(VLPa`h< zR?*|hwtutzph|BQNol=bo-6hk=J>qh(&mi&#xJTf!6G>a#8~CIl`av{K=-A?sQ)X=wp?0t(_RBIw z4K<<&g|BIkKaVjrd2Bi#( zS7h{8Gb^8?%2xUIO5UL&3*wcA`D;_^w5Xeacf-<*waQGfVvQcB2ZgVWws~iO9lkYV z_^dA|@DJV}IAtu&Z{DuAcxAr1WW+t{tNe?g0bNq#*OB+;i1j`&WAM;RgcULmw+JtA zYNlgHU|A7T3PTz06E>w6Ey{WYZkqY7%VSNXf6YW@9v!0dem{D1COvq*;A-->Q6}@H zJIwghd1IvJl9mT?qzUVCWi`(0EBk4f40F|}=k@7@(B1o*L25Yf3_IS!VxA28 zv;EK-z)g?sYL)4ARqSroFKwNQR}j+aE6dUI8Qb__)Z(y#^JD8WY;mnL@wX`jET2(yHH8?hIy10B4WUisveeB_7EXIO)OIo;5obdgc*VoY7m z;>6h6P&lN!nlBzi+&tQ0z11Q@zOt(!pP@1>5bo{m@!B_*`(b0qhTvRGeV9F8PENRJ zHJ4L>o0}NPfF?l2NYC>k;pXoM+B`L}*GenyL%?^h#O+)MEMG1((v&OnvrSNBrUa^#+ptRC>*K+y)kk-}l46|W#?vR3W?4g~B{`EY8MSm5JqH6) z(F`$o4N7xkLyc)C3q2!pAH$yMyZT7w)tAJ)TuS0}P2Fz@Jz^jic^0{r@=cc%^=F#W zZ#+Y_uLI1DH(!02K~>){>6z5Vqfs|0?dcDc@S!QOl07P)*6cl4*% zP$D?JLOHRlbdOS4M)642IN`n^gV8Zn7?TDbxx_`hOTgJ6(HYr6b+$=xg}(x zZ&|~MG7Noe77sBdt>%CvL+Rl{h1!E^L6q=XGShIhK-<4ve%ZByG^8QxVmg_z`vy^J zbC-r9@!HBP|FW-8Ryc`=pHa{1%`@RFb-3FWx(98BvOz|?r%Q`}b~B$R@M^_6OijCy z|J^NxnluUMI_Vy!!ah7;tEzYKfv~rLP0`BtU}F`Z0+FT{-{kqPy0g95*4aNzi&gFo z@MJg^Imqx1bX!N1PH%nHbsFkD{Lp)I z5OnBm`};D5ABjHYvVnJ7!3py4<0dzcZH&bsD#nslu;tE+h&R6A9-)6`n%F2kn;Q<= zGxOt6L+7UGtjHPEHX!D)#&3jh$Ej8R#AG;ZSbcQ~fMy?K)a#(;B}DEfBC;7YFGc+a zLU%q5)Y6td>WcsemIV+2Bo0-mf-)=VxDLYA03pUu6S7@;U;PJ+H>rh;SKPVXQ!;Qj zt0n3F)YzxHY+=s1+q=p)o z2BmC>Pf5pN2*G>fFsGmNuYs#KF`~=&uelWv{e94j1fJ~+Gn5F#a{Hm9KRXu{?5?tO zbdOi(@VdQPA^Gj>+tKDQ3|YF=nMZj57zM0ECZnRU}9 zO*_pu0KaYEOgzmU2bwR9^67t7s@K;fOiBXhMg(SMM)~suK?HTV z<3eTGQ#90Y{#B!fFp2gJu#)xzP86$Oh>v+)K+1kPb@+Ku1E?T8Mvd_S74Pm;NfJK0 zY4kfYOt`Y99XgQnhT{a(Vf7PI^eW0b0EgaGnCZpM9mrjHU@R<%z)tk+WGq6Bx>Pqu zGlQ`-QZ`ptuXN0D$~AY|(!TLE5*ywdD{SD)J9PBf?7JOpH3m3;!Ao)yy}7&O-Ei;# zM}cQ#iB19=+_|7*36JJ;0O@e!)!Y{FPlTtSgP<$u&;I)t!S5vCGvAeKm_C92R)O(S zz#*gj=L3`BJ|0#h=ycD)mr|dA&ZlO@DvN?&(t?d=BOXW01GwQoJktl=6bno+i@4Bf zW2C2~3OG+=2nU7p;2sF@LgB1hG?QTYoTuiXFP8H6n8FX#L2Rvm&L7MK-14;}-*3bX{ z?th-TY5{7ny6Q`keVqUC{Zq^Km!@I}ql1+#KU`Zw)%y>3IJ6 zlMk3*PXb#(=f|tS)>dmdwbSV@C{1d6_;CM5C+bRmV2aLAgOv$N2lw9(fBN{%|7x}d z56tyijeuQyV2Fg6AeK+@xM|QoUVaC>jO?d`_qYkQgJ-|DT`w{P-E(}LaqzE0^h6n? z{l)PAmkv0KfZ6R_Vy9CM9%hDM`s^Jl-s9Us5aD$Yu-Q(XjvAQp_RZ7lrruKg1Q{@` zGcnLB_e>aKTSL?n{X^?OyZ>Y7|11%!ATT$r)YhBy!M~Nz$Kmvm-a)|<_Ccq4d>KCL zP*w$vuroY6aYEI4PnQgue+v5eLZ89|AbS2^h7j#>zLk$U^?bIy$iKF-j9=^&=zEo5{k?HGFh8A~1!!FeKgptXSWI%yyfdd^#mfAgZht)J0D$4 zpkxeoN5SWhF7`>tA$zp`1#oeb;Dni9uyOj|akT%%#X65J*0Io?0j?4x02cRR{IYrc ztl%-|Jx)}y{o`Bt7(Ke&qM2JU1oUMq6j-dof>4Rwr#Im1==>0FN?m`T# zx{K1Ak8LLyx#Ez^z9^S!8G#lpj||thEe$G3hYL{x&g6aJc5yPim0DIIls`tr;in^k z$1M63K1{-Y3(9aG^%OAh)v_J^umGq%XErIUGIlwE!~~J+{WU@WHjZZhd8+*&hj^Y> z60@F`fMtS%6+%r|IXK7HImcd_UN<#M(CWC5A5GOSHT8Xr43~qfbRt8F3zKsoVdGYt z?#mIJ^E||!lP5+INc zZaQCZJBymmdSvshJ?Dt>r^foS#$H*A%u@5hg|E4DhqtG>7M@dODPk5?qmK(8FY2m1 zkuuTqbNG-!S775~)msEU=jezTeey=Si*9}ITZ@JPs_zVuB4;;RM)|J@x!LWA@i&2h z4QC&LL*9YS1)=s0V8fjUG|M}!)hd!8i4OVRr`l0gGa+RSH7m3V9pV8Jk&n6?#0lp> zEF^rVhHA=(2ZMI#y#|)h7QK9&GCdlCAR$)x#^W^WDv9Z3kISAUTtl!SU1YYfcDNYCj`T z=owwbTUy#{1AGJL{miW=gY*YRT8R9Bsr92%x94KL%~C-_GdP(+L7Boky50BFzko)9 zZC3(5G56>G=ptrK*z}Z(Mia6v2MZ{#HEYPzIXKHuoZv(Lw-cb@Z9r5G-B`jMvx*ruiRR&>Ui;KX<_l} zgD2pva^%abLK1XWWS<&|p@W0cA8lTw2Vit$YQQ(ADbSF$mOc!Hl!9UyC`I?jv$Q z)=FJ|qm5piL`gN-+e9}01Iq_613%2;b1-oZLmBojyaNsO+--V-#xamw3|sjjf?q!VTr4* zD1j!RP&LJ8Vx+Y@*D#*mN0=1Tw9AwMp9yFmYI5~5`BUh$X}CR3dfw=;g;?R4I{9=O z=3it)47BLF6)+j@(<}xys6uClY}yF<`daVq-8nP)T;TtF<@?+eVs*HH)P>SFVF<`?{==>JhFHcAZ%4DQC#%G$WBxV>J11FjTKl z6BI9(FW;6G;2wyr^IxrD)%W${L#m~an>yL|@4@SQ4`$*>*<9MQ0^J-iUCTzO13ss%n5r=R%|=+57$)VtI)l$-P74l80(tn<_*#2gG<5 z_%7$;+{|{%+gc%j7yZ*E=U`;p-M-C1`*XDLP&O!cY;^dJl|0{h{3FM3?(aQ79E{OO zyPMWlkFA@8kA>?Fcqr$UE`%}aZ7fy(e8jg}%aKH#LnJ-9n6q*D^rb)2o$U4gLrxe| zs7cBdWTJ}t3+CL{UObZqfI^@Km2FdM5XSm>*2J8POq6FzGeGl4!Tbxz1U2w%BpYE~ z0($wngF*Uonfbona;s?Cu zG}PXztE>DqqsQBIp>J{-GU7K+Cky}m%+WsfxUlz9A8z~ZMq%ZysL#gw<1hQi!hfE* z>=xdiLoITjN}QxE;ViT`Zs)sJGc%-To*mNpZ=VOb{Guq}!En4Ticy`6;NzlX@mF23Td(tUmwBK4y0EI8;TzPq@u~Y=bw}n? zcNfwNhc0_3C3=mgmbW=dMn@hg3(jG$=FEVs(2IN*Z;p2)W9=Tgkb&Mm9JMdxBzr{} z)-d)AwRjuu+;%A`f7fx7kB4IU_(Pz>&_yf`oYc>4)yMVT1ojdWOqba)P1Dt$^YC^& zlfA8xb6z)B8=YQk8ueij^*SCiIyxuanG2??QyK>DKN#I}ue<0EA!AnV6OtG&<)ZteY6R9jri>R#}Gw-wu9IO8I5$d}Yh_Q0| z$NRQRM}M_l21bd8RbTi$>Q(?hQ>rRwkVuZ-x_VmkAT-?WPoBN07C)Tkz|4IQ^k6wj zNA;q!{KJ_7=hyQoNFM!uo~WTau9su%SWD1isJCOhXRwFty9; zoU4t0F8nRLw>+d^XqTvZF6(*>_nnzu{6b-g4Y9?rzBaa;9x28A#zZWwZMv0G%G&~} z&AT?yuwZ^#g`co-xN_4w2jM=1qUVx`mNswYq=-IT9g96IE(665N)B;&+Fc#|!~Pxl z8;8PcSC}8#pXT>rPkvO^w352&*d4aK@=iV@>hy~5Q{Y&#PInrFL8>FhDhkhYE8j4+ z{$c$5*=BYOyn-*-a3q&BL)8N@#~ul&FFTQ$9h+2@dl%hyOCzm-Cc)1~fw}qPId3y@ zL%cQkeu~VwA9^-_1AgFt4SbnW_^b5ogjnf}V{0kFVlDgMYaqiVmKXPvcL-yswI174 z3zr@mH>D8k>oGxZOj$0V_8w3W4IPXnT!icp4|>s5{faadiNhI|3;I*tf;!zZkXy7H zVC4)j4Gs^L1Mw6VoQ8O!Vo(gxk2Xb+5z7+I)%%me*l2JY}| zyzR08beYKO%AkJdM~O25Qn8IfF9il-$+6v-mN+3Rfpb|Y`}sW`G|T({ICrL_o2nV& z!4U`ZXIHvi&(B#qP-_Xi=hvUd>aO}uo` zzYGa;$YRBK3r82M%x9om8t&k2={I0Tr?*#rxwe@2QT5hjn-70aJz>98$#C}FCo-+h z#ns=I#$C6+V#vuc$v01oh|IQYTfV|+T0KJ-`{opmi$%Tbe{Uf2siN(U*?apL71A@A zjO@X`jJ%OnH`cALqUwxIrNZp67Fi{oyY}bzlfTx~wtg$nHvB#q%NysLN^HTnTgLoY z)+3OM3B-xg7ED(4`|ytGLrA9Mx~pQ0dK<)C=2_^x(kjl2Bi!XOD@gbk7rCzNw0N63 zg^``UWlPwPD%J@;Y)!0acZ#UwM9<{wL!*NQfoz-RfQDGzf@lRB$F!!i#9R2cW(;z+ zp-T`uCClm?sM`gfqIud74%5+mV8wCMb*?0JO5P_%>(49C>SxIuZ5R@T#8~%+R!x|z zO}>7xPXQRk9+*cRSOU+o|5*Z%>DG0li^w{qigub}nVH#^#vZy7N2pW17#S?$yt<2@ z;qsz3h;W)bd!+bzrS24rA2dPeDfN37$O{x;(^O#X8Lk$z&l{U>l^^4pA5jML6NlYMOkOujaoQOO( zI1y4xew-rtY|*&n#Rb%YxgOBPQDF{I{RwLlSbXjTL~0;+QYCy^ij^o+#1e0DrPQJi zzOW^}dx`ggY*6n3HWR!yiPBx=Vu}7Wyd}-3=39=WtYUAacS3A+Rj{$ZA7q3)>iE`o z65cf(+Ya3y3WyrfU?iSq_PMS=tOVJmPeb^+Z*D|AYXk4Y69pm#*-R_8Z zwk*rJ@H(bI!GZji!~j!~HTM7%GueC(=UuiJ0gxP7o?x@m0#HpirziD17k#+sJ7uCe zS(68pfPx14?1$=zAcLPaS96VdJbIje>fS5*SoJ_n5>mC6Y{UK*z0n`Xc4UbOA}Tlk zc6~ZxdsZsUU{q0|O+!W%X5)4CYiq@(y3$9l2PgTb!%@eA==odw9fvrz=xZ zhl+$*lh;E@986vMoPLKW!)$_?#>;C&J1F>n-c!sD|CXHzQAmoXYGqWGlcqx^4NiU{ z!`7M1Y7ma$oPeIB5h%4NSD21N>DnJJpem`jF)%1{V=j`FK=s7Crl$&d_Vcfy{D8js zrM{FZ(rkv5yk3F%tEC5S;cP;kw=+n;=B6e)M>${6qAb~m)EZMoBA`MNBZRIItK4c- z`qQGhS#FQ`sMFA8Ra=Z!HLti|lUEoq3U`7F5gm-^zNBC;Vhc@?Q0tcmyK|Z6fqB?a zHG|m%Tbj?1G(&F2A!BhKWjfmW(9eo^$-di;VBe&>o26e&9tOCfQ27hHMZe*P->Qh; zBzXvpNMByE3a3*mjuYv!I2F-ae*0>gk@iV+R`F2#PX@KRCO-05>0tu-xKt|#g~@`$ zN{F@UCofr6;cF@kgD^{oA0t>3*w=+RETE2Oi`jK@qTZkSUFLa$CzlOu#6K!+7)Gl$ ztIgp_V3RrP&gsb<&W}Qh%TiZbxfV+(Rdwq%(o5ww$7AmDHgpd@L3u6{awJ@@{&1gC zNNlk)AFb2E5-2RNZ-J%#q5Fy^oJ~I*@13(ki19h?aTl58gL z*y0l+n>BA6*D_;z_spX()lRn)*P2rhYMHHFV(n(_3>QM_AdwR!^K-(hv5~L{zA#I&mbF|!W9X(uv1H>Bkh|lWlPSN9cjD7in&e{)eI+@p z8e%#ScK0#xH}>pS{d`#`XV(Ijt4YFhUrf=_B&)ya02*?+= zR>O<(*BUn1EEq$R{{OZVqlv$%k|riV45_L%DpVS2p1g~`i3x}bp?~t#aF)03YR?uQ zj!JZXE&tuYf-J+_h_c2g+c|r@27>FV3IdS#S}!B?{UiV(3MSFMq2|c&_wDcwM0K$E zLqT#8%6O|!MtmM(6|T_!_olb)HXlM+kgR&3U3*|+>xKV4xu;4v^y<_<&Rw#k+q21> z-;>bRQrn7L-pk*KJf1j_{R8gU^PI8af+qnz*q$q9=Ma8`nhChSgh1@cOC?lS=&F`p zrjg>{bV8wfQ^so9h$WbtS+l=X;lq){>6<=v8j-zA9IuzGLNObjEUx@!$c*qz4f^62 zXvs^O)sFmBQ%e=^9J9%!YmIG0y|2W{lVJ*3#PhZyvjgG?-9=;i{=fN-INR*%wRpI) zM9oK}8R%iImjz<3$q>;eGD`jA6pK!1d}}Z7mL8l)!|fO+w+#!NH>e$hQd#-3Swv3P z(sBk5sM*XO4s~603OR5x)Rs!X_TgbAG3qu))kKd^?R#&ECyXh^zol82J)Btii0LI$vJBXSS%`w zm;lN6VdyOg@wkdCo1x+#F?0fuD2Wv~(eWKfx(j)Beg1{`f~#G3homlxySDN}{CJ}h zhp>&VMYy^ppL@sp+lf6^El*LdG0E_AciWJF!{1((_7Nyv0;VNoT%6w3&>v{QtVIoX zy}D^}!DRlL^LcAU^0i5)Krvy)L}QA2^Db#XP}tCi>*+596cUBoQT68E`4thQO}AYy z`QHf-3;AYS>Yv7zHu0i2K3-*Tmp3(dG?c;`lqMwBd+o5kJK-KevA=DOw1vA7q3Rt60X&8l29QBC_`sm zG|QiA@OQc`cM84v!uyqG7f4TfaZ4U~D~3s?D_h4-YF_+h*J)L{tZ_hb`q?GZT4T!7 zPGnp7X9x4AX^sg18PRz~-`!i4Ad!wo)MC&2N38R2+K3=WOpK}0^+s?YnT0vmJ>1{) zxwzcEIt-|l$@zdHiKuY^l#L@0vgY+{prJy+Rg;{XRA(l)_av)!b|HT6lBSXB~>t^CEfCF9eTxA2og3bLlD{MD&p-&{r{J8`E z;=JwiGAFfK2|Sb`djoU4!WazRAx3h$=kHTvHubA4;>fAu6zN3b_Wn7Byv~U-u?b`~ zS2@KqX^e>M`$-AsCWH-Eek*)B%VT{_`Vh~u1-STl2DoGWr+P>}`?3YU!lk)VEZ zIj_=$%CrpTdHnm16(|TnAF}4`+0{#e)zjppnckf?5SlN;CsnnQ{m}J~@92herdy%Mk+xU4L|eMP!Trj^x@8xir-!iddf4oTO>Ya)t0 zZ(j}>K6oggBTxH0b>4lZHyxJP>0i-wd#_LFrpxPrz%$`(nuo6ZdvLa$?;?0IIa%R$ z62a%#uGYTK!W#r-C*btIj}1dObveHvm8r%C=rfe8GcSi?jJJl;m*9HA?y9uKNhoB z0)O?hlDaCvVz!iwW{uS*JCtN@Yju34qgfbd^;NjQ*Hiy$Ld(US9Hld^w(^Y3a&_gBYoOn?^%`E& zRZa>Q4RLIYK&@z!V-#m&gnhq;Q1Vs%wR8sgqJlk7&ScQ#+ysA@mrku`*SLwb$zA6V z>jnWWyp+lBgpE@TM~9K@paSf25L!@A)LCZ~VsQTj$ba7J12#@^QB{dgi-Uo=yNiJ3 zsU+MCpBk^*0Xna$ftkuip(Z4iVo}zZlZXC;gqLEL`eI^F679jHB!P(I%a8gQ8R2?B z{6?qbj~pJyES$jEZ<4XLaXNYvBC-x8@iNBi#*nu~{4F%0QQsZda=r0AclQ*o zX=2vfHB>_>%$T6NXvc{QA-dzdbWh9kx9gXpXqlXueJLI+pJQx~Scy8BWHQh0M74Be zOh4L4c2|+hHr?YIIRo)92tAIxHR&~{h3Gw|UkUL{a`uXFo zwl3v|+z-Ehi#;nme=M|^>z6R*kDo?xFQ*{TCfc<&#LLEhQ}3cTiG<+oH=$C5pom(@ zz)y3VkAbEjsE>VQV`)q9Y!(-P^EmF4f6brYi{vMWL zWmH_t`tF+$Ah^3X?k>UI-7Uch+7Jj5Jh;0<}P>yxs zwEb5ggJH|@b*rc1Djb5EPHZ`3LVzAyFp7R}#lpN+fGyVajjdH5Iryt8YzA*SNEQ;f z67&zX!+^;4}QE+K+nwd7Mk2GOESLD zy6TW=5+q(=T;5M&O)}b67=;zZm`EG3CEGv5}=$qr{pkiUZ-Zm6^VM-TV=V$Uuqq|MJ-eGEU5|Eu7h z4C_IR{Jp+1*07WXPL!reCY?WI_I^y7wY3Lvf$H3hksv?l#g8MJ_q++c8vI=vWq}L0 zOZ$EBvUX^}5(GHo1+kYLwBIC&&h{+C_XR#-1~Y~Vk=W}q5+`z$>#eOd>N@3`bu}c? zBgZWz3gE4$8QC*E@m%dq(({le(R_af<%>Y?4#)IN=;cIWQ$%@f{(wC;Qz9Q4c@{`h zZic0?*;51Lx_fHf1unq5yabM3(KyTE3O=PWl4K~z#xp0Bhk?J)rOXt3zo=2xzoZP? zA9p06r{x`B$`3O6WZ;oEs7+y;^qC0y!i7@}4((f^AgdcAb z6zhC&@S_E;x_S_47mT3toL^}oOTw0ld zE%0Zax`c%AfF5-{d#o8M6EA8avA70w0<7Xc0vv6BqzX|y#sv3h-<|->-(kMZ_e~Ud zbyU>e_1(09Es88LXZ3SSRt^ZOlH=1WN*S{;OuLa}5EJfDank8n$V#uuAWUmRT(y{xMu!)QMFO_lGwXG4 zs!BVNt;;kTtFrvJH@yZr986YMonDP;;Hyzb_7*sS2+tvz$QuwLBMQqe-(gh*IRI-O zrzBID2t>n=1x+&Wc9`-oCoUnIvHr81TWO+D9I662;~th1Tox!-{?JB-&67bz zNwX3(g~1ooD=gWECG+fV`_ljXX5O^*dF}Wy0oU2jTYh$3Cn+|Q2KA2Xu2F0A+9qV?eiF5Jo$Q|x_K$6}sA2F+QpNiB72A3j@c*^n|-1Hfe+6Zg&)fG!PtOFoTf1LVM z+izUP0A+DOspFfTMEOzPthY&ARlRd2KLr-MOxL;(-w#jLf(ggnE9Yv#DKGzLd&A|ruAXKB|rv%9w+FwGoy z?6w@u4E>puG;Z~E))TODD26MJ9;}qNa#Lz^0C$o%1~_vA!II7QM%JCc*@SNqIGZTo zm)@9R@l!eB!IG-5g2OP#NfP6!SVH(=injqhYV0L!nivY)yES%zE6I3B+6hVkTL-(l zoJR>ehFkGjPTYiXN-*;2glIgEB9(bb`4+uKk*GYjhRu?kNxf&&Kxzk@0=M9$Rj_Mt zXubtWNGz%2M~@t>@Ue7+AOz4as*e&Qk;V$FmXw9)Gt*t~zzHm4b-J$;=!zAHwoknt zM}I*MovAl?Shz9~egZ+8&f6TJ^8fbJ#G*m`1 zzERwB;VsghLhGfRfq_D5!j$d08J@V9&g7SzFK&b+O2#4YWgZd|vhp_wo1WTn2(~%Y zyJ*OF#8!on*Qh>A1%({;xvM)>oDUn8w#eBUFJWA@34BWghun)a%t&6`-Ip+=-K_g$ zvc8%pHo>$q=(^h!m}c#1!LcCT@msN~L#~Y8cyZcn!iH1d%m%Ju92Jq|P&S_eaD2m5 z_|h>Kw0seP2}_&c@08il%=!LMFNuY7W-qLjwoa7knJph|a52S>R_?z=;0FM$4$!vR zAlA?~W+-dIi<{MLY5WPFuCA4)+HIp-2$->(ADx2h1M2*F^^hSkBFCJ)t|{Xb4T{VW zv}^Z)~IbRXV&X`cV!*{1}jx<5u|+ zi9jT}0#^dHa0i|KKO7m zQu9lJs>ueYjF|NJ|mL4NK1oh{BaknyNuJU6}9NqHEg%IYfiEHVTr@<{O5vZ1GKpb;Gy6 z(&8B~zAJ`;H#dy^mI{`?jSGz1uvuU2?5-{K5?J^I;EQu?%spB>2+sJl@wHZ==RqE` zHuF+1MFn0RR!2Nj6EobXXkWtk?O)xTL7PV+_Ohymk;%BSnSM}P)o)zK)_!dgwuo?c zc`T~<4Qn90(lJ5DZyj6ralT4Pte^@t?^f-_c4g}#$tDeW;a<~pBdcSYy}!st&;34E zR`~WL0-Jo$sj=fYi~zY*0Tq9xv-+HljU9QMFziNTg_@Dv^8FoA4=a)p(R@q8=uyox z^kCah*0NCa{$;7^W@XeLuhxzE*Ldzmcx-ZnmiD?6&bBmL!`l3oYKR5A-~gE|OEqBO zVSfE80$rB53fPWYOCJ_ghlw3h%W&Z3v`J>1$#A7~yfU@Lk`*CF<>Qbt(zC!~XoFMN zdSr}}oH}KeF<-+nqhgW_Q9>OiN-AWp3+!{<;OxGCxOxR~j6lDT`cTn#mc%ZFgSmHe zSUWD1Xth9)M12e)I&$eEv#VAbGz7gB-}!U?)UE0|9o}>A<mIJKOvI}0gBS=%ct7Y=%BS7@ zJ@oJ`%>Z%ZXdIHjl5oG<5crB!QJ0$)umh^$#O#oM7tBbkFA!6re47JI=Kf1~$k$SS zT$At)K&1v~wf<7beHO;Db+;g9vAMZNqJ>ZS3;W%~7PD>>QZtD|& z{9#eS!*(JJzQ4|rMf!!$`b&Ca@=iru5?+uniJdkw{ix$7g=G+maMv+$3Q<(G_|mJ% zUb@~(1~%F~iD;w1C6eT0A}gL0c$+21+Ft@!4>Uizx`2Zq%he-JRQ$49sOMX?Vn3MGUalyN(sWKiu%lh-!!9wg zfVwMF`Qi3S-jfOjj|(#kMxfqlJ=Nx*;kDMx!&`_gsih-!4a1)I%v8ia)VB5U(~g(} zlMfNeSe}g~uG2@`J}9pD*z#}s@70Z?=b>{WfbUs{O(_Z4E@N$r@+EO4U+RSy_O{q?sVuymFtVEVQ$qvA8O8VL4gI=*T-u1qmNOhoOa=o0g{1QArbZ1uU9 zp3sJtNoVfK8GD6d3pwt7R8&&v%Ta=OX}*xIWE}P9Eg5NkB_M<2obZmSv?!5YLsWVc zO}3D?wGUBQ<5d)C`P))2$&{Zf$-0cs)%-ya*2sGTahti5w!-KHgNAxhBu&w%<%i49 zRJ``!1TmBU4&R`JiNZ~m=6P|*DLm{v}wA_V}j1W zG$u6l<>DGS1Vk+>*kg0^)>BY?Syq~pSb?>LRo7uQ#gf65G+=ILUi=^CHpt6BHX00O zxvZ*7y-Ur=Gk9BomZaH^MvV}>mcgKX{a#m!wY67I#@X2W>MVFhj1rG-tlBes(Beeg zUwpfP)}5RF6qJHqBkP@@v~R5<^;lepn4@nP_a~FF7Hpw(vr+DVWKpuzG@TbLG+fJk zLtPP0t_*#b&t!hm^aBy!lpPmcOy*~_T%X}*xX^RX5YUkKPpShzqG1h(CB?X5&|V3S zHbmAJT%FOD&(@%%+1{^|qv+M3GIJeRuDg7Ud;01BG@?+VLf{q3DFr7b(!Ngc=9@Lh z1=1eF`7R9mWfZ6HM+RCEn`AevP=Y$y9IVw0+t!h>@dwe=8y?o<>}X~m^}B9SFe^$I zN0^j;DK9a2ZC?<@d(|6kdhP zBfIOHX~k-YOrADACto^Eeg_p_3)cAKYEcw)R0V&nJ49V)7~|u!?0ezw&?A)VaGkdo zI~>^Jb$xud=04vnCReRiLk-+ikS0y*)!yvgIUaU%3@8gZHyv?nd*27k26mr?jibdo z&z=A>*m*}F`tWEWz@emWz*ZPeTMArHXn?5;voXukQV5qfLvR{a9a%yISh#jTNjKHG zhsM31&Vk6BX@^|?OtBJCU5FXn>F>g%ZSRy<8|#3o@>qjWnP-4GWZ!oLQR|rZEvGrL zbac4g{hE~G2kJ$VKIX6p-B@6!KGWj+MlV_4WJ*?nRr>T8Fmm2^ZQ)EIx7T8nqBE=n z7?y;NSG5xqL_Gz7iq#zjGsA7|x*?Y;Ei_-Ff^Mj%istC5o4-`;m)utpXh)sz!zDnC zJjU*tcdaT(to8K|dH)GCXGaB3vw?-2IqY}PT_I*0tjic>zOBkQ(j-aNOPTMD2w@(k zYQ(PL8Pw2{#{Z+4Z3a4|1rbY2^TkeN=DVoj&2#QQPwj@ydr7zR$1hWD<#cJ90p<&; z0c#qvoD@zAB^$K>#}Q1xy$y)tmauCsP!7zTlev+Ias}>lVej_;!~D;ryoVot2YqMa z*cxm=@ayF|)l3H1Ny~Wmc?3zC0fI zD2xI|YwC1nZUTDrac-g()C}FmS^er$2epgKcabO$G*(5 z-LPtAFm2=t%`C}g*P=TFN2fuaj2*eI-bJDfofr*cV3%XxZ(ygJ9>=xsGqW>kRny*U z@c{=BR+c9XNU)n>{?YI-*D3uw z#VX`K>-vHP;X4F^=%RdbQ@mnh`7qgI!_$S+9%dU>MZD6LwZ9$aS3wKcKjf;c@kGY= zcDK}L!2O(zw9!wF zgr?~)nV)u%sQv<)AxCF$W^-1%xag$i09H~DD)+U3adja7!ShQ z+GiYO5Vkba(4h2^W`uZSEUE^W3p0Hh2QJzD>e;kAO-vuImj> zoGYLQi%tn&5SS~Z+T-@%NF!LovZk4-+{|b7TM&wq)kKq4M3F6PLxeFY#vJ=Sm=4jFhmea`UG zs^bMX)l#s)?8B<>6=p|W1CILm32+`Ce}OOXr<)?+{&Yqo>U698W>l273Vq2k#BtkK z)=1ETxUi59EF17?M%GqA{aWT>d_B4}9vY`u7j|?GvaFFN>+Pzpcx@AKz}t(y9=K^> zi#1c+i18vUh-9yas=_JheL~b0mA;f3lz_oZ(gO-o1L5A@t(A=5{f@LwA+4{suQakS z%pzG_^oq$i?w5No8}m{DZ-+-xJ1&K7&o`wb31g8P0h&Vdbh39J@48zK z^ipI?;dZ3sbW#Fw=KnrnA2CMb;i{d5f?T9_p3{&1!ChdH^T?`lUjOCOwE5&qYPle2 z4KYn=3JNF{{e1gT(m;4>EHX4CCIL@AW8DGlxMB>526zJ^jEKvv4cKr^0gVNtJdqMg z&_JzfE~BmP1C6EHV9kVR`5HXC`Sxi?%oPnXWrW%lCBi^`YQ zMTGZ<%Hxe!ru6A?IJjZu`0z0k9rtI-^A-A4ajG_%bwc_0qKm=gjJVjl7=UULk~867 znraTf)F^Nw^)Xt;^@gSFBbSBfeJIdxZL_*Cyn~^v{j}w&PmVJFKiyfT&%nXa3bTkn3CGKqLcsE;i&+b46?2qB5N7gWdg z$Yq*3Az+24RiA;U()aRN>T`NYqWFBdpW5P6!@)OyecsGtX}jB4uc2cu2fTm}$+4+m z6RmH9UtVoh@jV*SLRd#oq4M+u$%h`=nRo6?Q%ZdH9_9)bQf#7cal`G*Q>ezre z3#n>*XvkhyNHy?<<69~X-~&xCckp8(0e1xj#y=F`3_c-c?_Db`JLQU;7Y{PuQAKyX zw`AI%;PfH*Y=tXu8_Q^7k&vUtB^j;38MJM!tUnKXUN!e$Xs;T(2THdLHshN^+@mImijrOPw#(!^qHKE%3E|Eh9K z>?W6M>skX+34Z0Qg*(dRpjogLLOOUx@rr%~Y|3-3ohWXtO9QCJUpEC{XYDJY=`|OK ztGTCQaJ=El2eN$4IYPFs)Btsi2XZUnGu0ZSyRiHk>Kk#3EfQ9eikXIb#t)3RmLY;K zJu{i^mJN^^05vOW96Y>Hkilh`J3*U0>NZ2lyQHohy4L}VstGfXW>Zf@g%D9Cj{V2) z2_M3`@Or*Ah0;dwS}X=Q%Cc_Ias}jCt0>`YV#_2o9w9g-DboK=fi}5p3E?Gb;L;Sn z`Sj@{P8vg=j`A)NvOp=RD&bdxOPOd_bADlbk;^Z@9csvDk)0H6iy~LR6C?NiYhjN% zbQ3ajuEpf9j26URxF|EpgqooRXxi$c?o)QHj_2;{Z=$S!Zp=Q{toedIx4c`YK_doF zcQp%G!rxdlrf~kH>+v+I+(9{jVO(=3A`X+PO_<5A^WEjdLlox`QC#YRkOF}@} ztC+&Tg-0tI$feTld2-TFJ(%cf9^b9e;$pEFPEQYSr~Whm(3`V^Sha1Z z$3xFfX>rvL1>A4ZBCT^gtnOb~4YRGDdiZ(8209_OK^~6$p2@<+991kw{eGo*m=Mho z*EJ5|zI$$L1uwa;svSc=Leo>m!iF|JhaCOmaS)bzyLtO`a8 z^Zb26y;jMx>ze8xGY-(Zeq$LkzOv&~BTYg>eISFAfaao zV%m{27U?jw!?xk`%BKiFL-c4Ked(CZeS=q?j>1()C9j>b-XJzJAN5;(AHMo$!*Q{5R<~xHa{5$!NHvb(9oGid@+TapmD++Ua46 zIxxX%DXN3NhsSxH2hHnsG`IB!rw#_}*PC`->wsF%7VoY-$M=okw*BwCP_Ou>P1Nuq zH(N#*4&kT!jbgQRha=;#e2T#jRjLB+HW?9NjgU(x! z)K?R`eClCI`8FTBnit4_;M5tS`hvA|2H?`d&o@{#r-OKL8Z|ahk}$VRnjYpeI>c5? z0LLixcQhwWo0!Z>rA+1_i`!(WM(Vi3QwlC1^TQ-%_TN-QeN`N^l)!}kVj3%8{&WJ$SU5zvad!^ev}|J$0c5mVQp$Vi#6O;^U3zbuiTGByV+1tf9LZUz@4F_2E#?R zK6515_TSUA_CHEg;0#mLU%4Z4LhN;(iOj(MJ14GK-Z=P-jSY{e;%)z;uuWEut)E?$ z5n`kTH;pG6ZxK{U?|0a~l-JBMKNnnAWxVKaTT3QKcAmn@yv~X`8(ZJ$UDP!iL*rV* z!DU5D#ps=+_Ggn-DJ=`H)a-K66QRpEuak-V$!4VG1|z!-lRD6zxVTHAY|wCKYLaf? zU-wfzMoTzgAvMPwGn74^r3{W_-qXR<*24$S;Hf5dP7Da7)H=p$|Hy}QI%m-LS%1MF zXntb2FC$f6Uw}8|egLl1Rhd?Vd?(xe{jb{bm65c@MjlngcjK!3r{Z7K=~pv+yTgnY zslI!&)EtV9=bnZ8pH-x3jK~5flcH-KR#k*OY*LPgPQR`3Gu9h!vCe;Y) zAPdy2>WkgyA-F$7O63IqM>lg$1xGv`ei3_Bc1D)hc%--QaQ;cS;t(VWQq|?6eZB{> z<*%(mKOLFAx}Vt<-mMdSnfs;m9!rQrjDmbO^XkrlK+#?-`dz4XqDa^M%oW-sUY$Ay!?!lgP6=2+D9ZEvS+|9JUM^Uq>TZ?{K!s_CW@~I|<_EJ_ z6M@@p{5kHPntsQRVyNJ)R;a}D32Fhhj%+Jc9QN6tSC+-}Ojus2)Hn=G zw30vnSk?MDCS2A{t3{tdpET4-%{VShGU;Otll2OM7DTj7Na2m%4GRwuzM~KJ>W-m2;8t~p0AA(u#t5lS@SRWmK6B_ zoM`O!E|uwsYAqi_oK{YRYhI*NsV21#ARHk6OCrHDNVuE&$0~2 z5_JTf>#>E71nXQT$Sx_IADxOsF}IGVBb!DLS9RWftJq#ViJ!Oef}N`UZKL5jZg)uq zJU^EbnLGdq?Q;9g{>CD1Mv34?EmLEM#ow0L9iKYrdWH#A3#oMKWq#OfkbC^nz=%u! zC`!L!!*jh7(HS=EV-PJm9m-<~Iza$;p(jZU=Xgnm;&HU5-9Ppk$mhuGwR^)TDR~zBu3D zb8Zwn2`ggMHC;Ln`O|c*i`T7*&#{!o7)m>K*Wn!qz42s%-e|JyJ*<$z8!Gr;q*q@Z zuF}|v6fAXsP)1nw{@mbF;O>ACW{CTnXdKcG-hUb$uS?#MFS~>Loj3;AKu6mQOQ6 zwoMp;2IL&q`b=&%N>c=0%U*Ygr%O>tFm4IU1WKz$5x^0`qevAe5>TVa8A$2GY!;R! zhvGyZcyS}%SYZ$60y)qMl~HbMQ!~l;{#Bp5ouwEHKJw(D zQ)}rB(3<>+cyKvev?YDF-NHGbmO$3zfy9HQLiPG%Ji{q%V(}(CYXnP3>T9=2*)JHY zELClr?Da(5W{R)I0Y68%J=CYr!i-lSdKJQ_G3ou)q~yyxB$_B{%rNf^%)}vQ1u)MD z=L^%-WP&w|P<*|Jj`R2ySc*4|D>W^tR8|3Fh~ya!-s`N``t*Y4-7J!%IMOG?9I zT=Y+2-OX;RRqaxfc*9=(l;&Jy3}&xB_YY!7hFmF2I2R9rc5EeO8k+;VH>)j{bh zX}bJS5-}0D)XQ6j^whw*ByDjR><=`w>?qDe+hh@iSkKmZ(q4hZ;skFruM`_1E7^tEuDfKkbsw`#Lwm7t{ZW>GiJzZm;rbGnov*fx_T5QjR3hZw{SW zT6Dl|))Po%kBNAF?cglJ@F&nNOo)y-mB_vK#E=bdxCd9A>_*tPs`1Zaf*fl%1AEzV7IjG><7qc`Z*AQjbkeqz2^S)?`WFU zPze^C;S7UJE`v`=MFa%>Hx}B4k7H{kZATuvnUnhTEz&{wN=9}S5v|z8v|>Zzp2R#(JZB zdS%1l=><^*3NS&}+XAdR;ReM%oez{$!y>iu%(ieEE)Iesst&<{<22QX$C| zDJc)lJxO2BFF0Ms?U4NPxcbv#afUWad4_>&LY%;SY;bEZ&FNK7ov z6mViiy_`j&L<#qEsd=%CQSY+>Z)^~mUmR5aqu}9IP%0bnQ^_QHdo_zw1es%WIW#S@ zdWnJAU2=M7Puls`)%V(=s#!dPg!_z@$N!2B!e%qmkoU8teB6$)}-NAfGW_>#8=E5RY8Bnp~_a94@KMDYv>r&$JvK`;tQ@~D>%7{jlHQ&_}Ia|9XAiAprzeO?Y6VY zjwW^X`&pSuS@Xzt!X^z?OY+|yc5cTfS6ly(QHIpp-?ZgbaY8I#xUgQic@QO46!B;X z+&LQofetr1g9&v(i-XG5I{tpQj!4E2d_1?RTPi;)R($xqJ`|Ap9d0>Nq&+U!@t-I% zIvrZ#UT6N;b&YO7J!$IRkgk?Lto;Pna^=-Q#+X<8GuQ=jtsWU16F7)o)N3xrmN$Ee zE;yI`^Lnfn3dC^KYBOU>zQ5-m*03x#RS~r=W3$mw?sFk=zm2l0O>T>3ok-&BPhsdaqri9Ju%xx8T<};tIWX+XyA}_(bB0mM?U^6pShMORruMN?TEQ zNQSBT?k*|C9%qsBH<_$cu;Yuw;qV@nVd1YQ2?l9txkp%nntUqM8=*2Ig(6h=QhG7; z1+0<;kV8b$Pf^JOR4CrMWgi|B%Jp8m^kN{iU;Fzf=V7L2%CRa7v9HMa?D=0RMQn(5 zNH@uFu?$lgu5tP!hxlHtNZ7-se9M&y#Nu@_+jPa6Zd zO?Dg|*PCiR-xF5!qT|nZ{^Tiw$4*!Xmw1k^&T)nZI_LPehD+7|kp%%TG(xya1y)r3 zxntlG|F}!b;G0NBAH(icoHam+SxDx52JNrQLakoK zRmv1Gh@@lsCCN`RiKwkdOMjlFf7YFPW5;-8zm>O_rod}XGGmLFxetfSX_rRu$f`nl zRpzzqNfg93G9Iu#c0VCo{0<-Ubnp>K2ppeHew+yZFD?gl zXye3SM^!ym*oD5RUd6rKHI>x$1qob}e z*q%O%q{a=QkSZ-&oHq?1$Ht-h8j2YC91aU~b{&T;_Gep5o=N4PQ(8)BJ3;zhJ$zGN zPzx7DIYDqUBoZAQ%6zA>9Y_{BHTh?wTlh@QE9zZ#$YyK5&^txMN%$HBX7$|C#1srI zN@fYM*QOa^4(sC-+*ks|85U9R^e;rw`V|-@_8H@`<0dNHb`;f-WTZyT0YRKa|3tnt zIc?bl(nDmFPFhmD`cv@W=9f0PWg1oo141kpj8{LOiPDq-HdrzalWhqNJ;B$dJzv;}JYWrDW)0yrkzewI+2& za0M4&2lj&zruvtEw&>SK?+rRvIU(LK^X@0KflkOQU&IoHsOdnGSkY7m{AUK*NQ|_+ z8z$E@70o4&GLZ5d44@-C;FxLQ44Pf$k7S<4yE4Zpfyt|$dkrVxF z<(23@vUw8%6DbVENWQeHn$#oFE_K%(!${K2Y|m%72vy;#d}4!A2&|n? zsK%or?p@a(*Ylvn-x40@bSyV3K5K?tw}uW}u!JR_Sx`Tkp@RGE0dCUICocXl*V@>s z&mXHVK0cpBvBm>yh?b}4Uq}*Rp@mYUcqhf2VUKmOSkM+N{^)CXC3e(e2pJs$$3&_t zaHK9hT&_XV*p#}4%Dxuu_^tDdH`Ocei>V+Mh%g-Z!yCE4B{awiUzuBpl&gHq0q=7! zFWq@%`8imkw=O`$zE-P;cMTyIW2h^9a^01FxOOuvd<{fOa^G$>G8nlbP$nfGrT8$= zpygSiYSrFrU;}d6pS30TpdK+ig6h_h^-3Gm@>(<~l}^Z+0TDswM5#*C?Zl7Mt+Ml4 zM@Rlq0j>=pbwx!uD7}>M4j&$UdfkMI7x+mscx6!X)@Ya__lhRkjq|;oq|c}C1jW-= zOE58SG!S_5=zN%$YAz0YtRF~@{mQ+woyJ&rhtUeAsbP zcMWT;!?CoB!s3eiirQ~=HqD@m{B42gj?}{KR>gzJ!tPDm(9+$!Y2Ixv+3wT#YI7(3 z>||(pgg>P}Md%VOjz629^x3#DyR^~%M_F{cz5+giDsxL!yh#7bLmL2;~M((8z<~-lcc9z>90cGSb1aqTH2p80+%D-r}gK;$X0IV7a>^ePEcM_a5Z2*x2v_Bw3gT=g!O^wl1 zNC-z#R$5lARsX8JdE&mr0#5PCsm}0<@j$mjl4b6yz`5i_)6QauH=6nkP@ZIcc2>M1 z;van(yy z*R+Qu8}n4GVpdT*iuMxFS5;?+F%m55&v2+eWW*j|1x3HB3K1Hiej7TVQtgtD&HwGs zT$78FqOnGp`foL#(LN{ntOB7cXb?Xl|0IWh;@ySlo68l1QH7>BHrn?2K4(yenAe=4 zI~0>q=qIT-G`Ja!7ZVEFd1ZY4(N&EvtYw)o`^$&^-M}9dTCzpsZ=s?U zk{vacMx*n(9?-=ypOyeU<@GaV+-lJMp=ZN0OJZEQGWmfa#|!)AVd3W+A3!A(R?*FB zK#Ie7GRqd4w92F}BCh#H&c~}`UWbqlkhSIO!bUcw??^jdR&olXjGCm6xPV$_$~em) z&F}Zp@)!~=z+WYfZ<~*sTIcB_>aW3TKHDvEllr^{`)1!yZO4=xE`gsR_rvBs#+>HA zGB zlhGv+T`2~@nB9LjtqGO=EbPl>9)SE54YewL0~I}3PV+rJbEiP|<0paJ%ghq8PhNOQ z;8nT;7o;@2uHe^AqgsikYl1go+PWEKd-|qmetQ2mOna~aAjI?Ag06EOY*-o^xmjjM2j{US;n@MKeJ8^p4~iIuGfn5FQ%qD5QOJ_zVLqGU}O=g z%{=O2eR;D^jGrkiOOJ*a#pWuFV29mdh&gENblYeLmGZ zf3^jdL>3aw9R>h~T1yS^dEZtFrWynM)VERqxjNHc*&0UmHUjv(<+5u1Fve>RK>tdM z^@ztA23ExrHEyp5d+;D#x?3HZ4b+DL0MH&NUbw@6+-ETAE5DYg66-K~)+I{dE$GjrJZ1ATs}pwvfX{3N z^0%w}8MMcMp?v}H&$A0J7a*2zs!ZBfK1&9BeF8~Vik;ZU~9BASm)){ZY|G&Ui{{=F)g{x+jQKEwFbV`YVHf4cy z5P?#8p97_;YA7-n0M&uT^W`j zIuD;(NDTvdTNq~Y1Ah>ItOFkKzZdqe54M;vmTG$a6)FtNR&HGt`rh_YS;|6d{3fkHzSkpC)_4+bda2^oT6o9SVNA~P$>{$1$* zC32njxd8=D(O=YMz?8xlT#2;*0T>&Ahs90H+fuqzO`yR{Y1WN_S%90xq5}+{4Rqqa z+Wo&iWFY~_@vPEn=JNmcFaEALXrjv0?HYiXztQHe^sbJut~9D`fzhk~!^8S)0pHie zg-`kA#eet`)^scQ+h+ek;lH`q6K1d>^%}&7I}Gp0UH#t>qq^@> z^q$_K;9~-{Ez(+B9RRnH`%&P>;O?ePzPY!D}>7Z&5#WR0Z)%8Wk><|0#Oba1Bljl@5`_nFY7k58vu2|gVp%CT=riJ3<7Kr zQ)LV(0bhi{pw3~HB=|5$I?O}>juWRN${_7o6hE-a0pUylTaT%s*A2k-?6K2X;GFP3>CIga_H9IOfw`LLcqDd7eh|5*~&6Ot@) zy|8Y<1!li{(3fFM7;pP;D)&G2{HI$agkejg@LUVvT#FP)3+svh!ZPov>HA8U3hS1C z;gvbChc_dBHU5`pmj-)wX|vy=Vf6Lqz_Y`V0M>O_jeo#uj8<9$t1$>xV^D=`D2zEC z26P^mgoU^)YxMt6x&K3jeP9*#nQQ%K1XSf4%%cMz7Yr=;Ko`dXT|61V3Y}gG#YUYLYWu78zjSc}tcx3Tt55-LAJBON z82>`RYrF(7+6T|dYhaM{4Vd%9M!5_EtcziWJvb7`{D6V{-&6j7U*AF`?qI)uH|O`o z^yU}#m(}a5{?^|%nQNo9*CMedE9Jvir>&H&Tr~Ynkqns&Y>*`!-Mud_9AHinOI$h_ zP|2Uo;koZ|JMw<+zJ8}R?-REM6;yn&ecOlX+!VidQ@Zou|3YH*i!9)%qIvCphW581 zOy(pK%E~NzPYpJWToYhHvOdZ^%<6R7OUQxsqi<**VB5OW$j7-Qt8hmegX?EWD&8^2 zVwL`7K=cFH&yrI9H|Gfyxu5-%0dA&#P+j?N?STLM^;$Aup#a+(9P`49-TmTeRDA-k z=;sCOJbu`uTy@601shEjuRl&rb2N)09%H}hkG%TyE6va*v$(VPZTquC@~rw@qt=yf zO0r`NgNKj5sMP~5+!_Zs2<;Y8I{<^W)tkGVlj5wm%$_$D>GJTkY3&RA9h^5y{NL^o zJ1#uV>i2y-)TJF?S}e*_`fbC`m10l#?>#po8Crrdgi3wB9|hKmz~n?fzXwico;2@K zG>!=!Tu3mvDS+iW?-=iHa7v;|&A?gU{ubq|nd# z(%~(dU*rUregHwAy|;OO9s=Vc=S``4MuV!tM|H7Aj;Soq1FzP6#@hiO+sRy60>d7F zIO+CA%kS=}F-}Om7Irb`tyXm8yn9r40`v>7{XtdxrP20*?FlM-(`RGG?JJD@vG$O$~Dth=vez|Gnu0W!V&9UdzsBA7+fF(j?+=i|#U5^(n0$6f^U7yS z+5~Pz1@;Fuo$h_MzWA60?hw4wRu^zzJqX5~*^luvFGPqhV9SdAR*nT$8}DK z>Q-EJ-L{i7Wd?)Mhk(Rs9?RuDScvN$_GF;DO~Y5Al7Qe|_@D>JinHLsf@WQ|3MlxD9n^ zG*zxAkDuQ!%pyzjf=2P3XaQl(pcFmFu)Ox5Ou#Z=3tMp;S6Ib<0G3M9FksL8$%Q4h zmv}T(b(VKsS-ZvnXM=gi+f zFp9Sqx`f!6+!7+)xHVw3+9LO0`CTL3Jb)gdw(Ncob+W@{cS3*v%gg4#Rmh}1dd<@C zq-l@U?I60)bwT;|Pdh+*DKz!1_eUjI9)VC;ySrcg>dj$q_0*}Yc=m@ubWHpgk4-VEi=2?x zhBX&o0Y-UIR_$$~s@UTUY1Jwy42Eyx^#GmfuU1D%bdoJ=Ygnw}`zh9PI`ptCzXZX} zalKJD7n1YQMkqRL@fml*(1)oRSJBLAaZ*}K7?;hQ)$X1+**eeXXp$djtT|q*XnVgL z!%hyM<*u5fUY`q(pZmXEj_kOKIl0w81`j_dhh_b57;2sme!G2Tx^+$?_OzwRCD2+g zHJ(^qyJb3+JZh>6)BXGpX`Z%iJqs&s@quk&0WqPHp+-Oy1y)aChGTeusm2%qih*70 zH3>>N)O9Z>qzM{5ESnueuIM|=e3@`?sUmc|#oDm$?;aoO9L%pYMexvcSbk{RaxTMn zJ+pv9r*$-ROC=+!y&TO7KY;+6$Oc-bWPOf*!}v6d7Ytx9y8+(_my8Hx>luX9S2CQ_ zOY(G?Tj;`P;xE-kVqSoseQE9aufE%g3l^MkOn4B0S?0;Q92Z+V27b^a1}%3d#tzt7oT%cCO6834U2_*xHuo* zE%gMd4N7MD1JOBQ&?4RV9829i<-xEki_0zx{X-5m5xU^N)+w&)1cj|-f`KEvgsJoo zxX|YQgV3AV+lIyQMJ<6(58sSvzMZa$6?sh9BBN9SRP!c=U#XN$;)%X=cYZfxa4O-H z4^Wq{BI9o%`xX9lbP!~xKBR-R&PcLw`fy{JIIg_xFXC#SP(zKuk*V+DcD`>2R~H(O zosVohKb4)M*;zMxeQh##GdEv@cDoiAmp{8)m;Cf>_q0oPA19q9Ln#31Sod%aD9=HB z%bKC_eb8vfP&2+PuWDkS^~k&6vjq@QrtjMRs*|GoaY~k-1Jw<%OK-hc-J}uziWU9g zEryn)9r3}=Pjgm*&$Tv+Go;vaVIrzmtM*p`;@SRkv)GiYLk%#rthMzWh~G(%mH55? zV*!n~xgL|W+VtJ^^Mrm#(?faNcvjQawqnbiP^0f;cEmDIp*~fJFR|NcZJohzrt`GC z%1$(qsTyKPsaq)Q;?mFWNvywBp+HmHrd|PQhG=19-wSdhMcU;Q^bx(1IYy z%-&Ys<62`wgh8V5P(PjQMkb znaKvEWJCmq3OrOEZc6M{TrX{Q6Vm56CCb|Bep#EhjJMp|%E&L==;UTu95>Z5^g{}q z%c4Z8YcG?BKA-k*o@*eqF(YOAJv)zYy3;M0CMah>h69MRZS46yzvpZ0&pQI#Ko?Cz zpIX0JpqF&a`>nv=yZ|6uSCTXhw7;Qmw5ECWgh>_AOCOfiLt^gzp8~x;>&zL$f9uEm zjrBHCEBTqyDq1Ue;|BO5+NxP2ea>A!7&Tb{UZ!n!6)L529K5#`rn%l?x9f0gum2Q3 zoONT^z3<^{k$VI_*5v|{pFdk!O!ROH%Aqz`f*a}qm5z-?zN96&m;LYGP&0xY8Wq`EXXv_>Ic)e<>{CkpmScl`wKSGz()&5vtnXQ|T4XDW zWx>zBK*Glf#OuU?F4H;w1wjX{GLqc+F?E{|$#9t@UV7XDxPj(WM&i;dS3Ie41T1(y zQCPzY?eD=&n;T4tKs3lyD}a!F<|Zou8sr-Ud5V(tpRIrMKN=H4uvJCxOkW5hjmCix zlU$e<7!{1LODyF_SXpYh>WW7?$IWBe__6wiKzsqSk6DgB@F2?9q&sgA5(|+?Y_Wv&nK)5Fa{o(w9e5F^`P>_}LX0)sE+ z*W+2s3OwXjm}ecu0^1>We)d9aRn>Ij&MTEALaxS5{dycH*Zlb*OZjuOtJP>Zs_hT= zLT=ZVnqD!+A73h8hz!^D&{>C`} z;_4$m6%N+*k0N+D6-mWBahf!8MF~08%XShjr+gS@sPh_2%mjFT&x8M?J8a>iaI^- z_E9eg{o#;vaXHNI|Lx;*mxb@P5}t`%J4~Vl`cCPd8qc~=TAu0q&)JN#343oVL3edY=dB0!~eniu&t> zBqAd2%1C>4zEyXV^g#9qqtY@UW|1hEHv4Sl;;9ay=qi&d755FIlwc_Lzm)EyJWdOJ z&;0_EiiJUMq))}rsS^YbuR$6VBeL5`02vZAcwQrXPqbgZ+Qj}t*AAep_ZII-82EepfPth1y*Q)?ASB1L;^&>hH^_1l z_At`+7=Ln7;2tP6*`aGlb}G?Pmpo-|tbi(3y1yW0-nIO|H#v-mR&hAVDmqAErCI~H zB|AL09ybs@+WKCLaNAE05KTUjyyeVa+y8*n+imV{)_XW#clqtG;@tf45W148@V@gejGuDMo@Au|5es^UF zH}PAqSbrb~V<-F>Nf3o>g_T&Ip)Xj5O43o%tvNd8#U}h@j-acK!-!I1DtAAwH}rGz zda<#Cos^t<`p@-X&^0aWS~dKJ*AE+$auu~QC--mA60eb5tCH;(S*APn-Bew>IA)0& zn%GC?@E*~C?`F;K8@*v<{y1m(t^JzvOOtC~^Kjnj*Ti_6|9y>kZkT1~7U#Kib?u7u zfY&IU-N>Jc5!G>8nXl2N&QgvagX0AN(1u^S#13k;6pCb!0+;x{MnZRI%)GYC4Szy= zpwCYa|Kg;^4MXzl?hi`%6qZ`O+~~H_08weVtg?@&mm82ZDq#72$a3b>g{rDGi19nX ztaSMScV0CjvfBkmGMk5jVl9|I*%Hmgc1-XuS|uumcF$$dmAIT3>Ms56c8cMum+^u< zka_gex_kjiS2*U6Bhmg`g&_yGY$|32i~H7wC?=ijf>{cJJo{P4fi!ZS1t=3!m5_}+ zFgBot+F-z0#^!C_Q3JQ2Pm#|_%w|9T;ETs@=G+_{_AAIlJUC+6@8#(vCxq+*){lc$ z&c0uI`<-2frRA)v4K7#xod~-_`)-zB+lSc>GEIp5o0Ihz68H5V&#e+#*{sJ)^{^Z- z_A|E=VUr7;p(zgmH(Sa^A=9pRF@<5X8oHw) z{9W$Yb7T|*o0)Gw&%CTMc5QcGV~CX;QKN}%YT__*-nZEaukWWW#0X!6Hb31g`Dph{ zlm@bR)0)TPfT@xFB0+x0jGLH&OWn1pH;Lcyj1i&}{{XfF_ z^)W&>1H}DoS>kq(y7K{Klm4)t`(8El&z_;j_WKHQiqPY_C0kn{-%Eut*IksU61D5? zX$0>`^`*)LR*$fGEI({{&`7yKU=0dv{#Jl?U<-CW0A7+w5yv*h{JrM2>NX~x`uW{J znmJ_OzFoJ7J@)C;@8xibv56hGi*r*0|KBr4tWNO%UGpsP^naYwbBdzMpjw4a7zU0= zo98f1vbc}#tu(s<#_Kz9PLv*y-PbnCF>yLynP=yu`>j$s;D=jkjL9nD@q42rq&516 zk9`?Ic5mO(r?d>*$$#9&9Acqd>q9}dZS#HID(vCn z*{{FdG@iU~7R(<$o9-n-M7)}G?OJE+McUY$F~rvIPVlt8ytbVd&o|tpmNK~8!1!zQ zLd^GEszE;@EEw(TGy7TdZuZ-i^;NZglk>SCc4l;RM1s}6IfHIY5fdnxW6-~?L!Int z5{Sk)JRBQp{kZj^s{(41DjIZ}{J@zE9*4%Io@@QK-fApZb*GRd7$2lg)H4xw1cKCt zbEb{n5-#N#GQMA=gU}<3@P85ik(xW)!9@i{4O~<8e52rZm~?;5RqbXne;gIh*R3dJbxD8H1`clx^mixPX^YCqsTH3xZZZr=nG+n&`I zs&48|I!;I+zVBw<1L$nP7w1X@dNYY^C;cMm%CwfCt|u_dFRLqJmZC0vXWrpkb=nVDX=BHU}W!Ll8mfMW7V&Wk_Qk%V*dUTX@UTk<%|-o9fvXb7Bu9j(dsh z=8H_GZRhH5JXocl2u2(kul7b`nxJ(o?kGpALX;hPI%KbRE-^&igxH#@+u^DEvDDv1 zhz&Ou=66b}#kh(*g0?cO#hNr&X>2j{pyH>57~`M#d|gbANaT&bHpdeG(4iD+xjwC5 zX2DPdaPC!H2J9AQ`I6U?KSZu8|8y$AbWz>lS@TzKj+xm)#t4b#R?lg z{&#$8fP#fQG2$~d_P6?!6k~)tz4%KHjZW?mQ7&h3Rx{MT@##rg;IEh;oWLeI+}|+C z){w0nZnZAkzATr0;0+DNM31BDC*N;+%G1r`?zeR+_4?-6N$W7E_`zahY|tskJ#*Q0 zwaa@^ruo|zf+0`C2M^cWf8Uk5vy+R1W?`1>g8!Pc0{c0^>iEjSv6Osk#g(N#NCBqR z>LKuTndY5#?D}FAV>ChtoS^RargVZo>>#=70LNhu{V(u zAcp2AA&dSa@4H*gznH*OG+m<0bW49_Y~6RRItN7Nb1K7jbErRbz~2QVdP2?4?Fwu| z&3qniY{XN;y!2XPzIgx5$13YMCkcKSnk;H~ccbtbhNK9n>%-OX3hHn$)B!`x~tW;Kj~baDBpqGQE`s^#oyj@5J1cvIy<_ zLnV_3P^vt@V}R`(ICnr$jtpsPy?lluB}Z|-`1)g(5+v2^NnrP|h7u(qAqYk0gTEnP za^7}`qscR>Ks*l^RLK(THI0ans0gIG?V_AHvtR2XSUA{_7!w7TOkk3%(xCv5*1h7v z1iFykI}?P+1X^XrU@!`f1bq)?I<3)sNy{mToiF$=oG$1oe-_k2yQ)Qx=%_(o;{@iS zG0s#fKNG)8khU--0U|{KI~3yZL@DD4Vxw!cqGdCxHhZtS#}Ui!Q6Rj#v6xoZ zFv2;kruP9j_mAPm9IHmc`FM2~3qSof^AAuecopIcM&&@U1fa{nu6I;t%GjYCHOPQ4 zjDCJSC-#MA4Op{mx-{&mkL}KKCB`LbX+-gM0}pOq2A!ab)d0WtYvZfa;f}udUKW)q zh~?HoGuAFTC$tCexg5&Y8oF>{+>1kpA%r@pQLChZli7thMs(Ewa zE=m;V&l%!pM&3lQOgT@yf&nefvC4^nbL~cdQLG=-QhvdIe1O0qqS!$i{l#QhuaK04(G zm&18dDJVN{iKQ6EI$L*>o;No=*1bASc03uk;~sdBQ;!N7Dv||e*UbZ6R$zokYG&5Z z!mJ-T80HsN3TwH0Ot)Qo4@;74N9#7)^m%2+Hc&2mdT@_=429k0N#YI-iiCV(Bl)U0 zs}CW3vk+KM+mQAZGAOpHyt}+LMra?+lrln*`pJYz>RneulvlxH(t$k8ck7p|H-UP& zo!5HZNyp@VJ6l19;vPd6G~6ihIWF|i|Ww-xQVJ1@P*&0f(O z^98<|z(%a!G*yzz-AarJTFIJ)k)mH}nmv?$Oo(0G*Z8={SqrYqJL9V8xPc^#CT;ChIcwIAaVolBFwAyP#KhWt`| z@`IzFX@|gv-y?8DUaX)}x($&y$1dF){qlWH+bhat-TAHuM1&?~QLc+{AD@I$`FDVM7WI0ie*MKFc6*o-X zHdNkb*W7?=OtIyLIwn)Y{q>A?NNu7yJsrufx}ra+Nz%=eh5WvNmv#LZsY2f&H_Y0-WDFysRv9C1kxNAP+rd<6=@GE~ZqpFq=; zMj$mdM&5To+hN=uXnT2(;ONOJ89~YNnP=<%omoj29}&wpGUW$8kz5KdD#B&vU`A~U zGm?6rb@oo!ZH)sM0Gae3@X>r2So2W#ppIcgNaWeKfb0ee0*f%Ni8BcMTch;?k#O;M zQ)Id99oAqJ8_D_I*yT{Ta`*sTmubp1qTMRYVG6hK$;{LDF%<4P0CQ?Wfw&_f1rLHz zAxSCBcO4K3w}D~&s*9^Xhz||z7WK;Fl>Ho3El=FFr_ii|bJF`A3ptF%;f}&@DtMdB z(GCfDj}##mDfN$)xE$92pWrxv$$AGNotIPM`O zQr!EL7?nyV+T{?6R!n?qw%ZF|j)CdbK)uj08MYCipvTYH$#=U^yjehw(aaCRq~mnl zk_&-^;V5HI-M{aGpP$kcSIf@AHr6&E#n;3bJC|HbtU zD}s!+*QZICx`exjmAF3Kr;;f7+$|+T4FPt*2SQlr39c!4H->6&nl{xGE6#y%jov2` z4{12IvS#llI7DbtTTpq?w>H$wF~;%w?LJSX(uL+!;VvnnqpC=>c}A2bbK8eA^K*C; za38{+2nYbc^$%WtUAZVfZwWtB&I!;q8Y1xLC6>htB%nu;vPc2XD-^>uh4MzOA8Y$g zJ7m<_{g^1HW6+kP!QtLRfk>dB6qurpxFznwAguLMPoALU*5{E!+n3MpPt&3P&OYec_cdbd~M%W z!uIs=FvlZrKtHstr+EjlFMe+jGx0mn6O3ReFmF=>*sQE?*VtYTJy|A)OeI53xcMbvYQ%yweUTdFWjXBL|*Z2u7&po>})wAN+1_S6G zEcA^e&F&X0?k{@CMlFq*oC7Mm6vK?(*MjE4;Y|G5KsJiUsNmd3SgFgim;7 zj>&`$ui&xm+1<}wW`*rMd~O)QCkq2Nm+Maa$VpMsk6tBTu*+|D`DXM(LGRWo^Y4u= z{+nOcD5p#nZNry;b&IopBmOI^%s^Rn`TxqQL73SH;UL)K+v9d%+0kU4Y^l$8_}(*O z%pJ;J*N7)CAi!GA$7ue;Z$u}(c}cBQ!bM4j?{_9)Utal1>`w{$%yZ;L}}r@#2*9$@nO`cTmB(9 z+(bQy*Qi?zzzeoVqRpwtJK(pP`Hhfp8J|@~o9uu(hzu8m9wpbnKnrsiO{1OC{tTdu z1lTXaCbY58;X9d#5MHRUpcKKKjv8Agdh!=4xNaDzEP^dxAiMz}JWkv`?6-MneZ*Li zNi{U*a<8xuyCXtrmF-VbO`^}w>)_p#@8u}91Q5sAh9>KeL~uk?5h?WGPzhE{N;){YE=4P>NPfhPz#l)oP2AZ7vKj86&Oca7 zfb83U>$=dW=m|)XkkN0c8a_^TOv!4!xjQK8Y|V!OXVm-6P{xlc1*asW2+?5Ie3AjV z!2TW-iU8%Pl4V)DUL+NvF-7K*PpTH1Z*0(GBsK}-%_Y}3zsub2PzZ(x<|88v2%>Tx zr^E&$nN0_SH{Z^2%ZHj=2}9Ou@TKKC_AF34n)GAIiazzfcjS4D;K;0#Fhr=t>MHjZ zLsS1nZb=H~p|DsxmQ-lC)t>_FdO)im=SP7LwGS!ZDV5iY}myR?sHzS8d)%zOh;5&AYb7djiJTrp?chZmdwH zfq*Y;{&P9`r|4ZlS7DY0&IQbMKwt0Sl0jQ=?jzoX1x7L^%2U)DBFhB+LdCm0P|iii5=dME*ds0UPgURgM;cLNr08USR5sQw@B|+k9vE6?LEK0NM0fy{4>dJCm*{t4^u`1jxdI+3 ze)5O?N_T83!{2ZM{rqoM@;+YlIL;vS-!aaIIUkzTxr&Ic$c~zQ<#iBh;>E(S{L^wRJ`bm@4HJ zv)$Fxw9eHp>}ITpz&e~x>MH9!NT@eh16&=vFw!gMCB}9a+U{pcPQK5g0X>ZjQ8XoqclN?T4#v2VrO8DpTi7kq_?5aN> zA@gOd|6Q?Np^%1l@1FRLkycJ(J%by2V)_c^(@K$MP!>QHDwB``+q)Y)Rm^+9k|#2V z_hu47$Y%ZTq7{qmo(}b(7$%PSqN3wCqY{6Mr(2$da=Aaw6IC(+J;WEZBo=$GdkBJ_BVZ zeM)M)x^IDX`eKnsGW#zkyRr5?aS<`_uL-XnDCYc=*N+M2FNt( zno7W;m#-GT3}?biO(jR-fS~6~4egYdb8^QI=gLnh2Hq&6nw^@3*QFphxTU8`*al(z6M+fl;zyDt-GqK{KtUTq92TXNg;XGSKi3qV z1&(}tFFO$J6kNy|=`T0+N|HDjWQg<{)4woQCP7a4=WoJ#LGeXeSd0^SNt8Zdf^iM> zR*Y8&H4}WKKu{1i3YA4-Ag7{*Q1<}mT3>q<(Lkbc%m&?CqS~th!7```nDJnv?7@2U zRS<*bRQRMY5ZM#~!R)4U33FO136si^m63bBSwQ=UzP(WML(Gy#Mh-iiN<_g!eo4Va zPfy@yOQ@{q0K9fS2{2tcPTxyMLczFs7+bzNSM@0~znt&wv+R_Gr+bqy78HGJf;>Ru z>sX10dpZ0Yy4frg-qni(E$eK= z%wVe2#}qqUE4Q?zS8%VLLiOPJsK$s(+YZ-bLIW+}S5@(B!3nnf%XD7#$QvtIophrP zjF)yeA2Zwor_Cx=vmy)4u0CgcO3>0Mf=ndnCEe`L5+M4^$}tBFutgAUo`nmgNcZ<9 zsSgSWZ*j;-vE^NE`r-#~b1*Qp?;WEBcD5)ijj`S7sASz_ zjptb8=%)dEqV%GR{}z@a8_qhl>OdFhTEmzBG`2i`EnH(>o(pPScDfU3i+rYfXgFHjjz3k$n z;>GPx?RwiAayVT1kmYyV2vhp?fF|E?Zc8kLRBgG%EkAs-<7DTWhe2|ziq_~6s%w3C zd)_u?@=yl%db&1fPsHO|A5yyJ_QV+#gKQ(FD<*L0gl9?A(!5RH7>%d?kVy2)x9{KkCj^&9QX z7!UGuH8wqDo9f_C-IRY_j~DO0&G)Ca%j2}FVfn&e`u#U1cZ8bl+m*A1nJFbhTan=K z5KP}r#nZ2{f8}_Ko=BaKEJsc+!6Nv};p04`{P@$Ej-((e1(J-SgF0dGW}Di_ zJ81%Y%xC5ira80pUiM#TWl5gQ0n`i|aBG0SQ3mqkH+}#c$jxfg|K`ox50Y{k7tG(z zV=1YdW2t*wJVFQ>?p(nY9E-2;cR8XsrMMg6{o$lSsDJbXZ=iSDm!hR!j5YQR!J*p9 z$*Fwb>I+AFyZO$tS8Go-`HpT_sLtwl9}Sj}si`QyaRi2s4Y_rI-)mG#g6X zWTb6L3tKv3*T)md0|45Yv@K2`X8ER4n_oot+Rh}$l&o9)s|BVXL8C$zPB?%Gf#1X2 z(k5co1^mS*g9WneZa2ldQ1MADfiBSz_HF~| zKg?`zpV}@D1i9yrh@QTyKEkp33>M(JF=y68Z&cFgJO~p%wu$AX205Em;xu4_K_qmC zp2M*8o2SF8Dqz>Rp}BH#DRV^*y$6 zt{7=3xDPCsy_=xO0h0NbD`DZd*3j>X)bpdJ4qin;Co@TcRLd!MM`M{n4|mevjOGt0 zisenoj&|qsr{5xiG6mn`>6|}WPWDd?Rays&vrv5Lsk*9H?de8x(Y`b%$E(Z z56DrBxDk|eXUApm$3mrvq4p@s@6w3$$36cVlodk@?qUybqnP$ZV`cC04oyTBZFCLkZ6bwJ=)6nRT6h2cNsQpgx= zMwqy7o?KTHWqmLBU`!uFm3B~*ggIP;h@>yGD9RsNC^aSW@^~55#Ub(WjrstGu)4t8 zWWWhFhjT$H_)e9NV5%1yk-wqU6*4G5NWV*yZ1!KhVV%)$S(RUz=TyVTP!}xCMUTPX zjS6Y;PRFdp+#Ha6g)W^CNRQ*zoup78$jVG^oZ(KdNcA@8ZZmqACV6`wzZNDDYPu;A zbZ;R-S)SYN31;0D=oM0Q*N;~8*~OdzMNO@O;w|4Go@SCO?-60i^fYFV0Kl88>)ntZePEWmf z<;&7C&}Is%BveoJ^)r8pofrcMI=Q-lNg!gJ*(L!e>0s9wWF>p=r&8d-JPoB!5^+i4 zAn$R*I$%24-zIrthxF{h5z3D9t$8~#xG)_9f2lNFIg8Jsf37~nMhEuL%|SI34je3& z>wmR7`BtATNmExqCVHwA9;9d3Cw(pzv*;HT;^-uQc=`J_gPtOYvS;w{l?dt-` zvAQwJz9afR2eS}4mj&XKMvtZO!?yb?ruuGwq1!8_(sq9#rvp^|ebujz(^D=lfYjA$ z&Ne{5IE?!CJDMx=NRs#CSikML8J?Tp{sn$YZ-A!2gs{)}wCE=WOBi8W%#!7o&MzNS z3^IfNSohnxwTMa6H*ly%F$_zNRkS}INIv~|y%iBgu6$)GrSDqg6KeEOQRT;hn}J@U z!^k#g=ylIC=QsOC!hAQ+^=8#)XwclUIN*Q!s6@ZVZE|US`v=wf=I$o49RtrJnmIEl zDm)IrUYWgs4DzLDm$p5c!)jIquTzL5rTqz0=R)$R_8nZylw6!h{RP3?5Aj@qnN)?Al z$yZ0DBZOS_N*<9cc1`=VA$Do1Llz}FG{x{Yw6$4ud2t|tQ*Dn1?!P2H+ zB>yko)HV5diFNMLQycDATYRfRTAAbudUV0q2BvY+-XC#=-Vq|BsXv=`k)zHyJ9lx@ zYVVE8Ccs|=@&aU1;Wr&0#~8t@fZP$B!jJlx^UtjzZO2_Y)-S1<@kycSH$o+|b^7E+ zN{7G|H5Sa<`E0XNmRKsGi*1&%Qc17n!X_A0xz*^Q0aCPbgbO6Sdk(B+^SG+>f}N<~ z`dR!=u1nilQH`{6=;8Ls0*1QHzT`(8w*8AP9}No3uSzI^WC&jgb|rJ#2x56&(qium$XJUDYq~1o6D4O30G> z(J-q!U&U({G)5fKy|us0pS~P@D&HbRN%F#w@3#x9&-Ej1c1cv{sbxvgx;bhcZ~Bpr zJCH*#Oy0ijaB36jgStm4#9EUF+oFWHZ#{0)8Jw^RZE*U9N&p9X(5L715`^X`*M)&o zYrBuzM12L1H8zT~nY)cw^NOU@xL7R-Hq(B@b1wbm5IIig`W!UjHB9uYEX|i`mcN!9 zgCA?l(BW%_v-O1~{!DdcW!<+3eGBlH^;|t)h=CjnGSB6d8vjxW7yfmub(Z=UR?}v? zOXbGOltq1i^fbQwod*$D5()h$`+&_<$+tUBGC=a<_0s*$Vmr?{%1ZRz&^NjS#&kgwT0f(M1q0KX@;17xemijUcs#!{2 z;zRP}JN3{-=?-U`jTOKU>#=IDc#U(NZ7sQc`Cq-+Xtg;ar2MGcKTDmw-x#d`i5EcL z!7FB9E~j&*25-UbfEB}{v*E}kc1W%tOAUUH2qzkR`#o&VA?y^6bQwGH`4{q~LREH# z&khzAX_OqBpmO!=0iPN-o}FiE$|Sw||7r@RFVJi1s;{Kym6rjDLfF`Buj%QvnsvCb z;HMC5@w9zJ4oib((er0d=%IiOy@mo!oPVmElqR3T>`Q5y+p5O`%R8L&MRANtL}&u$ zqFgAJVHXsb*%Hz%Fg_R|`s1^mTP2#V$2m^b{nSD*`q~MPucQd^R2~qLm+>1cjZy>| zsZ8y`l4S;d&rGNR`~APXaN41mF#~`{?_?*def>lm(l}EGT>snehI`F&PibIx8`fU~ z#{9Vux~Ogi@UuM{RR%hg%7!cYk=hK1lZtwjSp>=q>K=85Mn=C>qnm&(By9Gbvn^_N z&^o1uB3g8M7eVoo>2mXXU>>Xdhg)~pL!q95_qYxu5M>bhhLItOv>Wm)#a*cZ6Ol)- zN4>$0=PuH>j91fpf!gV9sul>U;1~K?6qMOcdQ9D1*AK*C-kpOyif7rZrcjPEd_RTY zqRKNm`YE#pMUKQ2MUxT}1#b&g1ZvT4AKnl>|C#D3;eJz+m{d~+%w1L6#Pnv5a{&2} zoz86kT!{!o6#*GkWX_A$UR2__a$+DYqX=kF$ckzvCc!gR-UX#K{UoUR@5 zYL!*l!LIPUlmK9^NfpCI!ayXhP<75n^{)f4Gd9*vUNcLKlkShJAbL|286+KBMW7x` z&E*T-6IJ!nC;%8WO+_!GiZ6)!8Fj;{@#j_UG3f2H4Zv&#G&;zaM3u}^)JqPHJym>J ze$&Uzn{8;e{{7z_*kYWV#>MKzR4uAcxZGe5f$ynmQU|P@ zq63C1zjCK}ziz6(x#zvE*pwSyGtC&rvjhy2< z#4K2U;A@eWw9Azvr%{6zgD6tr)uWm-l{WeT@7Q}rtmESdZz^)4{bXG?nXFh1yh~EV zQdjY~M2GHOKHMc`9nr>{(cQHM$vLr_Jv6&^E|`-DhBCSl+g;ajCiKL)5GJsa^*6td zJ(H9V?aejVb)ZDunO{LdkQzl<&?&xo{S4)C8>d{Xv#izKC(l0 zCE$;LU_1u=hmh>g#lC_h1^H;Z>+4cT5-5nw*xT|`)!Tf;aX4oL!HFhzeLoamp5bFA zMAfh8YOFch!vb*s8G0CG^3LdtpVyJz>b}lJw&IXKP6Vl4A`w(FKfSMgXPkzv9_+8@ zv7JOLoWvVRqa2u*czzW?O?cxXM{yFMiF-a0Hv_VulEo(0@~Rs$?wEift;n?j&n0~- zxc{!;rAYn|!)z1G`%2)A2jJFiP54HQ%nGyfm)=B{q)p0vec>J;Q% zjR}#;w{g@f@=fNv0#uT;lXj4HrG1W07XjJ@!&B7&fSX*QFfGqWDXYl>WEpzR7hcM5 zJojo+UbSW>)up13Ki1sJ(wMM)g`nATLpN4h?%un|r;oYC z5GiAGH2FL+R)D5Gw&+edN|sBm!5#Z(rYIp#M7*O$}1%|UL zWg|*y_i^0zRfAiQL|m!rAP3p z=uBDL-GSNe9B7O2I=N3IW_e2v@f;IGO<{0a6^ah$en*_r93+Gn$*Vn7C7eX1#%3DQ zBDmcmIqozU)6#}S5jgFXB{&!IDKUZW*goFttO@Z6v=NY^O9$!kfSI{9XZby9S2f<@ z|6D6;9bN2&+S66Aj;X_Rrb4pXU`0#UFRs^T-&W0?+yJRLM2&~v7upy~zg&0Sy`S;)@b6A#&7p3~K-7sCY`fB3ud(k#S0MXuUx{gb$6 zfuddY_coj?{!Y6Ijx1e)*mpIA%8`6u;HF2{J;mcX(-te~U@`fKPN%wjHg%WO>+58# zqaU%?JM7xlGGN{HJHq@Hm^HT0EQvXG|4^-)8GOUbnC4~5I1D5^kk89>PCR5$9uHDS z@Q*5y3_$P_W2jUj*7mC7ayb* zY~)>1R(EmdVj-?#VJDz;1kH84Szt1xSps@!>W>+*4DK4>6r)#w$w)Min;kgG?x$gb zl;Bk|E2eik^}a?VSwD1~l*WHA!trcp+8s-+w^xY-ZTZzWoi} z|47ZP+}Du@$_X!KASk%N}2jEo(N59I}1ZjQj6Vk++R zX+~8Imf(N;FEa`EML^;PI<)&YCakAiB)4n8sX=cNg+s8;yAAydWeR!f;{Pc`ZQx0A z;hz(tagG`(vE`q#N+p*h25_dRJ>smcBkor)7vtG2u*WzDhcR=MEX|RET?bTiET*J@ zAk-fDbMCNywZ$+z<*fkm4iUyAs~W<_LT|W&$d{k&@mFP5T?C#)U~q=%Bo|Ps%`CZQ zC&t03LyFAPwtd5Qljt{#0R{yS>&pXv<*jgCELp>j{6P1=sQu>uZxcUx4JuvxRy~SG z%Rn|PG|c77iicO7m&Gy&Eig@}Bj>Y?<4&?oQ_58ZgHNLY@2*rFfB3EdvL8K+;w^U% z6?N3V*>P)sx`YFLE3H@p7?z+7d|htgg`ZgDO^h>XZC=9YAojrh!7o*8S+zuDQ9ONi zT4?>*Op&_Jty0_TdktSW$#piKUrC;F#B8(ma-Iu2K+-)a%3v$g!bNi%8QADzL=bge zaH$-s(o(rGzt>bg$Y=#_r;l*GOxO`u-?QrciagAQt z(Spry^*;)yX3mxk@;BcH_TXfi z)BBf?S{*i$N)~g&K5MqS)mqnEK!Z3pL_p_gTGrwmrsmk%lp}>P$axA{^!dvV@i+aa ze$M^hT$DIY|E~sYFD<-3l+-qSeQhw#Nb@&Ix2-@?_MeU{Y(|!O(Q~ZY;P>3hUZJRM z0tvrbDdxIbVH11V^sGDFm;dE1oN+Zs&3AZI9bXe?(S?PNT<L1K~yjKhT>>fq}8{#igIl|kttDy0^v$iCN0R&>INCq&uykXJyQbn6fGfP{#U%mTH z3!u33>ZImO4~u$;dcbh}+^0498XI@g6j|Tb3wj@jsoaJvL2n5SI3mJ)*Cz8*97A1< ze1*zw{&hO5ss=uVYmNm?$t|^0ssm0n2>MJeqe3?$#nz4OQ6k$cGtYJZyrHLEx=8qc z`&!eM?Alj2Dk$F+q5dDj-ZHGNX4x7|2oPKoAh^4G@Zb)C;O-6~xI=JvcMrjWyDr=% zxCM8Yg>&c1-ur&%p6}hy{R1I1HRr0Xs_w2HHR>U40N_kHA|MZGi~d-}-O{ncpWvW3 zH20aBn~=luOTHT|!C<7=HO4{wl|89Lb*>i!V|gYUv?al7vZTU}+%)2(^C*O)n~8w_hg01bSo ziEDVLP^3hyhG}XbEjwBkHj^L*Pb^BXVwfg74H^3@DV|oJy_no@y7de|9umoa9bF_l z1f?mE1lmwzUVxk-fcIQKFxD051rZ}twFFs=TcdfI zLRlrtwn);-@`{!MK)`DZCmmF=1ZaI^JyFGV-zpGc`X@fKZLgWNjWv*lhZki1J89p0-CYYvpVCqP~P z0)M%`DeaW86__yM5*$FMKrYu9$Q|_D8=o;d7$+a{9e*=cIbz`(zg-9Q_OF>OxPdI; zAtWDbDZ(e6zSurjGuKc4+Cc#pw*nIkuG!Nh<%OR0Y4n5=y3++nSNNN8jnA28e=!N)gg$z?W*IOua z9k&~ZFUMiQGMT|%j&S5!1qm*iB>7W59Y6tD6{Z+~O?eTLHvAkJ6LigSb9elDAJHo$ zKv$IHcDRLfi;s?2?3QqVZnd&|?LBa~rA$&;ELJnZA8=3wO7g|};rlc~O|FI)H?tG^ zRbT2uv~Y6UUdIz2rAiu8l$}gBCGEUVIVAmyJR)zizC;_YjtbmbO|(7?Rd*hSX=tng z^DYSrtk$0W1TfBKFDf@KM6Kt3f*j|d&{c;hZ8Hx5R@w5FQs9rmIsvRv{lMXP>&c}< z1UL&ZE1e}OiM@JMn7%Zzd6*69kYi-UW4jHKwsH1SIHW6H$vN>~u5BrHi`I7C`B~5B zewlyLXoHyLJais*17yVS&=M|m-$vo>wSiQWmh8Ve+INDKBMRDWXq zZobV21~&#S+Ab(FDDAt!q#Ytq|Qz}Yg2eqRhlDoxqr`zjzBU;$Dg#T~>5M5xBQwO-9(&2wc zAQwSu188;PP)7qKpu0^8J{0e}Pv7bFTBUP!16%0;p??*3cu8RvTO?@3s{JM4~St^he_0^OQDg_r{7Z0%B5 zsUJ!N{a$rcMcg8678|0%@p+Z-i7>g}T~H?9XQJ36d~(T+7A=<105at?!R5~+WV@3K z%Un|IpWw;Zz2Kh^+=z`Ov!$P7)G7O19N~=ZuUN-X>_c3}YA!+Y+<75@n3;mmfS^OXH{w#o_eIAX-3_~fCCW{>p zXCuo(q0ZZ_<|=v*-5fJ0i#`)S;jZCjb*rOI*6boNaoHQ6wca<~qIE#vXD^NRP3 zeSUjy`O40br@`o&i2|wi@K5Dfl14zC=Aft1ULioyHXPlg0Zr;fxCu|G-hCd-C=)+H z{O%i4Y)0?9Elh>7I0<3z>FkZ|L;-lO5%uo^2?Fx>Gu*=2wx_>QN%;%R9q~I_0wPA9 zfcdAL!E}3Ylv4%5XVe?FB1<5a?s1<)8UvinW_!`8^aXZ?_yFIAp4(GYu*hATtYBXr z8AG$)4j*D#Me_k|HZ(s73M!V_k#_g;ib1L3Z!nGs+-gs>wTe^^0>hHHoYS9nJbO?6 zYF}<1Zjy7iQSuax*zwUhuI$~k6L{&nHlNFPjgWXZAfV@UpGfwIo$CUaf`P*7c>!K) z?;peGE;SVAQtRfhhjE7&`{Gk4_es2AUkBJm8j5iRI8Pr%ZCx5-m=yr$EaLdZJla5P{gu=*8O6ryInb_+q zJZo=RO|OT|#yyr-gXGmg&vhsnWiw(l{o@Vy>Hg*N6dlv3MZBqK&g=k6?J+i?cW%h5 z)y5tx(sd`^%E=~IDwWwAT z?82`l!jlDD=pE%c?^gyI%XgQt^f+Q0N1D&V-9#r{qL-svSoc?qAqBywtyx`<<2>xhGoF4NOVPn1^x@iM zdYWKG5-Hu+l5h6k8Y;#e0rls-%yv>e)dj8he7b(MEQ)%Y3wx4N&_{6Zaj1Z8$6~LU zcGLPtzD}E8U9iuN=Gq9;LoD-`Bvytg+VKqHLXvL6qVbp2z4PDE#YHiPx3m|rKmMZacV`9CJNZn3)RbS&Wkbf>O6_ZYcW7lWgUo>9S- zQTt<(T7Pe>vGj^^#qP|wQj|4Ndmj6?QaRv4?f|<$yWYNs6;8j<_+o1i8E(XWpTzN# zxlG*IsxZBbG}G>#>ZF*bR_<8~{CACviDYHFf_H#e!QHqk(bX!SReNHmQrN19Z$L_O z>(fSi>NjD7uq>Jcj2CQD=3}0#g15G4p@rp#Gc{@Ek|kHs2Cl#Pykyjsb+8C+OB|Zw zOz6MZE*Laxk|h~Do^)thWP%*f#1Su2k|uE<4qgZb= zDOoK6YNqfjBDXf)(~0kD^GXW-y8faC6w&f`049A!iZ^3xkiS{B z&1V26xRC+8qLgh}OXQtzVSwwj!`IxX>6Cn5TOhz^m`}Fs02bUGf)5^aIBmG_){T~2 z*{qMLn+OB|=lcG`E>SJhnX9{wJ|{UWZ=1@&Yt3EPN^f~aOf?skPx)rb7rkbB$g_RU zfO~?;%%^Lew?M6EhSJ1j=!YZWQW4-r5u}zRu_h&@;bg;bg?WKgE;bjWF7vcmZ~yPG zVNX4G(&SE=YznkMF>^ANM(#Ssq!ni1R=NLi7A>?-eVGn;zN|Xp9Ic$g;j?IDuv#`+@ z^sX9Mx?w8$40Yqz!yF63viTyypNasD zx4<(a*A(Ged-#0VRUdM`)P%RWh^ROg1*}rxE}S7KuCcx!$^$Q)8tawB`7)EAlqy7l zqneVy@q4wR?pMi|)+`w!lpCwARhV5%$XP6Cze3rp!>IVC0$`=aEV{I?d$8N%B?#Ss zWt|i`$hlR`yvs^us^RDKpa3~49F`_A-6U3T%lCG1USIC-{qfxEZp7a%+Jd1N0je%B zYi{8wgsO;7=ve}1ilpM46_;(wYu_TYUG2K_@xBMMgotg!t$6}et6}SyPJ~y`xqce& z(cA|>a03lV#&EC-SE4l4Z^5NonV4zu9(n*hUvErn^VpF;UMbxVk+@{817rgf;Vihj zp2*6*qKQ&DU4D`tn3G;t*S?-nWR5d2mW#YOEv+%Rr#4YU73e> z4VHVY-^C#ukmn=pG8REGVHe}k?JY{{>mqj^LA$$A-^#@I_7e(9pdG=ALI*y^E6Mb_ z(TU;&($vFdAyQ+fcX^>Ewfh#+MH~lflaUc>aott>)pV0=TXf0vB8%*Kd~-FmA1+L0 z#)ZRV?nxBVWv1+xx!xW4=|Wkp1l{eNQ5FQACJ5wfhaxUzsr9eJ#CUW3F0XaCFDD0| z0_ny3CMQWjtW5H22_94)lqZx03i-|qsVo66TwJ?bT^ukX4bRAM!}l!xvd>XD9%mr~ zr@3hTU-5(I7#Cp)MVuZc!0Qcf!!^#Fv8k3(b>`)Dg!` zCJ9&9CBzro#j+Zg4kKV=N~YD?P#ERbev{TI zV6d`nD&jq;&R@>Pq8?G(vvPldfX{v z#SXq?9_`$2;s^RCbO5k=9S%u^%jhEc&8G>}l8M3G(1b*Lg8EJoXbF}9;s5tzsbdOf4<9aImpPQ6s z&Bz-Fx7z9U39D)!P4Ad1^E8+uAhv8rtq7c0-^#QWs7WKm^hTu5EO5uJ}uSaSkC>qGpJ$ zu-W$(&Y#3}w8^S6)77yuQdrTn^yydyR^aM4^+bLpKj*Ql z#))(J<&u>xvqNY{@~!aDE}LQ&0Mbr&A~}+BBpZ;V!(O~ul`J6^)SCbzBwAV9d_MS^xe6U#DWz}WU{uOw7F@KcO8iZ;LE&N9vtDeyTSYBb zA7XlB;~aM3G)62k`0-IuK?1Y_T;Z!Ty>5(yD~ku5X*joTp9>6DRI;)d%c%>_T@D-V z@AQG_h)Q?_B;v7*I?cDgghw@slbVxj304JRE$5F~A2dD8X8MAE$+@N){pkjGzbGNO zmVoR!o_0i3)^`%SP_m?@_Yt}<-*EeLM0|gF26uR+(02P5x*^3rs9J?b<*kUk%4^Fn zop6x~;Avu7ZyE5B^xQqTN7 z%0=AMw&iv?N3A69s<`I9!oX$9HJnX&zM(`BrKD=&=!>ITmv)ZTkM2zgS+S4RVrqV5 zMwrZn3Ps1s_p=l}4mKPH0g9P1A(P5zBjyiRgE3c2-;HO+%L&q3d7`{S&kpz80iKMA zs}}qDFUo@biF$({2RN>fJ&OZ!jPZlojXYy1_4{1Y&8X-}o=DuGGN*q-ja>~!5KK-+ zyy?vFNX|br#uvMFIvC~B{V6z7N_BCwkE>kbL$N88*->{gO?AGyuSTLUwTdG+d*E77 zx1nv-Q*F6%J42<{q?YC0`(*Jf*wo>87oKhtb=%7)1t#~LyTUGN5lhzn%`o}#zKv&^ zC@u~lCbFvV;OHcVCR#s=2}SQBA^-GclMr$Nh}t5hp~HEyAujvjbEF|#qCG(T*97qM z4F==$Z~Cz*^}kEC)lVG~h8&$tRGLRb0XK!S)J6U4TOWkz0#{0o5(9JY_2GI{??Mi$!2qkj@QU&eCTW_t{HGdeW(wzSoUmcDLWBD zMgy(nH?-VPBjYR`$>j5N#;a8r!PrvU_F0ltSl}&Ex-*B zSUAaFSor6^C!EC@cM;;T#xHi`=Htp*a08v~BT+kQ96Ij;{gsqk&cED|SgF+QZ1icboSKyU9wvr4QR!zMvqc`34WdrYaz49`yR@vukEwEl)hsW{$ zoM)58>ibgf&798j{%Dr~n2gi$%ckLHhtzb3laK!IoYhf*17&$|gSyZ7L=uD|HNE($ z9>(xPc%sH*uovw3CEDmuhJ}JBUHH#Z%HZoHzIqO5%{PCu zh%yZF^q6@P?i|OK{3OIAUU3mJvy=z>HgkP7lIijFz>(}*1*fHD9UAmjrpXLuoM2R= z{;9TNeK`p;nf5mfgPwM5D~cKM&MSvHbesE&e-E5vDPI*%7;%wF;&0i z0)6)vi-c!~M#F`)ChItFMwXO@hS#t{Oo(5XM3@VTexjZ;(r|;rQi8CfpTsK&oPT}` z^jVlO>{tll3Fh+3BSO3G>OuQ~{g)G#61aPeiq^4#f*xu74V|MITLLGUj`=+ReOPJz zXK47vST$}gMF;w@<%W|cg(c4GJJo6oam(AuGE0sy-`bDU;~e+j4S!Oc(wAn%JZd~# zrO+HkuvVvT^TTON;Y6@G&(++~Z?3bFn z3pA3SE6~{Dh>gqb!q~^Y?RwS$V6=1e6y~*p`vU)ZdRzsn`a}5O-|#zn`@^}EGs-ux z+ja4y*=p_~3k;zS^^GNv7B+_eJ5d9XfN3qGX}*R$2?2uU zrgN226$8e71yb^M(7>1e{t7^mz9jm<6aUvYA-qq(Ny}zSY{>|sYbof6BSj2SnZF~2 zY=KGN37S9v-pNnZ7no+vE}3dth$w)Qw-!)-;;R8hy#Foo-_H?R5`swHd}ugL?{^LITyl+aRPv|kmgV)r`OYhXA-F0@4x(pqFL76wH81r~GYXkzb1R7Vl(*S?=mI}U3U?y;N)61r z{T==@81SA00}F}|fV~_8b!8RKYmqY}z=WGZjO>GY&oKZDLwV0@_J8}%zoyLw1rmjt z)NE0$fg$j4DX*DdOHCSiqtK!2-{7|7HLff)?)k;gyj=Rs7%KU)}?AsuDPjzy?ezE@V<8 z+i^;hfcapD_!ROVb4TFC#AD{+|7!6cEYmz3qI8CKCl6C#NQelabo(FkAO8;j84gkU zhD9Mn={69hbFPKY3;{~VB?ZI=xdupx(<7o+8U0t`@etv1?am(N5aFKy;Ve1xH2)GF z0SKpkW7!K4E(Z}#sTZyS5e@~I3)U+Pd;m)Pst4u2xk?W3LV(WiR*y@7Avr8irmw6c zLNkFC0r+VVvdiJjQ_TW2@tYK?=+N@KTs;%`4Y4So77|kA=t%WhG*n*J{}y04!yo}> zFT9~2h(UhhfVKQWCwKl=fcZ%VlrzuGS?3>DR7gNSfH)V#_f@d{ z^t_*Do^Co`?u5;vcEWD$l=R>p-;H91jc^XrS1%cAvAwFtxpLmbfP2LEqJy#7TP|Z8 zKYBh37EBm0NJjR%KsUG5v2Lz^bTOhy#|C_7G~C5uEpqMsW4n-P*!`qN-g7NYucMA~ zo|Vb2SWeT!bL;hJT1PpbnX2c2Sx>d&l_k(7W8NsbY0dkAp{=NEM)2is+!knsgECfM z0a8}rpCRzNnhZ^B2b#|;14O7Pt}BfH*JA#kb>tfDhneBR?waSOuInKK_;l~31t3?& z($#<6aFrL{TtQc{_srdoA4>ep#LClpf6{U?2sEjB@xGLsvjDna9SqZNKG$!>$=Ukm zC=q!+H+ftnsx2!|KJ7ki60M{Ge6p%hJN`RqUN=2F!+}W^Ex*Z5li>fnzgg(-cssQ-F7ZiJBGK?}xmuj~i@b_jFv;%}E*#^j;2l7+b$u3&^)$ zjPah-RCdU>GGgyU{Msc*Ak*^!XWDV`954DjXi<_5XaQZmR$s1^^?tuF0G+Hz)9~Jv zsIGKGV)-h~(tS?PcBo%i4wGTn<`GRX_(~_?x>~H~G0KnC_GWeI0DZ@k>3BDji-WhZ z;dG%UWhZMLv_eT&sm*5_n(5B@N;MC4l3(!Y(P5!de?gLKOc1_c7|lWZ}gbb9=VSJ5@H0 zbv{jIh11gXC@EF5D0#%{dv`+YHmY*jDI&nSD{x&hDRbjCmT(JZfa1o-^7MZ zPQ_*MIiIPWdggj*o5%6%rMS^|^1=HtEn)1r_=?eK><+BD2Zg*Fy$brp_O>~r?INZ` zMuiop1-E|m=CY*a@jNRhuel}g;7ke%3+B$n>ZoEhw-;Wu9AtKuP8mUx>m=5xdY`9`7rKv81t?4sPxu{|w@Evp8A;6YtHk%2 z64^vl4T9$Z4-bMb`%F(X(l6P=j1GuNIF)^g%D^?jl+(6=!^i#GwlmKwyobZW z+R0n}I*g8mA)1B^c8&fdCFj{S{`vT)4Gvs(8w#1+z?!I(N4n>NtcQ zmq(fD;)h}TP2P5gJ`p?7=D3IHwX;mNB0ah^G7F%Gnv~eXB?C*JRJmfLE<3*=bdaYWT`so1up0UIbP!DtHXk))Kg{9T-Lh>)^GyMaz72*` ztxmxKug3hDnhMm5j`a0$>cOigzBcu-%2i8;MD7FEeCIv$R%ACTa|BhJQB`wWThEgj zTXzl18>n~f&m7LyQu#q!HeojWxUXvVKyLLb^{+`v-p$TsfBnAXz2YQ8QM%`@>gD`+ zdwx=OSgBAh$g|#Ko~47yQTPpLBf;|B2uXt2MK1EbfxC;_<@~szrR3#4xkd24Qp%*@ zl*ns*7X=3`xz07p?*0#p5#NUv*9&kadmHn~7_UzDk7#MkgD73~8i!rj!M;`Z(nGFq z#{Lc#Z(~~ZLhgs80jw*b{Stvs>-cv8pUaEkaM5!SkP*NqQ9 zOAnMQa8EO!(zX8WM5h4JZwt@2TEz(2^<0AYKd77n+|xuo?5YCiX6(tM`I_rL!C;_BNAeFQ)n)7RwJ6mp z7T`B|P7pUdP^R}#0zDCal~#P~kHEwB$c*2FMRB~k&J`kk)?#l@1Vhha6F94|mzH+c1BJ(o{fs8q>L@x=_gCIdlZf@_&hD^3FNYxHZ3!Y|#8 z$Fu!J;C?BeAG{r0(^!8vz&KPT6?LAg5Rw*P%l%qlShN&QFH$uxv=ys-&ysfBypS&m zSm;;3+x+w9%CATw2l(qUZ&Qpom2!)Vt)|`k#7Q3H`1W+MAf(nn3V7K42eQpOy`M+t zuw?M@SvV!rTS@T>&RP{srupO=hbZ#A;#;(>59UpOVnmkPwQNfiIF;=Pe`+~8s+9yHa+T#&rx5dF|^QA}ZSy&D}F z@s3Ii^I1yx;UV0;q4?(bFly0lw_r=oyL}bOSL51126MRjfDKo2Zb0bq&*gZsHJuDY zb%@7(>m{zM?@uu=*G&*=%Q4wTmSmcl;MMKVrw5rS@g=36>Xst8OE3NWh^|mXvWN%q zK34{k59)e|V7;(`vP^8fR@df|0gYZfQC=&2SN$qG!IwY&IvwTpw7O%{rfGR6L|*5C zhqb#|ks*FS+NJeWTL{>cXe%^xD(Ec(4Vm5g(93n^hFtO+(7q_7F@MUwSasY8F#%OJ z^)ZoK#Bg)_hIkl>E~B=I?o8HoF&LuCMDkx=VFKuS7J+#((uE|_bY^G%FK)dvsHOZI z_Rs4f^Q~jwhWE);mMW=q)Q}ak!UqC@7-63OESKE2U|ISRi@pFo(DD8o_%ec_Ndk!E zkDN#EKQ4EHO5i#UUHhEUf2<68#nq>ch^39^!FKtoQwvRL%tFva<(e~#J{TX4TIt0F=bx~VqYWDs>#;mo8`-kl?%Nzn7& zh0!fnnYf0n*=$BWSz3BUw>~J7k@movl%<%F-nW%jGP-NVKA4v9u9D93?B$3Tu+lh4 zZ@F1*GU{yoTBu()1_#HgF$h=nN&(C>7k%Y@V@7Bwhax{vRDCcJXcFjqsw4A4pf*0* z8H-|l*oJe=#)x!m^M3dI5*0um#~jUBc3JL? z_CZ?&N8^q4gl!jRU6 zbpn`A{S(FJ{!X);B5rb@U63Z!#6Rl@TR=cEmh%5LuQC?YHJ9b{&P?ZTpnQAVI&y`T znkce^Pjf-HA{)9a7kxO=8U3tRG|j4rMjnnfjRQuC#=N~AWl4O^s>$)SdX`72#n}KO zfVI#&g!_ziTgxwA_kpPS%x=P~Qe;W%@D^2YT2hFy`%#jooPodND@tJnn!O4Wu_g2s zWc0@B_>6|jIy`{rKEy-r3T4E1p~-$4bA{KCVKx*O^ffO0rx+g^^PO%SIS}fUnlgwm zV(p{DC7TB756dZDA86Br#AS-|y7@jc3bZ&^`vRz?nlWG2Il=6!wgFfptgqL$uy7bmI3CdY-^Vw(7Pp zt0u55BrhRjN5Je@^c7%7$aYn)4Z8`VX2*$-)fCQeZcj21M9Lo6qRmA;U#*kh(h-BR zPw?{il02%W*XEjD<`i7p11(rBT`YexuiLh~$<%Qq9~ojbFpK_qYbS(xDnod_{jPqg z!gW~5sdE?)s>CFcx>fVRZO2|vETD-hZ$B3!z3w^29JK>{>fnh%^n=ce2=8~&% zwGQJSi;6D@D}~2VkAEEmV?SJ!st>Vaznp+IJyz{ z&r*1uj}IsbJ<8ha5J9yDXkKS!HGCx24+BOyl;`+uhZRwFG*aEC^)wMuQec$vx%k)2 zJ#`pflJjCnJoc;%7h!?+zy%-I>U`&Aa=Yrjx2hK<*pECQn7?~NpFYcEC-sQ}Y0N7h zEpBlb{#aFbc{WercK|gZ>8RqE6HxH*j&Jvum@Ms;KL_#!=fqNbnr{ z@o4;MrlLG)z@JwBi)zWWx=+R(#8=Fxue*DH{P6m!GaNn15+Dc-I%KQts9@rnCqi?> znelSKmumbJ^hXFYhQvZ>b|S8BR8hR{kkGrKISVL=27tFZoDb_j73shC6oT)?(5Gy) zI^v1E?@K1Dk|yv6_<`Y z^vt7unKWh$i_)?#wo5gO5>CcEdExpdTx-rw82>S9!XXE3*j-|s<<6`9VoC-(JOr^= zleWypA<91Ny^Rt4GP`ce~&U$kr2`_*xC+dB>9(>YfzI_U5?~E0}^9Xe2Td)BV{OOVKl?DTM@PAVl|2yNbND6f= zO0UIq!Iuxukh{)%{Im)_s; z2cg< z$iV+N!TiK?I^R4yNjz3 zU)pc`IxZh0!b!0u2s`hg-9;+`wYn7;&|I}2$4!zycE={gfdwB%Jd!5&S0j+>2(UB( z9Qktaulk|q2kgq>2ga-rXMie8M||14(8-K`f`+yEuqud=D@r|SH}kN1!S3%urs`7+ z?2*cVo!7E|8>WGbSW=*lVEud&WgZwafMJU2Bat~Cga$z z%kq2R8f9TAv!=Ih2U2q;y+RijaqoApQplqmi$J8(0CldxQu&pOH?VtJd{Yu3sLo#B zbE=E@L4qaAlF{H?HUp&www99N0X?4Q=y5PrUJY8C8&+2+oVC&Gp0*>#)LR zzzvVb%yZ9nz1!}UDQsQf+{GzYFHx;E0#LZgDqKC)Yk8rgv6KDIu3;M=+3yVm*)<0d z)@8P?%)goCq|ql{S}bMfOJ!-iV|xZJ)tvibOW$u^oD!5neSb_O2ava$dGJL7G^GUF z-m)QS|1~ki2XGt!yo)*%a*BQVe_D%a_~b*)-+&;;#~!vM?KL({e%^}iruTz*wnU*= zSQQT*+?*8_hH~Zs>+X^<-7>04&3e2}KS4i2gtWhR2AHM2Jgi76AJ1$&i&H!Yz&0?E zLJfO5jO&o9J({Tc+hMznW59zd?FC9ds|*>3`#H@F;7|~D5-$pU{Y|35VK1{Axn%bK zX6?%!*??E;rDFB$Q~3a|qQv_oiW4o33cEGf>$w2fkfa*xdJX>rxbveWBJZ!6`FG6| zZ-x(JSst0f85fD81>gqb3#SfSXO=6m-{|Xlr3BEd>z-qg!qQCf^H?T;Ty+@+e~u3| z`QT6P2Afyi9My~+SjrKF6~nqQ4j4|8D(O*RxSLIgFaN?HkVO>JT@~$~kTe+RmtOV2 zKUoudq9vS>h9@*RqbCzq*X_PcqFemo@kJC(kYmawQBr%Qa5RCoc&gcIigMFeE-&z5 zS1wDtHF6fz8{Z{QamqJvfSN9YJr`a9Q(NX`kNLS8qxWTF3%~CQx;FQ-(EVUZ`;IVT|)xE|JbO*q(I{ca| z{96i!Vw=<}3(XC*rb@Fw+x$hLxgzgvv=sh9?P1=UIls3{M2$laSITYY8{}{6O+eqw zW)AM;YvS>F*6~w9f@T%T0($)KJ)u2;E!Ws-dkWmUik8~%iYgtWNcUNY8yN^kxdy;g zh|6(P{h4!K@N?&jJYo#KA;Z(!Mj4GBbN3(r7E3mhBq2u`_My;`-CWjB{+z=jOP(eL z4lV@PfpIuWrrZHqd0mr9TDCL|cE5n~Fc2Fa;ldC)aDV9^SNJ!v|G)1U%}W6WpDKFx z5PWQOvu5%2#*-}0QGNn9`cyJf6g1)2`HuMTr0iQlxc+=Wv9Ng&lu8q-v>dj@b(Jx% zC<-_ztIv4~Kp&+)c8ISU^;n6`Hoy3IfL}97sNC2;N-B3wz(DUy?nz37!7@XU!jX!F zv2Vjbzf)wUCT?}KmJb5{P-Iw8YzhWa}EgEW$n0cUXj1Nu~ZKv zFpB@^{qEWIcqsw=LmxNQB0I7w_O*PiZ`oIm?sY;h{&g`Gn+^cwmo($U;?e#+67I|f zPk;@db%qIBz>>d%@3eJ`K_|t1$TsM=w-x&@SjE9UZReT2IYdjIWZ8QEM`o+Mb*njF>Zy zs(}u(S#aOItCLE1pTr+(NDmtyqj-M?B_S@Yt=)^j6#pbTr>JB)yX=X+hW$`pH7=02 zzRV82MBwaj{}XHC=IRz8x^3Az^f%+Mi9@D24kiqrD}5z;y*uQXyI!2wtC-!}Zr(U@ z_+3`^`RVpt&>7Uo>KgcT%i+x8JnS?ZY9{AJU?v35=2yfRb78v563^ER1Rx>RsOnFyV_%u zF|y{8%BKnwR8_&!yi*v2fK;x5+cYfonSN)&qDvt@^sK{D|#&N{lP6Qvme28NBEwI51w$r&t*dM@e4;h4KD&k>7>v4@M;y+`s5}> zp5wOG>fV!LD~p^MDF;v5ek0!N=atvgWPjp5a(xQ0p}B8Ozi-Z4%HYuRoDKueo*m*= z^DvGg6)`y2YV3F@WVk7<*<=G0Dnmt<)Dw0vRVeXCynAP#^W#o$n?K|%Y^x84cn<_( ztNujxf1tI4RTz2}NB^R7eKmgLWms&nM&-!(oPvyg2 zch1}lI6O+&g-+T&EvbN`_jtbBU5V>Tsa`aO(L%0Te@$4wjwi0Mi;0Eo)wEtq&~Dx?wE3eYxCgX3KhD!rEHdGE^D4U8QP-lZl;F$#}s zOviw#2~u@ZI0RHXt*n?4p;#2gc2?^>ZeX7j#LNHu(h%j9`o)y9Zkq$ISOXN6^=*ho zUc>}LUDaR%9tw`w_tpRS(gxj3@r#~tLl(RJsW;d)|GlGgqscCUPbU&kXYkxHKkArX zUY8`(;;%Vvh1`(i7M66$U^GT}!yClp4Od+&YvG+0>ipTK;*)<|vdJPLipcumY`*ta z+nP6`5?0{uQ9}~q%e`9hx_7I^q`^oxj}?FPY1mjxN|LIYYZpyc#k$CQ{P%igVNA5W z!~1pL4^dWaTeiB@_;ffCJkLx5RzgY;HP3tF^F9o3AXYHVqY;IV3U*YsA5=}&cL-Q0 zvDR9t0~OrJymB@g}GKfpobh7Tl?p{JypRH(b)VkL^J`@)W zud`MS4USM|F8ofLu7hjiv2Yn;yJxkTql`THAcn_5i!aT`@XPv_7fPTX#n7*OS>E;@ zzo&b~Jcl2(Q)TV-S%1CCZ8y~W;p&6^dDq*P#3L4ZBF)YV`n4z9Th$#07^Xwmz>ikO zd;)_Nu`k_Fcb*oeLG*fNT-Q$C>9}4I9mV@CWxxr{glCrL5xg!whs~(Avs`@y&MNbE z2Fr2U`*8p9B@bH9#tL|O`@k;*iYhgqcR==8J;E@H#4~%ECH*K8p8OO^TKMg0HsfKbteN0S=4T@K>&Hv!u}lF|@_e*4FD%XDb$ieW{>N_xORa-~wzp0fA^+0} z0G|-zf^(G7U+8UEJ#ZFS59n^$8WKTu((>8FOT3$FNS_xMypY_!rf!+Ymwh!Po|8x9 z?Znl=)ZF=00i(&0kMFc!crqdQRH8J4j`icp=%LE(6QZfo$DW|DM$fCgpJfaR3wFZ( z*qYR-y7k8m{I@y0Gv3P`FZ;#uM9EzBc+l@f*@syBvaPsK?q%7A_6l2yU25^Lcheol zj8{e=yTvVgVrKhw`PPQ!1?hH&_)-PYRdIv0rvdz%fQ|Jfc0KMd!-7Xa zV|I&c{!BxzMI+*RYjz!5I7(RXCRuQ&q;qT0j5)@M@XAGBOzv>1r=+DaH7*+tp8n-T zvX_xeWfob?og6l);;VE^*@flG{g2K`_A*`(ObA(C^Fj3C{&Ej8KDX1rozGC&ADQwp zAMf_Fs?|W*gZa?Ic(|9-!H4_bzRHP_f`>B(!@S>bd2Sm^jDdVmwm%k-6A;B z8>^Ur%UuCvb@(`rie3a}e=KD+yJo%4w$YawIR!P$ z*>Fn4wd|l^qIS?1EE9|@!z$FrrEXr-YOtR^GdJsSQo_k`|M4^VFWKwT9xm0M57aNb zYBw(yyT|9ta|+MI2_BU>D#|fUVBJkJ=>Suw-!vs@$gFKAzE(}WcCI~jP4{^^9P}vG@vxzo|FTwc zvuItj#cRSXYRiW7r60o--_-9Z8m79i*XH&*aF@!xa&?W`lYiaF)%NGBW^Bgx#4skvJE53hfr9LYOwo{WV?J z1D}SsK6k0IscTL)_Bg$Vr@wT1yv%-aj25{6;Q^YuY_|nbcp6$%sJy%7n3>|dXEo>! z_(^a6{3H%F?0r*{-83!FJF2!0yFk!9q+TBx$*)oW-pq5tv4&k$+_L%pc; z$J4k#%bfV(_fg=ekoNfXkm;2LC5#lmjR@9#Zfke04!ch3C+7z1{mS{%4@*mOPQ~h+ zv3K>Wn(?%S{ofbTK6~4IGVGt9c-KyybMU(5wc;l<%i^G5^%cgx2VM`3H7~P_SZ(X6 zOVfHCY+J{MtJ7l%+tb2hwVWj`hIy)yiy|kknjVmHMx}oH9;xW+eKpi@?TFoRu%ixr znn3f%DZMWt2cKIhr+j6RTMOMghtm zd3rj1I9Mi268n^jS1p}d|6l@Y=HLsLPLTpBtW8&oX4rJ}mpqOJ)hB-+`zu3Qp28rB(pNu@aN>&XNz4%RtTDGC|7oM3%SqOJ(RsR@i z5{Ru@nfmO^6-ST{$zmjtrXt^03r4(%XV;F078b)`1~0{e`C46z@80Q`3N4l8wc8OP znoobzFlo7-Q(#=(Hu*k?;H;R5(D@W^5|^4UPMOLrBr-gUiC+YOlkN-h=;MYcH54qa zQYLv0EIjakm4J}=$p6CyU~Rirha^Vp^?w#Gs+Wev0k?ppXqiWsQhksbQ%CE!cHD8j z9jCu4xW?v>hD)Bjls~j`I@x7Iq&Yjx<|I#VSLpG1u<$cEZ>p%*dvNuZ`JLNY+6cHy zHFR;J=~dlzmPgWE2HczBcgt-7HcK50dpl$OL;y?Q*;0waaBR}k)Z4ZmQ04udBb$Fv z)tnsRI+$F}XH4L2(!hsBRumjd;{l7csIq?BgTw0js)2`l`I1u$1Go9H(RR}{)Gt?= zb|(v_4r{1TPnZ1G)ON6uN z-fFY%Rx9LcH(X&~SDu@K+~&TX(ym9!dAqOX+ulFao3LLETj_e8EF0}sxa}6Uj{!Tw z+iRyOU|G8JDBXNB{A@GX#-#3ENU@-F z7*KjsMnS1c4ILr$A|jm-v4DzziUjFRdI>FbLKTEiq=ga!0s=w^J)s8n&CK`iwbsnH z*38<+{`vX~kF@75S3j@wB93ddef+y|GNg*yf%|ZlNbB%T;qTIYesK* zUbu(&b9W!ybgK8Fv$}4yOnS((dFH1%Q*(OW%8;1t2e!VcJ&arn_B#7ZPUef*ontN6 z2#=2xxggF*Ib|y`F3&{zXz{oPS4@DJ;J&y%6qaJ|adc|mpnpAtc~OjNonWpS%ts$s zkkxWT&@UJ^>IM^JkW_InUkH1$syMc}AnA2;3)}mO598WFyWXN9#>XC0She1L@8Ek@ zUj5*TyWh-{T`EGEGh!shzvMi|nXRb)VXP87ei_XW;VfKNhRU6_scX|Tv+gYyBKAu! z+W8@Z^@CT8G_fCY<#sO>X%b!4EXPFP1+^W4tj^n&F4lA0LwMP@Vmph2_Rc~;wZzCq zek*_CWSOVwtSVB}7_)Nq>7`)Uj)Hj~B}dtPjclu!3CY^_i|;)&Tu_SVt-0=IweZIa z#J%wIqpXacIV#_$7d=IVtyR2CS|#90j-PZ18);9YqFsk6E3+qHH4kuk`D?G>J?p_* zan}@jdQ39MH*0cGc|Q2&?P#>~afSr?FpS>9F7nyY1CI`Y_Tu6w!te}M6lo4sjgw0M zC|lvuy2%Y2sqTz`Gag+$${U^N;*Kptr^0)T5OVtk6=OzhX5uG5zAc@XYEF5dlDid{ z4XoIdH!)Bx7$&$AKI4Tol+FupGWwiNHRba7&7f5+F;dA&)k^d_skQJDxorAEmb&~7 zUg0q4dLO|gtmj=MhGz=I@PAs+s!8V;9(fV`OU>}@r7+>624;I_f+8b1=M0NfZdk5`WUj6=!{16;ZqGDb zRB4ibdjtN4u{kHTM8BiVJhnZec*1D!okn$bNn2*T9Ceubfr=}ugE3UjwO@-O|5T=) zP#Alb7kDSSqZM2nG%#`*3^{+PBt+d?HAo5S_<7{jJtc&o@1Z1lIVS}YapHB;kxOW z&rC12Y9My-X3EWUJ`@R~4GH`?yh_|yCf@f!gtEKKp*8!&tK^tqe;(XRzAJX|eiv()Uq*sRoTl*Y@+)BjTs6UGNuTU!vyul5ffd-Us&5c50VceW-WPa**y_HGtv97$Ev?s=w@Oj9M1b# zK1s@3C)go_`-WJ4)thxcfJ-JEc;MZ!BGuXQZQUaj`tFeh_I<3mOp()7yp zh*P1oh4w$8kgH3Nn@-;4tw3pz>ai{{o$dF2&XFUFZ(719Hc0b2k%vMT4umcM%;y?Q z@Q!gX-k|#>28BOgw|Q*ZOWDdNF%$A)kkhz4Ec^!i{v)~^Tul!A=fZ@-dgruVakqy~ z*lEOoP?3wLMkBnLQF?16K_b=FO8Fs9aCBUVbY=1arzf=esa-Tkk+3?6LH^`K z9y#XEa2U2xb(9lNot&@GRUXqWW>B{Nu9`r-T&v5)w4Uj|$2CxW&O&)_;aR8{y{7Kd zTaxzzFB*I0Qae6MB~$m)8I(%_o5*#=3n8VN_#0zGj1>I)pdaInZn}GYi=}xxSE62o zOq@Ep`r%~%e!xcU`WU^`6I)3vUj<<{$d-LHP}Xa?j?g0^f!pMh<>? z%Kn@oB(-Gi)s3-drW{)$wzCCtQZ8dS-A&ls=om3aiHBF1FoUnwz7lo4qpO}{x6 zti6Y^nYXy9Z?ZYAm-K(}y79QP#cQCSB2y$>C`2SbVvyLjzVpspaaW;W-<$k}&^MIH z9e#HnphUwuGtCd-Pt+ zI`d*(R_ahp#nUU6ALn)04+2kydTcJgjPy8zd3M0O*w-ncyHkD1E^l;G4#v-bwMK@o zzH(%Lk8nP+p=S2@E^JL8fHV^X^qG-GjNhRTxVXtp7?v7Jx!JCDhvT%FG)GRY!^sz{ z6`T=$Z``hY^C6{;)b=f?2Z)_sVnFDq$15vkeN!Os-T4KVgK_(!NXf1xmlKYqq~J|% z7xV5Wc!czeH(~g*7kRwT;l9g-zH%Rujc~WWrg+vESzjTiRHPX%9Zzl4N|ZyFWOO`~ znkbv(+{g^UCSd#Shpuau=%;(A#LX5+7r9*AwPAeT8uZX-G08sB%y`<;! zDpV?tA;U`-O(u1tNBcHO-S#k@HCU)kq*lnt3Q7%Ho=J997mXHgew|#nsNeA*a8z-rA_eXA8)dz_*?lx*jEY_PE=q z>6$unlEhE`=7cvP_jdNK#$V~7BE(E7#kJP=lDL(X+I4@-4ZVyZx>QDa$NV8orwIKa z$$j5$tlOV@eqI#+bzOoQYiT)**xoFZ+tA$vslRBW9X&+0wa1O$V#Pp45P`zkEWTqi z&U~9({dEa@1#2fe$5#K-QjQUy?eeP<(fGY4Tl7oP-2}2WTbNg`OhL;{uU&U^wET$M zL$L=Wl%H`BHrIvo!eqh7YtcCHGw5ad0-gbjKSc+NF1s z?w+Ml%jHhPjBPU9aHJ#fo3DZy%=f7A`Dyg1 zpLwsfDQq#MoafNwd4E~0Iy_xof_h!C^`1%tgE#H4>Sy}!Whq)#0FpcQC$ zRE=AS%P3-%t8tQRWOc8)QnJEaW|M941~rJ&$sX-k@BTtr!Fe=@^#?hihKP^ZI{m%G z)u=9OG#qpTh`)cs)WCqxVW31FYc{+piQE&zd@Z!@D`P6{_-!{)16p3PWEgai9yun+ zT6yO54Q4ykeW}yYk4|78nS0EhVPwj!NjG4An#%LF^q%hpCvH+yEa@~kv}+N2Uq$;9 zpPH(!lH(D+jt?QKL~|Mk9>p30d+uevUXuX6w zGQk5MU@V@9Z%(7+62g&~pG?#Fuhd2%Yqb~a`pQN2O*SO zrR~;1+cfK3hwP2_0GMy%6Iu50`2Mc_an8Zgo@TG@xj!Vzb=KY^f!%11@tjCH_N`>+ zcORW4n>x6wB%WJ3|Eu3`wQntaZdvB_v=pIERZOeaKrbuA3|)uZW3lqbgsTAy5bmo-Z6keB2r3j^bvv=+z7HJl(Z_kkIJ`_zb)VDc~Z+Tuh zeIYE=y1u2P!09U{|EzmYVpdX|ZC-a={rgQI=FYbGY1oF(Wlu|H^%+SCjN4t04Mink zl*#cn$ZV2)VBVUUs)pcm3*+%(&6(03Ip;0I8NU%vtQ}(ceshyb&1UDFk#_Eq)Mhfl zAS3B}o^3Gg!I$9Tbdkaz@j`{4s%*Ci6FvGp?#w~4TOl#|r^bVV4$e;uXZ3su&`~Cc zl&&-dA*;FZKmd)>ciKA-eY;mc0BgPl*^VmiJWzVra-!lrp(~eH6cYV1w&rws&GAV2 zrAqx+*Yc58bFV>zXh-63O#e7~-^Y256-57_FlN8Rk5^z}bh;WUHug8201&=+6Tvg0# zX|$nly}vT7fqX5pKdIoVUIy}rt^-{C2R8L1*$M8A$CS%Y=})`*w!9QEeR{7T1!bFg ze4n$HSQwo`BeE2lq?y;jWSve!$HtY}4B3?sC(xWTBUm55%@RoAr zH%{pqyA?IGERQ~Ff@bvY3v(CVC+F2uMtJ&hS@lG5NuyB(crOpe@$!>S_he3tOGzuo z(k$;*Up&OlhGaCtctY;}402>=vv8_;8d5V(r>y(SQ z<=j?~azZiUn~0QelZ|u21z&43GjYEZTf|-Y!%O z()^n}BYXZN$B?nVW7c9leL`VQh zkHDo|?B^EgPsJj-Wutl`5zvx%2k7NT)+&j!$xg`{a>``b#^uOLGHGm(4MHNgAf$yx z(9VoQ1#g|KPnMEGmUrizB9#wt0X)#w(%NP3pelcEpe^$3<4b1^#K{W%-LiWM^l?Kz z9S5MZC->rzGfWg$^h%kr8>(-a;5dkCR+jR2%bAI%)~R`g!1s+c#?$Lh63WtfrJ@fA zFt)5oXgu`#-jd?DRJ* zK?xx+UTz+gocHPmS%P643lCyjxzRj16ISO$EF}h z5q%-Z*P*)Ya!PN;ZkoAU#Xft-{8m5D7Dn%EhaU{t>UN{P3y6W7*n0dC@|5at@-7yE zVvk&9!gQ>pFnBuhk<|9fw)X;7A#&#WgM_KuZ)mS_%P-fCP2Otqe{&r9vKg^JJK~G| zAgvd?cm;;%w#VJ4Q9plTzT)`ed9I z8x58cDpA$De@BX8|IUVwc(>@jlgw~h#<&&TAl?B%X{q#Z+fJYvFOv$573$9<)?q*e zI&7S0c%?h&Yj#;Vw+*!oMY7vS<2yC_K>TM3h5aLr>GL3)o%d?vX~*@9x-5)#+x^k< z7W|%C&GD45cen5P_HLQgT!cqzNf%TZOGd^@xav4N_+B*Z@2AE7SFtFbprao*$ix>Z zI7{CXu4)20Klzp=q&Ae$#VI%6mno?U#}S{_HyPeltyp z2Sp_>M3Jzb^6QY+R~07gh0I0FbSppAY#4h}d6G&ybZgp|IckoG);?Eq9R~md{m>Fy zQk-OMT9Ei)(Z?Y5ghzESJJ3KrU4ewZ6c!TCV60!GCYnO>0*Kl#UUV-5tghM(lCv){swn0v|@OsCpOt zG(!_+eC2){9_@Xs9{^rj?>WO2&^4a@EhS*N?R$BT#cSTXy3^c>#UGMMp^a!`BI;KM?;V?pR zqq-pZxO_|F*&wbClTs7$&eHKnN!*s-benjTmZ6FZaJ{67p9K0TW#033-gHQG>HksH z#S@#8XWseiu=}|8$ntDpUq+HCXc&I{?fR=C>b~E#4K$`;)do}vJh=9~OpfCL$S6E1 zAlEfKNZVl~Eg04jm_s@+>nK{;R3d-mbb76`)~!fpPg(4CoQN4X9qq4dc~GNIJ@C=6 zG&(?LiKXVl;x9aY#UPo|>M3ZN-YwlvsZXu|D(_B@2vshgT-P>~Maj2MuX+ikr(TD& z3aMaN__!q~WTC=G>!w#5Yah%?zY%}_xIpuXHD?@`F|OM);gP)DjO<|zDA)2hGMq~u zC&KpG*NC-HO&D!oAkp5+y`Phjh#70;jKBgc#COpm<~L!iul558tt2I^l8bu{Now;= zhWTK9(TiZ1|A8zg(FbtY6L0*;2uad6jgVW&z7i0NQpKmab_g2b-<@?L+E8pvYL_kx z-P^p*3^ z()?8I>k6Hd$Za#W?Wr)<8rRxldCv(rfeo~sb4mJ21CW<5-j(11k@(;^-1U4>d%TiV zZL{5H-TYyautXV0Da~+^plg9Vur+pc7lUgIcFt=t557QU~kP1v1qUNL?>!D zzk6}SG00@xCUA8TUPF|#s29BwNC-03>-EMsNrx;Hs|(;MOiKI1BIVN&v2Ht)2OzEd zgv0O(O2P5+FZ^ftFe;x_FrF?ay2zv{--5@VV6fgZ>KKLfEae%CQyc5(sbWqs8mUp9 zOh)KN3AIkd_DCrCV_5?i<9zlauV2Rdea*J%lA8^B7Sy0o4XM4pCQ5*JK_446Rp~iv z8AJYlse?18$Zx9McG1(Msg!3DZ;)lyqt~Cz^c+^cC(0HE?4Q!Y2bEvUoa2Pf=|G|v_NlF!}DDihB1WY-s4j$P3sEVrxf0}*j8k>K91xf@@u}f5I;T$>% zcOA1k@Lvm9uBs{@>#Nrcanp>lat&N(Hyu{O1x1EXaEfIbh`;l6vHDuQBc;0}qD%R-9KIy3c zlgnSiV$2?R{`^t9QX$Z&^=wkLWG(TIZpi3^2pLA&ifn5aPaL{YvX3A6Ivxt$uQ z^a+!Gcg_HJj9=FR$9DKs9h34ChG8Z0T(J)nQR#h#E~=t0jeRzd3oU^}uU}}Z$cf@U zDU6*krAibD*SDjyg4WuvEjjMK*J-{fTK4Uh8$0J!E95ifJA;La0TDwM0V2>jd1Rpv zWcPik`WaJiSF%>`qm=1IZ9|xLyo|@gvyFSO-DkTjyQ@x^?b$q(#O$3v1u9lF^iOQ8 zVkg3@8`2r<&n-$bK&pRslhdH(8_nzM-sh4;2Slt@e-Ux5M|X--H!urGWl+*Nt7I!p zo~K(wiB#F5Qa;xn-|)h(j~d#V$ov*LTR$q%0!I+MJlVM1n=2iSIY~q&lC*@m?gN^) zOAUoLT#`ix6gL<0mRxJXEE=zujx0Nl&RGJKA#!Pb*_4v%yj(3bA_|e`ws>@Y=uDa> z-YdajSit;>U-O-7pRjinjmO=z2a7E>mRl-rvz_8DnYg07y`h&Cb}2Vcy%!RF`#DX8 zi7FdQPHCqCA@E3%Cc?P2Y_TM9JUN=Muj=A}wIQXYi=l?sAqDPEUcKLLi;dcU&!fcG zh*CtQ4)*RMOo+F#cD@-+1mPY1VAtd9DI-xBW7lr_pQ1G)JNafXRGr|UW;JEB`gyPr z1Jk!_q@}Q$0+h%)bZjWpEVf*FT_Fv{HA)!5xC~v7J~DrUXycWXn>x9H`Wb#IoPzF> z+1%L8?d>@UZ|n7|k*I~c%!P*yqs<_qL-h1(L~`UpMeC?+zFTXr?17a$LS!myIfQ<8 zV`c+R@z@Pq4%mn3@qpiRzS^Bdp=v-sTNHbSu&|j5%bt#dA}q{dJtCac@u;CpZ*7Lq z(?%+DHmt*z#J%ncRMG^0cjdl+#WK77m9T}YvW&|kY#D?(8F+CxZ0N2P6k}y{9694I zq4yV8mL_e`Y=c0y~EMv?(Hr~iQ`k4FH z(9xOI+IY8nB@8fsS1o*FT*SdgL+omGoXLd}w6%PWKsVkps#%6rR-q(H$SEJ93bqrxQ zdHkw(2>l}Zo(4UCf7vr^U{&{>@UYU}9mjAbK?lE!*lJ>rWtgpy+Y@s%(s@%>yMVIM zHh-8+V4=mX!9TtEOG)+UZ%-Raj+CU!yGTaEtxjU6X0YLETr<~ewJJW^i>Su&G^sT= z!2<>jYGD2J?xCVG4m|aM_Desa=zDClZ~)YjRg{L3p+xLH`wjBQ{KV!ABd6$NjO^To z7~S49OS;;%SV71t7w1C*b{zi~$WEGACQ1Z@_*4p~C5#U}UYZ}%n{KOtdE*Nn>k_P0 zB~C*fGdhTN%Bd*la(?m+4J+VljwgCfhu`(;kfJuk+DnnIib9AMo^y$JsU01a%^{qu z-EVODuKJ2_kBI(GN=2S1SZM}ODVx@U{|RaPhhKQ=%n@4b@vjj}4PCXQMmj>J^n|8K z;YE%i6T8^cWAt$ed@0szciyt=#nv_-=NwQxW)GXZsyIn&6~&vAnM2D_GT&1%k#veZ z^9{?Z>Xq7cDK9R4sYib-i>tED6fypIXLP^TC$3)#f+TEjP2YuicFN`LHcDf96W&NV zrJ}G;CrL_dpRRj3@vUftZ})yn6~T@T#c<-;z_qNZ3ondsC<&DPo5LE>Ja#5qpaIel z_gm*7p7OEz6dgJw{Bj8>9A}W@qaqs9smE`ELpF}yUYrVf6 zJHu-O4Yx^|Y$yp>s%it3n?X3q+0xT;r!U4SKcxLHfxuIh16HsE#4?XbC=D&?+;>{5 z-F)ad+7qYDj_iyE*DQ}bK6d;A4V<7digyvBO%xCZEPXy;YFpLK=f|tiIFmd{>9j8e zZZbuS=phSF9fj2w@m)^=`A-+CbkxFMwuJ^XA)GPBnOHih(FAw@0)B07QOE=cV4{$U zCBAAm0(tqVipPM6rcuyOFqD+78uRjbeGYG#n8-6BN|wDA5{K^R=fQEZtx$l0a* zZr#kvx2D3Ps`8VUUE;th{Ac&Th`#hx zB>?i1I7;jq1v^>!R3f@=e}}jPI@f)YIpqclN;(9;uyI>?BI$*9SDKj!fEqIPSPY}M zv=rN4j_NPO8+aA{y)9{|MtR@!>h$rlJ0Qz&ztr? zeDIqnP#2?oUH<>=YXAB|@abQ`EmQSo?)r0v^j|yl*Uua|Hp-_0x;;Kanf^CVcM%-7 z*Vl+NAT9r;tKfh7uS(6a6T;3h*NK0LJpP9xmOC^Or$_EzKleYp>Cek@hygoJ`e3K{ zKRwQ$j$I`b=n~vT`8Rf#{_%={ET08CZr+zq_rG|$pNEz}&Q`4#sM0^@vHshGN-+mJ zj@F1H|MUH(q2;;+jy80WKMqLwKi-Nm4Y1?hcT2hdH&3Suj+Xe2>$c=ymC=8@Gr`^` z!H$bM;-3F6p6=hm^vCV|w=n%7JO37@KUBuQh3OB)`0d}8=?_)^Z_D(%V5Iziv`p6( zix%erla|i}ydnV1Zy~5MDgH3Z=TFC==Hlt_vX2cL4fV(@pb{qh<2w-rtp2FrO~bx9VVjHwx2}mtV6~?Y8p0 zai1@es`(wv#(wNxM>fnbIONjYyfh)77-~sd)^07iVXdb z1+(fC_q$~05^l`FLJrtI$$8}lEEcy3x(kCq!VS##E~s@QpDR#4o!bZ5zXS`vfqO(> zy$S<^GTmZf$W^i3#rrq;*1M!FVbt|*c~k)SQwSAf>L#02zLTcX&WAK^s{i5f^yGk? z1!V$(@Bw7{hWet_KQC>j^H8(b;;vCOR1jFP+Lc=w_jSOy&9leM{nDG04oMBUe8xPY z4YSBS3t{jTD6Ex3hgl`?XKEdPw;Lv z1&F-DHp4+vqsyPz|6Bj%UoV_jq16Hqp_kiS-ouRq&mP5>^M;_c;78he%FXBWVv^tN z_xh9fe;l@Q&^KQUy)YG_wDYrrXsCR#sFRO<3;4w3_c#RcT2cPNQv4kgoK`R_>Z;Z~ z+VEzT!m(5Y-5c{`YZ}1UeUAZF7ST)Lcz_MUd2GXSC5NM(e zZ4c}{W5c0MY^3AaaOaDZKE$!vMrq}aPv5QvF8{nJY`lPl|2HcrJ7LMR9JhMQ3TjXC zWOU8@?qJDk>hkL*c;fN;#i2<1B)?2~62Kiv_9#S+beA=hEC zJD@Mue;wC;{U5l_bN3*~IxvaYZS@Nqio?(uOt91uy@yy0vs|3n?N#HcLIsiY?jDy^ z_Bgzg^x9$AtmL2tAjlk>AV97O<@Wz7AcT!`E}SbG4C~t7W1I(nI$lc zT75j(t$Kb;v}SQCDQL&hXYwVR9HczwG^FlucC=f+mNW@ni%5U(m5kWm{#_5{egZd& zz=YUpwj}^$w?)ZPLHTG03Bc`wSe8J`xffy=Kk>mY$$vrM8Yj%h)PFvM0O%&>nlPt9 z`zT#4QX7{+&If4&?e)Vch|${{Kl(Jp3glXu7g^j`CNshu=H?`!Q*?9M> zBm+b)qT@x?N)v-TmC-qSwn&G}7`A%~qMQZy9t=px3nH&pj6DvsG+3(;2OZVYfmut*Wz4e`e z19QZf`n{Rl#n1FtHmUtsv3j$4Y#`slCfP662$+y@x!91u59P$Q8blSO&9s%N8{B!B z3&{}751c()cEI8-|CxzR%x0a%x~Y{`BqU3Jkh8EYWO%Wd_mc&7p880MVK&>JOPf=| zRy`7uO3qF1^$PVeEi&&R4_R8Gmw=<;#$rWl zgncahLS_J|^w)w3TCBe?jgZ;rwXtV=5<}5a1tnJD*I2Fe4VJ6sl1#~RV?nL~mB4_d zI$3aWdiX8ZZRXD2hl4BOqhN{}VtxAnoe+^)^i|3w9%9WG#RNLzb2rfm5S15U6l24b zTtEFtO86Vtd|n&{+?A>YuS#tO!G&U#*rcs3%KF!m_i2<&lAa}sTjY!+*##>GfYK#{f~U!TL{` zBAVI`7t&8Xk)jGC&Z%jS!?G}0Iu|3C&_nx9h(yuhknKk2Q{cv%_tm%tZ5rzgmS6UZ zyc3XKuHpN>5u~1!p=!sa7cRgz&T?iTM9D{_4Fc^R}W3SmhkA-WchY=uHaX{ zU+9qAGo{=j>1G*H*q#17b0lN7gt^Y0hzrmgkw7ubOwwmSQTUgf?_Es6*qhPyXJN1SchdBxlDCi^T<_JD*Bmz#Qe}>XDag z*Si&0t2Z#uTmuco3Z#X$?%ZUTs(py^_qwPo48w8BeOBBAu!)opvuNvS|3g}K3pO&m zm5tM`s4e6asd$nnul(l7i;aE26#d?%^`n5EKl|4o*Oa&Ke()1?8=~OdEl2k5MqSOY zlkH!7{3eEs5@H$f{lI37G^j6`%RY2*>qb+AZ&??o;&Vs0;wSd5CM0av8m8#h)(5sq z7@ViGP5=xg2E^Br^d#U1N6$lpZ~4XU*cQ$M!gSD$L@dm|GS?1X!RMVG%&^hC8H%wu z$aY=jbA^(cNr1&stxbP)VzK~GH?WD#80LJAOae|Kz?2P)X)9Q`RJK~QH63MA(9PgE zaK*2Dh@JI#`%1ir6^Kiuu-@F|U2ou;=iSmb(sg9H_x)1$L1?|6MTrQC6> z(xZ-IP+5RZ;(7AzrU8~%nvwJvSZgDZWZX3Y=lEs4ji1UjYqzqR`v!JNJI%q{_U68)B{Lml8dlQEl0uINt-kcHJ1uD{FwASQ zPXhSJQ8RCXN1cBGZz5>57hz}BYi>NWnRPgxa-EwR9*Xo^Ykb@vNbginuSR`nOOI5l zcJhPpIwlHsjNbriKX=|_2!tY0^VJPJs9iC{wuS_$nMrxEz2gP4Q}=tl%$6$gK>+jl zY$}g^M(;+r)M)mD(r2vAlrJNXrfA-mr9KdfhUhp!=w~3vFXO7Arx~4==2=p_fSohQ zYzv0bpI_fKalOaD-T!OurBWFywcsf7N8p1OcS!D;ZUf$Nf6AycDtCTzC7qs|Ve@tZ zRU7}F_1L`R*JzJCdrs3|-3zAq#ESAey*Fo8&(h6sgE)d^bjT7>w_yCuV=`2GkqMqF zajZ32uVZmWW6T|(VZgBg-%b48J-GXYmibcs9m?Rk@zo+>5&Q^nl<)T}1O#o?Oc-!6 zSc~VP)Eg_TCsOmX(D(8d3eXmrm;XM|`|+!BCIe*>@=(zzx-L@!OY|Qr@2p>!?`?;ix%WL zfUoVN<)3nqqCc^E`zCaGuRSUM=|LEp>5K351mshLWsldhOk65VoL|HJ{nSF z?jJ-Y4~2$Z?LjB`Dj|epJc#HtM|b8CH%7Hs`*hz#jRqPTR?EA;-PGqDHUU-&$h)Ck zjj31dz^H{*(Oz0N+xL@q zZdy+5f1^X*n3jnoY)G?FjyN?JSvTj7)^|zaw=xH*;2bqazT9d%r=w83L~cuFvObfD zT1@cl&N0z>PjWS=!)Ph|gIv8W19Rl5dpVa+Ys*f)IOpGGpkoCM^f0|CLjUl@!58Ad zqj#8=erDq{F}~c4k~t5&36r<|6q!o(zPRc>3J!@n9IW-BQ_lkzS0u{wHeJpM+!Hqeb;j1V?G$`sTUtl*+|quI>u4(-Mbifca~Dk-*U{ z%$=a?Z@)6GHc6E1mbu){&w|OCvu4f8Ww|Z(M4=VC)9}p!XR)i{O3An{T_3n-Y+FO# zWUWvPq=Go1ZII$`PV{YO5Y~f*yZPir#8_~CTDxPif;^~sTk1~$S&C?m(ZQ@%>a9v0 zvY9uB_Wj^59_{qP&aEEYbV%3g`OMXY0MXi&rd*p6^%Mitz0A5^2dmf;?-0A4w;MNW zpu~Ft2cK*ra&oVAXXn6}huI5-PW`5tr?-sG9nUAPD*b)oq2YkxP%W04k%04cV7Xpq zPrpQ8%02JrYYpvzTfHff_|orGXK3|Q%;VdqXDU-?djOR}N1?o%{rNMj<&m%D3C_uLq}700QL{27LZSd4s7%j}9a=QbyO|$Jh6h zKe%Dy48+0m&S5Y_%J-x^V9)5zqU?+-RVlQEr>XTraL^0G19$;QwMDjBgZQ`AYf>QskmS>HJ1 zYH5j+dXeGoK5nBhP`1p_44dLDp4gj}p8PQ|2b?l5SnWTk@aXdC3Kj`>tEWHB5id${ z((1Qx_*%V{R?j5dzw&;y%mlR#5Tvj9L=PREA+8F~j*kMXxlx+;J&M9D-9X$y+$I5t z{jtgI%?)EfFvMQhH1kGDd8OfK0J!LN7Feg@hDrzip2~6Gr2HWu0wE@EHAZ!V7!>#e7heha$x#n?hy9YR&CysmY6^mg0N)BC01;MBLW3q>}2Vbjq~+2VI-bM0uL+* zzMwO;=r~zCmrV491C2+07#j@hlIfmKDK48tO#6*;8E1CduG&8|$?Tyw?mh=I-{|%q z*nbtKu`&OD>vh>DgCOhnLvwN5nWuiYRcS-mkmNBsB-f$C(BBtg)0roaQLz9T zXT+-w|50jj6!5hhqT%$9D?#}?>ZxSCx%F}0K`7WxY+JAb*>>p-NgL#_CO&uA(Dyfw@wdsxhD<=2dU&C!Ghch zoPTV@-$#kM5=ELv1U*zfJY#YLQH{PSXcXDKj;a12ERu-wlP*Ob`=Pc+Q zw-ibnF197~j!zUs+C~OcC(GWm_QLo>b}jU z!wkZ(1^|48zglov6wbxZd{EF5`~3QVwL@OLv*i>l5@d#ybJl!+cNJ09Q^G;vl?I02 zeh(sU(_%SBmM}^dEnN25ry`k>e-#@O0d6V!G-O~05y}(fJN$y1v5J#Pu@)FhqgkMd z`%eKUNBe|u|D&eKAO(I8l~llc;uy??(HhNi z%s?G|$!s=_|H(t%%&@uL80SH$N%S7gDPccMz59y<%*NVZ4Yn!y_UjyRBeI56ZVK}| z`234>y^EzHPR`=ZG31RB0vulZRi1mNZ`o8a6DH%LmYjR)iM9O3_8EJpx4VOu)CHsH z=4-%5UGx|~84O#HRIQJ9$5cIxqFm|b&V)6e-4rSrnk!Ob+8p!j$@OAnm$+h9<`lPJ zaHdKOwm|k;`3K+=-Fg+W!Q@Vi4)WD=?k0x8+ey0(5(b%J`?rz33iOvwNa{zQ6c(yk zs_X&;N^BOs)+kp~Pyz6ta|Y(6Pk`^%HG-N*9pLZK?xSb6GVn&RB5-IqRE}x z!2urcZp*miJSWOcBEjdOUJG!NDMU7d1ugG7;vcGQKmfNK>_twJ%t~X0&P_u{zWsQ1 z*~hknF4q#DJQ$R68g48CGaFH=k&f)?P21CRen-MWkPHd;;-{z3$(GglZe_VaX zf5RAMTIph`fbyzkJ}K;MTeG|4dp|zSSRTyD{1q)28cm|N7p)qK-0y?g6re%P!!qkJknRG02?Dg z-jVxDPvHLrNRe%s0_<@$O+6Ss#!{V<&oB~W?hPHRwYC}of;X&p<-}d`7%gK~vzJf59h6F=ygrod&W8;OUF{ju|7tw>rcP-S1-0 zvMn7wP!N$hEJEb_3GdE`fs}b?<{%LXy&r!SM6;mZXt0Jro%H?1!({drq}49ka5KjQ zC1JB;Q-GTW5z_s^f!YR%F5_95wEmxcbIh!@yLfTH{)f$lc`sG!HW5h1DyIrFPo}KhYsLEd9F& zSL4L>Vl722d`5LYttwbwy*k+c6KLUqLoGab0J7&oCy#~A8GRoFN$Fupm*FBoPS^?h zuxD#X6Q`V9zb5eXc{F)44SZ%3`@72%=~fM8Yg^Nio4J-)!OO^!k(OW&N3YLyY;;J) zwXc^IJ&NAq(y5@#viaHIz8@fA=zVPJRt1CkE9zX;{Gun4tSiy1J}>+ zb%kQLv3D!Gy?#N3VQUE>{TYyA42UKBWZHmWZ3#R2!uHjuuly~ck(cZ#eS*0|A_WoN z7$c(Z>(Cm5NB2!~d}?gwFme`U%FXcnxfnniF?!W-+}SHRmqj4nW~?HVG%%5=q}Rl2 zC&DHc9>;AhtNSVL~OWA0xMiM%Q*4vqP6OyYC3M;2KXd{SK3>;bf>-^>l2Hw-_02lmT(HS8M&++On`9|;wdJy`QG{fzV(_qzrK z-1V%LQHyPd^;f94&U?`F`t(Fui4IFD<6!KCwgoofN?aFUnbA&WVdaetbo=QQ+vH)9 zoTQYsv0dPKgcLv)*f}+1e?Jz~X|QFlVSk&-40dC20BG%shsEYpRh341qz_$usGNNSjJ_>Ax+q{p)*FQV!8_b?Uz9_4J=1 zNG{LLU)_d_tf}bsGKT;6J^vSV`k&Vu9Kj5hcG(Bt;IeUq?!x!OvDDHIVB#03O4OvP zhE`ux4LPNGs+{8=eO||Mmj?$AW|Zy` Note: See the [Testing example](https://github.com/swiftwasm/JavaScriptKit/tree/main/Examples/Testing) for a complete working example. + +## Setting Up Tests + +### Package Configuration + +Your `Package.swift` should have a test target with a dependency on your library target. Here's a simple example: + +```swift +// swift-tools-version: 6.2 + +import PackageDescription + +let package = Package( + name: "Example", + products: [ + .library(name: "Example", targets: ["Example"]), + ], + dependencies: [ + .package(url: "https://github.com/swiftwasm/JavaScriptKit.git", branch: "main") + ], + targets: [ + .target( + name: "Example", + dependencies: [ + .product(name: "JavaScriptKit", package: "JavaScriptKit") + ] + ), + .testTarget( + name: "ExampleTests", + dependencies: [ + "Example", + .product(name: "JavaScriptEventLoopTestSupport", package: "JavaScriptKit"), + ] + ), + ] +) +``` + +> Important: Include `JavaScriptEventLoopTestSupport` in your test target dependencies. This is required to run tests in the JavaScript event loop environment. + +### Writing Tests + +Create your test files in the `Tests/ExampleTests` directory. JavaScriptKit supports both XCTest and swift-testing. Write your tests using either framework as you would for standard Swift projects. + +## Running Tests + +### Basic Test Execution + +Run your tests using the `js test` subcommand: + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test +``` + +> Important: The `--disable-sandbox` flag is required because the test runner needs to execute npm and Playwright to run tests in JavaScript environments. + +This command will: +1. Build your test target as WebAssembly +2. Package the tests with the necessary JavaScript runtime +3. Execute the tests in Node.js by default + +The test binary is produced as `PackageTests.wasm` (where `Package` is your package name) and is located in `.build/plugins/PackageToJS/outputs/PackageTests/`. + +### Test Environment Options + +**Run tests in Node.js (default):** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --environment node +``` + +**Run tests in a browser:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --environment browser +``` + +When running tests in the browser, the command will launch a browser instance using Playwright and execute the tests there. + +### Other Test Options + +**Build tests without running them:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --build-only +``` + +After building, you can run the tests manually: + +```bash +node .build/plugins/PackageToJS/outputs/PackageTests/bin/test.js +``` + +**List available tests:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --list-tests +``` + +**Filter tests by name:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --filter "testTrivial" +``` + +**Enable inspector for browser tests:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --environment browser --inspect +``` + +This starts a local server without automatically running tests. You can manually open `http://localhost:3000/test.browser.html` in your browser to run the tests and use the browser's DevTools for debugging. + +## Code Coverage + +To generate code coverage reports: + +1. **Run tests with code coverage enabled:** + +```bash +swift package --disable-sandbox --swift-sdk $SWIFT_SDK_ID js test --enable-code-coverage +``` + +2. **Generate HTML coverage report:** + +```bash +llvm-cov show -instr-profile=.build/plugins/PackageToJS/outputs/PackageTests/default.profdata \ + --format=html .build/plugins/PackageToJS/outputs/PackageTests/main.wasm \ + -o .build/coverage/html Sources +``` + +3. **View the coverage report:** + +```bash +npx serve .build/coverage/html +``` + +![Code coverage report](coverage-support.png) + +## Customizing Test Execution + +You can customize the test harness by importing the generated test function and calling it with custom options: + +```javascript +// run-tests-custom.mjs +import { testBrowser } from "./.build/plugins/PackageToJS/outputs/PackageTests/test.js"; + +async function runTest(args) { + const exitCode = await testBrowser({ + args: args, + playwright: { + browser: "chromium", + launchOptions: { + headless: false, + } + } + }); + if (exitCode !== 0) { + process.exit(exitCode); + } +} + +// Run XCTest test suites +await runTest([]); + +// Run Swift Testing test suites +await runTest(["--testing-library", "swift-testing"]); + +process.exit(0); +``` + +Then run your custom test script: + +```bash +node run-tests-custom.mjs +``` diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index 47937ad43..d506c3867 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -53,6 +53,7 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex - - +- - - - From 15974c72250981e55bef095ee6586fde71675853 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 28 Nov 2025 15:19:27 +0100 Subject: [PATCH 046/252] BridgeJS: Snapshot for LIFO order issue in Swift glue code for stack-based types --- .../Inputs/EnumAssociatedValue.swift | 29 ++++-------- .../EnumAssociatedValue.Export.d.ts | 1 + .../EnumAssociatedValue.Export.js | 27 +++++++++++ .../ExportSwiftTests/EnumAssociatedValue.json | 46 +++++++++++++++++++ .../EnumAssociatedValue.swift | 11 +++++ 5 files changed, 93 insertions(+), 21 deletions(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift index e099ba85b..43344ddd1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift @@ -10,12 +10,8 @@ enum APIResult { @JS func handle(result: APIResult) @JS func getResult() -> APIResult -@JS func roundtripAPIResult(result: APIResult) -> APIResult { - return result -} -@JS func roundTripOptionalAPIResult(result: APIResult?) -> APIResult? { - return result -} +@JS func roundtripAPIResult(result: APIResult) -> APIResult +@JS func roundTripOptionalAPIResult(result: APIResult?) -> APIResult? @JS enum ComplexResult { @@ -29,12 +25,8 @@ enum ComplexResult { @JS func handleComplex(result: ComplexResult) @JS func getComplexResult() -> ComplexResult -@JS func roundtripComplexResult(_ result: ComplexResult) -> ComplexResult { - return result -} -@JS func roundTripOptionalComplexResult(result: ComplexResult?) -> ComplexResult? { - return result -} +@JS func roundtripComplexResult(_ result: ComplexResult) -> ComplexResult +@JS func roundTripOptionalComplexResult(result: ComplexResult?) -> ComplexResult? @JS enum Utilities { @@ -45,9 +37,7 @@ enum Utilities { } } -@JS func roundTripOptionalUtilitiesResult(result: Utilities.Result?) -> Utilities.Result? { - return result -} +@JS func roundTripOptionalUtilitiesResult(result: Utilities.Result?) -> Utilities.Result? @JS(namespace: "API") @JS enum NetworkingResult { @@ -55,9 +45,7 @@ enum Utilities { case failure(String, Int) } -@JS func roundTripOptionalNetworkingResult(result: NetworkingResult?) -> NetworkingResult? { - return result -} +@JS func roundTripOptionalNetworkingResult(result: NetworkingResult?) -> NetworkingResult? @JS enum APIOptionalResult { @@ -65,6 +53,5 @@ enum APIOptionalResult { case failure(Int?, Bool?) case status(Bool?, Int?, String?) } -@JS func roundTripOptionalAPIOptionalResult(result: APIOptionalResult?) -> APIOptionalResult? { - return result -} +@JS func roundTripOptionalAPIOptionalResult(result: APIOptionalResult?) -> APIOptionalResult? +@JS func compareAPIResults(result1: APIOptionalResult?, result2: APIOptionalResult?) -> APIOptionalResult? diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts index 9df9bbea3..20962c388 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts @@ -86,6 +86,7 @@ export type Exports = { roundTripOptionalUtilitiesResult(result: Utilities.ResultTag | null): Utilities.ResultTag | null; roundTripOptionalNetworkingResult(result: API.NetworkingResultTag | null): API.NetworkingResultTag | null; roundTripOptionalAPIOptionalResult(result: APIOptionalResultTag | null): APIOptionalResultTag | null; + compareAPIResults(result1: APIOptionalResultTag | null, result2: APIOptionalResultTag | null): APIOptionalResultTag | null; APIResult: APIResultObject ComplexResult: ComplexResultObject APIOptionalResult: APIOptionalResultObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index c332a403e..e484b72c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -814,6 +814,33 @@ export async function createInstantiator(options, swift) { if (resultCleanup) { resultCleanup(); } return optResult; }, + compareAPIResults: function bjs_compareAPIResults(result1, result2) { + const isSome = result1 != null; + let result1CaseId, result1Cleanup; + if (isSome) { + const enumResult = enumHelpers.APIOptionalResult.lower(result1); + result1CaseId = enumResult.caseId; + result1Cleanup = enumResult.cleanup; + } + const isSome1 = result2 != null; + let result2CaseId, result2Cleanup; + if (isSome1) { + const enumResult1 = enumHelpers.APIOptionalResult.lower(result2); + result2CaseId = enumResult1.caseId; + result2Cleanup = enumResult1.cleanup; + } + instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); + const isNull = (tmpRetTag === -1); + let optResult; + if (isNull) { + optResult = null; + } else { + optResult = enumHelpers.APIOptionalResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + } + if (result1Cleanup) { result1Cleanup(); } + if (result2Cleanup) { result2Cleanup(); } + return optResult; + }, APIResult: APIResultValues, ComplexResult: ComplexResultValues, APIOptionalResult: APIOptionalResultValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index 52279ce0d..fb7271b91 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -787,6 +787,52 @@ } } } + }, + { + "abiName" : "bjs_compareAPIResults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "compareAPIResults", + "parameters" : [ + { + "label" : "result1", + "name" : "result1", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + }, + { + "label" : "result2", + "name" : "result2", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } } ], "moduleName" : "TestModule", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index 0c70fe5cc..2f7ad81d1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -606,4 +606,15 @@ public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultC #else fatalError("Only available on WebAssembly") #endif +} + +@_expose(wasm, "bjs_compareAPIResults") +@_cdecl("bjs_compareAPIResults") +public func _bjs_compareAPIResults(result1IsSome: Int32, result1CaseId: Int32, result2IsSome: Int32, result2CaseId: Int32) -> Void { + #if arch(wasm32) + let ret = compareAPIResults(result1: Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId), result2: Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif } \ No newline at end of file From e68dcfbf7548409c23708d6366219851f3d5faf2 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 28 Nov 2025 15:21:26 +0100 Subject: [PATCH 047/252] BridgeJS: Fix issue with multiple stack-based parameters that require reversed order and intermediate properties --- .../Sources/BridgeJSCore/ExportSwift.swift | 25 +++++++++++ .../Inputs/EnumAssociatedValue.swift | 2 +- .../EnumAssociatedValue.swift | 4 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 26 ++++++++++++ .../Generated/BridgeJS.ExportSwift.swift | 13 ++++++ .../JavaScript/BridgeJS.ExportSwift.json | 42 +++++++++++++++++++ Tests/prelude.mjs | 9 ++++ 7 files changed, 119 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index d4ea770a3..ebcf7d4c5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1667,6 +1667,7 @@ public class ExportSwift { } func call(name: String, returnType: BridgeType) { + generateParameterLifting() let item = renderCallStatement(callee: "\(raw: name)", returnType: returnType) append(item) } @@ -1694,6 +1695,7 @@ public class ExportSwift { func callMethod(klassName: String, methodName: String, returnType: BridgeType) { let (_, selfExpr) = removeFirstLiftedParameter() + generateParameterLifting() let item = renderCallStatement( callee: "\(raw: selfExpr).\(raw: methodName)", returnType: returnType @@ -1827,6 +1829,29 @@ public class ExportSwift { func returnSignature() -> String { return abiReturnType?.swiftType ?? "Void" } + + /// Generates intermediate variables for stack-using parameters if needed for LIFO compatibility + private func generateParameterLifting() { + let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in + switch param.type { + case .optional(.associatedValueEnum): + return index + default: + return nil + } + } + + guard stackParamIndices.count > 1 else { return } + + for index in stackParamIndices.reversed() { + let param = parameters[index] + let expr = liftedParameterExprs[index] + let varName = "_tmp_\(param.name)" + + append("let \(raw: varName) = \(expr)") + liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName))) + } + } } private struct ClosureCodegen { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift index 43344ddd1..efb6cd1b1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift @@ -45,7 +45,7 @@ enum Utilities { case failure(String, Int) } -@JS func roundTripOptionalNetworkingResult(result: NetworkingResult?) -> NetworkingResult? +@JS func roundTripOptionalNetworkingResult(result: NetworkingResult?) -> NetworkingResult? @JS enum APIOptionalResult { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index 2f7ad81d1..bcc95ef4c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -612,7 +612,9 @@ public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultC @_cdecl("bjs_compareAPIResults") public func _bjs_compareAPIResults(result1IsSome: Int32, result1CaseId: Int32, result2IsSome: Int32, result2CaseId: Int32) -> Void { #if arch(wasm32) - let ret = compareAPIResults(result1: Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId), result2: Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId)) + let _tmp_result2 = Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId) + let _tmp_result1 = Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId) + let ret = compareAPIResults(result1: _tmp_result1, result2: _tmp_result2) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index ff3d9dbed..682e11853 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -528,6 +528,32 @@ typealias OptionalAge = Int? return value } +@JS func compareAPIResults(_ r1: APIResult?, _ r2: APIResult?) -> String { + let r1Str: String + switch r1 { + case .none: r1Str = "nil" + case .some(.success(let msg)): r1Str = "success:\(msg)" + case .some(.failure(let code)): r1Str = "failure:\(code)" + case .some(.info): r1Str = "info" + case .some(.flag(let b)): r1Str = "flag:\(b)" + case .some(.rate(let r)): r1Str = "rate:\(r)" + case .some(.precise(let p)): r1Str = "precise:\(p)" + } + + let r2Str: String + switch r2 { + case .none: r2Str = "nil" + case .some(.success(let msg)): r2Str = "success:\(msg)" + case .some(.failure(let code)): r2Str = "failure:\(code)" + case .some(.info): r2Str = "info" + case .some(.flag(let b)): r2Str = "flag:\(b)" + case .some(.rate(let r)): r2Str = "rate:\(r)" + case .some(.precise(let p)): r2Str = "precise:\(p)" + } + + return "r1:\(r1Str),r2:\(r2Str)" +} + @JS func roundTripOptionalComplexResult(_ result: ComplexResult?) -> ComplexResult? { return result } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index 9923eedd5..bfb102192 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -3079,6 +3079,19 @@ public func _bjs_roundTripOptionalAPIResult(valueIsSome: Int32, valueCaseId: Int #endif } +@_expose(wasm, "bjs_compareAPIResults") +@_cdecl("bjs_compareAPIResults") +public func _bjs_compareAPIResults(r1IsSome: Int32, r1CaseId: Int32, r2IsSome: Int32, r2CaseId: Int32) -> Void { + #if arch(wasm32) + let _tmp_r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) + let _tmp_r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) + let ret = compareAPIResults(_: _tmp_r1, _: _tmp_r2) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripOptionalComplexResult") @_cdecl("bjs_roundTripOptionalComplexResult") public func _bjs_roundTripOptionalComplexResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 75964debb..50a9236ee 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -6826,6 +6826,48 @@ } } }, + { + "abiName" : "bjs_compareAPIResults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "compareAPIResults", + "parameters" : [ + { + "label" : "_", + "name" : "r1", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "label" : "_", + "name" : "r2", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, { "abiName" : "bjs_roundTripOptionalComplexResult", "effects" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index cfd898b31..04fa3abdf 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -571,6 +571,15 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.deepEqual(exports.roundTripOptionalAPIResult(p1), p1); assert.deepEqual(exports.roundTripOptionalComplexResult(cl1), cl1); + const apiSuccess = { tag: exports.APIResult.Tag.Success, param0: "test success" }; + const apiFailure = { tag: exports.APIResult.Tag.Failure, param0: 404 }; + const apiInfo = { tag: exports.APIResult.Tag.Info }; + + assert.equal(exports.compareAPIResults(apiSuccess, apiFailure), "r1:success:test success,r2:failure:404"); + assert.equal(exports.compareAPIResults(null, apiInfo), "r1:nil,r2:info"); + assert.equal(exports.compareAPIResults(apiFailure, null), "r1:failure:404,r2:nil"); + assert.equal(exports.compareAPIResults(null, null), "r1:nil,r2:nil"); + const optionalGreeter = new exports.Greeter("Schrödinger"); const optionalGreeter2 = exports.roundTripOptionalClass(optionalGreeter); assert.equal(optionalGreeter2?.greet() ?? "", "Hello, Schrödinger!"); From 68923541af3397f6b8464dfc5cc82b64aab3b2a4 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 29 Nov 2025 15:53:27 +0900 Subject: [PATCH 048/252] Add Node.js example (#473) * PackageToJS: Make some options optional in option setup functions * Examples: Add NodeJS example * Documentation: Add Package output structure article * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert browser.d.ts API change --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- Examples/NodeJS/.gitignore | 8 + Examples/NodeJS/Package.swift | 15 ++ Examples/NodeJS/README.md | 9 + Examples/NodeJS/Sources/NodeJS/NodeJS.swift | 12 ++ Examples/NodeJS/main.mjs | 18 ++ .../Templates/platforms/browser.d.ts | 2 +- .../Templates/platforms/browser.js | 2 +- .../PackageToJS/Templates/platforms/node.d.ts | 4 +- .../PackageToJS/Templates/platforms/node.js | 4 +- .../Articles/Package-Output-Structure.md | 155 ++++++++++++++++++ .../Documentation.docc/Documentation.md | 1 + 11 files changed, 224 insertions(+), 6 deletions(-) create mode 100644 Examples/NodeJS/.gitignore create mode 100644 Examples/NodeJS/Package.swift create mode 100644 Examples/NodeJS/README.md create mode 100644 Examples/NodeJS/Sources/NodeJS/NodeJS.swift create mode 100644 Examples/NodeJS/main.mjs create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md diff --git a/Examples/NodeJS/.gitignore b/Examples/NodeJS/.gitignore new file mode 100644 index 000000000..0023a5340 --- /dev/null +++ b/Examples/NodeJS/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +/.build +/Packages +xcuserdata/ +DerivedData/ +.swiftpm/configuration/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc diff --git a/Examples/NodeJS/Package.swift b/Examples/NodeJS/Package.swift new file mode 100644 index 000000000..83a84fc8e --- /dev/null +++ b/Examples/NodeJS/Package.swift @@ -0,0 +1,15 @@ +// swift-tools-version: 6.2 + +import PackageDescription + +let package = Package( + name: "NodeJS", + dependencies: [.package(name: "JavaScriptKit", path: "../../")], + targets: [ + .executableTarget( + name: "NodeJS", + dependencies: ["JavaScriptKit"] + ) + ], + swiftLanguageModes: [.v6] +) diff --git a/Examples/NodeJS/README.md b/Examples/NodeJS/README.md new file mode 100644 index 000000000..2b4e03218 --- /dev/null +++ b/Examples/NodeJS/README.md @@ -0,0 +1,9 @@ +# Node.js example + +This example demonstrates how to use JavaScriptKit with Node.js. It shows how to export Swift functions to JavaScript and run them in a Node.js environment. + +```sh +$ swift package --swift-sdk $SWIFT_SDK_ID js +$ node main.mjs +``` + diff --git a/Examples/NodeJS/Sources/NodeJS/NodeJS.swift b/Examples/NodeJS/Sources/NodeJS/NodeJS.swift new file mode 100644 index 000000000..deebc1bd8 --- /dev/null +++ b/Examples/NodeJS/Sources/NodeJS/NodeJS.swift @@ -0,0 +1,12 @@ +import JavaScriptKit + +@main +struct NodeJS { + static func main() { + JSObject.global["greet"] = + JSClosure { args in + let nameString = args[0].string! + return .string("Hello, \(nameString) from NodeJS!") + }.jsValue + } +} diff --git a/Examples/NodeJS/main.mjs b/Examples/NodeJS/main.mjs new file mode 100644 index 000000000..5aca7d0a7 --- /dev/null +++ b/Examples/NodeJS/main.mjs @@ -0,0 +1,18 @@ +// @ts-check + +import { instantiate } from "./.build/plugins/PackageToJS/outputs/Package/instantiate.js" +import { defaultNodeSetup } from "./.build/plugins/PackageToJS/outputs/Package/platforms/node.js" + +async function main() { + // Create a default Node.js option object + const options = await defaultNodeSetup(); + // Instantiate the Swift code, executing + // NodeJS.main() in NodeJS.swift + await instantiate(options); + + // Call the greet function set by NodeJS.swift + const greet = globalThis.greet; + console.log(greet("World")); +} + +main() diff --git a/Plugins/PackageToJS/Templates/platforms/browser.d.ts b/Plugins/PackageToJS/Templates/platforms/browser.d.ts index babe3f487..dcfb5f617 100644 --- a/Plugins/PackageToJS/Templates/platforms/browser.d.ts +++ b/Plugins/PackageToJS/Templates/platforms/browser.d.ts @@ -11,7 +11,7 @@ export function defaultBrowserSetup(options: { getImports: () => Imports, /* #endif */ /* #if USE_SHARED_MEMORY */ - spawnWorker: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker, + spawnWorker?: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker, /* #endif */ }): Promise diff --git a/Plugins/PackageToJS/Templates/platforms/browser.js b/Plugins/PackageToJS/Templates/platforms/browser.js index 3fce7c556..d471e8415 100644 --- a/Plugins/PackageToJS/Templates/platforms/browser.js +++ b/Plugins/PackageToJS/Templates/platforms/browser.js @@ -118,7 +118,7 @@ export async function defaultBrowserSetup(options) { /* #endif */ /* #if USE_SHARED_MEMORY */ const memory = new WebAssembly.Memory(MEMORY_TYPE); - const threadChannel = new DefaultBrowserThreadRegistry(options.spawnWorker) + const threadChannel = new DefaultBrowserThreadRegistry(options.spawnWorker || createDefaultWorkerFactory()) /* #endif */ return { diff --git a/Plugins/PackageToJS/Templates/platforms/node.d.ts b/Plugins/PackageToJS/Templates/platforms/node.d.ts index ca0e826c4..4b8d95843 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.d.ts +++ b/Plugins/PackageToJS/Templates/platforms/node.d.ts @@ -7,10 +7,10 @@ export type DefaultNodeSetupOptions = { /* #endif */ onExit?: (code: number) => void, /* #if USE_SHARED_MEMORY */ - spawnWorker: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker, + spawnWorker?: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker, /* #endif */ } -export function defaultNodeSetup(options: DefaultNodeSetupOptions): Promise +export function defaultNodeSetup(options?: DefaultNodeSetupOptions): Promise export function createDefaultWorkerFactory(preludeScript?: string): (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker diff --git a/Plugins/PackageToJS/Templates/platforms/node.js b/Plugins/PackageToJS/Templates/platforms/node.js index 2fc0e8d15..3e1253965 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.js +++ b/Plugins/PackageToJS/Templates/platforms/node.js @@ -113,7 +113,7 @@ class DefaultNodeThreadRegistry { /* #endif */ /** @type {import('./node.d.ts').defaultNodeSetup} */ -export async function defaultNodeSetup(options) { +export async function defaultNodeSetup(options = {}) { const path = await import("node:path"); const { fileURLToPath } = await import("node:url"); const { readFile } = await import("node:fs/promises") @@ -134,7 +134,7 @@ export async function defaultNodeSetup(options) { const module = await WebAssembly.compile(new Uint8Array(await readFile(path.join(pkgDir, MODULE_PATH)))) /* #if USE_SHARED_MEMORY */ const memory = new WebAssembly.Memory(MEMORY_TYPE); - const threadChannel = new DefaultNodeThreadRegistry(options.spawnWorker) + const threadChannel = new DefaultNodeThreadRegistry(options.spawnWorker || createDefaultWorkerFactory()) /* #endif */ return { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md new file mode 100644 index 000000000..af9b0d2bd --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md @@ -0,0 +1,155 @@ +# Package Output Structure + +Understand the structure and contents of the JavaScript package generated by the `swift package js` command. + +## Overview + +When you run `swift package --swift-sdk $SWIFT_SDK_ID js`, the PackageToJS plugin compiles your Swift code to WebAssembly and generates a JavaScript package in `.build/plugins/PackageToJS/outputs/Package/`. This package contains all the necessary files to run your Swift application in JavaScript environments (browser or Node.js). + +## Package Structure + +The output package has the following structure: + +``` +.build/plugins/PackageToJS/outputs/Package/ +├── ProductName.wasm # Compiled WebAssembly module +├── index.js # Main entry point for browser environments +├── index.d.ts # TypeScript type definitions for index.js +├── instantiate.js # Low-level instantiation API +├── instantiate.d.ts # TypeScript type definitions for instantiate.js +├── package.json # npm package metadata +└── platforms/ + ├── browser.js # Browser-specific platform setup + ├── browser.d.ts # TypeScript definitions for browser.js + ├── node.js # Node.js-specific platform setup + └── node.d.ts # TypeScript definitions for node.js +``` + +## Using the Package + +### In Browser + +```html + + + + + + +``` + +### In Node.js + +```javascript +import { instantiate } from './.build/plugins/PackageToJS/outputs/Package/instantiate.js'; +import { defaultNodeSetup } from './.build/plugins/PackageToJS/outputs/Package/platforms/node.js'; + +async function main() { + const options = await defaultNodeSetup(); + await instantiate(options); +} + +main(); +``` + +> Tip: For a complete Node.js setup example, see the [Node.js example](https://github.com/swiftwasm/JavaScriptKit/tree/main/Examples/NodeJS). + +### With Bundlers (Vite, Webpack, etc.) + +The generated package can be consumed by JavaScript bundlers: + +```bash +npm install .build/plugins/PackageToJS/outputs/Package +``` + +Then import it in your JavaScript code: + +```javascript +import { init } from 'package-name'; +await init(); +``` + +## Core Files + +### WebAssembly Module (`ProductName.wasm`) + +The compiled WebAssembly binary containing your Swift code. The filename matches your SwiftPM product name (e.g., `Basic.wasm` for a product named "Basic"). + +### Entry Point (`index.js`) + +The main entry point for browser environments. It provides a convenient `init()` function that handles module instantiation with default settings. + +```javascript +import { init } from './.build/plugins/PackageToJS/outputs/Package/index.js'; + +// Initialize with default browser setup +await init(); +``` + +For packages with BridgeJS imports, you can provide custom imports: + +```javascript +import { init } from './.build/plugins/PackageToJS/outputs/Package/index.js'; + +await init({ + getImports: () => ({ + // Your custom imports + }) +}); +``` + +### Instantiation API (`instantiate.js`) + +A lower-level API for more control over module instantiation. Use this when you need to customize the WebAssembly instantiation process or WASI setup. + +```javascript +import { instantiate } from './.build/plugins/PackageToJS/outputs/Package/instantiate.js'; +import { defaultBrowserSetup } from './.build/plugins/PackageToJS/outputs/Package/platforms/browser.js'; + +const options = await defaultBrowserSetup({ + module: fetch('./ProductName.wasm'), + // ... other options +}); + +const { instance, swift, exports } = await instantiate(options); +``` + +### Platform-Specific Setup + +The `platforms/` directory contains platform-specific setup functions: +- `platforms/browser.js` - Provides `defaultBrowserSetup()` for browser environments +- `platforms/node.js` - Provides `defaultNodeSetup()` for Node.js environments + +## Package Metadata (`package.json`) + +The generated `package.json` includes: + +```json +{ + "name": "package-name", + "version": "0.0.0", + "type": "module", + "private": true, + "exports": { + ".": "./index.js", + "./wasm": "./ProductName.wasm" + }, + "dependencies": { + "@bjorn3/browser_wasi_shim": "0.3.0" + } +} +``` + +The `exports` field allows importing the package as an npm dependency: + +```javascript +import { init } from '.build/plugins/PackageToJS/outputs/Package'; +``` + +## TypeScript Support + +All JavaScript files have corresponding `.d.ts` TypeScript definition files, providing full type safety when using the package in TypeScript projects. + diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index d506c3867..60808a894 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -51,6 +51,7 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex ### Articles +- - - - From 9511ee2f34ae7026def6c7a120c51067d54994a2 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 29 Nov 2025 23:00:24 +0900 Subject: [PATCH 049/252] Update README --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 2f41b7a31..c18cc1ccf 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,3 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for details on ## Sponsoring [Become a gold or platinum sponsor](https://github.com/sponsors/swiftwasm/) and contact maintainers to add your logo on our README on Github with a link to your site. - - - - From 631e25eeeee93fa11167ed3f2fca930b5d7e6786 Mon Sep 17 00:00:00 2001 From: scottmarchant <15382220+scottmarchant@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:41:23 -0700 Subject: [PATCH 050/252] build: Allow swift-syntax 6.2.0 (#474) --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ddf2e36ef..670b43500 100644 --- a/Package.swift +++ b/Package.swift @@ -37,7 +37,7 @@ let package = Package( .plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]), ], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"602.0.0") + .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0") ], targets: [ .target( From fe5aa6c7c373636ae2cbcd39817e89ec14358e80 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 10 Dec 2025 05:35:12 +0000 Subject: [PATCH 051/252] workflows/test.yml: update `main` snapshots, add 6.3 snapshot (#476) --- .github/workflows/test.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 487b008e2..b79d911ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,14 +19,19 @@ jobs: download-url: https://download.swift.org/swift-6.1-release/ubuntu2204/swift-6.1-RELEASE/swift-6.1-RELEASE-ubuntu22.04.tar.gz wasi-backend: Node target: "wasm32-unknown-wasi" - - os: ubuntu-22.04 + - os: ubuntu-24.04 + toolchain: + download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a-ubuntu24.04.tar.gz + wasi-backend: Node + target: "wasm32-unknown-wasip1" + - os: ubuntu-24.04 toolchain: - download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz + download-url: https://download.swift.org/swift-6.3-branch/ubuntu2404/swift-6.3-DEVELOPMENT-SNAPSHOT-2025-12-05-a/swift-6.3-DEVELOPMENT-SNAPSHOT-2025-12-05-a-ubuntu24.04.tar.gz wasi-backend: Node target: "wasm32-unknown-wasip1" - os: ubuntu-22.04 toolchain: - download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz + download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a-ubuntu22.04.tar.gz wasi-backend: Node target: "wasm32-unknown-wasip1-threads" From 9b2a6b1ddeaa9d68217a3d764935f0a244cff2e9 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Sat, 20 Dec 2025 11:19:48 +0700 Subject: [PATCH 052/252] BridgeJS: Swift struct support (#479) --- .../JavaScript/BridgeJS.ExportSwift.json | 3 + .../JavaScript/BridgeJS.ExportSwift.json | 3 + .../Sources/BridgeJSCore/ExportSwift.swift | 714 +++++++++++--- .../Sources/BridgeJSCore/ImportTS.swift | 14 + .../Sources/BridgeJSLink/BridgeJSLink.swift | 488 +++++---- .../Sources/BridgeJSLink/JSGlueGen.swift | 922 ++++++++++++++++++ .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 56 +- .../Inputs/SwiftStruct.swift | 44 + .../ArrayParameter.Import.js | 8 + .../BridgeJSLinkTests/Async.Export.js | 8 + .../BridgeJSLinkTests/Async.Import.js | 8 + .../DefaultParameters.Export.js | 8 + .../EnumAssociatedValue.Export.js | 8 + .../BridgeJSLinkTests/EnumCase.Export.js | 8 + .../BridgeJSLinkTests/EnumNamespace.Export.js | 8 + .../EnumNamespace.Global.Export.js | 8 + .../BridgeJSLinkTests/EnumRawType.Export.js | 8 + .../BridgeJSLinkTests/Interface.Import.js | 8 + .../InvalidPropertyNames.Import.js | 8 + .../BridgeJSLinkTests/MixedGlobal.Export.js | 8 + .../BridgeJSLinkTests/MixedModules.Export.js | 8 + .../BridgeJSLinkTests/MixedPrivate.Export.js | 8 + .../MultipleImportedTypes.Import.js | 8 + .../BridgeJSLinkTests/Namespaces.Export.js | 8 + .../Namespaces.Global.Export.js | 8 + .../BridgeJSLinkTests/Optionals.Export.js | 8 + .../PrimitiveParameters.Export.js | 8 + .../PrimitiveParameters.Import.js | 8 + .../PrimitiveReturn.Export.js | 8 + .../PrimitiveReturn.Import.js | 8 + .../BridgeJSLinkTests/PropertyTypes.Export.js | 8 + .../BridgeJSLinkTests/Protocol.Export.js | 8 + .../StaticFunctions.Export.js | 8 + .../StaticFunctions.Global.Export.js | 8 + .../StaticProperties.Export.js | 8 + .../StaticProperties.Global.Export.js | 8 + .../StringParameter.Export.js | 8 + .../StringParameter.Import.js | 8 + .../BridgeJSLinkTests/StringReturn.Export.js | 8 + .../BridgeJSLinkTests/StringReturn.Import.js | 8 + .../BridgeJSLinkTests/SwiftClass.Export.js | 8 + .../BridgeJSLinkTests/SwiftClosure.Export.js | 8 + .../BridgeJSLinkTests/SwiftStruct.Export.d.ts | 66 ++ .../BridgeJSLinkTests/SwiftStruct.Export.js | 499 ++++++++++ .../TS2SkeletonLike.Import.js | 8 + .../BridgeJSLinkTests/Throws.Export.js | 8 + .../BridgeJSLinkTests/TypeAlias.Import.js | 8 + .../TypeScriptClass.Import.js | 8 + .../VoidParameterVoidReturn.Export.js | 8 + .../VoidParameterVoidReturn.Import.js | 8 + .../__Snapshots__/ExportSwiftTests/Async.json | 3 + .../ExportSwiftTests/DefaultParameters.json | 3 + .../ExportSwiftTests/EnumAssociatedValue.json | 3 + .../ExportSwiftTests/EnumCase.json | 3 + .../EnumNamespace.Global.json | 3 + .../ExportSwiftTests/EnumNamespace.json | 3 + .../ExportSwiftTests/EnumRawType.json | 3 + .../ExportSwiftTests/MixedGlobal.json | 3 + .../ExportSwiftTests/MixedPrivate.json | 3 + .../ExportSwiftTests/Namespaces.Global.json | 3 + .../ExportSwiftTests/Namespaces.json | 3 + .../ExportSwiftTests/Optionals.json | 3 + .../ExportSwiftTests/PrimitiveParameters.json | 3 + .../ExportSwiftTests/PrimitiveReturn.json | 3 + .../ExportSwiftTests/PropertyTypes.json | 3 + .../ExportSwiftTests/Protocol.json | 3 + .../StaticFunctions.Global.json | 3 + .../ExportSwiftTests/StaticFunctions.json | 3 + .../StaticProperties.Global.json | 3 + .../ExportSwiftTests/StaticProperties.json | 3 + .../ExportSwiftTests/StringParameter.json | 3 + .../ExportSwiftTests/StringReturn.json | 3 + .../ExportSwiftTests/SwiftClass.json | 3 + .../ExportSwiftTests/SwiftClosure.json | 3 + .../ExportSwiftTests/SwiftStruct.json | 448 +++++++++ .../ExportSwiftTests/SwiftStruct.swift | 273 ++++++ .../ExportSwiftTests/Throws.json | 3 + .../VoidParameterVoidReturn.json | 3 + .../JavaScriptKit/BridgeJSInstrincics.swift | 51 + .../BridgeJS/Exporting-Swift-to-JavaScript.md | 1 + .../Exporting-Swift/Exporting-Swift-Struct.md | 180 ++++ .../JavaScript/BridgeJS.ExportSwift.json | 3 + .../BridgeJSRuntimeTests/ExportAPITests.swift | 122 +++ .../Generated/BridgeJS.ExportSwift.swift | 461 +++++++++ .../JavaScript/BridgeJS.ExportSwift.json | 859 ++++++++++++++++ Tests/prelude.mjs | 95 ++ 86 files changed, 5351 insertions(+), 349 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json index 9094df267..5ba46ff61 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -726,5 +726,8 @@ "moduleName" : "Benchmarks", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json index f48970689..a536a23fc 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -142,5 +142,8 @@ "moduleName" : "PlayBridgeJS", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index ebcf7d4c5..436e264d0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -24,6 +24,7 @@ public class ExportSwift { private var exportedFunctions: [ExportedFunction] = [] private var exportedClasses: [ExportedClass] = [] private var exportedEnums: [ExportedEnum] = [] + private var exportedStructs: [ExportedStruct] = [] private var exportedProtocols: [ExportedProtocol] = [] private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() @@ -71,6 +72,7 @@ public class ExportSwift { functions: exportedFunctions, classes: exportedClasses, enums: exportedEnums, + structs: exportedStructs, protocols: exportedProtocols, exposeToGlobal: exposeToGlobal ) @@ -88,6 +90,9 @@ public class ExportSwift { /// The names of the exported protocols, in the order they were written in the source file var exportedProtocolNames: [String] = [] var exportedProtocolByName: [String: ExportedProtocol] = [:] + /// The names of the exported structs, in the order they were written in the source file + var exportedStructNames: [String] = [] + var exportedStructByName: [String: ExportedStruct] = [:] var errors: [DiagnosticError] = [] /// Creates a unique key by combining name and namespace @@ -132,6 +137,7 @@ public class ExportSwift { case classBody(name: String, key: String) case enumBody(name: String, key: String) case protocolBody(name: String, key: String) + case structBody(name: String, key: String) } struct StateStack { @@ -516,6 +522,14 @@ public class ExportSwift { case .protocolBody(_, _): // Protocol methods are handled in visitProtocolMethod during protocol parsing return .skipChildren + case .structBody(let structName, let structKey): + if let exportedFunction = visitFunction(node: node, isStatic: isStatic, structName: structName) { + if var currentStruct = exportedStructByName[structKey] { + currentStruct.methods.append(exportedFunction) + exportedStructByName[structKey] = currentStruct + } + } + return .skipChildren } } @@ -524,7 +538,8 @@ public class ExportSwift { isStatic: Bool, className: String? = nil, classKey: String? = nil, - enumName: String? = nil + enumName: String? = nil, + structName: String? = nil ) -> ExportedFunction? { guard let jsAttribute = node.attributes.firstJSAttribute else { return nil @@ -600,12 +615,21 @@ public class ExportSwift { staticContext = isNamespaceEnum ? .namespaceEnum : .enumName(enumName) case .protocolBody(_, _): return nil + case .structBody(let structName, _): + if isStatic { + staticContext = .structName(structName) + } else { + staticContext = nil + } } let classNameForABI: String? - if case .classBody(let className, _) = state { + switch state { + case .classBody(let className, _): classNameForABI = className - } else { + case .structBody(let structName, _): + classNameForABI = structName + default: classNameForABI = nil } abiName = ABINameGenerator.generateABIName( @@ -691,37 +715,59 @@ public class ExportSwift { override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } - guard case .classBody(let className, _) = state else { - if case .enumBody(_, _) = state { - diagnose(node: node, message: "Initializers are not supported inside enums") - } else { - diagnose(node: node, message: "@JS init must be inside a @JS class") + + switch state { + case .classBody(let className, let classKey): + if extractNamespace(from: jsAttribute) != nil { + diagnose( + node: jsAttribute, + message: "Namespace is not supported for initializer declarations", + hint: "Remove the namespace from @JS attribute" + ) } - return .skipChildren - } - if extractNamespace(from: jsAttribute) != nil { - diagnose( - node: jsAttribute, - message: "Namespace is not supported for initializer declarations", - hint: "Remove the namespace from @JS attribute" + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) + + guard let effects = collectEffects(signature: node.signature) else { + return .skipChildren + } + + let constructor = ExportedConstructor( + abiName: "bjs_\(className)_init", + parameters: parameters, + effects: effects ) - } + exportedClassByName[classKey]?.constructor = constructor - let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) + case .structBody(let structName, let structKey): + if extractNamespace(from: jsAttribute) != nil { + diagnose( + node: jsAttribute, + message: "Namespace is not supported for initializer declarations", + hint: "Remove the namespace from @JS attribute" + ) + } - guard let effects = collectEffects(signature: node.signature) else { - return .skipChildren - } + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) - let constructor = ExportedConstructor( - abiName: "bjs_\(className)_init", - parameters: parameters, - effects: effects - ) - if case .classBody(_, let classKey) = state { - exportedClassByName[classKey]?.constructor = constructor + guard let effects = collectEffects(signature: node.signature) else { + return .skipChildren + } + + let constructor = ExportedConstructor( + abiName: "bjs_\(structName)_init", + parameters: parameters, + effects: effects + ) + exportedStructByName[structKey]?.constructor = constructor + + case .enumBody(_, _): + diagnose(node: node, message: "Initializers are not supported inside enums") + + case .topLevel, .protocolBody(_, _): + diagnose(node: node, message: "@JS init must be inside a @JS class or struct") } + return .skipChildren } @@ -753,27 +799,29 @@ public class ExportSwift { // Determine static context and validate placement let staticContext: StaticContext? - let classKey: String switch state { - case .classBody(let className, let key): - classKey = key + case .classBody(let className, _): staticContext = isStatic ? .className(className) : nil case .enumBody(let enumName, let enumKey): if !isStatic { diagnose(node: node, message: "Only static properties are supported in enums") return .skipChildren } - classKey = enumKey - let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true staticContext = isStatic ? (isNamespaceEnum ? .namespaceEnum : .enumName(enumName)) : nil - case .topLevel: diagnose(node: node, message: "@JS var must be inside a @JS class or enum") return .skipChildren case .protocolBody(let protocolName, let protocolKey): return visitProtocolProperty(node: node, protocolName: protocolName, protocolKey: protocolKey) + case .structBody(let structName, _): + if isStatic { + staticContext = .structName(structName) + } else { + diagnose(node: node, message: "@JS var must be static in structs (instance fields don't need @JS)") + return .skipChildren + } } // Process each binding (variable declaration) @@ -810,13 +858,15 @@ public class ExportSwift { staticContext: staticContext ) - if case .enumBody(_, let enumKey) = state { - if var currentEnum = exportedEnumByName[enumKey] { + if case .enumBody(_, let key) = state { + if var currentEnum = exportedEnumByName[key] { currentEnum.staticProperties.append(exportedProperty) - exportedEnumByName[enumKey] = currentEnum + exportedEnumByName[key] = currentEnum } - } else { - exportedClassByName[classKey]?.properties.append(exportedProperty) + } else if case .structBody(_, let key) = state { + exportedStructByName[key]?.properties.append(exportedProperty) + } else if case .classBody(_, let key) = state { + exportedClassByName[key]?.properties.append(exportedProperty) } } @@ -937,7 +987,6 @@ public class ExportSwift { let emitStyle = exportedEnum.emitStyle if case .tsEnum = emitStyle { - // Check for Bool raw type limitation if exportedEnum.rawType == .bool { diagnose( node: jsAttribute, @@ -945,8 +994,6 @@ public class ExportSwift { hint: "Use enumStyle: .const or change the raw type to String or a numeric type" ) } - - // Check for static functions limitation if !exportedEnum.staticMethods.isEmpty { diagnose( node: jsAttribute, @@ -1055,6 +1102,98 @@ public class ExportSwift { return .skipChildren } + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let name = node.name.text + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "struct") + guard namespaceResult.isValid else { + return .skipChildren + } + let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) + let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Struct visibility must be at least internal" + ) + + var properties: [ExportedProperty] = [] + + // Process all variables in struct as readonly (value semantics) and don't require @JS + for member in node.memberBlock.members { + if let varDecl = member.decl.as(VariableDeclSyntax.self) { + let isStatic = varDecl.modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + + // Handled with error in visitVariable + if varDecl.attributes.hasJSAttribute() { + continue + } + // Skips static non-@JS properties + if isStatic { + continue + } + + for binding in varDecl.bindings { + guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { + continue + } + + let fieldName = pattern.identifier.text + + guard let typeAnnotation = binding.typeAnnotation else { + diagnose(node: binding, message: "Struct field must have explicit type annotation") + continue + } + + guard let fieldType = self.parent.lookupType(for: typeAnnotation.type) else { + diagnoseUnsupportedType( + node: typeAnnotation.type, + type: typeAnnotation.type.trimmedDescription + ) + continue + } + + let property = ExportedProperty( + name: fieldName, + type: fieldType, + isReadonly: true, + isStatic: false, + namespace: namespaceResult.namespace, + staticContext: nil + ) + properties.append(property) + } + } + } + + let structUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + let exportedStruct = ExportedStruct( + name: name, + swiftCallName: swiftCallName, + explicitAccessControl: explicitAccessControl, + properties: properties, + methods: [], + namespace: namespaceResult.namespace + ) + + exportedStructByName[structUniqueKey] = exportedStruct + exportedStructNames.append(structUniqueKey) + + stateStack.push(state: .structBody(name: name, key: structUniqueKey)) + + return .visitChildren + } + + override func visitPost(_ node: StructDeclSyntax) { + if case .structBody(_, _) = stateStack.current { + stateStack.pop() + } + } + private func visitProtocolMethod( node: FunctionDeclSyntax, protocolName: String, @@ -1314,6 +1453,11 @@ public class ExportSwift { collector.exportedProtocolByName[$0]! } ) + exportedStructs.append( + contentsOf: collector.exportedStructNames.map { + collector.exportedStructByName[$0]! + } + ) return collector.errors } @@ -1463,6 +1607,11 @@ public class ExportSwift { } } + if let structDecl = typeDecl.as(StructDeclSyntax.self) { + let swiftCallName = ExportSwift.computeSwiftCallName(for: structDecl, itemName: structDecl.name.text) + return .swiftStruct(swiftCallName) + } + guard typeDecl.is(ClassDeclSyntax.self) || typeDecl.is(ActorDeclSyntax.self) else { return nil } @@ -1484,7 +1633,7 @@ public class ExportSwift { var decls: [DeclSyntax] = [] guard exportedFunctions.count > 0 || exportedClasses.count > 0 || exportedEnums.count > 0 - || exportedProtocols.count > 0 + || exportedProtocols.count > 0 || exportedStructs.count > 0 else { return nil } @@ -1543,6 +1692,12 @@ public class ExportSwift { } } + let structCodegen = StructCodegen() + for structDef in exportedStructs { + decls.append(structCodegen.renderStructHelpers(structDef)) + decls.append(contentsOf: try renderSingleExportedStruct(struct: structDef)) + } + for function in exportedFunctions { decls.append(try renderSingleExportedFunction(function: function)) } @@ -1592,6 +1747,9 @@ public class ExportSwift { case .closure(let signature): typeNameForIntrinsic = param.type.swiftType liftingExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: param.name))") + case .swiftStruct(let structName): + typeNameForIntrinsic = structName + liftingExpr = ExprSyntax("\(raw: structName).bridgeJSLiftParameter()") case .optional(let wrappedType): typeNameForIntrinsic = "Optional<\(wrappedType.swiftType)>" liftingExpr = ExprSyntax( @@ -1703,6 +1861,30 @@ public class ExportSwift { append(item) } + /// Generates intermediate variables for stack-using parameters if needed for LIFO compatibility + private func generateParameterLifting() { + let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in + switch param.type { + case .swiftStruct, .optional(.swiftStruct), + .associatedValueEnum, .optional(.associatedValueEnum): + return index + default: + return nil + } + } + + guard stackParamIndices.count > 1 else { return } + + for index in stackParamIndices.reversed() { + let param = parameters[index] + let expr = liftedParameterExprs[index] + let varName = "_tmp_\(param.name)" + + append("let \(raw: varName) = \(expr)") + liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName))) + } + } + func callPropertyGetter(klassName: String, propertyName: String, returnType: BridgeType) { let (_, selfExpr) = removeFirstLiftedParameter() if returnType == .void { @@ -1830,28 +2012,6 @@ public class ExportSwift { return abiReturnType?.swiftType ?? "Void" } - /// Generates intermediate variables for stack-using parameters if needed for LIFO compatibility - private func generateParameterLifting() { - let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in - switch param.type { - case .optional(.associatedValueEnum): - return index - default: - return nil - } - } - - guard stackParamIndices.count > 1 else { return } - - for index in stackParamIndices.reversed() { - let param = parameters[index] - let expr = liftedParameterExprs[index] - let varName = "_tmp_\(param.name)" - - append("let \(raw: varName) = \(expr)") - liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName))) - } - } } private struct ClosureCodegen { @@ -2051,7 +2211,220 @@ public class ExportSwift { } + /// Helper for stack-based lifting and lowering operations. + private struct StackCodegen { + /// Generates an expression to lift a value from the parameter stack. + /// - Parameter type: The BridgeType to lift + /// - Returns: An ExprSyntax representing the lift expression + func liftExpression(for type: BridgeType) -> ExprSyntax { + switch type { + case .string: + return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .int: + return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .bool: + return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .float: + return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())" + case .double: + return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())" + case .jsObject: + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftHeapObject(let className): + return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" + case .swiftProtocol: + // Protocols are handled via JSObject + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .caseEnum(let enumName): + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .rawValueEnum(let enumName, let rawType): + switch rawType { + case .string: + return + "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64, .float, .double: + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + } + case .associatedValueEnum(let enumName): + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftStruct(let structName): + return "\(raw: structName).bridgeJSLiftParameter()" + case .optional(let wrappedType): + return liftOptionalExpression(wrappedType: wrappedType) + case .void: + // Void shouldn't be lifted, but return a placeholder + return "()" + case .namespaceEnum: + // Namespace enums are not passed as values + return "()" + case .closure: + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + } + } + + private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { + switch wrappedType { + case .string: + return + "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .int: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .float: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" + case .double: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" + case .caseEnum(let enumName): + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .rawValueEnum(let enumName, let rawType): + switch rawType { + case .string: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool, .int, .float, .double, .int32, .int64, .uint, .uint32, .uint64: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + } + case .swiftStruct(let nestedName): + return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftHeapObject(let className): + return + "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())" + case .associatedValueEnum(let enumName): + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .jsObject: + return + "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + default: + // Fallback for other optional types + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + } + } + + /// Generates statements to lower/push a value onto the stack. + /// - Parameters: + /// - type: The BridgeType to lower + /// - accessor: The expression to access the value (e.g., "self.name" or "paramName") + /// - varPrefix: A unique prefix for intermediate variables + /// - Returns: An array of CodeBlockItemSyntax representing the lowering statements + func lowerStatements( + for type: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch type { + case .string: + return [ + "var __bjs_\(raw: varPrefix) = \(raw: accessor)", + "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + case .int: + return ["_swift_js_push_int(Int32(\(raw: accessor)))"] + case .bool: + return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"] + case .float: + return ["_swift_js_push_f32(\(raw: accessor))"] + case .double: + return ["_swift_js_push_f64(\(raw: accessor))"] + case .jsObject: + return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + case .swiftHeapObject: + return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + case .swiftProtocol: + return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + case .caseEnum: + return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + case .rawValueEnum: + return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + case .associatedValueEnum: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .swiftStruct: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .optional(let wrappedType): + return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) + case .void: + return [] + case .namespaceEnum: + return [] + case .closure: + return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + } + } + + private func lowerOptionalStatements( + wrappedType: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + var statements: [CodeBlockItemSyntax] = [] + statements.append("let __bjs_isSome_\(raw: varPrefix) = \(raw: accessor) != nil") + statements.append("if let __bjs_unwrapped_\(raw: varPrefix) = \(raw: accessor) {") + + let innerStatements = lowerUnwrappedOptionalStatements( + wrappedType: wrappedType, + unwrappedVar: "__bjs_unwrapped_\(varPrefix)", + varPrefix: varPrefix + ) + for stmt in innerStatements { + statements.append(stmt) + } + + statements.append("}") + statements.append("_swift_js_push_int(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") + return statements + } + + private func lowerUnwrappedOptionalStatements( + wrappedType: BridgeType, + unwrappedVar: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch wrappedType { + case .string: + return [ + "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar)", + "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + case .int: + return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"] + case .bool: + return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"] + case .float: + return ["_swift_js_push_f32(\(raw: unwrappedVar))"] + case .double: + return ["_swift_js_push_f64(\(raw: unwrappedVar))"] + case .caseEnum: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return [ + "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar).rawValue", + "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + default: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + } + case .swiftStruct: + return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] + case .swiftHeapObject: + return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + case .associatedValueEnum: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + case .jsObject: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + default: + return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] + } + } + } + private struct EnumCodegen { + private let stackCodegen = StackCodegen() + func renderCaseEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName var initCases: [String] = [] @@ -2138,47 +2511,14 @@ public class ExportSwift { var lines: [String] = [] lines.append("case \(caseIndex):") let argList = enumCase.associatedValues.map { associatedValue in - let paramName: String + let labelPrefix: String if let label = associatedValue.label { - paramName = "\(label): " + labelPrefix = "\(label): " } else { - paramName = "" - } - switch associatedValue.type { - case .string: - return - "\(paramName)String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: - return "\(paramName)Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .bool: - return "\(paramName)Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .float: - return "\(paramName)Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())" - case .double: - return "\(paramName)Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())" - case .optional(let wrappedType): - switch wrappedType { - case .string: - return - "\(paramName)Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: - return - "\(paramName)Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool: - return - "\(paramName)Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .float: - return - "\(paramName)Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" - case .double: - return - "\(paramName)Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" - default: - return "" - } - default: - return "\(paramName)Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + labelPrefix = "" } + let liftExpr = stackCodegen.liftExpression(for: associatedValue.type) + return "\(labelPrefix)\(liftExpr)" } lines.append("return .\(enumCase.name)(\(argList.joined(separator: ", ")))") cases.append(lines.joined(separator: "\n")) @@ -2193,48 +2533,13 @@ public class ExportSwift { var bodyLines: [String] = [] for (index, associatedValue) in associatedValues.enumerated() { let paramName = associatedValue.label ?? "param\(index)" - switch associatedValue.type { - case .string: - bodyLines.append("var __bjs_\(paramName) = \(paramName)") - bodyLines.append("__bjs_\(paramName).withUTF8 { ptr in") - bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") - bodyLines.append("}") - case .int: - bodyLines.append("_swift_js_push_int(Int32(\(paramName)))") - case .bool: - bodyLines.append("_swift_js_push_int(\(paramName) ? 1 : 0)") - case .float: - bodyLines.append("_swift_js_push_f32(\(paramName))") - case .double: - bodyLines.append("_swift_js_push_f64(\(paramName))") - case .optional(let wrappedType): - bodyLines.append("let __bjs_isSome_\(paramName) = \(paramName) != nil") - bodyLines.append("if let __bjs_unwrapped_\(paramName) = \(paramName) {") - switch wrappedType { - case .string: - bodyLines.append("var __bjs_str_\(paramName) = __bjs_unwrapped_\(paramName)") - bodyLines.append("__bjs_str_\(paramName).withUTF8 { ptr in") - bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))") - bodyLines.append("}") - case .int: - bodyLines.append("_swift_js_push_int(Int32(__bjs_unwrapped_\(paramName)))") - case .bool: - bodyLines.append("_swift_js_push_int(__bjs_unwrapped_\(paramName) ? 1 : 0)") - case .float: - bodyLines.append("_swift_js_push_f32(__bjs_unwrapped_\(paramName))") - case .double: - bodyLines.append("_swift_js_push_f64(__bjs_unwrapped_\(paramName))") - default: - bodyLines.append( - "preconditionFailure(\"BridgeJS: unsupported optional wrapped type in generated code\")" - ) - } - bodyLines.append("}") - bodyLines.append("_swift_js_push_int(__bjs_isSome_\(paramName) ? 1 : 0)") - default: - bodyLines.append( - "preconditionFailure(\"BridgeJS: unsupported associated value type in generated code\")" - ) + let statements = stackCodegen.lowerStatements( + for: associatedValue.type, + accessor: paramName, + varPrefix: paramName + ) + for stmt in statements { + bodyLines.append(stmt.description) } } return bodyLines @@ -2279,11 +2584,69 @@ public class ExportSwift { } } + private struct StructCodegen { + private let stackCodegen = StackCodegen() + + func renderStructHelpers(_ structDef: ExportedStruct) -> DeclSyntax { + let typeName = structDef.swiftCallName + let liftCode = generateStructLiftCode(structDef: structDef) + let lowerCode = generateStructLowerCode(structDef: structDef) + + return """ + extension \(raw: typeName): _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(raw: typeName) { + \(raw: liftCode.joined(separator: "\n")) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + \(raw: lowerCode.joined(separator: "\n")) + } + } + """ + } + + private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { + var lines: [String] = [] + let instanceProps = structDef.properties.filter { !$0.isStatic } + + for property in instanceProps.reversed() { + let fieldName = property.name + let liftExpr = stackCodegen.liftExpression(for: property.type) + lines.append("let \(fieldName) = \(liftExpr)") + } + + let initArgs = instanceProps.map { "\($0.name): \($0.name)" }.joined(separator: ", ") + lines.append("return \(structDef.swiftCallName)(\(initArgs))") + + return lines + } + + private func generateStructLowerCode(structDef: ExportedStruct) -> [String] { + var lines: [String] = [] + let instanceProps = structDef.properties.filter { !$0.isStatic } + + for property in instanceProps { + let accessor = "self.\(property.name)" + let statements = stackCodegen.lowerStatements( + for: property.type, + accessor: accessor, + varPrefix: property.name + ) + for stmt in statements { + lines.append(stmt.description) + } + } + + return lines + } + } + /// Context for property rendering that determines call behavior and ABI generation private enum PropertyRenderingContext { case enumStatic(enumDef: ExportedEnum) case classStatic(klass: ExportedClass) case classInstance(klass: ExportedClass) + case structStatic(structDef: ExportedStruct) } /// Renders getter and setter Swift thunk code for a property in any context @@ -2309,6 +2672,10 @@ public class ExportSwift { callName = property.callName() className = klass.name isStatic = false + case .structStatic(let structDef): + callName = property.callName(prefix: structDef.swiftCallName) + className = structDef.name + isStatic = true } let getterBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic)) @@ -2369,7 +2736,7 @@ public class ExportSwift { if function.effects.isStatic, let staticContext = function.staticContext { let callName: String switch staticContext { - case .className(let baseName), .enumName(let baseName): + case .className(let baseName), .enumName(let baseName), .structName(let baseName): callName = "\(baseName).\(function.name)" case .namespaceEnum: if let namespace = function.namespace, !namespace.isEmpty { @@ -2387,6 +2754,57 @@ public class ExportSwift { return builder.render(abiName: function.abiName) } + func renderSingleExportedStruct(struct structDef: ExportedStruct) throws -> [DeclSyntax] { + var decls: [DeclSyntax] = [] + + if let constructor = structDef.constructor { + let builder = ExportedThunkBuilder(effects: constructor.effects) + for param in constructor.parameters { + try builder.liftParameter(param: param) + } + builder.call(name: structDef.swiftCallName, returnType: .swiftStruct(structDef.swiftCallName)) + try builder.lowerReturnValue(returnType: .swiftStruct(structDef.swiftCallName)) + decls.append(builder.render(abiName: constructor.abiName)) + } + + for property in structDef.properties where property.isStatic { + decls.append( + contentsOf: try renderSingleExportedProperty( + property: property, + context: .structStatic(structDef: structDef) + ) + ) + } + + for method in structDef.methods { + let builder = ExportedThunkBuilder(effects: method.effects) + + if method.effects.isStatic { + for param in method.parameters { + try builder.liftParameter(param: param) + } + builder.call(name: "\(structDef.swiftCallName).\(method.name)", returnType: method.returnType) + } else { + try builder.liftParameter( + param: Parameter(label: nil, name: "_self", type: .swiftStruct(structDef.swiftCallName)) + ) + for param in method.parameters { + try builder.liftParameter(param: param) + } + builder.callMethod( + klassName: structDef.swiftCallName, + methodName: method.name, + returnType: method.returnType + ) + } + + try builder.lowerReturnValue(returnType: method.returnType) + decls.append(builder.render(abiName: method.abiName)) + } + + return decls + } + /// # Example /// /// Given the following Swift code: @@ -2879,6 +3297,7 @@ extension BridgeType { case .caseEnum(let name): return name case .rawValueEnum(let name, _): return name case .associatedValueEnum(let name): return name + case .swiftStruct(let name): return name case .namespaceEnum(let name): return name case .closure(let signature): let paramTypes = signature.parameters.map { $0.swiftType }.joined(separator: ", ") @@ -2935,6 +3354,8 @@ extension BridgeType { } case .associatedValueEnum: return .associatedValueEnum + case .swiftStruct: + return LiftingIntrinsicInfo(parameters: []) case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: @@ -2956,6 +3377,7 @@ extension BridgeType { static let caseEnum = LoweringIntrinsicInfo(returnType: .i32) static let rawValueEnum = LoweringIntrinsicInfo(returnType: .i32) static let associatedValueEnum = LoweringIntrinsicInfo(returnType: nil) + static let swiftStruct = LoweringIntrinsicInfo(returnType: nil) static let optional = LoweringIntrinsicInfo(returnType: nil) } @@ -2987,6 +3409,8 @@ extension BridgeType { } case .associatedValueEnum: return .associatedValueEnum + case .swiftStruct: + return .swiftStruct case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 00ef5399b..a3ae96abb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -476,6 +476,13 @@ extension BridgeType { case .exportSwift: return LoweringParameterInfo(loweredParameters: [("caseId", .i32)]) } + case .swiftStruct: + switch context { + case .importTS: + throw BridgeJSCoreError("Swift structs are not yet supported in TypeScript imports") + case .exportSwift: + return LoweringParameterInfo(loweredParameters: []) + } case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as parameters") case .optional(let wrappedType): @@ -552,6 +559,13 @@ extension BridgeType { case .exportSwift: return LiftingReturnInfo(valueToLift: .i32) } + case .swiftStruct: + switch context { + case .importTS: + throw BridgeJSCoreError("Swift structs are not yet supported in TypeScript imports") + case .exportSwift: + return LiftingReturnInfo(valueToLift: nil) + } case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as return values") case .optional(let wrappedType): diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 7ecc2086f..3e815b717 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -71,8 +71,8 @@ struct BridgeJSLink { var classLines: [String] = [] var dtsExportLines: [String] = [] var dtsClassLines: [String] = [] - var topLevelEnumLines: [String] = [] - var topLevelDtsEnumLines: [String] = [] + var topLevelTypeLines: [String] = [] + var topLevelDtsTypeLines: [String] = [] var importObjectBuilders: [ImportObjectBuilder] = [] var enumStaticAssignments: [String] = [] } @@ -109,29 +109,33 @@ struct BridgeJSLink { data.dtsClassLines.append(contentsOf: dtsType) } - // Process enums - if !skeleton.enums.isEmpty { - for enumDefinition in skeleton.enums { - let (jsEnum, dtsEnum) = try renderExportedEnum(enumDefinition) + // Process enums - collect top-level definitions and export entries + var enumExportEntries: [(js: [String], dts: [String])] = [] + for enumDefinition in skeleton.enums { + let (jsTopLevel, jsExportEntry, dtsType, dtsExportEntry) = try renderExportedEnum(enumDefinition) - switch enumDefinition.enumType { - case .namespace: - break - case .simple, .rawValue: - var exportedJsEnum = jsEnum - if !exportedJsEnum.isEmpty && exportedJsEnum[0].hasPrefix("const ") { - exportedJsEnum[0] = "export " + exportedJsEnum[0] - } - data.topLevelEnumLines.append(contentsOf: exportedJsEnum) - data.topLevelDtsEnumLines.append(contentsOf: dtsEnum) - case .associatedValue: - var exportedJsEnum = jsEnum - if !exportedJsEnum.isEmpty && exportedJsEnum[0].hasPrefix("const ") { - exportedJsEnum[0] = "export " + exportedJsEnum[0] - } - data.topLevelEnumLines.append(contentsOf: exportedJsEnum) - data.topLevelDtsEnumLines.append(contentsOf: dtsEnum) + // Add top-level JS const definition + if enumDefinition.enumType != .namespace { + var exportedJsEnum = jsTopLevel + if !exportedJsEnum.isEmpty && exportedJsEnum[0].hasPrefix("const ") { + exportedJsEnum[0] = "export " + exportedJsEnum[0] } + data.topLevelTypeLines.append(contentsOf: exportedJsEnum) + data.topLevelDtsTypeLines.append(contentsOf: dtsType) + } + + if !jsExportEntry.isEmpty || !dtsExportEntry.isEmpty { + enumExportEntries.append((js: jsExportEntry, dts: dtsExportEntry)) + } + } + + var structExportEntries: [(js: [String], dts: [String])] = [] + for structDefinition in skeleton.structs { + let (jsStruct, dtsType, dtsExportEntry) = try renderExportedStruct(structDefinition) + data.topLevelDtsTypeLines.append(contentsOf: dtsType) + + if structDefinition.namespace == nil && (!jsStruct.isEmpty || !dtsExportEntry.isEmpty) { + structExportEntries.append((js: jsStruct, dts: dtsExportEntry)) } } @@ -146,107 +150,14 @@ struct BridgeJSLink { } } - for enumDefinition in skeleton.enums - where enumDefinition.enumType != .namespace && enumDefinition.emitStyle != .tsEnum { - if enumDefinition.namespace != nil { - continue - } - - let enumExportPrinter = CodeFragmentPrinter() - let enumValuesName = enumDefinition.valuesName - - for function in enumDefinition.staticMethods { - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) - for param in function.parameters { - try thunkBuilder.lowerParameter(param: param) - } - let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) - - let methodPrinter = CodeFragmentPrinter() - methodPrinter.write( - "\(function.name): function(\(function.parameters.map { $0.name }.joined(separator: ", "))) {" - ) - methodPrinter.indent { - methodPrinter.write(contentsOf: thunkBuilder.body) - methodPrinter.write(contentsOf: thunkBuilder.cleanupCode) - methodPrinter.write(lines: thunkBuilder.checkExceptionLines()) - if let returnExpr = returnExpr { - methodPrinter.write("return \(returnExpr);") - } - } - methodPrinter.write("},") - - enumExportPrinter.write(lines: methodPrinter.lines) - } - - let enumExportLines = enumExportPrinter.lines - - let enumPropertyPrinter = CodeFragmentPrinter() - - for property in enumDefinition.staticProperties { - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) - let getterReturnExpr = try getterThunkBuilder.call( - abiName: property.getterAbiName(), - returnType: property.type - ) - - enumPropertyPrinter.write("get \(property.name)() {") - enumPropertyPrinter.indent { - enumPropertyPrinter.write(contentsOf: getterThunkBuilder.body) - enumPropertyPrinter.write(contentsOf: getterThunkBuilder.cleanupCode) - enumPropertyPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) - if let returnExpr = getterReturnExpr { - enumPropertyPrinter.write("return \(returnExpr);") - } - } - enumPropertyPrinter.write("},") - - if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false) - ) - try setterThunkBuilder.lowerParameter( - param: Parameter(label: "value", name: "value", type: property.type) - ) - _ = try setterThunkBuilder.call( - abiName: property.setterAbiName(), - returnType: .void - ) - - enumPropertyPrinter.write("set \(property.name)(value) {") - enumPropertyPrinter.indent { - enumPropertyPrinter.write(contentsOf: setterThunkBuilder.body) - enumPropertyPrinter.write(contentsOf: setterThunkBuilder.cleanupCode) - enumPropertyPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) - } - enumPropertyPrinter.write("},") - } - } - - let enumPropertyLines = enumPropertyPrinter.lines - - let exportsPrinter = CodeFragmentPrinter() - let dtsExportsPrinter = CodeFragmentPrinter() - - if !enumExportLines.isEmpty || !enumPropertyLines.isEmpty { - exportsPrinter.write("\(enumDefinition.name): {") - exportsPrinter.indent { - exportsPrinter.write("...\(enumValuesName),") - var allLines = enumExportLines + enumPropertyLines - if let lastLineIndex = allLines.indices.last, allLines[lastLineIndex].hasSuffix(",") { - allLines[lastLineIndex] = String(allLines[lastLineIndex].dropLast()) - } - exportsPrinter.write(lines: allLines) - } - exportsPrinter.write("},") - } else { - exportsPrinter.write("\(enumDefinition.name): \(enumValuesName),") - } - - dtsExportsPrinter.write("\(enumDefinition.name): \(enumDefinition.objectTypeName)") + for entry in enumExportEntries { + data.exportsLines.append(contentsOf: entry.js) + data.dtsExportLines.append(contentsOf: entry.dts) + } - data.exportsLines.append(contentsOf: exportsPrinter.lines) - data.dtsExportLines.append(contentsOf: dtsExportsPrinter.lines) + for entry in structExportEntries { + data.exportsLines.append(contentsOf: entry.js) + data.dtsExportLines.append(contentsOf: entry.dts) } } @@ -324,12 +235,22 @@ struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpParamInts) = [];", "let \(JSGlueVariableScope.reservedTmpParamF32s) = [];", "let \(JSGlueVariableScope.reservedTmpParamF64s) = [];", + "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", + "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", ] + let hasStructs = exportedSkeletons.contains { skeleton in + !skeleton.structs.isEmpty + } + if hasAssociatedValueEnums { declarations.append("const enumHelpers = {};") } + if hasStructs { + declarations.append("const structHelpers = {};") + } + declarations.append("") declarations.append("let _exports = null;") declarations.append("let bjs = null;") @@ -497,6 +418,16 @@ struct BridgeJSLink { printer.write("return \(JSGlueVariableScope.reservedTmpParamF64s).pop();") } printer.write("}") + printer.write("bjs[\"swift_js_push_pointer\"] = function(pointer) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(pointer);") + } + printer.write("}") + printer.write("bjs[\"swift_js_pop_param_pointer\"] = function() {") + printer.indent { + printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") + } + printer.write("}") printer.write("bjs[\"swift_js_return_optional_bool\"] = function(isSome, value) {") printer.indent { printer.write("if (isSome === 0) {") @@ -883,7 +814,7 @@ struct BridgeJSLink { } } - printer.write(lines: data.topLevelDtsEnumLines) + printer.write(lines: data.topLevelDtsTypeLines) // Generate Object types for const-style enums for skeleton in exportedSkeletons { @@ -1002,8 +933,7 @@ struct BridgeJSLink { let printer = CodeFragmentPrinter(header: header) printer.nextLine() - // Top-level enums section - printer.write(lines: data.topLevelEnumLines) + printer.write(lines: data.topLevelTypeLines) let topLevelNamespaceCode = namespaceBuilder.buildTopLevelNamespaceInitialization( exportedSkeletons: exportedSkeletons @@ -1015,6 +945,16 @@ struct BridgeJSLink { printer.indent { printer.write(lines: generateVariableDeclarations()) + + let allStructs = exportedSkeletons.flatMap { $0.structs } + for structDef in allStructs { + let structPrinter = CodeFragmentPrinter() + let structScope = JSGlueVariableScope() + let structCleanup = CodeFragmentPrinter() + let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs) + _ = fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) + printer.write(lines: structPrinter.lines) + } printer.nextLine() printer.write(contentsOf: generateAddImports()) } @@ -1068,6 +1008,8 @@ struct BridgeJSLink { printer.write(lines: data.classLines) + // Struct helpers must be initialized AFTER classes are defined (to allow _exports access) + printer.write(contentsOf: structHelperAssignments()) let namespaceInitCode = namespaceBuilder.buildNamespaceInitialization( exportedSkeletons: exportedSkeletons ) @@ -1112,6 +1054,22 @@ struct BridgeJSLink { return printer } + private func structHelperAssignments() -> CodeFragmentPrinter { + let printer = CodeFragmentPrinter() + + for skeleton in exportedSkeletons { + for structDef in skeleton.structs { + printer.write( + "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), enumHelpers);" + ) + printer.write("structHelpers.\(structDef.name) = \(structDef.name)Helpers;") + printer.nextLine() + } + } + + return printer + } + private func renderSwiftClassWrappers() -> [String] { var wrapperLines: [String] = [] var modulesByName: [String: [ExportedClass]] = [:] @@ -1367,6 +1325,8 @@ struct BridgeJSLink { } } return type.tsType + case .swiftStruct(let name): + return name.components(separatedBy: ".").last ?? name case .optional(let wrapped): return "\(resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons)) | null" default: @@ -1460,9 +1420,109 @@ struct BridgeJSLink { } } - func renderExportedEnum(_ enumDefinition: ExportedEnum) throws -> (js: [String], dts: [String]) { - var jsLines: [String] = [] - var dtsLines: [String] = [] + func renderExportedStruct( + _ structDefinition: ExportedStruct + ) throws -> (js: [String], dtsType: [String], dtsExportEntry: [String]) { + let structName = structDefinition.name + let hasConstructor = structDefinition.constructor != nil + let staticMethods = structDefinition.methods.filter { $0.effects.isStatic } + let staticProperties = structDefinition.properties.filter { $0.isStatic } + + let dtsTypePrinter = CodeFragmentPrinter() + dtsTypePrinter.write("export interface \(structName) {") + let instanceProps = structDefinition.properties.filter { !$0.isStatic } + dtsTypePrinter.indent { + for property in instanceProps { + let tsType = resolveTypeScriptType(property.type) + dtsTypePrinter.write("\(property.name): \(tsType);") + } + for method in structDefinition.methods where !method.effects.isStatic { + let signature = renderTSSignature( + parameters: method.parameters, + returnType: method.returnType, + effects: method.effects + ) + dtsTypePrinter.write("\(method.name)\(signature);") + } + } + dtsTypePrinter.write("}") + + guard hasConstructor || !staticMethods.isEmpty || !staticProperties.isEmpty else { + return (js: [], dtsType: dtsTypePrinter.lines, dtsExportEntry: []) + } + + let jsPrinter = CodeFragmentPrinter() + jsPrinter.write("\(structName): {") + try jsPrinter.indent { + // Constructor as 'init' function + if let constructor = structDefinition.constructor { + let thunkBuilder = ExportedThunkBuilder(effects: constructor.effects) + for param in constructor.parameters { + try thunkBuilder.lowerParameter(param: param) + } + let returnExpr = try thunkBuilder.call( + abiName: constructor.abiName, + returnType: .swiftStruct(structDefinition.swiftCallName) + ) + + let constructorPrinter = CodeFragmentPrinter() + let paramList = thunkBuilder.generateParameterList(parameters: constructor.parameters) + constructorPrinter.write("init: function(\(paramList)) {") + constructorPrinter.indent { + constructorPrinter.write(contentsOf: thunkBuilder.body) + constructorPrinter.write(contentsOf: thunkBuilder.cleanupCode) + constructorPrinter.write(lines: thunkBuilder.checkExceptionLines()) + if let returnExpr = returnExpr { + constructorPrinter.write("return \(returnExpr);") + } + } + constructorPrinter.write("},") + jsPrinter.write(lines: constructorPrinter.lines) + } + + for property in staticProperties { + let propertyLines = try renderStaticPropertyForExportObject( + property: property, + className: structName + ) + jsPrinter.write(lines: propertyLines) + } + + for method in staticMethods { + let methodLines = try renderStaticMethodForExportObject(method: method) + jsPrinter.write(lines: methodLines) + } + } + jsPrinter.write("},") + + let dtsExportEntryPrinter = CodeFragmentPrinter() + dtsExportEntryPrinter.write("\(structName): {") + dtsExportEntryPrinter.indent { + if let constructor = structDefinition.constructor { + dtsExportEntryPrinter.write( + "init\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftStruct(structDefinition.swiftCallName), effects: constructor.effects));" + ) + } + for property in staticProperties { + let readonly = property.isReadonly ? "readonly " : "" + dtsExportEntryPrinter.write("\(readonly)\(property.name): \(resolveTypeScriptType(property.type));") + } + for method in staticMethods { + dtsExportEntryPrinter.write( + "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" + ) + } + } + dtsExportEntryPrinter.write("}") + + return (js: jsPrinter.lines, dtsType: dtsTypePrinter.lines, dtsExportEntry: dtsExportEntryPrinter.lines) + } + + func renderExportedEnum( + _ enumDefinition: ExportedEnum + ) throws -> (jsTopLevel: [String], jsExportEntry: [String], dtsType: [String], dtsExportEntry: [String]) { + var jsTopLevelLines: [String] = [] + var dtsTypeLines: [String] = [] let scope = JSGlueVariableScope() let cleanup = CodeFragmentPrinter() let printer = CodeFragmentPrinter() @@ -1472,7 +1532,7 @@ struct BridgeJSLink { case .simple: let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition) _ = fragment.printCode([enumValuesName], scope, printer, cleanup) - jsLines.append(contentsOf: printer.lines) + jsTopLevelLines.append(contentsOf: printer.lines) case .rawValue: guard enumDefinition.rawType != nil else { throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType") @@ -1480,20 +1540,63 @@ struct BridgeJSLink { let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition) _ = fragment.printCode([enumValuesName], scope, printer, cleanup) - jsLines.append(contentsOf: printer.lines) + jsTopLevelLines.append(contentsOf: printer.lines) case .associatedValue: let fragment = IntrinsicJSFragment.associatedValueEnumHelper(enumDefinition: enumDefinition) _ = fragment.printCode([enumValuesName], scope, printer, cleanup) - jsLines.append(contentsOf: printer.lines) + jsTopLevelLines.append(contentsOf: printer.lines) case .namespace: break } if enumDefinition.namespace == nil { - dtsLines.append(contentsOf: generateDeclarations(enumDefinition: enumDefinition)) + dtsTypeLines.append(contentsOf: generateDeclarations(enumDefinition: enumDefinition)) + } + + var jsExportEntryLines: [String] = [] + var dtsExportEntryLines: [String] = [] + + if enumDefinition.enumType != .namespace + && enumDefinition.emitStyle != .tsEnum + && enumDefinition.namespace == nil + { + var enumMethodLines: [String] = [] + for function in enumDefinition.staticMethods { + let methodLines = try renderStaticMethodForExportObject(method: function) + enumMethodLines.append(contentsOf: methodLines) + } + + var enumPropertyLines: [String] = [] + for property in enumDefinition.staticProperties { + let propertyLines = try renderStaticPropertyForExportObject( + property: property, + className: nil + ) + enumPropertyLines.append(contentsOf: propertyLines) + } + + let exportsPrinter = CodeFragmentPrinter() + + if !enumMethodLines.isEmpty || !enumPropertyLines.isEmpty { + exportsPrinter.write("\(enumDefinition.name): {") + exportsPrinter.indent { + exportsPrinter.write("...\(enumValuesName),") + var allLines = enumMethodLines + enumPropertyLines + if let lastLineIndex = allLines.indices.last, allLines[lastLineIndex].hasSuffix(",") { + allLines[lastLineIndex] = String(allLines[lastLineIndex].dropLast()) + } + exportsPrinter.write(lines: allLines) + } + exportsPrinter.write("},") + } else { + exportsPrinter.write("\(enumDefinition.name): \(enumValuesName),") + } + + jsExportEntryLines = exportsPrinter.lines + dtsExportEntryLines = ["\(enumDefinition.name): \(enumDefinition.objectTypeName)"] } - return (jsLines, dtsLines) + return (jsTopLevelLines, jsExportEntryLines, dtsTypeLines, dtsExportEntryLines) } private func generateDeclarations(enumDefinition: ExportedEnum) -> [String] { @@ -1622,8 +1725,8 @@ extension BridgeJSLink { staticContext: StaticContext ) throws -> (js: [String], dts: [String]) { switch staticContext { - case .className(let className): - return try renderClassStaticFunction(function: function, className: className) + case .className(let name), .structName(let name): + return try renderStaticFunction(function: function, className: name) case .enumName(let enumName): return try renderEnumStaticFunction(function: function, enumName: enumName) case .namespaceEnum: @@ -1635,7 +1738,7 @@ extension BridgeJSLink { } } - private func renderClassStaticFunction( + private func renderStaticFunction( function: ExportedFunction, className: String ) throws -> (js: [String], dts: [String]) { @@ -1718,67 +1821,61 @@ extension BridgeJSLink { return (funcLines, dtsLines) } - private func renderEnumStaticFunctionAssignment( - function: ExportedFunction, - enumName: String + /// Renders a static method for use in an export object + private func renderStaticMethodForExportObject( + method: ExportedFunction ) throws -> [String] { - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) - for param in function.parameters { + let thunkBuilder = ExportedThunkBuilder(effects: method.effects) + for param in method.parameters { try thunkBuilder.lowerParameter(param: param) } - let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) - let paramList = thunkBuilder.generateParameterList(parameters: function.parameters) + let returnExpr = try thunkBuilder.call(abiName: method.abiName, returnType: method.returnType) - let printer = CodeFragmentPrinter() - printer.write( - "\(enumName).\(function.name) = function(\(paramList)) {" + let methodPrinter = CodeFragmentPrinter() + methodPrinter.write( + "\(method.name): function(\(method.parameters.map { $0.name }.joined(separator: ", "))) {" ) - printer.indent { - printer.write(contentsOf: thunkBuilder.body) - printer.write(contentsOf: thunkBuilder.cleanupCode) - printer.write(lines: thunkBuilder.checkExceptionLines()) + methodPrinter.indent { + methodPrinter.write(contentsOf: thunkBuilder.body) + methodPrinter.write(contentsOf: thunkBuilder.cleanupCode) + methodPrinter.write(lines: thunkBuilder.checkExceptionLines()) if let returnExpr = returnExpr { - printer.write("return \(returnExpr);") + methodPrinter.write("return \(returnExpr);") } } - printer.write("};") - - return printer.lines + methodPrinter.write("},") + return methodPrinter.lines } - /// Renders an enum static property as getter/setter assignments on the enum object - private func renderEnumStaticProperty( + /// Renders a static property getter/setter for use in an export object + private func renderStaticPropertyForExportObject( property: ExportedProperty, - enumName: String - ) throws -> (js: [String], dts: [String]) { - var jsLines: [String] = [] + className: String? + ) throws -> [String] { + let propertyPrinter = CodeFragmentPrinter() - // Generate getter assignment + // Generate getter let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) let getterReturnExpr = try getterThunkBuilder.call( - abiName: property.getterAbiName(), + abiName: className != nil + ? property.getterAbiName(className: className!) + : property.getterAbiName(), returnType: property.type ) - let getterLines = getterThunkBuilder.renderFunction( - name: property.name, - parameters: [], - returnExpr: getterReturnExpr, - declarationPrefixKeyword: nil - ) - - // Build Object.defineProperty call - var definePropertyLines: [String] = [] - definePropertyLines.append("Object.defineProperty(\(enumName), '\(property.name)', { get: function() {") - - // Add getter body (skip function declaration and closing brace) - if getterLines.count > 2 { - let bodyLines = Array(getterLines[1.. 2 { - let bodyLines = Array(setterLines[1.. = [ reservedSwift, + reservedInstance, reservedMemory, + reservedSetException, reservedStorageToReturnString, reservedStorageToReturnBytes, reservedStorageToReturnException, @@ -50,6 +54,8 @@ final class JSGlueVariableScope { reservedTmpParamInts, reservedTmpParamF32s, reservedTmpParamF64s, + reservedTmpRetPointers, + reservedTmpParamPointers, ] /// Returns a unique variable name in the scope based on the given name hint. @@ -324,6 +330,22 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") resultExpr = "\(isSome) ? \(enumVar) : null" + case .swiftStruct(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let structVar = scope.variable("structValue") + printer.write("let \(structVar);") + printer.write("if (\(isSome)) {") + printer.indent { + printer.write( + "\(structVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + } + printer.write("} else {") + printer.indent { + printer.write("\(structVar) = null;") + } + printer.write("}") + resultExpr = structVar default: resultExpr = "\(isSome) ? \(wrappedValue) : null" } @@ -342,6 +364,19 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(value) != null;") switch wrappedType { + case .swiftStruct(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let cleanupVar = scope.variable("\(value)Cleanup") + printer.write("let \(cleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let resultVar = scope.variable("structResult") + printer.write("const \(resultVar) = structHelpers.\(base).lower(\(value));") + printer.write("\(cleanupVar) = \(resultVar).cleanup;") + } + printer.write("}") + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return ["+\(isSomeVar)"] case .string, .rawValueEnum(_, .string): let bytesVar = scope.variable("\(value)Bytes") let idVar = scope.variable("\(value)Id") @@ -494,6 +529,22 @@ struct IntrinsicJSFragment: Sendable { ) } printer.write("}") + case .swiftStruct(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write( + "\(resultVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + } + printer.write("} else {") + printer.indent { + printer.write("\(resultVar) = null;") + } + printer.write("}") default: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") @@ -1259,6 +1310,9 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLowerParameter(enumBase: base) + case .swiftStruct(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return swiftStructLowerParameter(structBase: base) case .closure: return IntrinsicJSFragment( parameters: ["closure"], @@ -1297,6 +1351,9 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLiftReturn(enumBase: base) + case .swiftStruct(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return swiftStructLiftReturn(structBase: base) case .closure(let signature): let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)" return IntrinsicJSFragment( @@ -1374,6 +1431,26 @@ struct IntrinsicJSFragment: Sendable { } ) } + case .swiftStruct(let fullName): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: + "Swift structs are not supported to be passed as parameters to imported JS functions: \(fullName)" + ) + case .exportSwift: + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanupCode in + let resultVar = scope.variable("structValue") + printer.write( + "const \(resultVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + return [resultVar] + } + ) + } case .closure: throw BridgeJSLinkError(message: "Closure parameters not yet implemented for imported JS functions") case .namespaceEnum(let string): @@ -1428,6 +1505,16 @@ struct IntrinsicJSFragment: Sendable { case .exportSwift: return associatedValueLowerReturn(fullName: fullName) } + case .swiftStruct(let fullName): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: + "Swift structs are not supported to be returned from imported JS functions: \(fullName)" + ) + case .exportSwift: + return swiftStructLowerReturn(fullName: fullName) + } case .closure: throw BridgeJSLinkError(message: "Closure return values not yet implemented for imported JS functions") case .namespaceEnum(let string): @@ -1886,4 +1973,839 @@ struct IntrinsicJSFragment: Sendable { ) } } + + static func swiftStructLowerReturn(fullName: String) -> IntrinsicJSFragment { + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let cleanupVar = scope.variable("cleanup") + printer.write( + "const { cleanup: \(cleanupVar) } = structHelpers.\(base).lower(\(value));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return [] + } + ) + } + + static func swiftStructLowerParameter(structBase: String) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let cleanupVar = scope.variable("cleanup") + printer.write( + "const { cleanup: \(cleanupVar) } = structHelpers.\(structBase).lower(\(value));" + ) + cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return [] + } + ) + } + + static func swiftStructLiftReturn(structBase: String) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanupCode in + let resultVar = scope.variable("structValue") + printer.write( + "const \(resultVar) = structHelpers.\(structBase).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + return [resultVar] + } + ) + } + + static func structHelper(structDefinition: ExportedStruct, allStructs: [ExportedStruct]) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["structName"], + printCode: { arguments, scope, printer, cleanup in + let structName = arguments[0] + let capturedStructDef = structDefinition + let capturedAllStructs = allStructs + + printer.write("const __bjs_create\(structName)Helpers = () => {") + printer.indent() + printer.write( + "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), enumHelpers) => ({" + ) + printer.indent() + + printer.write("lower: (value) => {") + printer.indent { + generateStructLowerCode( + structDef: capturedStructDef, + allStructs: capturedAllStructs, + printer: printer + ) + } + printer.write("},") + + printer.write( + "raise: (\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" + ) + printer.indent { + generateStructRaiseCode( + structDef: capturedStructDef, + allStructs: capturedAllStructs, + printer: printer, + attachMethods: true + ) + } + printer.write("}") + printer.unindent() + printer.write("});") + printer.unindent() + printer.write("};") + + return [] + } + ) + } + + private static func findStruct(name: String, structs: [ExportedStruct]) -> ExportedStruct? { + return structs.first(where: { $0.swiftCallName == name || $0.name == name }) + } + + private static func generateStructLowerCode( + structDef: ExportedStruct, + allStructs: [ExportedStruct], + printer: CodeFragmentPrinter + ) { + let lowerPrinter = CodeFragmentPrinter() + let lowerScope = JSGlueVariableScope() + let lowerCleanup = CodeFragmentPrinter() + lowerCleanup.indent() + + let instanceProps = structDef.properties.filter { !$0.isStatic } + for property in instanceProps { + let fragment = structFieldLowerFragment(field: property, allStructs: allStructs) + let fieldValue = "value.\(property.name)" + _ = fragment.printCode([fieldValue], lowerScope, lowerPrinter, lowerCleanup) + } + + for line in lowerPrinter.lines { + printer.write(line) + } + + if !lowerCleanup.lines.isEmpty { + printer.write("const cleanup = () => {") + printer.write(contentsOf: lowerCleanup) + printer.write("};") + printer.write("return { cleanup };") + } else { + printer.write("return { cleanup: undefined };") + } + } + + private static func generateStructRaiseCode( + structDef: ExportedStruct, + allStructs: [ExportedStruct], + printer: CodeFragmentPrinter, + attachMethods: Bool = false + ) { + let raiseScope = JSGlueVariableScope() + let raiseCleanup = CodeFragmentPrinter() + + var fieldExpressions: [(name: String, expression: String)] = [] + + let instanceProps = structDef.properties.filter { !$0.isStatic } + for property in instanceProps.reversed() { + let fragment = structFieldRaiseFragment(field: property, allStructs: allStructs) + let results = fragment.printCode([], raiseScope, printer, raiseCleanup) + + if let resultExpr = results.first { + fieldExpressions.append((property.name, resultExpr)) + } else { + fieldExpressions.append((property.name, "undefined")) + } + } + + // Construct struct object with fields in original order + let reconstructedFields = instanceProps.map { property in + let expr = fieldExpressions.first(where: { $0.name == property.name })?.expression ?? "undefined" + return "\(property.name): \(expr)" + } + + if attachMethods && !structDef.methods.filter({ !$0.effects.isStatic }).isEmpty { + let instanceVar = raiseScope.variable("instance") + printer.write("const \(instanceVar) = { \(reconstructedFields.joined(separator: ", ")) };") + + // Attach instance methods to the struct instance + for method in structDef.methods where !method.effects.isStatic { + printer.write( + "\(instanceVar).\(method.name) = function(\(method.parameters.map { $0.name }.joined(separator: ", "))) {" + ) + printer.indent { + let methodScope = JSGlueVariableScope() + let methodCleanup = CodeFragmentPrinter() + + // Lower the struct instance (this) using the helper's lower function + let structCleanupVar = methodScope.variable("structCleanup") + printer.write( + "const { cleanup: \(structCleanupVar) } = structHelpers.\(structDef.name).lower(this);" + ) + + // Lower each parameter and collect forwarding expressions + var paramForwardings: [String] = [] + for param in method.parameters { + let fragment = try! IntrinsicJSFragment.lowerParameter(type: param.type) + let loweredValues = fragment.printCode([param.name], methodScope, printer, methodCleanup) + paramForwardings.append(contentsOf: loweredValues) + } + + // Call the Swift function with all lowered parameters + let callExpr = "instance.exports.\(method.abiName)(\(paramForwardings.joined(separator: ", ")))" + if method.returnType == .void { + printer.write("\(callExpr);") + } else { + printer.write("const ret = \(callExpr);") + } + + // Cleanup + printer.write("if (\(structCleanupVar)) { \(structCleanupVar)(); }") + printer.write(contentsOf: methodCleanup) + + // Lift return value if needed + if method.returnType != .void { + let liftFragment = try! IntrinsicJSFragment.liftReturn(type: method.returnType) + if !liftFragment.parameters.isEmpty { + let lifted = liftFragment.printCode(["ret"], methodScope, printer, methodCleanup) + if let liftedValue = lifted.first { + printer.write("return \(liftedValue);") + } + } + } + } + printer.write("}.bind(\(instanceVar));") + } + + printer.write("return \(instanceVar);") + } else { + printer.write("return { \(reconstructedFields.joined(separator: ", ")) };") + } + } + + private static func structFieldLowerFragment( + field: ExportedProperty, + allStructs: [ExportedStruct] + ) -> IntrinsicJSFragment { + switch field.type { + case .string: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let bytesVar = scope.variable("bytes") + let idVar = scope.variable("id") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [idVar] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arguments[0]) ? 1 : 0);") + return [] + } + ) + case .int: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + case .float: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + return [] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + return [] + } + ) + case .jsObject: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(value) != null) {") + printer.indent { + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + } + printer.write("} else {") + printer.indent { + printer.write("\(idVar) = undefined;") + } + printer.write("}") + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar) !== undefined ? \(idVar) : 0);" + ) + cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") + cleanup.indent { + cleanup.write("try {") + cleanup.indent { + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + } + cleanup.write("} catch(e) {}") + } + cleanup.write("}") + return [idVar] + } + ) + case .optional(let wrappedType): + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(value) != null;") + + if case .caseEnum = wrappedType { + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(value) | 0));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + return [] + } else if case .rawValueEnum(_, let rawType) = wrappedType { + switch rawType { + case .string: + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let bytesVar = scope.variable("bytes") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write( + "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" + ) + return [idVar] + default: + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(value) | 0));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + return [] + } + } else if case .swiftHeapObject = wrappedType { + let ptrVar = scope.variable("ptr") + printer.write("let \(ptrVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(ptrVar) = \(value).pointer;") + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(ptrVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + return [] + } else if case .swiftStruct(let structName) = wrappedType { + let nestedCleanupVar = scope.variable("nestedCleanup") + printer.write("let \(nestedCleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let structResultVar = scope.variable("structResult") + printer.write("const \(structResultVar) = structHelpers.\(structName).lower(\(value));") + printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") + return [] + } else if case .string = wrappedType { + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let bytesVar = scope.variable("bytes") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write( + "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" + ) + return [idVar] + } else if case .jsObject = wrappedType { + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(idVar) = undefined;") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") + cleanup.indent { + cleanup.write("try {") + cleanup.indent { + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + } + cleanup.write("} catch(e) {}") + } + cleanup.write("}") + return [idVar] + } else { + // Handle optional primitive types using helper + switch wrappedType { + case .int: + pushOptionalPrimitive( + value: value, + isSomeVar: isSomeVar, + stack: .tmpParamInts, + convert: "| 0", + zeroValue: "0", + printer: printer + ) + case .bool: + pushOptionalPrimitive( + value: value, + isSomeVar: isSomeVar, + stack: .tmpParamInts, + convert: "? 1 : 0", + zeroValue: "0", + printer: printer + ) + case .float: + pushOptionalPrimitive( + value: value, + isSomeVar: isSomeVar, + stack: .tmpParamF32s, + convert: "Math.fround", + zeroValue: "0.0", + printer: printer + ) + case .double: + pushOptionalPrimitive( + value: value, + isSomeVar: isSomeVar, + stack: .tmpParamF64s, + convert: nil, + zeroValue: "0.0", + printer: printer + ) + case .associatedValueEnum(let enumName): + let base = enumName.components(separatedBy: ".").last ?? enumName + let caseIdVar = scope.variable("enumCaseId") + let enumCleanupVar = scope.variable("enumCleanup") + printer.write("let \(caseIdVar), \(enumCleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let enumResultVar = scope.variable("enumResult") + printer.write("const \(enumResultVar) = enumHelpers.\(base).lower(\(value));") + printer.write("\(caseIdVar) = \(enumResultVar).caseId;") + printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") + default: + // For other types (nested structs, etc.), original logic applies + let wrappedFragment = structFieldLowerFragment( + field: ExportedProperty( + name: field.name, + type: wrappedType, + isReadonly: true, + isStatic: false + ), + allStructs: allStructs + ) + printer.write("if (\(isSomeVar)) {") + printer.indent { + _ = wrappedFragment.printCode([value], scope, printer, cleanup) + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + } + return [] + } + } + ) + case .swiftStruct(let nestedName): + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let structResultVar = scope.variable("structResult") + printer.write("const \(structResultVar) = structHelpers.\(nestedName).lower(\(value));") + cleanup.write("if (\(structResultVar).cleanup) { \(structResultVar).cleanup(); }") + return [] + } + ) + case .swiftHeapObject: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value).pointer);") + return [] + } + ) + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("enumCleanup") + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return [cleanupVar] + } + ) + case .caseEnum: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let bytesVar = scope.variable("bytes") + let idVar = scope.variable("id") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [idVar] + } + ) + default: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + } + case .void, .swiftProtocol, .namespaceEnum, .closure: + // These types should not appear as struct fields - return error fragment + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");") + return [] + } + ) + } + } + + /// Helper to push optional primitive values to stack-based parameters + private static func pushOptionalPrimitive( + value: String, + isSomeVar: String, + stack: StackType, + convert: String?, + zeroValue: String, + printer: CodeFragmentPrinter + ) { + let stackName: String + switch stack { + case .tmpParamInts: stackName = JSGlueVariableScope.reservedTmpParamInts + case .tmpParamF32s: stackName = JSGlueVariableScope.reservedTmpParamF32s + case .tmpParamF64s: stackName = JSGlueVariableScope.reservedTmpParamF64s + } + + printer.write("if (\(isSomeVar)) {") + printer.indent { + let converted: String + if let convert = convert { + if convert.starts(with: "Math.") { + converted = "\(convert)(\(value))" + } else { + converted = "\(value) \(convert)" + } + } else { + converted = value + } + printer.write("\(stackName).push(\(converted));") + } + printer.write("} else {") + printer.indent { + printer.write("\(stackName).push(\(zeroValue));") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + } + + private enum StackType { + case tmpParamInts + case tmpParamF32s + case tmpParamF64s + } + + private static func structFieldRaiseFragment( + field: ExportedProperty, + allStructs: [ExportedStruct] + ) -> IntrinsicJSFragment { + switch field.type { + case .string: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let strVar = scope.variable("string") + printer.write("const \(strVar) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + return [strVar] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let bVar = scope.variable("bool") + printer.write("const \(bVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop() !== 0;") + return [bVar] + } + ) + case .int: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let iVar = scope.variable("int") + printer.write("const \(iVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [iVar] + } + ) + case .float: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let fVar = scope.variable("f32") + printer.write("const \(fVar) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + return [fVar] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let dVar = scope.variable("f64") + printer.write("const \(dVar) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + return [dVar] + } + ) + case .optional(let wrappedType): + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let isSomeVar = scope.variable("isSome") + let optVar = scope.variable("optional") + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(optVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + // Special handling for associated value enum - in struct fields, case ID is pushed to tmpRetInts + if case .associatedValueEnum(let enumName) = wrappedType { + let base = enumName.components(separatedBy: ".").last ?? enumName + let caseIdVar = scope.variable("enumCaseId") + printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write( + "\(optVar) = enumHelpers.\(base).raise(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + } else { + let wrappedFragment = structFieldRaiseFragment( + field: ExportedProperty( + name: field.name, + type: wrappedType, + isReadonly: true, + isStatic: false + ), + allStructs: allStructs + ) + let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) + if let wrappedResult = wrappedResults.first { + printer.write("\(optVar) = \(wrappedResult);") + } else { + printer.write("\(optVar) = undefined;") + } + } + } + printer.write("} else {") + printer.indent { + printer.write("\(optVar) = null;") + } + printer.write("}") + return [optVar] + } + ) + case .swiftStruct(let nestedName): + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let structVar = scope.variable("struct") + printer.write( + "const \(structVar) = structHelpers.\(nestedName).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + return [structVar] + } + ) + case .caseEnum: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [varName] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + return [varName] + } + ) + default: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [varName] + } + ) + } + case .swiftHeapObject(let className): + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let ptrVar = scope.variable("ptr") + let varName = scope.variable("value") + printer.write("const \(ptrVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + printer.write("const \(varName) = _exports['\(className)'].__construct(\(ptrVar));") + return [varName] + } + ) + case .jsObject: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let objectIdVar = scope.variable("objectId") + let varName = scope.variable("value") + printer.write("const \(objectIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(varName);") + printer.write("if (\(objectIdVar) !== 0) {") + printer.indent { + printer.write( + "\(varName) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectIdVar));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectIdVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(varName) = null;") + } + printer.write("}") + return [varName] + } + ) + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write( + "const \(varName) = enumHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + return [varName] + } + ) + case .void, .swiftProtocol, .namespaceEnum, .closure: + // These types should not appear as struct fields + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + printer.write("throw new Error(\"Unsupported struct field type: \(field.type)\");") + return [] + } + ) + } + } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 12970b505..e80d1c827 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -25,7 +25,7 @@ public struct ABINameGenerator { let contextPart: String? if let staticContext = staticContext { switch staticContext { - case .className(let name), .enumName(let name): + case .className(let name), .enumName(let name), .structName(let name): contextPart = name case .namespaceEnum: contextPart = namespacePart @@ -115,6 +115,7 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable { case associatedValueEnum(String) case namespaceEnum(String) case swiftProtocol(String) + case swiftStruct(String) indirect case closure(ClosureSignature) } @@ -205,10 +206,51 @@ public struct Effects: Codable, Equatable, Sendable { public enum StaticContext: Codable, Equatable, Sendable { case className(String) + case structName(String) case enumName(String) case namespaceEnum } +// MARK: - Struct Skeleton + +public struct StructField: Codable, Equatable, Sendable { + public let name: String + public let type: BridgeType + + public init(name: String, type: BridgeType) { + self.name = name + self.type = type + } +} + +public struct ExportedStruct: Codable, Equatable, Sendable { + public let name: String + public let swiftCallName: String + public let explicitAccessControl: String? + public var properties: [ExportedProperty] + public var constructor: ExportedConstructor? + public var methods: [ExportedFunction] + public let namespace: [String]? + + public init( + name: String, + swiftCallName: String, + explicitAccessControl: String?, + properties: [ExportedProperty] = [], + constructor: ExportedConstructor? = nil, + methods: [ExportedFunction] = [], + namespace: [String]? + ) { + self.name = name + self.swiftCallName = swiftCallName + self.explicitAccessControl = explicitAccessControl + self.properties = properties + self.constructor = constructor + self.methods = methods + self.namespace = namespace + } +} + // MARK: - Enum Skeleton public struct AssociatedValue: Codable, Equatable, Sendable { @@ -416,7 +458,7 @@ public struct ExportedClass: Codable { } } -public struct ExportedConstructor: Codable { +public struct ExportedConstructor: Codable, Equatable, Sendable { public var abiName: String public var parameters: [Parameter] public var effects: Effects @@ -457,7 +499,7 @@ public struct ExportedProperty: Codable, Equatable, Sendable { public func callName(prefix: String? = nil) -> String { if let staticContext = staticContext { switch staticContext { - case .className(let baseName), .enumName(let baseName): + case .className(let baseName), .enumName(let baseName), .structName(let baseName): return "\(baseName).\(name)" case .namespaceEnum: if let namespace = namespace, !namespace.isEmpty { @@ -498,6 +540,7 @@ public struct ExportedSkeleton: Codable { public let functions: [ExportedFunction] public let classes: [ExportedClass] public let enums: [ExportedEnum] + public let structs: [ExportedStruct] public let protocols: [ExportedProtocol] /// Whether to expose exported APIs to the global namespace. /// @@ -511,6 +554,7 @@ public struct ExportedSkeleton: Codable { functions: [ExportedFunction], classes: [ExportedClass], enums: [ExportedEnum], + structs: [ExportedStruct] = [], protocols: [ExportedProtocol] = [], exposeToGlobal: Bool ) { @@ -518,6 +562,7 @@ public struct ExportedSkeleton: Codable { self.functions = functions self.classes = classes self.enums = enums + self.structs = structs self.protocols = protocols self.exposeToGlobal = exposeToGlobal } @@ -624,6 +669,9 @@ extension BridgeType { case .swiftProtocol: // Protocols pass JSObject IDs as Int32 return .i32 + case .swiftStruct: + // Structs use stack-based return (no direct WASM return type) + return nil case .closure: // Closures pass callback ID as Int32 return .i32 @@ -660,6 +708,8 @@ extension BridgeType { return "\(name.count)\(name)O" case .swiftProtocol(let name): return "\(name.count)\(name)P" + case .swiftStruct(let name): + return "\(name.count)\(name)V" case .closure(let signature): let params = signature.parameters.isEmpty diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift new file mode 100644 index 000000000..3415f54a9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift @@ -0,0 +1,44 @@ +@JS struct DataPoint { + let x: Double + let y: Double + var label: String + var optCount: Int? + var optFlag: Bool? + + @JS init(x: Double, y: Double, label: String, optCount: Int?, optFlag: Bool?) +} + +@JS struct Address { + var street: String + var city: String + var zipCode: Int? +} + +@JS struct Person { + var name: String + var age: Int + var address: Address + var email: String? +} + +@JS class Greeter { + @JS var name: String + + @JS init(name: String) + @JS func greet() -> String +} + +@JS struct Session { + var id: Int + var owner: Greeter +} + +@JS func roundtrip(_ session: Person) -> Person + +@JS struct ConfigStruct { + @JS static let maxRetries: Int = 3 + @JS nonisolated(unsafe) static var defaultConfig: String = "production" + @JS nonisolated(unsafe) static var timeout: Double = 30.0 + @JS static var computedSetting: String { "Config: \(defaultConfig)" } + @JS static func update(_ timeout: Double) -> Double +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index 227093668..e53708aab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index 372de6ec3..c9c2e484f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 873c9d697..c98f19719 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index fa7a7c06b..ba9eac2fb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -32,6 +32,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -97,6 +99,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index e484b72c0..f0fbf6f75 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -501,6 +501,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; const enumHelpers = {}; let _exports = null; @@ -567,6 +569,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 526e2fc91..4a0ebe848 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -50,6 +50,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -115,6 +117,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 9fed226d9..96127eba5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -51,6 +51,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -116,6 +118,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index a38b50933..c766f08ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -70,6 +70,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -135,6 +137,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 9daa221b2..2331d1c78 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -101,6 +101,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -166,6 +168,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 6e5461190..1bfd09445 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 9336edc6d..c8b242720 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index 453057fa3..737a40046 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index 0ff8f450e..ccf941dec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index e422b08b6..1e1e9563a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 380f1a721..df998b01b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 24022a438..da5566616 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index e2f13dd02..c051fcd21 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index f9c60e068..015d5a1c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index c8bd621df..5e7ae2094 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 32f5e36f9..512b48ace 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 605a13ea6..f2e1bbe0c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 62122a832..4b486f484 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index e37af60c9..4bfa5f698 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 58f32ea96..efb6b11e7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -90,6 +90,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; const enumHelpers = {}; let _exports = null; @@ -156,6 +158,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 8522168f2..782a38605 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -77,6 +77,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; const enumHelpers = {}; let _exports = null; @@ -143,6 +145,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 3e445992e..f0ce10325 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -77,6 +77,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; const enumHelpers = {}; let _exports = null; @@ -143,6 +145,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 5d70c39b1..d1039d0f4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -31,6 +31,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -96,6 +98,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 09a2b0de9..086a2ca31 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -31,6 +31,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -96,6 +98,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index a668639d4..2f182b630 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index e13404bbf..21caebd02 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index f31ef1403..712563448 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index ae86fd8f1..f1ab79072 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index e946b01ce..2def00d13 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 755d98fd6..74b2cfe4f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -128,6 +128,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; const enumHelpers = {}; let _exports = null; @@ -194,6 +196,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts new file mode 100644 index 000000000..1d1474510 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts @@ -0,0 +1,66 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface DataPoint { + x: number; + y: number; + label: string; + optCount: number | null; + optFlag: boolean | null; +} +export interface Address { + street: string; + city: string; + zipCode: number | null; +} +export interface Person { + name: string; + age: number; + address: Address; + email: string | null; +} +export interface Session { + id: number; + owner: Greeter; +} +export interface ConfigStruct { +} +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Greeter extends SwiftHeapObject { + greet(): string; + name: string; +} +export type Exports = { + Greeter: { + new(name: string): Greeter; + } + roundtrip(session: Person): Person; + DataPoint: { + init(x: number, y: number, label: string, optCount: number | null, optFlag: boolean | null): DataPoint; + } + ConfigStruct: { + readonly maxRetries: number; + defaultConfig: string; + timeout: number; + readonly computedSetting: string; + update(timeout: number): number; + } +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js new file mode 100644 index 000000000..fe359bcbe --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -0,0 +1,499 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + const __bjs_createDataPointHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamF64s.push(value.x); + tmpParamF64s.push(value.y); + const bytes = textEncoder.encode(value.label); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const isSome = value.optCount != null; + if (isSome) { + tmpParamInts.push(value.optCount | 0); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const isSome1 = value.optFlag != null; + if (isSome1) { + tmpParamInts.push(value.optFlag ? 1 : 0); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome1 ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + }; + return { cleanup }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const bool = tmpRetInts.pop() !== 0; + optional = bool; + } else { + optional = null; + } + const isSome1 = tmpRetInts.pop(); + let optional1; + if (isSome1) { + const int = tmpRetInts.pop(); + optional1 = int; + } else { + optional1 = null; + } + const string = tmpRetStrings.pop(); + const f64 = tmpRetF64s.pop(); + const f641 = tmpRetF64s.pop(); + return { x: f641, y: f64, label: string, optCount: optional1, optFlag: optional }; + } + }); + }; + const __bjs_createAddressHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.street); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const bytes1 = textEncoder.encode(value.city); + const id1 = swift.memory.retain(bytes1); + tmpParamInts.push(bytes1.length); + tmpParamInts.push(id1); + const isSome = value.zipCode != null; + if (isSome) { + tmpParamInts.push(value.zipCode | 0); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + swift.memory.release(id1); + }; + return { cleanup }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const int = tmpRetInts.pop(); + optional = int; + } else { + optional = null; + } + const string = tmpRetStrings.pop(); + const string1 = tmpRetStrings.pop(); + return { street: string1, city: string, zipCode: optional }; + } + }); + }; + const __bjs_createPersonHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.name); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + tmpParamInts.push((value.age | 0)); + const structResult = structHelpers.Address.lower(value.address); + const isSome = value.email != null; + let id1; + if (isSome) { + const bytes1 = textEncoder.encode(value.email); + id1 = swift.memory.retain(bytes1); + tmpParamInts.push(bytes1.length); + tmpParamInts.push(id1); + } else { + tmpParamInts.push(0); + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + if (structResult.cleanup) { structResult.cleanup(); } + if(id1 !== undefined) { swift.memory.release(id1); } + }; + return { cleanup }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const string = tmpRetStrings.pop(); + optional = string; + } else { + optional = null; + } + const struct = structHelpers.Address.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const int = tmpRetInts.pop(); + const string1 = tmpRetStrings.pop(); + return { name: string1, age: int, address: struct, email: optional }; + } + }); + }; + const __bjs_createSessionHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamInts.push((value.id | 0)); + tmpParamPointers.push(value.owner.pointer); + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const ptr = tmpRetPointers.pop(); + const value = _exports['Greeter'].__construct(ptr); + const int = tmpRetInts.pop(); + return { id: int, owner: value }; + } + }); + }; + const __bjs_createConfigStructHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + return { }; + } + }); + }; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { + const obj = Greeter.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Greeter extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); + } + + constructor(name) { + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); + swift.memory.release(nameId); + return Greeter.__construct(ret); + } + greet() { + instance.exports.bjs_Greeter_greet(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + get name() { + instance.exports.bjs_Greeter_name_get(this.pointer); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + } + set name(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length); + swift.memory.release(valueId); + } + } + const DataPointHelpers = __bjs_createDataPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.DataPoint = DataPointHelpers; + + const AddressHelpers = __bjs_createAddressHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Address = AddressHelpers; + + const PersonHelpers = __bjs_createPersonHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Person = PersonHelpers; + + const SessionHelpers = __bjs_createSessionHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Session = SessionHelpers; + + const ConfigStructHelpers = __bjs_createConfigStructHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.ConfigStruct = ConfigStructHelpers; + + const exports = { + Greeter, + roundtrip: function bjs_roundtrip(session) { + const { cleanup: cleanup } = structHelpers.Person.lower(session); + instance.exports.bjs_roundtrip(); + const structValue = structHelpers.Person.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (cleanup) { cleanup(); } + return structValue; + }, + DataPoint: { + init: function(x, y, label, optCount, optFlag) { + const labelBytes = textEncoder.encode(label); + const labelId = swift.memory.retain(labelBytes); + const isSome = optCount != null; + const isSome1 = optFlag != null; + instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag : 0); + const structValue = structHelpers.DataPoint.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + swift.memory.release(labelId); + return structValue; + }, + }, + ConfigStruct: { + get maxRetries() { + const ret = instance.exports.bjs_ConfigStruct_static_maxRetries_get(); + return ret; + }, + get defaultConfig() { + instance.exports.bjs_ConfigStruct_static_defaultConfig_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + set defaultConfig(value) { + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + instance.exports.bjs_ConfigStruct_static_defaultConfig_set(valueId, valueBytes.length); + swift.memory.release(valueId); + }, + get timeout() { + const ret = instance.exports.bjs_ConfigStruct_static_timeout_get(); + return ret; + }, + set timeout(value) { + instance.exports.bjs_ConfigStruct_static_timeout_set(value); + }, + get computedSetting() { + instance.exports.bjs_ConfigStruct_static_computedSetting_get(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, + update: function(timeout) { + const ret = instance.exports.bjs_ConfigStruct_static_update(timeout); + return ret; + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 4c3cbc213..b0684f153 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 059c93157..928ba5950 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 320609e1c..c2f477245 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 783884efb..71511ca3c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index b6d7a4ea3..b39042bda 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 627dd140c..8f8328054 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -26,6 +26,8 @@ export async function createInstantiator(options, swift) { let tmpParamInts = []; let tmpParamF32s = []; let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; let _exports = null; let bjs = null; @@ -91,6 +93,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_f64"] = function() { return tmpParamF64s.pop(); } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json index 2e295991b..4bb845587 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json @@ -178,5 +178,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index ccb4cb289..66b4dcc41 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -647,5 +647,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index fb7271b91..f7e57aabd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -838,5 +838,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json index 9effaaec7..1f4d55046 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json @@ -314,5 +314,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json index 8aeb6c78c..98ded1fe8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json @@ -409,5 +409,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 94d1bb061..24afb4eb2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -409,5 +409,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json index 4bf1644c4..b7ea9cd17 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json @@ -1492,5 +1492,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json index 21e78b120..995c3efcf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json @@ -70,5 +70,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json index d86712af6..c986a903f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json @@ -70,5 +70,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json index bde86c44f..a0b1efea2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json @@ -176,5 +176,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json index 910fcfc2c..2420d592e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json @@ -176,5 +176,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json index eb92b21d5..64aaa295e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json @@ -693,5 +693,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json index ccd504f4d..d9edf11c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json @@ -63,5 +63,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json index 6210c8663..79ce75dac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json @@ -79,5 +79,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json index 14f0cc0fd..aa5fcc86b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json @@ -354,5 +354,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index 487533b38..c3107394e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -798,5 +798,8 @@ } ] } + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json index 8a2923a02..4e8d80d59 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json @@ -330,5 +330,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index 13f707bda..ab399f102 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -330,5 +330,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json index d7af99185..472406ba9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json @@ -333,5 +333,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index fb3a12b6b..6ef937981 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -333,5 +333,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json index bec03d8fc..b70151233 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json @@ -61,5 +61,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json index 86221037d..39ec8b7a3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json @@ -28,5 +28,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json index 9f1f934ec..df4975e11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json @@ -136,5 +136,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json index 2a8a64040..20015ba25 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -1069,5 +1069,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json new file mode 100644 index 000000000..498231bf0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json @@ -0,0 +1,448 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "Greeter" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_DataPoint_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "label" : "label", + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "label" : "optCount", + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "label" : "optFlag", + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "DataPoint", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "swiftCallName" : "DataPoint" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "Person" + }, + { + "methods" : [ + + ], + "name" : "Session", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "owner", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "swiftCallName" : "Session" + }, + { + "methods" : [ + { + "abiName" : "bjs_ConfigStruct_static_update", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "update", + "parameters" : [ + { + "label" : "_", + "name" : "timeout", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + } + } + ], + "name" : "ConfigStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "maxRetries", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "defaultConfig", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "timeout", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "computedSetting", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "ConfigStruct" + } + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift new file mode 100644 index 000000000..57635c626 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -0,0 +1,273 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +extension DataPoint: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { + let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let label = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.x) + _swift_js_push_f64(self.y) + var __bjs_label = self.label + __bjs_label.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + let __bjs_isSome_optCount = self.optCount != nil + if let __bjs_unwrapped_optCount = self.optCount { + _swift_js_push_int(Int32(__bjs_unwrapped_optCount)) + } + _swift_js_push_int(__bjs_isSome_optCount ? 1 : 0) + let __bjs_isSome_optFlag = self.optFlag != nil + if let __bjs_unwrapped_optFlag = self.optFlag { + _swift_js_push_int(__bjs_unwrapped_optFlag ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) + } +} + +@_expose(wasm, "bjs_DataPoint_init") +@_cdecl("bjs_DataPoint_init") +public func _bjs_DataPoint_init(x: Float64, y: Float64, labelBytes: Int32, labelLength: Int32, optCountIsSome: Int32, optCountValue: Int32, optFlagIsSome: Int32, optFlagValue: Int32) -> Void { + #if arch(wasm32) + let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Address: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { + let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Address(street: street, city: city, zipCode: zipCode) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_street = self.street + __bjs_street.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_city = self.city + __bjs_city.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + let __bjs_isSome_zipCode = self.zipCode != nil + if let __bjs_unwrapped_zipCode = self.zipCode { + _swift_js_push_int(Int32(__bjs_unwrapped_zipCode)) + } + _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) + } +} + +extension Person: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let address = Address.bridgeJSLiftParameter() + let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Person(name: name, age: age, address: address, email: email) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.age)) + self.address.bridgeJSLowerReturn() + let __bjs_isSome_email = self.email != nil + if let __bjs_unwrapped_email = self.email { + var __bjs_str_email = __bjs_unwrapped_email + __bjs_str_email.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + } +} + +extension Session: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Session { + let owner = Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return Session(id: id, owner: owner) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + _swift_js_push_pointer(self.owner.bridgeJSLowerReturn()) + } +} + +extension ConfigStruct: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { + return ConfigStruct() + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + + } +} + +@_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get") +@_cdecl("bjs_ConfigStruct_static_maxRetries_get") +public func _bjs_ConfigStruct_static_maxRetries_get() -> Int32 { + #if arch(wasm32) + let ret = ConfigStruct.maxRetries + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get") +@_cdecl("bjs_ConfigStruct_static_defaultConfig_get") +public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { + #if arch(wasm32) + let ret = ConfigStruct.defaultConfig + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set") +@_cdecl("bjs_ConfigStruct_static_defaultConfig_set") +public func _bjs_ConfigStruct_static_defaultConfig_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_timeout_get") +@_cdecl("bjs_ConfigStruct_static_timeout_get") +public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { + #if arch(wasm32) + let ret = ConfigStruct.timeout + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_timeout_set") +@_cdecl("bjs_ConfigStruct_static_timeout_set") +public func _bjs_ConfigStruct_static_timeout_set(value: Float64) -> Void { + #if arch(wasm32) + ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_computedSetting_get") +@_cdecl("bjs_ConfigStruct_static_computedSetting_get") +public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { + #if arch(wasm32) + let ret = ConfigStruct.computedSetting + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_update") +@_cdecl("bjs_ConfigStruct_static_update") +public func _bjs_ConfigStruct_static_update(timeout: Float64) -> Float64 { + #if arch(wasm32) + let ret = ConfigStruct.update(_: Double.bridgeJSLiftParameter(timeout)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundtrip") +@_cdecl("bjs_roundtrip") +public func _bjs_roundtrip() -> Void { + #if arch(wasm32) + let ret = roundtrip(_: Person.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_init") +@_cdecl("bjs_Greeter_init") +public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_greet") +@_cdecl("bjs_Greeter_greet") +public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).greet() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_name_get") +@_cdecl("bjs_Greeter_name_get") +public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Greeter.bridgeJSLiftParameter(_self).name + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_name_set") +@_cdecl("bjs_Greeter_name_set") +public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Greeter_deinit") +@_cdecl("bjs_Greeter_deinit") +public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json index 9b2e61044..ef42dc6cf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json @@ -28,5 +28,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json index 508107ee6..c80650aff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json @@ -28,5 +28,8 @@ "moduleName" : "TestModule", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSInstrincics.swift index b0e5ec395..b3262cb9e 100644 --- a/Sources/JavaScriptKit/BridgeJSInstrincics.swift +++ b/Sources/JavaScriptKit/BridgeJSInstrincics.swift @@ -316,6 +316,15 @@ public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVo @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void } +/// A protocol that Swift struct types conform to. +/// +/// The conformance is automatically synthesized by the BridgeJS code generator. +public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType { + // MARK: ExportSwift + @_spi(BridgeJS) static func bridgeJSLiftParameter() -> Self + @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void +} + extension _BridgedSwiftEnumNoPayload where Self: RawRepresentable, RawValue == String { // MARK: ImportTS @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { rawValue.bridgeJSLowerParameter() } @@ -618,6 +627,24 @@ func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { } #endif +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_push_pointer") +@_spi(BridgeJS) public func _swift_js_push_pointer(_ pointer: UnsafeMutableRawPointer) +#else +@_spi(BridgeJS) public func _swift_js_push_pointer(_ pointer: UnsafeMutableRawPointer) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_pop_param_pointer") +@_spi(BridgeJS) public func _swift_js_pop_param_pointer() -> UnsafeMutableRawPointer +#else +@_spi(BridgeJS) public func _swift_js_pop_param_pointer() -> UnsafeMutableRawPointer { + _onlyAvailableOnWasm() +} +#endif + extension Optional where Wrapped == Bool { // MARK: ImportTS @@ -1225,3 +1252,27 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { } } } + +// MARK: Optional Struct Support + +extension Optional where Wrapped: _BridgedSwiftStruct { + // MARK: ExportSwift + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Wrapped? { + if isSome == 0 { + return nil + } else { + return Wrapped.bridgeJSLiftParameter() + } + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + switch consume self { + case .none: + _swift_js_push_int(0) // Push only isSome=0 (no struct fields) + case .some(let value): + value.bridgeJSLowerReturn() // Push all struct fields FIRST + _swift_js_push_int(1) // Then push isSome=1 LAST (so it's popped FIRST by JS) + } + } +} diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md index 44019bf6d..c70533055 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md @@ -65,6 +65,7 @@ This command will: - - +- - - - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md new file mode 100644 index 000000000..e20a324c2 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md @@ -0,0 +1,180 @@ +# Exporting Swift Structs to JS + +Learn how to export Swift structs to JavaScript. + +## Overview + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +To export a Swift struct, mark it with `@JS`: + +```swift +import JavaScriptKit + +@JS struct Point { + var x: Double + var y: Double + var label: String +} + +@JS struct Address { + var street: String + var city: String + var zipCode: Int? +} + +@JS struct Person { + var name: String + var age: Int + var address: Address + var email: String? +} + +@JS func createPerson(name: String, age: Int, street: String, city: String) -> Person +@JS func updateEmail(person: Person, email: String?) -> Person +``` + +In JavaScript: + +```javascript +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; +const { exports } = await init({}); + +const person = exports.createPerson("Alice", 30, "123 Main St", "NYC"); +console.log(person.name); // "Alice" +console.log(person.address.street); // "123 Main St" +console.log(person.email); // null + +const updated = exports.updateEmail(person, "alice@example.com"); +console.log(updated.email); // "alice@example.com" +``` + +The generated TypeScript declarations: + +```typescript +export interface Point { + x: number; + y: number; + label: string; +} + +export interface Address { + street: string; + city: string; + zipCode: number | null; +} + +export interface Person { + name: string; + age: number; + address: Address; + email: string | null; +} + +export type Exports = { + createPerson(name: string, age: number, street: string, city: string): Person; + updateEmail(person: Person, email: string | null): Person; +} +``` + +## Instance Fields vs Static Properties + +**Instance fields** (part of the struct value) are automatically exported - no `@JS` needed: +```swift +@JS struct Point { + var x: Double // Auto-exported + var y: Double // Auto-exported +} +``` + +**Static properties** (not part of instance) require `@JS`: +```swift +@JS struct Config { + var name: String + + @JS nonisolated(unsafe) static var defaultTimeout: Double = 30.0 + @JS static let maxRetries: Int = 3 +} +``` + +In JavaScript: +```javascript +console.log(exports.Config.defaultTimeout); // 30.0 +exports.Config.defaultTimeout = 60.0; +console.log(exports.Config.maxRetries); // 3 (readonly) +``` + +## Struct Methods + +Structs can have instance and static methods, both require @JS annotation: + +```swift +@JS struct Calculator { + @JS func add(a: Double, b: Double) -> Double { + return a + b + } + + @JS static func multiply(x: Double, y: Double) -> Double { + return x * y + } +} +``` + +In JavaScript: + +```javascript +const calc = {}; +console.log(exports.useMathOperations(calc, 5.0, 3.0)); // Uses instance methods +console.log(exports.Calculator.multiply(4.0, 5.0)); // Static method +``` + +## Struct Initializers + +Struct initializers are exported as static `init` methods, not constructors: + +```swift +@JS struct Point { + var x: Double + var y: Double + + @JS init(x: Double, y: Double) { + self.x = x + self.y = y + } +} +``` + +In JavaScript: + +```javascript +const point = exports.Point.init(10.0, 20.0); +console.log(point.x); // 10.0 +``` + +This differs from classes, where `@JS init` maps to a JavaScript constructor using `new`: + +```javascript +// Class: uses `new` +const cart = new exports.ShoppingCart(); + +// Struct: uses static `init` method +const point = exports.Point.init(10.0, 20.0); +``` + +## Supported Features + +| Feature | Status | +|:--------|:-------| +| Stored fields with supported types | ✅ | +| Optional fields | ✅ | +| Nested structs | ✅ | +| Instance methods | ✅ | +| Static methods | ✅ | +| Static properties | ✅ | +| Property observers (`willSet`, `didSet`) | ❌ | +| Generics | ❌ | +| Conformances | ❌ | + +## See Also + +- diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 979311c86..955b78f69 100644 --- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -533,5 +533,8 @@ "moduleName" : "BridgeJSGlobalTests", "protocols" : [ + ], + "structs" : [ + ] } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 682e11853..b3aa84c18 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1232,6 +1232,128 @@ enum APIOptionalResult { } } +// MARK: - Struct Tests + +@JS struct DataPoint { + let x: Double + let y: Double + var label: String + var optCount: Int? + var optFlag: Bool? + + @JS init(x: Double, y: Double, label: String, optCount: Int?, optFlag: Bool?) { + self.x = x + self.y = y + self.label = label + self.optCount = optCount + self.optFlag = optFlag + } +} + +@JS struct Address { + var street: String + var city: String + var zipCode: Int? +} + +@JS struct Contact { + var name: String + var age: Int + var address: Address + var email: String? + var secondaryAddress: Address? +} + +@JS struct Config { + var name: String + var theme: Theme? + var direction: Direction? + var status: Status +} + +@JS struct SessionData { + var id: Int + var owner: Greeter? +} + +@JS struct ValidationReport { + var id: Int + var result: APIResult + var status: Status? + var outcome: APIResult? +} + +@JS struct MathOperations { + @JS init() {} + @JS func add(a: Double, b: Double) -> Double { + return a + b + } + + @JS func multiply(a: Double, b: Double) -> Double { + return a * b + } + + @JS static func subtract(a: Double, b: Double) -> Double { + return a - b + } +} + +@JS struct ConfigStruct { + var name: String + var value: Int + + @JS nonisolated(unsafe) static var defaultConfig: String = "production" + @JS static let maxRetries: Int = 3 + @JS nonisolated(unsafe) static var timeout: Double = 30.0 + + @JS static var computedSetting: String { + return "Config: \(defaultConfig)" + } +} + +@JS func roundTripDataPoint(_ data: DataPoint) -> DataPoint { + return data +} + +@JS func roundTripContact(_ contact: Contact) -> Contact { + return contact +} + +@JS func roundTripConfig(_ config: Config) -> Config { + return config +} + +@JS func roundTripSessionData(_ session: SessionData) -> SessionData { + return session +} + +@JS func roundTripValidationReport(_ report: ValidationReport) -> ValidationReport { + return report +} + +@JS func updateValidationReport(_ newResult: APIResult?, _ report: ValidationReport) -> ValidationReport { + return ValidationReport( + id: report.id, + result: newResult ?? report.result, + status: report.status, + outcome: report.outcome + ) +} + +@JS class Container { + @JS var location: DataPoint + @JS var config: Config? + + @JS init(location: DataPoint, config: Config?) { + self.location = location + self.config = config + } +} + +@JS func testContainerWithStruct(_ point: DataPoint) -> Container { + return Container(location: point, config: nil) +} + class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index bfb102192..dcae4a744 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -2008,6 +2008,312 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se #endif } +extension DataPoint: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { + let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let label = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.x) + _swift_js_push_f64(self.y) + var __bjs_label = self.label + __bjs_label.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + let __bjs_isSome_optCount = self.optCount != nil + if let __bjs_unwrapped_optCount = self.optCount { + _swift_js_push_int(Int32(__bjs_unwrapped_optCount)) + } + _swift_js_push_int(__bjs_isSome_optCount ? 1 : 0) + let __bjs_isSome_optFlag = self.optFlag != nil + if let __bjs_unwrapped_optFlag = self.optFlag { + _swift_js_push_int(__bjs_unwrapped_optFlag ? 1 : 0) + } + _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) + } +} + +@_expose(wasm, "bjs_DataPoint_init") +@_cdecl("bjs_DataPoint_init") +public func _bjs_DataPoint_init(x: Float64, y: Float64, labelBytes: Int32, labelLength: Int32, optCountIsSome: Int32, optCountValue: Int32, optFlagIsSome: Int32, optFlagValue: Int32) -> Void { + #if arch(wasm32) + let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Address: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { + let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Address(street: street, city: city, zipCode: zipCode) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_street = self.street + __bjs_street.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_city = self.city + __bjs_city.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + let __bjs_isSome_zipCode = self.zipCode != nil + if let __bjs_unwrapped_zipCode = self.zipCode { + _swift_js_push_int(Int32(__bjs_unwrapped_zipCode)) + } + _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) + } +} + +extension Contact: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Contact { + let secondaryAddress = Optional

        .bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let address = Address.bridgeJSLiftParameter() + let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.age)) + self.address.bridgeJSLowerReturn() + let __bjs_isSome_email = self.email != nil + if let __bjs_unwrapped_email = self.email { + var __bjs_str_email = __bjs_unwrapped_email + __bjs_str_email.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + let __bjs_isSome_secondaryAddress = self.secondaryAddress != nil + if let __bjs_unwrapped_secondaryAddress = self.secondaryAddress { + __bjs_unwrapped_secondaryAddress.bridgeJSLowerReturn() + } + _swift_js_push_int(__bjs_isSome_secondaryAddress ? 1 : 0) + } +} + +extension Config: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { + let status = Status.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let direction = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let theme = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Config(name: name, theme: theme, direction: direction, status: status) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + let __bjs_isSome_theme = self.theme != nil + if let __bjs_unwrapped_theme = self.theme { + var __bjs_str_theme = __bjs_unwrapped_theme.rawValue + __bjs_str_theme.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_theme ? 1 : 0) + let __bjs_isSome_direction = self.direction != nil + if let __bjs_unwrapped_direction = self.direction { + _swift_js_push_int(__bjs_unwrapped_direction.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_direction ? 1 : 0) + _swift_js_push_int(Int32(self.status.bridgeJSLowerParameter())) + } +} + +extension SessionData: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SessionData { + let owner = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return SessionData(id: id, owner: owner) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + let __bjs_isSome_owner = self.owner != nil + if let __bjs_unwrapped_owner = self.owner { + _swift_js_push_pointer(__bjs_unwrapped_owner.bridgeJSLowerReturn()) + } + _swift_js_push_int(__bjs_isSome_owner ? 1 : 0) + } +} + +extension ValidationReport: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { + let outcome = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let status = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return ValidationReport(id: id, result: result, status: status, outcome: outcome) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + self.result.bridgeJSLowerReturn() + let __bjs_isSome_status = self.status != nil + if let __bjs_unwrapped_status = self.status { + _swift_js_push_int(__bjs_unwrapped_status.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_status ? 1 : 0) + let __bjs_isSome_outcome = self.outcome != nil + if let __bjs_unwrapped_outcome = self.outcome { + _swift_js_push_int(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_outcome ? 1 : 0) + } +} + +extension MathOperations: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { + return MathOperations() + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + + } +} + +@_expose(wasm, "bjs_MathOperations_init") +@_cdecl("bjs_MathOperations_init") +public func _bjs_MathOperations_init() -> Void { + #if arch(wasm32) + let ret = MathOperations() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_add") +@_cdecl("bjs_MathOperations_add") +public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_multiply") +@_cdecl("bjs_MathOperations_multiply") +public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_static_subtract") +@_cdecl("bjs_MathOperations_static_subtract") +public func _bjs_MathOperations_static_subtract(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ConfigStruct: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { + let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return ConfigStruct(name: name, value: value) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.value)) + } +} + +@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get") +@_cdecl("bjs_ConfigStruct_static_defaultConfig_get") +public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { + #if arch(wasm32) + let ret = ConfigStruct.defaultConfig + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set") +@_cdecl("bjs_ConfigStruct_static_defaultConfig_set") +public func _bjs_ConfigStruct_static_defaultConfig_set(valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get") +@_cdecl("bjs_ConfigStruct_static_maxRetries_get") +public func _bjs_ConfigStruct_static_maxRetries_get() -> Int32 { + #if arch(wasm32) + let ret = ConfigStruct.maxRetries + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_timeout_get") +@_cdecl("bjs_ConfigStruct_static_timeout_get") +public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { + #if arch(wasm32) + let ret = ConfigStruct.timeout + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_timeout_set") +@_cdecl("bjs_ConfigStruct_static_timeout_set") +public func _bjs_ConfigStruct_static_timeout_set(value: Float64) -> Void { + #if arch(wasm32) + ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ConfigStruct_static_computedSetting_get") +@_cdecl("bjs_ConfigStruct_static_computedSetting_get") +public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { + #if arch(wasm32) + let ret = ConfigStruct.computedSetting + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripVoid") @_cdecl("bjs_roundTripVoid") public func _bjs_roundTripVoid() -> Void { @@ -3311,6 +3617,85 @@ public func _bjs_makeAdder(base: Int32) -> UnsafeMutableRawPointer { #endif } +@_expose(wasm, "bjs_roundTripDataPoint") +@_cdecl("bjs_roundTripDataPoint") +public func _bjs_roundTripDataPoint() -> Void { + #if arch(wasm32) + let ret = roundTripDataPoint(_: DataPoint.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripContact") +@_cdecl("bjs_roundTripContact") +public func _bjs_roundTripContact() -> Void { + #if arch(wasm32) + let ret = roundTripContact(_: Contact.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripConfig") +@_cdecl("bjs_roundTripConfig") +public func _bjs_roundTripConfig() -> Void { + #if arch(wasm32) + let ret = roundTripConfig(_: Config.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripSessionData") +@_cdecl("bjs_roundTripSessionData") +public func _bjs_roundTripSessionData() -> Void { + #if arch(wasm32) + let ret = roundTripSessionData(_: SessionData.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripValidationReport") +@_cdecl("bjs_roundTripValidationReport") +public func _bjs_roundTripValidationReport() -> Void { + #if arch(wasm32) + let ret = roundTripValidationReport(_: ValidationReport.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_updateValidationReport") +@_cdecl("bjs_updateValidationReport") +public func _bjs_updateValidationReport(newResultIsSome: Int32, newResultCaseId: Int32) -> Void { + #if arch(wasm32) + let _tmp_report = ValidationReport.bridgeJSLiftParameter() + let _tmp_newResult = Optional.bridgeJSLiftParameter(newResultIsSome, newResultCaseId) + let ret = updateValidationReport(_: _tmp_newResult, _: _tmp_report) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testContainerWithStruct") +@_cdecl("bjs_testContainerWithStruct") +public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = testContainerWithStruct(_: DataPoint.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { @@ -5461,4 +5846,80 @@ fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } +#endif + +@_expose(wasm, "bjs_Container_init") +@_cdecl("bjs_Container_init") +public func _bjs_Container_init(config: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let _tmp_config = Optional.bridgeJSLiftParameter(config) + let _tmp_location = DataPoint.bridgeJSLiftParameter() + let ret = Container(location: _tmp_location, config: _tmp_config) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_location_get") +@_cdecl("bjs_Container_location_get") +public func _bjs_Container_location_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Container.bridgeJSLiftParameter(_self).location + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_location_set") +@_cdecl("bjs_Container_location_set") +public func _bjs_Container_location_set(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_config_get") +@_cdecl("bjs_Container_config_get") +public func _bjs_Container_config_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Container.bridgeJSLiftParameter(_self).config + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_config_set") +@_cdecl("bjs_Container_config_set") +public func _bjs_Container_config_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_deinit") +@_cdecl("bjs_Container_deinit") +public func _bjs_Container_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap") +fileprivate func _bjs_Container_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Container_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} #endif \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 50a9236ee..751d6519d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -3118,6 +3118,71 @@ ], "swiftCallName" : "TextProcessor" + }, + { + "constructor" : { + "abiName" : "bjs_Container_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "location", + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "label" : "config", + "name" : "config", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "Container", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "config", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "swiftCallName" : "Container" } ], "enums" : [ @@ -7578,6 +7643,194 @@ } } } + }, + { + "abiName" : "bjs_roundTripDataPoint", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDataPoint", + "parameters" : [ + { + "label" : "_", + "name" : "data", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "abiName" : "bjs_roundTripContact", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripContact", + "parameters" : [ + { + "label" : "_", + "name" : "contact", + "type" : { + "swiftStruct" : { + "_0" : "Contact" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Contact" + } + } + }, + { + "abiName" : "bjs_roundTripConfig", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripConfig", + "parameters" : [ + { + "label" : "_", + "name" : "config", + "type" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Config" + } + } + }, + { + "abiName" : "bjs_roundTripSessionData", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSessionData", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "swiftStruct" : { + "_0" : "SessionData" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SessionData" + } + } + }, + { + "abiName" : "bjs_roundTripValidationReport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripValidationReport", + "parameters" : [ + { + "label" : "_", + "name" : "report", + "type" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + }, + { + "abiName" : "bjs_updateValidationReport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateValidationReport", + "parameters" : [ + { + "label" : "_", + "name" : "newResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "label" : "_", + "name" : "report", + "type" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + }, + { + "abiName" : "bjs_testContainerWithStruct", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testContainerWithStruct", + "parameters" : [ + { + "label" : "_", + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Container" + } + } } ], "moduleName" : "BridgeJSRuntimeTests", @@ -7961,5 +8214,611 @@ } ] } + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_DataPoint_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "label" : "label", + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "label" : "optCount", + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "label" : "optFlag", + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "DataPoint", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "swiftCallName" : "DataPoint" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Contact", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "secondaryAddress", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + } + } + ], + "swiftCallName" : "Contact" + }, + { + "methods" : [ + + ], + "name" : "Config", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "theme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + ], + "swiftCallName" : "Config" + }, + { + "methods" : [ + + ], + "name" : "SessionData", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "owner", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "SessionData" + }, + { + "methods" : [ + + ], + "name" : "ValidationReport", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "status", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "outcome", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "swiftCallName" : "ValidationReport" + }, + { + "constructor" : { + "abiName" : "bjs_MathOperations_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathOperations_add", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "MathOperations" + } + } + } + ], + "name" : "MathOperations", + "properties" : [ + + ], + "swiftCallName" : "MathOperations" + }, + { + "methods" : [ + + ], + "name" : "ConfigStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "defaultConfig", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "maxRetries", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "timeout", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "computedSetting", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "ConfigStruct" + } ] } \ No newline at end of file diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 04fa3abdf..eaef7ca15 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -710,6 +710,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { testProtocolSupport(exports); testClosureSupport(exports); + testStructSupport(exports); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testClosureSupport(exports) { @@ -905,6 +906,100 @@ function testClosureSupport(exports) { processor.release(); } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function testStructSupport(exports) { + const data1 = { x: 1.5, y: 2.5, label: "Point", optCount: 42, optFlag: true }; + assert.deepEqual(exports.roundTripDataPoint(data1), data1); + const data2 = { x: 0.0, y: 0.0, label: "", optCount: null, optFlag: null }; + assert.deepEqual(exports.roundTripDataPoint(data2), data2); + + const contact1 = { + name: "Alice", + age: 30, + address: { street: "123 Main St", city: "NYC", zipCode: 10001 }, + email: "alice@test.com", + secondaryAddress: { street: "456 Oak Ave", city: "LA", zipCode: null } + }; + assert.deepEqual(exports.roundTripContact(contact1), contact1); + const contact2 = { + name: "Bob", + age: 25, + address: { street: "789 Pine Rd", city: "SF", zipCode: null }, + email: null, + secondaryAddress: null + }; + assert.deepEqual(exports.roundTripContact(contact2), contact2); + + const config1 = { + name: "prod", + theme: exports.Theme.Dark, + direction: exports.Direction.North, + status: exports.Status.Success + }; + assert.deepEqual(exports.roundTripConfig(config1), config1); + const config2 = { + name: "dev", + theme: null, + direction: null, + status: exports.Status.Loading + }; + assert.deepEqual(exports.roundTripConfig(config2), config2); + + const owner1 = new exports.Greeter("TestUser"); + const session1 = { id: 123, owner: owner1 }; + const resultSession1 = exports.roundTripSessionData(session1); + assert.equal(resultSession1.id, 123); + assert.equal(resultSession1.owner.greet(), "Hello, TestUser!"); + const session2 = { id: 456, owner: null }; + assert.deepEqual(exports.roundTripSessionData(session2), session2); + owner1.release(); + resultSession1.owner.release(); + + const report1 = { + id: 100, + result: { tag: exports.APIResult.Tag.Success, param0: "ok" }, + status: exports.Status.Success, + outcome: { tag: exports.APIResult.Tag.Info } + }; + assert.deepEqual(exports.roundTripValidationReport(report1), report1); + const report2 = { + id: 200, + result: { tag: exports.APIResult.Tag.Failure, param0: 404 }, + status: null, + outcome: null + }; + assert.deepEqual(exports.roundTripValidationReport(report2), report2); + + const origReport = { + id: 999, + result: { tag: exports.APIResult.Tag.Failure, param0: 500 }, + status: exports.Status.Error, + outcome: { tag: exports.APIResult.Tag.Info } + }; + const updatedReport = exports.updateValidationReport( + { tag: exports.APIResult.Tag.Success, param0: "updated" }, + origReport + ); + assert.deepEqual(updatedReport.result, { tag: exports.APIResult.Tag.Success, param0: "updated" }); + assert.deepEqual(exports.updateValidationReport(null, origReport).result, origReport.result); + + assert.equal(exports.MathOperations.subtract(10.0, 4.0), 6.0); + const mathOps = exports.MathOperations.init(); + assert.equal(mathOps.add(5.0, 3.0), 8.0); + assert.equal(mathOps.multiply(4.0, 7.0), 28.0); + + const container = exports.testContainerWithStruct({ x: 5.0, y: 10.0, label: "test", optCount: null, optFlag: true }); + assert.equal(container.location.x, 5.0); + assert.equal(container.config, null); + container.release(); + + assert.equal(exports.ConfigStruct.defaultConfig, "production"); + assert.equal(exports.ConfigStruct.maxRetries, 3); + assert.equal(exports.ConfigStruct.computedSetting, "Config: production"); + exports.ConfigStruct.defaultConfig = "staging"; + assert.equal(exports.ConfigStruct.computedSetting, "Config: staging"); + exports.ConfigStruct.defaultConfig = "production"; +} /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ async function BridgeJSRuntimeTests_runAsyncWorks(exports) { From 0872dbd7e2dd9c4a3a315d141ef2fd51e4b109ef Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Mon, 22 Dec 2025 23:04:04 +0700 Subject: [PATCH 053/252] BridgeJS: Add default parameters to struct and enable struct as default parameter --- .../Sources/BridgeJSCore/ExportSwift.swift | 79 +++-- .../Sources/BridgeJSLink/BridgeJSLink.swift | 174 +++++----- .../Sources/BridgeJSLink/JSGlueGen.swift | 3 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 12 + .../Inputs/DefaultParameters.swift | 45 +-- .../DefaultParameters.Export.d.ts | 32 +- .../DefaultParameters.Export.js | 107 +++++- .../ExportSwiftTests/DefaultParameters.json | 315 +++++++++++++++++- .../ExportSwiftTests/DefaultParameters.swift | 106 +++++- .../Exporting-Swift-Default-Parameters.md | 40 ++- .../BridgeJSRuntimeTests/ExportAPITests.swift | 24 +- .../Generated/BridgeJS.ExportSwift.swift | 20 +- .../JavaScript/BridgeJS.ExportSwift.json | 99 ++++++ Tests/prelude.mjs | 14 +- 14 files changed, 876 insertions(+), 194 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 436e264d0..2a2a19266 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -316,50 +316,77 @@ public class ExportSwift { return nil } - let className = calledExpr.baseName.text - let expectedClassName: String? + let typeName = calledExpr.baseName.text + + let isStructType: Bool + let expectedTypeName: String? switch type { - case .swiftHeapObject(let name): - expectedClassName = name.split(separator: ".").last.map(String.init) - case .optional(.swiftHeapObject(let name)): - expectedClassName = name.split(separator: ".").last.map(String.init) + case .swiftStruct(let name), .optional(.swiftStruct(let name)): + isStructType = true + expectedTypeName = name.split(separator: ".").last.map(String.init) + case .swiftHeapObject(let name), .optional(.swiftHeapObject(let name)): + isStructType = false + expectedTypeName = name.split(separator: ".").last.map(String.init) default: diagnose( node: funcCall, - message: "Constructor calls are only supported for class types", - hint: "Parameter type should be a Swift class" + message: "Constructor calls are only supported for class and struct types", + hint: "Parameter type should be a Swift class or struct" ) return nil } - guard let expectedClassName = expectedClassName, className == expectedClassName else { + guard let expectedTypeName = expectedTypeName, typeName == expectedTypeName else { diagnose( node: funcCall, - message: "Constructor class name '\(className)' doesn't match parameter type", + message: "Constructor type name '\(typeName)' doesn't match parameter type", hint: "Ensure the constructor matches the parameter type" ) return nil } - if funcCall.arguments.isEmpty { - return .object(className) - } - - var constructorArgs: [DefaultValue] = [] - for argument in funcCall.arguments { - guard let argValue = extractLiteralValue(from: argument.expression) else { - diagnose( - node: argument.expression, - message: "Constructor argument must be a literal value", - hint: "Use simple literals like \"text\", 42, true, false in constructor arguments" - ) - return nil + if isStructType { + // For structs, extract field name/value pairs + var fields: [DefaultValueField] = [] + for argument in funcCall.arguments { + guard let fieldName = argument.label?.text else { + diagnose( + node: argument, + message: "Struct initializer arguments must have labels", + hint: "Use labeled arguments like MyStruct(x: 1, y: 2)" + ) + return nil + } + guard let fieldValue = extractLiteralValue(from: argument.expression) else { + diagnose( + node: argument.expression, + message: "Struct field value must be a literal", + hint: "Use simple literals like \"text\", 42, true, false in struct fields" + ) + return nil + } + fields.append(DefaultValueField(name: fieldName, value: fieldValue)) + } + return .structLiteral(typeName, fields) + } else { + if funcCall.arguments.isEmpty { + return .object(typeName) } - constructorArgs.append(argValue) + var constructorArgs: [DefaultValue] = [] + for argument in funcCall.arguments { + guard let argValue = extractLiteralValue(from: argument.expression) else { + diagnose( + node: argument.expression, + message: "Constructor argument must be a literal value", + hint: "Use simple literals like \"text\", 42, true, false in constructor arguments" + ) + return nil + } + constructorArgs.append(argValue) + } + return .objectWithArguments(typeName, constructorArgs) } - - return .objectWithArguments(className, constructorArgs) } /// Extracts a literal value from an expression with optional type checking diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 3e815b717..32a211716 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1254,16 +1254,6 @@ struct BridgeJSLink { ] } - func generateParameterList(parameters: [Parameter]) -> String { - parameters.map { param in - if let defaultValue = param.defaultValue { - let defaultJs = DefaultValueGenerator().generate(defaultValue, format: .javascript) - return "\(param.name) = \(defaultJs)" - } - return param.name - }.joined(separator: ", ") - } - func renderFunction( name: String, parameters: [Parameter], @@ -1272,7 +1262,7 @@ struct BridgeJSLink { ) -> [String] { let printer = CodeFragmentPrinter() - let parameterList = generateParameterList(parameters: parameters) + let parameterList = DefaultValueUtils.formatParameterList(parameters) printer.write( "\(declarationPrefixKeyword.map { "\($0) "} ?? "")\(name)(\(parameterList)) {" @@ -1350,76 +1340,10 @@ struct BridgeJSLink { /// Helper method to append JSDoc comments for parameters with default values private func appendJSDocIfNeeded(for parameters: [Parameter], to lines: inout [String]) { - let jsDocLines = DefaultValueGenerator().generateJSDoc(for: parameters) + let jsDocLines = DefaultValueUtils.formatJSDoc(for: parameters) lines.append(contentsOf: jsDocLines) } - /// Helper struct for generating default value representations - private struct DefaultValueGenerator { - enum OutputFormat { - case javascript - case typescript - } - - /// Generates default value representation for JavaScript or TypeScript - func generate(_ defaultValue: DefaultValue, format: OutputFormat) -> String { - switch defaultValue { - case .string(let value): - let escapedValue = - format == .javascript - ? escapeForJavaScript(value) - : value // TypeScript doesn't need escape in doc comments - return "\"\(escapedValue)\"" - case .int(let value): - return "\(value)" - case .float(let value): - return "\(value)" - case .double(let value): - return "\(value)" - case .bool(let value): - return value ? "true" : "false" - case .null: - return "null" - case .enumCase(let enumName, let caseName): - let simpleName = enumName.components(separatedBy: ".").last ?? enumName - let jsEnumName = format == .javascript ? "\(simpleName)\(ExportedEnum.valuesSuffix)" : simpleName - return "\(jsEnumName).\(caseName.capitalizedFirstLetter)" - case .object(let className): - return "new \(className)()" - case .objectWithArguments(let className, let args): - let argStrings = args.map { arg in - generate(arg, format: format) - } - return "new \(className)(\(argStrings.joined(separator: ", ")))" - } - } - - private func escapeForJavaScript(_ string: String) -> String { - return - string - .replacingOccurrences(of: "\\", with: "\\\\") - .replacingOccurrences(of: "\"", with: "\\\"") - } - - /// Generates JSDoc comment lines for parameters with default values - func generateJSDoc(for parameters: [Parameter]) -> [String] { - let paramsWithDefaults = parameters.filter { $0.hasDefault } - guard !paramsWithDefaults.isEmpty else { - return [] - } - - var jsDocLines: [String] = ["/**"] - for param in paramsWithDefaults { - if let defaultValue = param.defaultValue { - let defaultDoc = generate(defaultValue, format: .typescript) - jsDocLines.append(" * @param \(param.name) - Optional parameter (default: \(defaultDoc))") - } - } - jsDocLines.append(" */") - return jsDocLines - } - } - func renderExportedStruct( _ structDefinition: ExportedStruct ) throws -> (js: [String], dtsType: [String], dtsExportEntry: [String]) { @@ -1437,6 +1361,8 @@ struct BridgeJSLink { dtsTypePrinter.write("\(property.name): \(tsType);") } for method in structDefinition.methods where !method.effects.isStatic { + let jsDocLines = DefaultValueUtils.formatJSDoc(for: method.parameters) + dtsTypePrinter.write(lines: jsDocLines) let signature = renderTSSignature( parameters: method.parameters, returnType: method.returnType, @@ -1466,7 +1392,7 @@ struct BridgeJSLink { ) let constructorPrinter = CodeFragmentPrinter() - let paramList = thunkBuilder.generateParameterList(parameters: constructor.parameters) + let paramList = DefaultValueUtils.formatParameterList(constructor.parameters) constructorPrinter.write("init: function(\(paramList)) {") constructorPrinter.indent { constructorPrinter.write(contentsOf: thunkBuilder.body) @@ -1499,6 +1425,8 @@ struct BridgeJSLink { dtsExportEntryPrinter.write("\(structName): {") dtsExportEntryPrinter.indent { if let constructor = structDefinition.constructor { + let jsDocLines = DefaultValueUtils.formatJSDoc(for: constructor.parameters) + dtsExportEntryPrinter.write(lines: jsDocLines) dtsExportEntryPrinter.write( "init\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftStruct(structDefinition.swiftCallName), effects: constructor.effects));" ) @@ -1508,6 +1436,8 @@ struct BridgeJSLink { dtsExportEntryPrinter.write("\(readonly)\(property.name): \(resolveTypeScriptType(property.type));") } for method in staticMethods { + let jsDocLines = DefaultValueUtils.formatJSDoc(for: method.parameters) + dtsExportEntryPrinter.write(lines: jsDocLines) dtsExportEntryPrinter.write( "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" ) @@ -1930,7 +1860,7 @@ extension BridgeJSLink { try thunkBuilder.lowerParameter(param: param) } - let constructorParamList = thunkBuilder.generateParameterList(parameters: constructor.parameters) + let constructorParamList = DefaultValueUtils.formatParameterList(constructor.parameters) jsPrinter.indent { jsPrinter.write("constructor(\(constructorParamList)) {") @@ -1945,7 +1875,7 @@ extension BridgeJSLink { } dtsExportEntryPrinter.indent { - let jsDocLines = DefaultValueGenerator().generateJSDoc(for: constructor.parameters) + let jsDocLines = DefaultValueUtils.formatJSDoc(for: constructor.parameters) for line in jsDocLines { dtsExportEntryPrinter.write(line) } @@ -3173,6 +3103,88 @@ extension BridgeJSLink { } } +/// Utility enum for generating default value representations in JavaScript/TypeScript +enum DefaultValueUtils { + enum OutputFormat { + case javascript + case typescript + } + + /// Generates default value representation for JavaScript or TypeScript + static func format(_ defaultValue: DefaultValue, as format: OutputFormat) -> String { + switch defaultValue { + case .string(let value): + let escapedValue = + format == .javascript + ? escapeForJavaScript(value) + : value // TypeScript doesn't need escape in doc comments + return "\"\(escapedValue)\"" + case .int(let value): + return "\(value)" + case .float(let value): + return "\(value)" + case .double(let value): + return "\(value)" + case .bool(let value): + return value ? "true" : "false" + case .null: + return "null" + case .enumCase(let enumName, let caseName): + let simpleName = enumName.components(separatedBy: ".").last ?? enumName + let jsEnumName = format == .javascript ? "\(simpleName)\(ExportedEnum.valuesSuffix)" : simpleName + return "\(jsEnumName).\(caseName.capitalizedFirstLetter)" + case .object(let className): + return "new \(className)()" + case .objectWithArguments(let className, let args): + let argStrings = args.map { arg in + Self.format(arg, as: format) + } + return "new \(className)(\(argStrings.joined(separator: ", ")))" + case .structLiteral(_, let fields): + let fieldStrings = fields.map { field in + "\(field.name): \(Self.format(field.value, as: format))" + } + return "{ \(fieldStrings.joined(separator: ", ")) }" + } + } + + private static func escapeForJavaScript(_ string: String) -> String { + return + string + .replacingOccurrences(of: "\\", with: "\\\\") + .replacingOccurrences(of: "\"", with: "\\\"") + } + + /// Generates JSDoc comment lines for parameters with default values + static func formatJSDoc(for parameters: [Parameter]) -> [String] { + let paramsWithDefaults = parameters.filter { $0.hasDefault } + guard !paramsWithDefaults.isEmpty else { + return [] + } + + var jsDocLines: [String] = ["/**"] + for param in paramsWithDefaults { + if let defaultValue = param.defaultValue { + let defaultDoc = format(defaultValue, as: .typescript) + jsDocLines.append(" * @param \(param.name) - Optional parameter (default: \(defaultDoc))") + } + } + jsDocLines.append(" */") + return jsDocLines + } + + /// Generates a JavaScript parameter list with default values + static func formatParameterList(_ parameters: [Parameter]) -> String { + return parameters.map { param in + if let defaultValue = param.defaultValue { + let defaultJs = format(defaultValue, as: .javascript) + return "\(param.name) = \(defaultJs)" + } + return param.name + }.joined(separator: ", ") + } +} + struct BridgeJSLinkError: Error { let message: String } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index d1bdf63ae..23fb2b533 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2135,8 +2135,9 @@ struct IntrinsicJSFragment: Sendable { // Attach instance methods to the struct instance for method in structDef.methods where !method.effects.isStatic { + let paramList = DefaultValueUtils.formatParameterList(method.parameters) printer.write( - "\(instanceVar).\(method.name) = function(\(method.parameters.map { $0.name }.joined(separator: ", "))) {" + "\(instanceVar).\(method.name) = function(\(paramList)) {" ) printer.indent { let methodScope = JSGlueVariableScope() diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index e80d1c827..b2dae86c0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -160,6 +160,17 @@ public enum SwiftEnumRawType: String, CaseIterable, Codable, Sendable { } } +/// Represents a struct field with name and default value for default parameter values +public struct DefaultValueField: Codable, Equatable, Sendable { + public let name: String + public let value: DefaultValue + + public init(name: String, value: DefaultValue) { + self.name = name + self.value = value + } +} + public enum DefaultValue: Codable, Equatable, Sendable { case string(String) case int(Int) @@ -170,6 +181,7 @@ public enum DefaultValue: Codable, Equatable, Sendable { case enumCase(String, String) // enumName, caseName case object(String) // className for parameterless constructor case objectWithArguments(String, [DefaultValue]) // className, constructor argument values + case structLiteral(String, [DefaultValueField]) // structName, field name/value pairs } public struct Parameter: Codable, Equatable, Sendable { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift index b670d2dbb..73274ad5c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift @@ -28,13 +28,11 @@ @JS class DefaultGreeter { @JS var name: String - @JS init(name: String) { - self.name = name - } + @JS init(name: String) } @JS class EmptyGreeter { - @JS init() {} + @JS init() } @JS public func testComplexInit(greeter: DefaultGreeter = DefaultGreeter(name: "DefaultUser")) -> DefaultGreeter @@ -53,22 +51,25 @@ enabled: Bool = true, status: Status = .active, tag: String? = nil - ) { - self.name = name - self.count = count - self.enabled = enabled - self.status = status - self.tag = tag - } - - @JS func describe() -> String { - let tagStr = tag ?? "nil" - let statusStr: String - switch status { - case .active: statusStr = "active" - case .inactive: statusStr = "inactive" - case .pending: statusStr = "pending" - } - return "\(name):\(count):\(enabled):\(statusStr):\(tagStr)" - } + ) +} + +@JS struct Config { + var name: String + var value: Int + var enabled: Bool +} + +@JS public func testOptionalStructDefault(point: Config? = nil) -> Config? +@JS public func testOptionalStructWithValueDefault( + point: Config? = Config(name: "default", value: 42, enabled: true) +) -> Config? + +@JS struct MathOperations { + var baseValue: Double + + @JS init(baseValue: Double = 0.0) + @JS func add(a: Double, b: Double = 10.0) -> Double + @JS func multiply(a: Double, b: Double) -> Double + @JS static func subtract(a: Double, b: Double = 5.0) -> Double } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts index 38cbf989c..c024ecfb6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts @@ -11,6 +11,19 @@ export const StatusValues: { }; export type StatusTag = typeof StatusValues[keyof typeof StatusValues]; +export interface Config { + name: string; + value: number; + enabled: boolean; +} +export interface MathOperations { + baseValue: number; + /** + * @param b - Optional parameter (default: 10.0) + */ + add(a: number, b?: number): number; + multiply(a: number, b: number): number; +} export type StatusObject = typeof StatusValues; /// Represents a Swift heap object like a class instance or an actor instance. @@ -26,7 +39,6 @@ export interface DefaultGreeter extends SwiftHeapObject { export interface EmptyGreeter extends SwiftHeapObject { } export interface ConstructorDefaults extends SwiftHeapObject { - describe(): string; name: string; count: number; enabled: boolean; @@ -96,7 +108,25 @@ export type Exports = { * @param greeter - Optional parameter (default: new EmptyGreeter()) */ testEmptyInit(greeter?: EmptyGreeter): EmptyGreeter; + /** + * @param point - Optional parameter (default: null) + */ + testOptionalStructDefault(point?: Config | null): Config | null; + /** + * @param point - Optional parameter (default: { name: "default", value: 42, enabled: true }) + */ + testOptionalStructWithValueDefault(point?: Config | null): Config | null; Status: StatusObject + MathOperations: { + /** + * @param baseValue - Optional parameter (default: 0.0) + */ + init(baseValue?: number): MathOperations; + /** + * @param b - Optional parameter (default: 5.0) + */ + subtract(a: number, b?: number): number; + } } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index ba9eac2fb..9836ffe95 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -34,9 +34,57 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const structHelpers = {}; let _exports = null; let bjs = null; + const __bjs_createConfigHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.name); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + tmpParamInts.push((value.value | 0)); + tmpParamInts.push(value.enabled ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + }; + return { cleanup }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const bool = tmpRetInts.pop() !== 0; + const int = tmpRetInts.pop(); + const string = tmpRetStrings.pop(); + return { name: string, value: int, enabled: bool }; + } + }); + }; + const __bjs_createMathOperationsHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamF64s.push(value.baseValue); + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const f64 = tmpRetF64s.pop(); + const instance1 = { baseValue: f64 }; + instance1.add = function(a, b = 10.0) { + const { cleanup: structCleanup } = structHelpers.MathOperations.lower(this); + const ret = instance.exports.bjs_MathOperations_add(a, b); + if (structCleanup) { structCleanup(); } + return ret; + }.bind(instance1); + instance1.multiply = function(a, b) { + const { cleanup: structCleanup } = structHelpers.MathOperations.lower(this); + const ret = instance.exports.bjs_MathOperations_multiply(a, b); + if (structCleanup) { structCleanup(); } + return ret; + }.bind(instance1); + return instance1; + } + }); + }; return { /** @@ -298,12 +346,6 @@ export async function createInstantiator(options, swift) { } return ConstructorDefaults.__construct(ret); } - describe() { - instance.exports.bjs_ConstructorDefaults_describe(this.pointer); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } get name() { instance.exports.bjs_ConstructorDefaults_name_get(this.pointer); const ret = tmpRetString; @@ -356,6 +398,12 @@ export async function createInstantiator(options, swift) { } } } + const ConfigHelpers = __bjs_createConfigHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Config = ConfigHelpers; + + const MathOperationsHelpers = __bjs_createMathOperationsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.MathOperations = MathOperationsHelpers; + const exports = { DefaultGreeter, EmptyGreeter, @@ -436,7 +484,54 @@ export async function createInstantiator(options, swift) { const ret = instance.exports.bjs_testEmptyInit(greeter.pointer); return EmptyGreeter.__construct(ret); }, + testOptionalStructDefault: function bjs_testOptionalStructDefault(point = null) { + const isSome = point != null; + let pointCleanup; + if (isSome) { + const structResult = structHelpers.Config.lower(point); + pointCleanup = structResult.cleanup; + } + instance.exports.bjs_testOptionalStructDefault(+isSome); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + optResult = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } else { + optResult = null; + } + if (pointCleanup) { pointCleanup(); } + return optResult; + }, + testOptionalStructWithValueDefault: function bjs_testOptionalStructWithValueDefault(point = { name: "default", value: 42, enabled: true }) { + const isSome = point != null; + let pointCleanup; + if (isSome) { + const structResult = structHelpers.Config.lower(point); + pointCleanup = structResult.cleanup; + } + instance.exports.bjs_testOptionalStructWithValueDefault(+isSome); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + optResult = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } else { + optResult = null; + } + if (pointCleanup) { pointCleanup(); } + return optResult; + }, Status: StatusValues, + MathOperations: { + init: function(baseValue = 0.0) { + instance.exports.bjs_MathOperations_init(baseValue); + const structValue = structHelpers.MathOperations.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return structValue; + }, + subtract: function(a, b) { + const ret = instance.exports.bjs_MathOperations_static_subtract(a, b); + return ret; + }, + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index 66b4dcc41..7e614a324 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -146,23 +146,7 @@ ] }, "methods" : [ - { - "abiName" : "bjs_ConstructorDefaults_describe", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "describe", - "parameters" : [ - ], - "returnType" : { - "string" : { - - } - } - } ], "name" : "ConstructorDefaults", "properties" : [ @@ -642,6 +626,108 @@ "_0" : "EmptyGreeter" } } + }, + { + "abiName" : "bjs_testOptionalStructDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalStructDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "point", + "name" : "point", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + }, + { + "abiName" : "bjs_testOptionalStructWithValueDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalStructWithValueDefault", + "parameters" : [ + { + "defaultValue" : { + "structLiteral" : { + "_0" : "Config", + "_1" : [ + { + "name" : "name", + "value" : { + "string" : { + "_0" : "default" + } + } + }, + { + "name" : "value", + "value" : { + "int" : { + "_0" : 42 + } + } + }, + { + "name" : "enabled", + "value" : { + "bool" : { + "_0" : true + } + } + } + ] + } + }, + "label" : "point", + "name" : "point", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } } ], "moduleName" : "TestModule", @@ -649,6 +735,203 @@ ], "structs" : [ + { + "methods" : [ + + ], + "name" : "Config", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "swiftCallName" : "Config" + }, + { + "constructor" : { + "abiName" : "bjs_MathOperations_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "defaultValue" : { + "double" : { + "_0" : 0 + } + }, + "label" : "baseValue", + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathOperations_add", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "defaultValue" : { + "double" : { + "_0" : 10 + } + }, + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "defaultValue" : { + "double" : { + "_0" : 5 + } + }, + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "MathOperations" + } + } + } + ], + "name" : "MathOperations", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "MathOperations" + } ] } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 525782c4f..03d037e98 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -45,6 +45,79 @@ extension Status: _BridgedSwiftCaseEnum { } } +extension Config: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { + let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Config(name: name, value: value, enabled: enabled) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.value)) + _swift_js_push_int(self.enabled ? 1 : 0) + } +} + +extension MathOperations: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { + let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return MathOperations(baseValue: baseValue) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.baseValue) + } +} + +@_expose(wasm, "bjs_MathOperations_init") +@_cdecl("bjs_MathOperations_init") +public func _bjs_MathOperations_init(baseValue: Float64) -> Void { + #if arch(wasm32) + let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_add") +@_cdecl("bjs_MathOperations_add") +public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_multiply") +@_cdecl("bjs_MathOperations_multiply") +public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MathOperations_static_subtract") +@_cdecl("bjs_MathOperations_static_subtract") +public func _bjs_MathOperations_static_subtract(a: Float64, b: Float64) -> Float64 { + #if arch(wasm32) + let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_testStringDefault") @_cdecl("bjs_testStringDefault") public func _bjs_testStringDefault(messageBytes: Int32, messageLength: Int32) -> Void { @@ -166,6 +239,28 @@ public func _bjs_testEmptyInit(greeter: UnsafeMutableRawPointer) -> UnsafeMutabl #endif } +@_expose(wasm, "bjs_testOptionalStructDefault") +@_cdecl("bjs_testOptionalStructDefault") +public func _bjs_testOptionalStructDefault(point: Int32) -> Void { + #if arch(wasm32) + let ret = testOptionalStructDefault(point: Optional.bridgeJSLiftParameter(point)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testOptionalStructWithValueDefault") +@_cdecl("bjs_testOptionalStructWithValueDefault") +public func _bjs_testOptionalStructWithValueDefault(point: Int32) -> Void { + #if arch(wasm32) + let ret = testOptionalStructWithValueDefault(point: Optional.bridgeJSLiftParameter(point)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_DefaultGreeter_init") @_cdecl("bjs_DefaultGreeter_init") public func _bjs_DefaultGreeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { @@ -262,17 +357,6 @@ public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, c #endif } -@_expose(wasm, "bjs_ConstructorDefaults_describe") -@_cdecl("bjs_ConstructorDefaults_describe") -public func _bjs_ConstructorDefaults_describe(_self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).describe() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - @_expose(wasm, "bjs_ConstructorDefaults_name_get") @_cdecl("bjs_ConstructorDefaults_name_get") public func _bjs_ConstructorDefaults_name_get(_self: UnsafeMutableRawPointer) -> Void { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md index 11574f0d0..9eec622f0 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md @@ -107,41 +107,45 @@ The following default value types are supported for both function and constructo | Nil for optionals | `nil` | `null` | | Enum cases (shorthand) | `.north` | `Direction.North` | | Enum cases (qualified) | `Direction.north` | `Direction.North` | -| Object initialization (no args) | `MyClass()` | `new MyClass()` | -| Object initialization (literal args) | `MyClass("value", 42)` | `new MyClass("value", 42)` | +| Class initialization (no args) | `MyClass()` | `new MyClass()` | +| Class initialization (literal args) | `MyClass("value", 42)` | `new MyClass("value", 42)` | +| Struct initialization | `Point(x: 1.0, y: 2.0)` | `{ x: 1.0, y: 2.0 }` | -## Working with Class Instances as Default Parameters +## Working with Class and Struct Defaults -You can use class initialization expressions as default values: +You can use class or struct initialization expressions as default values: ```swift +@JS struct Point { + var x: Double + var y: Double +} + @JS class Config { var setting: String - - @JS init(setting: String) { - self.setting = setting - } + @JS init(setting: String) { self.setting = setting } } -@JS public func process(config: Config = Config(setting: "default")) -> String { - return "Using: \(config.setting)" -} +@JS public func processPoint(point: Point = Point(x: 0.0, y: 0.0)) -> String +@JS public func processConfig(config: Config = Config(setting: "default")) -> String ``` -In JavaScript: +In JavaScript, structs become object literals while classes use constructor calls: ```javascript -exports.process(); // "Using: default" +exports.processPoint(); // uses default { x: 0.0, y: 0.0 } +exports.processPoint({ x: 5.0, y: 10.0 }); // custom struct +exports.processConfig(); // uses default new Config("default") const custom = new exports.Config("custom"); -exports.process(custom); // "Using: custom" +exports.processConfig(custom); // custom instance custom.release(); ``` -**Limitations for object initialization:** -- Constructor arguments must be literal values (`"text"`, `42`, `true`, `false`, `nil`) -- Complex expressions in constructor arguments are not supported -- Computed properties or method calls as arguments are not supported +**Requirements:** +- Constructor/initializer arguments must be literal values (`"text"`, `42`, `true`, `false`, `nil`) +- Struct initializers must use labeled arguments (e.g., `Point(x: 1.0, y: 2.0)`) +- Complex expressions, computed properties, or method calls are not supported ## Unsupported Default Value Types diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index b3aa84c18..7f2dab8ee 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1,6 +1,5 @@ import XCTest import JavaScriptKit -import JavaScriptEventLoop @_extern(wasm, module: "BridgeJSRuntimeTests", name: "runJsWorks") @_extern(c) @@ -1284,9 +1283,14 @@ enum APIOptionalResult { } @JS struct MathOperations { - @JS init() {} - @JS func add(a: Double, b: Double) -> Double { - return a + b + var baseValue: Double + + @JS init(baseValue: Double = 0.0) { + self.baseValue = baseValue + } + + @JS func add(a: Double, b: Double = 10.0) -> Double { + return baseValue + a + b } @JS func multiply(a: Double, b: Double) -> Double { @@ -1298,6 +1302,12 @@ enum APIOptionalResult { } } +@JS func testStructDefault( + point: DataPoint = DataPoint(x: 1.0, y: 2.0, label: "default", optCount: nil, optFlag: nil) +) -> String { + return "\(point.x),\(point.y),\(point.label)" +} + @JS struct ConfigStruct { var name: String var value: Int @@ -1373,7 +1383,7 @@ class ExportAPITests: XCTestCase { XCTAssertTrue(hasDeinitCalculator, "Calculator (without @JS init) should have been deinitialized") } - func testAllAsync() async throws { - _ = try await runAsyncWorks().value() - } + // func testAllAsync() async throws { + // _ = try await runAsyncWorks().value() + // } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index dcae4a744..addeedb1e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -2182,19 +2182,20 @@ extension ValidationReport: _BridgedSwiftStruct { extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - return MathOperations() + let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return MathOperations(baseValue: baseValue) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - + _swift_js_push_f64(self.baseValue) } } @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") -public func _bjs_MathOperations_init() -> Void { +public func _bjs_MathOperations_init(baseValue: Float64) -> Void { #if arch(wasm32) - let ret = MathOperations() + let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -3617,6 +3618,17 @@ public func _bjs_makeAdder(base: Int32) -> UnsafeMutableRawPointer { #endif } +@_expose(wasm, "bjs_testStructDefault") +@_cdecl("bjs_testStructDefault") +public func _bjs_testStructDefault() -> Void { + #if arch(wasm32) + let ret = testStructDefault(point: DataPoint.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripDataPoint") @_cdecl("bjs_roundTripDataPoint") public func _bjs_roundTripDataPoint() -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json index 751d6519d..872af0251 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -7644,6 +7644,78 @@ } } }, + { + "abiName" : "bjs_testStructDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStructDefault", + "parameters" : [ + { + "defaultValue" : { + "structLiteral" : { + "_0" : "DataPoint", + "_1" : [ + { + "name" : "x", + "value" : { + "float" : { + "_0" : 1 + } + } + }, + { + "name" : "y", + "value" : { + "float" : { + "_0" : 2 + } + } + }, + { + "name" : "label", + "value" : { + "string" : { + "_0" : "default" + } + } + }, + { + "name" : "optCount", + "value" : { + "null" : { + + } + } + }, + { + "name" : "optFlag", + "value" : { + "null" : { + + } + } + } + ] + } + }, + "label" : "point", + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, { "abiName" : "bjs_roundTripDataPoint", "effects" : { @@ -8613,7 +8685,20 @@ "isThrows" : false }, "parameters" : [ + { + "defaultValue" : { + "double" : { + "_0" : 0 + } + }, + "label" : "baseValue", + "name" : "baseValue", + "type" : { + "double" : { + } + } + } ] }, "methods" : [ @@ -8636,6 +8721,11 @@ } }, { + "defaultValue" : { + "double" : { + "_0" : 10 + } + }, "label" : "b", "name" : "b", "type" : { @@ -8727,7 +8817,16 @@ ], "name" : "MathOperations", "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "baseValue", + "type" : { + "double" : { + } + } + } ], "swiftCallName" : "MathOperations" }, diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index eaef7ca15..a5611523c 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -574,7 +574,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const apiSuccess = { tag: exports.APIResult.Tag.Success, param0: "test success" }; const apiFailure = { tag: exports.APIResult.Tag.Failure, param0: 404 }; const apiInfo = { tag: exports.APIResult.Tag.Info }; - + assert.equal(exports.compareAPIResults(apiSuccess, apiFailure), "r1:success:test success,r2:failure:404"); assert.equal(exports.compareAPIResults(null, apiInfo), "r1:nil,r2:info"); assert.equal(exports.compareAPIResults(apiFailure, null), "r1:failure:404,r2:nil"); @@ -985,9 +985,21 @@ function testStructSupport(exports) { assert.equal(exports.MathOperations.subtract(10.0, 4.0), 6.0); const mathOps = exports.MathOperations.init(); + assert.equal(mathOps.baseValue, 0.0); assert.equal(mathOps.add(5.0, 3.0), 8.0); assert.equal(mathOps.multiply(4.0, 7.0), 28.0); + const mathOps2 = exports.MathOperations.init(100.0); + assert.equal(mathOps2.baseValue, 100.0); + assert.equal(mathOps2.add(5.0, 3.0), 108.0); + + assert.equal(mathOps.add(5.0), 15.0); + assert.equal(mathOps2.add(5.0), 115.0); + + assert.equal(exports.testStructDefault(), "1.0,2.0,default"); + const customPoint = { x: 10.0, y: 20.0, label: "custom", optCount: null, optFlag: null }; + assert.equal(exports.testStructDefault(customPoint), "10.0,20.0,custom"); + const container = exports.testContainerWithStruct({ x: 5.0, y: 10.0, label: "test", optCount: null, optFlag: true }); assert.equal(container.location.x, 5.0); assert.equal(container.config, null); From ba38ba68d713f132dbf30fe32954622d3d5c8a80 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 23 Dec 2025 19:02:59 +0700 Subject: [PATCH 054/252] BridgeJS: Struct and struct vs classes benchmarks --- Benchmarks/Sources/Benchmarks.swift | 130 +++ .../Generated/BridgeJS.ExportSwift.swift | 588 ++++++++++++ .../JavaScript/BridgeJS.ExportSwift.json | 851 ++++++++++++++++++ Benchmarks/run.js | 132 ++- 4 files changed, 1700 insertions(+), 1 deletion(-) diff --git a/Benchmarks/Sources/Benchmarks.swift b/Benchmarks/Sources/Benchmarks.swift index b05075eb3..661aba63e 100644 --- a/Benchmarks/Sources/Benchmarks.swift +++ b/Benchmarks/Sources/Benchmarks.swift @@ -111,6 +111,136 @@ enum ComplexResult { } } +// MARK: - Struct Performance Tests + +@JS struct SimpleStruct { + var name: String + var count: Int + var flag: Bool + var rate: Float + var precise: Double +} + +@JS struct Address { + var street: String + var city: String + var zipCode: Int +} + +@JS struct Person { + var name: String + var age: Int + var address: Address + var email: String? +} + +@JS struct ComplexStruct { + var id: Int + var title: String + var active: Bool + var score: Double + var tags: String + var metadata: String +} + +@JS class StructRoundtrip { + @JS init() {} + + @JS func takeSimple(_ value: SimpleStruct) {} + @JS func makeSimple() -> SimpleStruct { + return SimpleStruct(name: "Hello", count: 42, flag: true, rate: 0.5, precise: 3.14159) + } + @JS func roundtripSimple(_ value: SimpleStruct) -> SimpleStruct { + return value + } + + @JS func takeAddress(_ value: Address) {} + @JS func makeAddress() -> Address { + return Address(street: "123 Main St", city: "San Francisco", zipCode: 94102) + } + @JS func roundtripAddress(_ value: Address) -> Address { + return value + } + + @JS func takePerson(_ value: Person) {} + @JS func makePerson() -> Person { + return Person( + name: "John Doe", + age: 30, + address: Address(street: "456 Oak Ave", city: "New York", zipCode: 10001), + email: "john@example.com" + ) + } + @JS func roundtripPerson(_ value: Person) -> Person { + return value + } + + @JS func takeComplex(_ value: ComplexStruct) {} + @JS func makeComplex() -> ComplexStruct { + return ComplexStruct( + id: 12345, + title: "Test Item", + active: true, + score: 98.6, + tags: "swift,wasm,benchmark", + metadata: "{\"version\":1}" + ) + } + @JS func roundtripComplex(_ value: ComplexStruct) -> ComplexStruct { + return value + } +} + +// MARK: - Class vs Struct Comparison Tests + +@JS class SimpleClass { + @JS var name: String + @JS var count: Int + @JS var flag: Bool + @JS var rate: Float + @JS var precise: Double + + @JS init(name: String, count: Int, flag: Bool, rate: Float, precise: Double) { + self.name = name + self.count = count + self.flag = flag + self.rate = rate + self.precise = precise + } +} + +@JS class AddressClass { + @JS var street: String + @JS var city: String + @JS var zipCode: Int + + @JS init(street: String, city: String, zipCode: Int) { + self.street = street + self.city = city + self.zipCode = zipCode + } +} + +@JS class ClassRoundtrip { + @JS init() {} + + @JS func takeSimpleClass(_ value: SimpleClass) {} + @JS func makeSimpleClass() -> SimpleClass { + return SimpleClass(name: "Hello", count: 42, flag: true, rate: 0.5, precise: 3.14159) + } + @JS func roundtripSimpleClass(_ value: SimpleClass) -> SimpleClass { + return value + } + + @JS func takeAddressClass(_ value: AddressClass) {} + @JS func makeAddressClass() -> AddressClass { + return AddressClass(street: "123 Main St", city: "San Francisco", zipCode: 94102) + } + @JS func roundtripAddressClass(_ value: AddressClass) -> AddressClass { + return value + } +} + @JS func run() { let call = Benchmark("Call") diff --git a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift index 8fb5c97d7..fcec5e675 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift @@ -246,6 +246,106 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } +extension SimpleStruct: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SimpleStruct { + let precise = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let rate = Float.bridgeJSLiftParameter(_swift_js_pop_param_f32()) + let flag = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let count = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return SimpleStruct(name: name, count: count, flag: flag, rate: rate, precise: precise) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.count)) + _swift_js_push_int(self.flag ? 1 : 0) + _swift_js_push_f32(self.rate) + _swift_js_push_f64(self.precise) + } +} + +extension Address: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { + let zipCode = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Address(street: street, city: city, zipCode: zipCode) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_street = self.street + __bjs_street.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_city = self.city + __bjs_city.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.zipCode)) + } +} + +extension Person: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let address = Address.bridgeJSLiftParameter() + let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return Person(name: name, age: age, address: address, email: email) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_name = self.name + __bjs_name.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.age)) + self.address.bridgeJSLowerReturn() + let __bjs_isSome_email = self.email != nil + if let __bjs_unwrapped_email = self.email { + var __bjs_str_email = __bjs_unwrapped_email + __bjs_str_email.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + } +} + +extension ComplexStruct: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ComplexStruct { + let metadata = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let tags = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let score = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let active = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let title = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return ComplexStruct(id: id, title: title, active: active, score: score, tags: tags, metadata: metadata) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + var __bjs_title = self.title + __bjs_title.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(self.active ? 1 : 0) + _swift_js_push_f64(self.score) + var __bjs_tags = self.tags + __bjs_tags.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + var __bjs_metadata = self.metadata + __bjs_metadata.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } +} + @_expose(wasm, "bjs_run") @_cdecl("bjs_run") public func _bjs_run() -> Void { @@ -556,4 +656,492 @@ fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } +#endif + +@_expose(wasm, "bjs_StructRoundtrip_init") +@_cdecl("bjs_StructRoundtrip_init") +public func _bjs_StructRoundtrip_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = StructRoundtrip() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_takeSimple") +@_cdecl("bjs_StructRoundtrip_takeSimple") +public func _bjs_StructRoundtrip_takeSimple(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + StructRoundtrip.bridgeJSLiftParameter(_self).takeSimple(_: SimpleStruct.bridgeJSLiftParameter()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_makeSimple") +@_cdecl("bjs_StructRoundtrip_makeSimple") +public func _bjs_StructRoundtrip_makeSimple(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeSimple() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_roundtripSimple") +@_cdecl("bjs_StructRoundtrip_roundtripSimple") +public func _bjs_StructRoundtrip_roundtripSimple(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripSimple(_: SimpleStruct.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_takeAddress") +@_cdecl("bjs_StructRoundtrip_takeAddress") +public func _bjs_StructRoundtrip_takeAddress(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + StructRoundtrip.bridgeJSLiftParameter(_self).takeAddress(_: Address.bridgeJSLiftParameter()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_makeAddress") +@_cdecl("bjs_StructRoundtrip_makeAddress") +public func _bjs_StructRoundtrip_makeAddress(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeAddress() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_roundtripAddress") +@_cdecl("bjs_StructRoundtrip_roundtripAddress") +public func _bjs_StructRoundtrip_roundtripAddress(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripAddress(_: Address.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_takePerson") +@_cdecl("bjs_StructRoundtrip_takePerson") +public func _bjs_StructRoundtrip_takePerson(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + StructRoundtrip.bridgeJSLiftParameter(_self).takePerson(_: Person.bridgeJSLiftParameter()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_makePerson") +@_cdecl("bjs_StructRoundtrip_makePerson") +public func _bjs_StructRoundtrip_makePerson(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makePerson() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_roundtripPerson") +@_cdecl("bjs_StructRoundtrip_roundtripPerson") +public func _bjs_StructRoundtrip_roundtripPerson(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripPerson(_: Person.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_takeComplex") +@_cdecl("bjs_StructRoundtrip_takeComplex") +public func _bjs_StructRoundtrip_takeComplex(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + StructRoundtrip.bridgeJSLiftParameter(_self).takeComplex(_: ComplexStruct.bridgeJSLiftParameter()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_makeComplex") +@_cdecl("bjs_StructRoundtrip_makeComplex") +public func _bjs_StructRoundtrip_makeComplex(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeComplex() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_roundtripComplex") +@_cdecl("bjs_StructRoundtrip_roundtripComplex") +public func _bjs_StructRoundtrip_roundtripComplex(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripComplex(_: ComplexStruct.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StructRoundtrip_deinit") +@_cdecl("bjs_StructRoundtrip_deinit") +public func _bjs_StructRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension StructRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_StructRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_StructRoundtrip_wrap") +fileprivate func _bjs_StructRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_StructRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_SimpleClass_init") +@_cdecl("bjs_SimpleClass_init") +public func _bjs_SimpleClass_init(nameBytes: Int32, nameLength: Int32, count: Int32, flag: Int32, rate: Float32, precise: Float64) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = SimpleClass(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), flag: Bool.bridgeJSLiftParameter(flag), rate: Float.bridgeJSLiftParameter(rate), precise: Double.bridgeJSLiftParameter(precise)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_name_get") +@_cdecl("bjs_SimpleClass_name_get") +public func _bjs_SimpleClass_name_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = SimpleClass.bridgeJSLiftParameter(_self).name + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_name_set") +@_cdecl("bjs_SimpleClass_name_set") +public func _bjs_SimpleClass_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + SimpleClass.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_count_get") +@_cdecl("bjs_SimpleClass_count_get") +public func _bjs_SimpleClass_count_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = SimpleClass.bridgeJSLiftParameter(_self).count + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_count_set") +@_cdecl("bjs_SimpleClass_count_set") +public func _bjs_SimpleClass_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + SimpleClass.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_flag_get") +@_cdecl("bjs_SimpleClass_flag_get") +public func _bjs_SimpleClass_flag_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = SimpleClass.bridgeJSLiftParameter(_self).flag + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_flag_set") +@_cdecl("bjs_SimpleClass_flag_set") +public func _bjs_SimpleClass_flag_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + SimpleClass.bridgeJSLiftParameter(_self).flag = Bool.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_rate_get") +@_cdecl("bjs_SimpleClass_rate_get") +public func _bjs_SimpleClass_rate_get(_self: UnsafeMutableRawPointer) -> Float32 { + #if arch(wasm32) + let ret = SimpleClass.bridgeJSLiftParameter(_self).rate + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_rate_set") +@_cdecl("bjs_SimpleClass_rate_set") +public func _bjs_SimpleClass_rate_set(_self: UnsafeMutableRawPointer, value: Float32) -> Void { + #if arch(wasm32) + SimpleClass.bridgeJSLiftParameter(_self).rate = Float.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_precise_get") +@_cdecl("bjs_SimpleClass_precise_get") +public func _bjs_SimpleClass_precise_get(_self: UnsafeMutableRawPointer) -> Float64 { + #if arch(wasm32) + let ret = SimpleClass.bridgeJSLiftParameter(_self).precise + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_precise_set") +@_cdecl("bjs_SimpleClass_precise_set") +public func _bjs_SimpleClass_precise_set(_self: UnsafeMutableRawPointer, value: Float64) -> Void { + #if arch(wasm32) + SimpleClass.bridgeJSLiftParameter(_self).precise = Double.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SimpleClass_deinit") +@_cdecl("bjs_SimpleClass_deinit") +public func _bjs_SimpleClass_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension SimpleClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_SimpleClass_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_SimpleClass_wrap") +fileprivate func _bjs_SimpleClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_SimpleClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_AddressClass_init") +@_cdecl("bjs_AddressClass_init") +public func _bjs_AddressClass_init(streetBytes: Int32, streetLength: Int32, cityBytes: Int32, cityLength: Int32, zipCode: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = AddressClass(street: String.bridgeJSLiftParameter(streetBytes, streetLength), city: String.bridgeJSLiftParameter(cityBytes, cityLength), zipCode: Int.bridgeJSLiftParameter(zipCode)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_street_get") +@_cdecl("bjs_AddressClass_street_get") +public func _bjs_AddressClass_street_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = AddressClass.bridgeJSLiftParameter(_self).street + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_street_set") +@_cdecl("bjs_AddressClass_street_set") +public func _bjs_AddressClass_street_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + AddressClass.bridgeJSLiftParameter(_self).street = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_city_get") +@_cdecl("bjs_AddressClass_city_get") +public func _bjs_AddressClass_city_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = AddressClass.bridgeJSLiftParameter(_self).city + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_city_set") +@_cdecl("bjs_AddressClass_city_set") +public func _bjs_AddressClass_city_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + AddressClass.bridgeJSLiftParameter(_self).city = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_zipCode_get") +@_cdecl("bjs_AddressClass_zipCode_get") +public func _bjs_AddressClass_zipCode_get(_self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let ret = AddressClass.bridgeJSLiftParameter(_self).zipCode + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_zipCode_set") +@_cdecl("bjs_AddressClass_zipCode_set") +public func _bjs_AddressClass_zipCode_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { + #if arch(wasm32) + AddressClass.bridgeJSLiftParameter(_self).zipCode = Int.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_AddressClass_deinit") +@_cdecl("bjs_AddressClass_deinit") +public func _bjs_AddressClass_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension AddressClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_AddressClass_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_AddressClass_wrap") +fileprivate func _bjs_AddressClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_AddressClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_ClassRoundtrip_init") +@_cdecl("bjs_ClassRoundtrip_init") +public func _bjs_ClassRoundtrip_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassRoundtrip() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_takeSimpleClass") +@_cdecl("bjs_ClassRoundtrip_takeSimpleClass") +public func _bjs_ClassRoundtrip_takeSimpleClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ClassRoundtrip.bridgeJSLiftParameter(_self).takeSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_makeSimpleClass") +@_cdecl("bjs_ClassRoundtrip_makeSimpleClass") +public func _bjs_ClassRoundtrip_makeSimpleClass(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeSimpleClass() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_roundtripSimpleClass") +@_cdecl("bjs_ClassRoundtrip_roundtripSimpleClass") +public func _bjs_ClassRoundtrip_roundtripSimpleClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_takeAddressClass") +@_cdecl("bjs_ClassRoundtrip_takeAddressClass") +public func _bjs_ClassRoundtrip_takeAddressClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ClassRoundtrip.bridgeJSLiftParameter(_self).takeAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_makeAddressClass") +@_cdecl("bjs_ClassRoundtrip_makeAddressClass") +public func _bjs_ClassRoundtrip_makeAddressClass(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeAddressClass() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_roundtripAddressClass") +@_cdecl("bjs_ClassRoundtrip_roundtripAddressClass") +public func _bjs_ClassRoundtrip_roundtripAddressClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassRoundtrip_deinit") +@_cdecl("bjs_ClassRoundtrip_deinit") +public func _bjs_ClassRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension ClassRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClassRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_ClassRoundtrip_wrap") +fileprivate func _bjs_ClassRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClassRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} #endif \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json index 5ba46ff61..e3532d33c 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json @@ -422,6 +422,638 @@ ], "swiftCallName" : "StringRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_StructRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_StructRoundtrip_takeSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeSimple", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSimple", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripSimple", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takeAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeAddress", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAddress", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAddress", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takePerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takePerson", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makePerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makePerson", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripPerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripPerson", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takeComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeComplex", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplex", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripComplex", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "name" : "StructRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "StructRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_SimpleClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "label" : "flag", + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "rate", + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "label" : "precise", + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "SimpleClass", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "SimpleClass" + }, + { + "constructor" : { + "abiName" : "bjs_AddressClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "street", + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "label" : "city", + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "label" : "zipCode", + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "AddressClass", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "AddressClass" + }, + { + "constructor" : { + "abiName" : "bjs_ClassRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_ClassRoundtrip_takeSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeSimpleClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_makeSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSimpleClass", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_roundtripSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripSimpleClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_takeAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeAddressClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_makeAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAddressClass", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_roundtripAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAddressClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "name" : "ClassRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "ClassRoundtrip" } ], "enums" : [ @@ -728,6 +1360,225 @@ ], "structs" : [ + { + "methods" : [ + + ], + "name" : "SimpleStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "SimpleStruct" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "Person" + }, + { + "methods" : [ + + ], + "name" : "ComplexStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "title", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "active", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "score", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "tags", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "metadata", + "type" : { + "string" : { + } + } + } + ], + "swiftCallName" : "ComplexStruct" + } ] } \ No newline at end of file diff --git a/Benchmarks/run.js b/Benchmarks/run.js index d47473115..5c27e6fff 100644 --- a/Benchmarks/run.js +++ b/Benchmarks/run.js @@ -3,7 +3,7 @@ import { defaultNodeSetup } from "./.build/plugins/PackageToJS/outputs/Package/p import fs from 'fs'; import path from 'path'; import { parseArgs } from "util"; -import { APIResult, ComplexResult } from "./.build/plugins/PackageToJS/outputs/Package/bridge-js.js"; +import { APIResultValues as APIResult, ComplexResultValues as ComplexResult } from "./.build/plugins/PackageToJS/outputs/Package/bridge-js.js"; /** * Update progress bar on the current line @@ -454,6 +454,136 @@ async function singleRun(results, nameFilter) { stringRoundtrip.make() } }) + + // Struct performance tests + const structRoundtrip = new exports.StructRoundtrip(); + + benchmarkRunner("StructRoundtrip/takeSimple", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.takeSimple({ name: "Hello", count: 42, flag: true, rate: 0.5, precise: 3.14159 }) + } + }) + benchmarkRunner("StructRoundtrip/makeSimple", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.makeSimple() + } + }) + benchmarkRunner("StructRoundtrip/roundtripSimple", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.roundtripSimple({ name: "Hello", count: 42, flag: true, rate: 0.5, precise: 3.14159 }) + } + }) + + benchmarkRunner("StructRoundtrip/takeAddress", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.takeAddress({ street: "123 Main St", city: "San Francisco", zipCode: 94102 }) + } + }) + benchmarkRunner("StructRoundtrip/makeAddress", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.makeAddress() + } + }) + benchmarkRunner("StructRoundtrip/roundtripAddress", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.roundtripAddress({ street: "123 Main St", city: "San Francisco", zipCode: 94102 }) + } + }) + + benchmarkRunner("StructRoundtrip/takePerson", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.takePerson({ + name: "John Doe", + age: 30, + address: { street: "456 Oak Ave", city: "New York", zipCode: 10001 }, + email: "john@example.com" + }) + } + }) + benchmarkRunner("StructRoundtrip/makePerson", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.makePerson() + } + }) + benchmarkRunner("StructRoundtrip/roundtripPerson", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.roundtripPerson({ + name: "John Doe", + age: 30, + address: { street: "456 Oak Ave", city: "New York", zipCode: 10001 }, + email: "john@example.com" + }) + } + }) + + benchmarkRunner("StructRoundtrip/takeComplex", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.takeComplex({ + id: 12345, + title: "Test Item", + active: true, + score: 98.6, + tags: "swift,wasm,benchmark", + metadata: "{\"version\":1}" + }) + } + }) + benchmarkRunner("StructRoundtrip/makeComplex", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.makeComplex() + } + }) + benchmarkRunner("StructRoundtrip/roundtripComplex", () => { + for (let i = 0; i < iterations; i++) { + structRoundtrip.roundtripComplex({ + id: 12345, + title: "Test Item", + active: true, + score: 98.6, + tags: "swift,wasm,benchmark", + metadata: "{\"version\":1}" + }) + } + }) + + // Class vs Struct comparison tests + const classRoundtrip = new exports.ClassRoundtrip(); + + benchmarkRunner("ClassRoundtrip/takeSimpleClass", () => { + const simple = new exports.SimpleClass("Hello", 42, true, 0.5, 3.14159) + for (let i = 0; i < iterations; i++) { + classRoundtrip.takeSimpleClass(simple) + } + }) + benchmarkRunner("ClassRoundtrip/makeSimpleClass", () => { + for (let i = 0; i < iterations; i++) { + classRoundtrip.makeSimpleClass() + } + }) + benchmarkRunner("ClassRoundtrip/roundtripSimpleClass", () => { + const simple = new exports.SimpleClass("Hello", 42, true, 0.5, 3.14159) + for (let i = 0; i < iterations; i++) { + classRoundtrip.roundtripSimpleClass(simple) + } + }) + + benchmarkRunner("ClassRoundtrip/takeAddressClass", () => { + const address = new exports.AddressClass("123 Main St", "San Francisco", 94102) + for (let i = 0; i < iterations; i++) { + classRoundtrip.takeAddressClass(address) + } + }) + benchmarkRunner("ClassRoundtrip/makeAddressClass", () => { + for (let i = 0; i < iterations; i++) { + classRoundtrip.makeAddressClass() + } + }) + benchmarkRunner("ClassRoundtrip/roundtripAddressClass", () => { + const address = new exports.AddressClass("123 Main St", "San Francisco", 94102) + for (let i = 0; i < iterations; i++) { + classRoundtrip.roundtripAddressClass(address) + } + }) } /** From 6f4b5b2639bf145245734b2933c1b0525a885ae5 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 24 Dec 2025 18:28:56 +0700 Subject: [PATCH 055/252] [NFC] BridgeJS: Codegen and minor cleanups --- .../Sources/BridgeJSCore/ExportSwift.swift | 1471 +++++++++-------- .../Sources/BridgeJSLink/BridgeJSLink.swift | 225 +-- .../BridgeJSRuntimeTests/ExportAPITests.swift | 7 +- 3 files changed, 839 insertions(+), 864 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 2a2a19266..6ced425a1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -28,8 +28,6 @@ public class ExportSwift { private var exportedProtocols: [ExportedProtocol] = [] private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() - private let enumCodegen: EnumCodegen = EnumCodegen() - private let closureCodegen = ClosureCodegen() public init(progress: ProgressReporting, moduleName: String, exposeToGlobal: Bool) { self.progress = progress @@ -1666,43 +1664,39 @@ public class ExportSwift { } decls.append(Self.prelude) + let closureCodegen = ClosureCodegen() var closureSignatures: Set = [] for function in exportedFunctions { - collectClosureSignatures(from: function.parameters, into: &closureSignatures) - collectClosureSignatures(from: function.returnType, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: function.parameters, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: function.returnType, into: &closureSignatures) } for klass in exportedClasses { if let constructor = klass.constructor { - collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) } for method in klass.methods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: method.parameters, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: method.returnType, into: &closureSignatures) } for property in klass.properties { - collectClosureSignatures(from: property.type, into: &closureSignatures) + closureCodegen.collectClosureSignatures(from: property.type, into: &closureSignatures) } } for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { - decls.append(contentsOf: try closureCodegen.renderClosureHelper(signature: signature)) - decls.append(try closureCodegen.renderClosureInvokeHandler(signature: signature)) + decls.append(contentsOf: try closureCodegen.renderClosureHelpers(signature)) + decls.append(try closureCodegen.renderClosureInvokeHandler(signature)) } + let protocolCodegen = ProtocolCodegen() for proto in exportedProtocols { - decls.append(contentsOf: try renderProtocolWrapper(protocol: proto)) + decls.append(contentsOf: try protocolCodegen.renderProtocolWrapper(proto, moduleName: moduleName)) } + let enumCodegen = EnumCodegen() for enumDef in exportedEnums { - switch enumDef.enumType { - case .simple: - decls.append(enumCodegen.renderCaseEnumHelpers(enumDef)) - case .rawValue: - decls.append("extension \(raw: enumDef.swiftCallName): _BridgedSwiftEnumNoPayload {}") - case .associatedValue: - decls.append(enumCodegen.renderAssociatedValueEnumHelpers(enumDef)) - case .namespace: - () + if let enumHelpers = enumCodegen.renderEnumHelpers(enumDef) { + decls.append(enumHelpers) } for staticMethod in enumDef.staticMethods { @@ -1878,7 +1872,7 @@ public class ExportSwift { } } - func callMethod(klassName: String, methodName: String, returnType: BridgeType) { + func callMethod(methodName: String, returnType: BridgeType) { let (_, selfExpr) = removeFirstLiftedParameter() generateParameterLifting() let item = renderCallStatement( @@ -1912,7 +1906,7 @@ public class ExportSwift { } } - func callPropertyGetter(klassName: String, propertyName: String, returnType: BridgeType) { + func callPropertyGetter(propertyName: String, returnType: BridgeType) { let (_, selfExpr) = removeFirstLiftedParameter() if returnType == .void { append("\(raw: selfExpr).\(raw: propertyName)") @@ -1934,7 +1928,7 @@ public class ExportSwift { } } - func callPropertySetter(klassName: String, propertyName: String) { + func callPropertySetter(propertyName: String) { let (_, selfExpr) = removeFirstLiftedParameter() let (_, newValueExpr) = removeFirstLiftedParameter() append("\(raw: selfExpr).\(raw: propertyName) = \(raw: newValueExpr)") @@ -2041,641 +2035,45 @@ public class ExportSwift { } - private struct ClosureCodegen { - func generateOptionalParameterLowering(signature: ClosureSignature) throws -> String { - var lines: [String] = [] - - for (index, paramType) in signature.parameters.enumerated() { - guard case .optional(let wrappedType) = paramType else { - continue - } - let paramName = "param\(index)" - if case .swiftHeapObject = wrappedType { - lines.append( - "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithRetain()" - ) - } else { - lines.append( - "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithPresence()" - ) - } - } - - return lines.isEmpty ? "" : lines.joined(separator: "\n") + "\n" - } - - func renderClosureHelper(signature: ClosureSignature) throws -> [DeclSyntax] { - let mangledName = signature.mangleName - let helperName = "_BJS_Closure_\(mangledName)" - let boxClassName = "_BJS_ClosureBox_\(mangledName)" - - let closureParams = signature.parameters.enumerated().map { index, type in - "\(type.swiftType)" - }.joined(separator: ", ") - - let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") - let swiftReturnType = signature.returnType.swiftType - let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" - - var invokeParams: [(name: String, type: String)] = [("_", "Int32")] - var invokeCallArgs: [String] = ["callback.bridgeJSLowerParameter()"] - - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - - if case .optional(let wrappedType) = paramType { - invokeParams.append(("_", "Int32")) - - switch wrappedType { - case .swiftHeapObject: - invokeParams.append(("_", "UnsafeMutableRawPointer")) - case .string, .rawValueEnum(_, .string): - invokeParams.append(("_", "Int32")) - default: - let lowerInfo = try wrappedType.loweringReturnInfo() - if let wasmType = lowerInfo.returnType { - invokeParams.append(("_", wasmType.swiftType)) - } else { - invokeParams.append(("_", "Int32")) - } - } - - invokeCallArgs.append("\(paramName)IsSome") - invokeCallArgs.append("\(paramName)Value") - } else { - let lowerInfo = try paramType.loweringReturnInfo() - if let wasmType = lowerInfo.returnType { - invokeParams.append(("_", wasmType.swiftType)) - invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") - } else { - invokeParams.append(("_", "Int32")) - invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") - } - } - } - - let invokeSignature = invokeParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") - let invokeReturnType: String - if case .optional = signature.returnType { - invokeReturnType = "Void" - } else if let wasmType = try signature.returnType.liftingReturnInfo(context: .exportSwift).valueToLift { - invokeReturnType = wasmType.swiftType - } else { - invokeReturnType = "Void" - } - - let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" - - let returnLifting: String - if signature.returnType == .void { - returnLifting = "\(externName)(\(invokeCallArgs.joined(separator: ", ")))" - } else if case .optional = signature.returnType { - returnLifting = """ - \(externName)(\(invokeCallArgs.joined(separator: ", "))) - return \(signature.returnType.swiftType).bridgeJSLiftReturnFromSideChannel() - """ - } else { - returnLifting = """ - let resultId = \(externName)(\(invokeCallArgs.joined(separator: ", "))) - return \(signature.returnType.swiftType).bridgeJSLiftReturn(resultId) - """ - } - - let optionalLoweringCode = try generateOptionalParameterLowering(signature: signature) - - let externDecl: DeclSyntax = """ - @_extern(wasm, module: "bjs", name: "\(raw: externName)") - fileprivate func \(raw: externName)(\(raw: invokeSignature)) -> \(raw: invokeReturnType) - """ - - let boxDecl: DeclSyntax = """ - private final class \(raw: boxClassName): _BridgedSwiftClosureBox { - let closure: \(raw: closureType) - init(_ closure: @escaping \(raw: closureType)) { - self.closure = closure - } - } - - private enum \(raw: helperName) { - static func bridgeJSLower(_ closure: @escaping \(raw: closureType)) -> UnsafeMutableRawPointer { - let box = \(raw: boxClassName)(closure) - return Unmanaged.passRetained(box).toOpaque() - } - - static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in - #if arch(wasm32) - \(raw: optionalLoweringCode)\(raw: returnLifting) - #else - fatalError("Only available on WebAssembly") - #endif - } - } - } - """ - return [externDecl, boxDecl] - } - - func renderClosureInvokeHandler(signature: ClosureSignature) throws -> DeclSyntax { - let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" - let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" - - var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")] - var liftedParams: [String] = [] - - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - let liftInfo = try paramType.liftParameterInfo() - - for (argName, wasmType) in liftInfo.parameters { - let fullName = - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - abiParams.append((fullName, wasmType.swiftType)) - } - - let argNames = liftInfo.parameters.map { (argName, _) in - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - } - liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") - } - - let paramSignature = abiParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") - let closureCall = "box.closure(\(liftedParams.joined(separator: ", ")))" - - let returnCode: String - if signature.returnType == .void { - returnCode = closureCall - } else { - returnCode = """ - let result = \(closureCall) - return result.bridgeJSLowerReturn() - """ - } - - let abiReturnType: String - if signature.returnType == .void { - abiReturnType = "Void" - } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { - abiReturnType = wasmType.swiftType - } else { - abiReturnType = "Void" - } - - return """ - @_expose(wasm, "\(raw: abiName)") - @_cdecl("\(raw: abiName)") - public func _\(raw: abiName)(\(raw: paramSignature)) -> \(raw: abiReturnType) { - #if arch(wasm32) - let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue() - \(raw: returnCode) - #else - fatalError("Only available on WebAssembly") - #endif - } - """ - } - - } - - /// Helper for stack-based lifting and lowering operations. - private struct StackCodegen { - /// Generates an expression to lift a value from the parameter stack. - /// - Parameter type: The BridgeType to lift - /// - Returns: An ExprSyntax representing the lift expression - func liftExpression(for type: BridgeType) -> ExprSyntax { - switch type { - case .string: - return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: - return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .bool: - return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .float: - return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())" - case .double: - return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())" - case .jsObject: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .swiftHeapObject(let className): - return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" - case .swiftProtocol: - // Protocols are handled via JSObject - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .caseEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .rawValueEnum(let enumName, let rawType): - switch rawType { - case .string: - return - "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool, .int, .int32, .int64, .uint, .uint32, .uint64, .float, .double: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" - } - case .associatedValueEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .swiftStruct(let structName): - return "\(raw: structName).bridgeJSLiftParameter()" - case .optional(let wrappedType): - return liftOptionalExpression(wrappedType: wrappedType) - case .void: - // Void shouldn't be lifted, but return a placeholder - return "()" - case .namespaceEnum: - // Namespace enums are not passed as values - return "()" - case .closure: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - } - } - - private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { - switch wrappedType { - case .string: - return - "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .float: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" - case .double: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" - case .caseEnum(let enumName): - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .rawValueEnum(let enumName, let rawType): - switch rawType { - case .string: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool, .int, .float, .double, .int32, .int64, .uint, .uint32, .uint64: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - } - case .swiftStruct(let nestedName): - return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())" - case .swiftHeapObject(let className): - return - "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())" - case .associatedValueEnum(let enumName): - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .jsObject: - return - "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - default: - // Fallback for other optional types - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - } - } - - /// Generates statements to lower/push a value onto the stack. - /// - Parameters: - /// - type: The BridgeType to lower - /// - accessor: The expression to access the value (e.g., "self.name" or "paramName") - /// - varPrefix: A unique prefix for intermediate variables - /// - Returns: An array of CodeBlockItemSyntax representing the lowering statements - func lowerStatements( - for type: BridgeType, - accessor: String, - varPrefix: String - ) -> [CodeBlockItemSyntax] { - switch type { - case .string: - return [ - "var __bjs_\(raw: varPrefix) = \(raw: accessor)", - "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .int: - return ["_swift_js_push_int(Int32(\(raw: accessor)))"] - case .bool: - return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"] - case .float: - return ["_swift_js_push_f32(\(raw: accessor))"] - case .double: - return ["_swift_js_push_f64(\(raw: accessor))"] - case .jsObject: - return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] - case .swiftHeapObject: - return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] - case .swiftProtocol: - return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] - case .caseEnum: - return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] - case .rawValueEnum: - return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] - case .associatedValueEnum: - return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .swiftStruct: - return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .optional(let wrappedType): - return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) - case .void: - return [] - case .namespaceEnum: - return [] - case .closure: - return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] - } - } - - private func lowerOptionalStatements( - wrappedType: BridgeType, - accessor: String, - varPrefix: String - ) -> [CodeBlockItemSyntax] { - var statements: [CodeBlockItemSyntax] = [] - statements.append("let __bjs_isSome_\(raw: varPrefix) = \(raw: accessor) != nil") - statements.append("if let __bjs_unwrapped_\(raw: varPrefix) = \(raw: accessor) {") - - let innerStatements = lowerUnwrappedOptionalStatements( - wrappedType: wrappedType, - unwrappedVar: "__bjs_unwrapped_\(varPrefix)", - varPrefix: varPrefix - ) - for stmt in innerStatements { - statements.append(stmt) - } - - statements.append("}") - statements.append("_swift_js_push_int(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") - return statements - } - - private func lowerUnwrappedOptionalStatements( - wrappedType: BridgeType, - unwrappedVar: String, - varPrefix: String - ) -> [CodeBlockItemSyntax] { - switch wrappedType { - case .string: - return [ - "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar)", - "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .int: - return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"] - case .bool: - return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"] - case .float: - return ["_swift_js_push_f32(\(raw: unwrappedVar))"] - case .double: - return ["_swift_js_push_f64(\(raw: unwrappedVar))"] - case .caseEnum: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return [ - "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar).rawValue", - "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - default: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - } - case .swiftStruct: - return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] - case .swiftHeapObject: - return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"] - case .associatedValueEnum: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .jsObject: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - default: - return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] - } - } - } - - private struct EnumCodegen { - private let stackCodegen = StackCodegen() - - func renderCaseEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { - let typeName = enumDef.swiftCallName - var initCases: [String] = [] - var valueCases: [String] = [] - for (index, enumCase) in enumDef.cases.enumerated() { - initCases.append("case \(index): self = .\(enumCase.name)") - valueCases.append("case .\(enumCase.name): return \(index)") - } - let initSwitch = (["switch bridgeJSRawValue {"] + initCases + ["default: return nil", "}"]).joined( - separator: "\n" - ) - let valueSwitch = (["switch self {"] + valueCases + ["}"]).joined(separator: "\n") - - return """ - extension \(raw: typeName): _BridgedSwiftCaseEnum { - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - return bridgeJSRawValue - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> \(raw: typeName) { - return bridgeJSLiftParameter(value) - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> \(raw: typeName) { - return \(raw: typeName)(bridgeJSRawValue: value)! - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSLowerParameter() - } - - private init?(bridgeJSRawValue: Int32) { - \(raw: initSwitch) - } - - private var bridgeJSRawValue: Int32 { - \(raw: valueSwitch) - } - } - """ - } - - func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { - let typeName = enumDef.swiftCallName - return """ - extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(raw: typeName) { - switch caseId { - \(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n")) - default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)") - } - } - - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - switch self { - \(raw: generateLowerParameterSwitchCases(enumDef: enumDef).joined(separator: "\n")) - } - } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(raw: typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - \(raw: generateReturnSwitchCases(enumDef: enumDef).joined(separator: "\n")) - } - } - } - """ - } - - private func generateStackLiftSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] - for (caseIndex, enumCase) in enumDef.cases.enumerated() { - if enumCase.associatedValues.isEmpty { - cases.append("case \(caseIndex): return .\(enumCase.name)") - } else { - var lines: [String] = [] - lines.append("case \(caseIndex):") - let argList = enumCase.associatedValues.map { associatedValue in - let labelPrefix: String - if let label = associatedValue.label { - labelPrefix = "\(label): " - } else { - labelPrefix = "" - } - let liftExpr = stackCodegen.liftExpression(for: associatedValue.type) - return "\(labelPrefix)\(liftExpr)" - } - lines.append("return .\(enumCase.name)(\(argList.joined(separator: ", ")))") - cases.append(lines.joined(separator: "\n")) - } - } - return cases - } - - private func generatePayloadPushingCode( - associatedValues: [AssociatedValue] - ) -> [String] { - var bodyLines: [String] = [] - for (index, associatedValue) in associatedValues.enumerated() { - let paramName = associatedValue.label ?? "param\(index)" - let statements = stackCodegen.lowerStatements( - for: associatedValue.type, - accessor: paramName, - varPrefix: paramName - ) - for stmt in statements { - bodyLines.append(stmt.description) - } - } - return bodyLines - } - - private func generateLowerParameterSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] - for (caseIndex, enumCase) in enumDef.cases.enumerated() { - if enumCase.associatedValues.isEmpty { - cases.append("case .\(enumCase.name):") - cases.append("return Int32(\(caseIndex))") - } else { - let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) - let pattern = enumCase.associatedValues.enumerated() - .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } - .joined(separator: ", ") - cases.append("case .\(enumCase.name)(\(pattern)):") - cases.append(contentsOf: payloadCode) - cases.append("return Int32(\(caseIndex))") - } - } - return cases - } + /// Context for property rendering that determines call behavior and ABI generation + private enum PropertyRenderingContext { + case enumStatic(enumDef: ExportedEnum) + case classStatic(klass: ExportedClass) + case classInstance(klass: ExportedClass) + case structStatic(structDef: ExportedStruct) - private func generateReturnSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] - for (caseIndex, enumCase) in enumDef.cases.enumerated() { - if enumCase.associatedValues.isEmpty { - cases.append("case .\(enumCase.name):") - cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") - } else { - let pattern = enumCase.associatedValues.enumerated() - .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } - .joined(separator: ", ") - cases.append("case .\(enumCase.name)(\(pattern)):") - cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") - let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) - cases.append(contentsOf: payloadCode) - } + var isStatic: Bool { + switch self { + case .enumStatic, .classStatic, .structStatic: + return true + case .classInstance: + return false } - return cases - } - } - - private struct StructCodegen { - private let stackCodegen = StackCodegen() - - func renderStructHelpers(_ structDef: ExportedStruct) -> DeclSyntax { - let typeName = structDef.swiftCallName - let liftCode = generateStructLiftCode(structDef: structDef) - let lowerCode = generateStructLowerCode(structDef: structDef) - - return """ - extension \(raw: typeName): _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(raw: typeName) { - \(raw: liftCode.joined(separator: "\n")) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - \(raw: lowerCode.joined(separator: "\n")) - } - } - """ } - private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { - var lines: [String] = [] - let instanceProps = structDef.properties.filter { !$0.isStatic } - - for property in instanceProps.reversed() { - let fieldName = property.name - let liftExpr = stackCodegen.liftExpression(for: property.type) - lines.append("let \(fieldName) = \(liftExpr)") + var className: String { + switch self { + case .enumStatic(let enumDef): + return enumDef.name + case .classStatic(let klass), .classInstance(let klass): + return klass.name + case .structStatic(let structDef): + return structDef.name } - - let initArgs = instanceProps.map { "\($0.name): \($0.name)" }.joined(separator: ", ") - lines.append("return \(structDef.swiftCallName)(\(initArgs))") - - return lines } - private func generateStructLowerCode(structDef: ExportedStruct) -> [String] { - var lines: [String] = [] - let instanceProps = structDef.properties.filter { !$0.isStatic } - - for property in instanceProps { - let accessor = "self.\(property.name)" - let statements = stackCodegen.lowerStatements( - for: property.type, - accessor: accessor, - varPrefix: property.name - ) - for stmt in statements { - lines.append(stmt.description) - } + func callName(for property: ExportedProperty) -> String { + switch self { + case .enumStatic(let enumDef): + return property.callName(prefix: enumDef.swiftCallName) + case .classStatic, .classInstance: + return property.callName() + case .structStatic(let structDef): + return property.callName(prefix: structDef.swiftCallName) } - - return lines } } - /// Context for property rendering that determines call behavior and ABI generation - private enum PropertyRenderingContext { - case enumStatic(enumDef: ExportedEnum) - case classStatic(klass: ExportedClass) - case classInstance(klass: ExportedClass) - case structStatic(structDef: ExportedStruct) - } - /// Renders getter and setter Swift thunk code for a property in any context /// This unified function eliminates duplication between enum static, class static, and class instance property rendering private func renderSingleExportedProperty( @@ -2684,26 +2082,9 @@ public class ExportSwift { ) throws -> [DeclSyntax] { var decls: [DeclSyntax] = [] - let (callName, className, isStatic): (String, String, Bool) - switch context { - case .enumStatic(let enumDef): - callName = property.callName(prefix: enumDef.swiftCallName) - className = enumDef.name - isStatic = true - case .classStatic(let klass): - callName = property.callName() - className = klass.name - isStatic = true - - case .classInstance(let klass): - callName = property.callName() - className = klass.name - isStatic = false - case .structStatic(let structDef): - callName = property.callName(prefix: structDef.swiftCallName) - className = structDef.name - isStatic = true - } + let callName = context.callName(for: property) + let className = context.className + let isStatic = context.isStatic let getterBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false, isStatic: isStatic)) @@ -2716,7 +2097,7 @@ public class ExportSwift { if isStatic { getterBuilder.callStaticProperty(name: callName, returnType: property.type) } else { - getterBuilder.callPropertyGetter(klassName: className, propertyName: callName, returnType: property.type) + getterBuilder.callPropertyGetter(propertyName: callName, returnType: property.type) } try getterBuilder.lowerReturnValue(returnType: property.type) @@ -2744,7 +2125,7 @@ public class ExportSwift { let klassName = callName.components(separatedBy: ".").dropLast().joined(separator: ".") setterBuilder.callStaticPropertySetter(klassName: klassName, propertyName: property.name) } else { - setterBuilder.callPropertySetter(klassName: className, propertyName: callName) + setterBuilder.callPropertySetter(propertyName: callName) } try setterBuilder.lowerReturnValue(returnType: .void) @@ -2819,7 +2200,6 @@ public class ExportSwift { try builder.liftParameter(param: param) } builder.callMethod( - klassName: structDef.swiftCallName, methodName: method.name, returnType: method.returnType ) @@ -2907,7 +2287,6 @@ public class ExportSwift { try builder.liftParameter(param: param) } builder.callMethod( - klassName: klass.swiftCallName, methodName: method.name, returnType: method.returnType ) @@ -2953,27 +2332,6 @@ public class ExportSwift { return decls } - private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { - for param in parameters { - collectClosureSignatures(from: param.type, into: &signatures) - } - } - - private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { - switch type { - case .closure(let signature): - signatures.insert(signature) - for paramType in signature.parameters { - collectClosureSignatures(from: paramType, into: &signatures) - } - collectClosureSignatures(from: signature.returnType, into: &signatures) - case .optional(let wrapped): - collectClosureSignatures(from: wrapped, into: &signatures) - default: - break - } - } - /// Generates a ConvertibleToJSValue extension for the exported class /// /// # Example @@ -3014,10 +2372,684 @@ public class ExportSwift { """ return [extensionDecl, externDecl] } +} + +// MARK: - ClosureCodegen - /// Creates a struct that wraps a JSObject and implements protocol methods - /// by calling `@_extern(wasm)` functions that forward to JavaScript via JSObject ID - func renderProtocolWrapper(protocol proto: ExportedProtocol) throws -> [DeclSyntax] { +struct ClosureCodegen { + func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { + for param in parameters { + collectClosureSignatures(from: param.type, into: &signatures) + } + } + + func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { + switch type { + case .closure(let signature): + signatures.insert(signature) + for paramType in signature.parameters { + collectClosureSignatures(from: paramType, into: &signatures) + } + collectClosureSignatures(from: signature.returnType, into: &signatures) + case .optional(let wrapped): + collectClosureSignatures(from: wrapped, into: &signatures) + default: + break + } + } + + private func generateOptionalParameterLowering(_ signature: ClosureSignature) throws -> String { + var lines: [String] = [] + + for (index, paramType) in signature.parameters.enumerated() { + guard case .optional(let wrappedType) = paramType else { + continue + } + let paramName = "param\(index)" + if case .swiftHeapObject = wrappedType { + lines.append( + "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithRetain()" + ) + } else { + lines.append( + "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithPresence()" + ) + } + } + + return lines.isEmpty ? "" : lines.joined(separator: "\n") + "\n" + } + + func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { + let mangledName = signature.mangleName + let helperName = "_BJS_Closure_\(mangledName)" + let boxClassName = "_BJS_ClosureBox_\(mangledName)" + + let closureParams = signature.parameters.enumerated().map { index, type in + "\(type.swiftType)" + }.joined(separator: ", ") + + let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + let swiftReturnType = signature.returnType.swiftType + let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + + var invokeParams: [(name: String, type: String)] = [("_", "Int32")] + var invokeCallArgs: [String] = ["callback.bridgeJSLowerParameter()"] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + + if case .optional(let wrappedType) = paramType { + invokeParams.append(("_", "Int32")) + + switch wrappedType { + case .swiftHeapObject: + invokeParams.append(("_", "UnsafeMutableRawPointer")) + case .string, .rawValueEnum(_, .string): + invokeParams.append(("_", "Int32")) + default: + let lowerInfo = try wrappedType.loweringReturnInfo() + if let wasmType = lowerInfo.returnType { + invokeParams.append(("_", wasmType.swiftType)) + } else { + invokeParams.append(("_", "Int32")) + } + } + + invokeCallArgs.append("\(paramName)IsSome") + invokeCallArgs.append("\(paramName)Value") + } else { + let lowerInfo = try paramType.loweringReturnInfo() + if let wasmType = lowerInfo.returnType { + invokeParams.append(("_", wasmType.swiftType)) + invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") + } else { + invokeParams.append(("_", "Int32")) + invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") + } + } + } + + let invokeSignature = invokeParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") + let invokeReturnType: String + if case .optional = signature.returnType { + invokeReturnType = "Void" + } else if let wasmType = try signature.returnType.liftingReturnInfo(context: .exportSwift).valueToLift { + invokeReturnType = wasmType.swiftType + } else { + invokeReturnType = "Void" + } + + let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" + + let returnLifting: String + if signature.returnType == .void { + returnLifting = "\(externName)(\(invokeCallArgs.joined(separator: ", ")))" + } else if case .optional = signature.returnType { + returnLifting = """ + \(externName)(\(invokeCallArgs.joined(separator: ", "))) + return \(signature.returnType.swiftType).bridgeJSLiftReturnFromSideChannel() + """ + } else { + returnLifting = """ + let resultId = \(externName)(\(invokeCallArgs.joined(separator: ", "))) + return \(signature.returnType.swiftType).bridgeJSLiftReturn(resultId) + """ + } + + let optionalLoweringCode = try generateOptionalParameterLowering(signature) + + let externDecl: DeclSyntax = """ + @_extern(wasm, module: "bjs", name: "\(raw: externName)") + fileprivate func \(raw: externName)(\(raw: invokeSignature)) -> \(raw: invokeReturnType) + """ + + let boxDecl: DeclSyntax = """ + private final class \(raw: boxClassName): _BridgedSwiftClosureBox { + let closure: \(raw: closureType) + init(_ closure: @escaping \(raw: closureType)) { + self.closure = closure + } + } + + private enum \(raw: helperName) { + static func bridgeJSLower(_ closure: @escaping \(raw: closureType)) -> UnsafeMutableRawPointer { + let box = \(raw: boxClassName)(closure) + return Unmanaged.passRetained(box).toOpaque() + } + + static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in + #if arch(wasm32) + \(raw: optionalLoweringCode)\(raw: returnLifting) + #else + fatalError("Only available on WebAssembly") + #endif + } + } + } + """ + return [externDecl, boxDecl] + } + + func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { + let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" + let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" + + var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")] + var liftedParams: [String] = [] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + let liftInfo = try paramType.liftParameterInfo() + + for (argName, wasmType) in liftInfo.parameters { + let fullName = + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + abiParams.append((fullName, wasmType.swiftType)) + } + + let argNames = liftInfo.parameters.map { (argName, _) in + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + } + liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") + } + + let paramSignature = abiParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") + let closureCall = "box.closure(\(liftedParams.joined(separator: ", ")))" + + let returnCode: String + if signature.returnType == .void { + returnCode = closureCall + } else { + returnCode = """ + let result = \(closureCall) + return result.bridgeJSLowerReturn() + """ + } + + let abiReturnType: String + if signature.returnType == .void { + abiReturnType = "Void" + } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { + abiReturnType = wasmType.swiftType + } else { + abiReturnType = "Void" + } + + return """ + @_expose(wasm, "\(raw: abiName)") + @_cdecl("\(raw: abiName)") + public func _\(raw: abiName)(\(raw: paramSignature)) -> \(raw: abiReturnType) { + #if arch(wasm32) + let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue() + \(raw: returnCode) + #else + fatalError("Only available on WebAssembly") + #endif + } + """ + } + +} + +// MARK: - StackCodegen + +/// Helper for stack-based lifting and lowering operations. +struct StackCodegen { + /// Generates an expression to lift a value from the parameter stack. + /// - Parameter type: The BridgeType to lift + /// - Returns: An ExprSyntax representing the lift expression + func liftExpression(for type: BridgeType) -> ExprSyntax { + switch type { + case .string: + return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .int: + return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .bool: + return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .float: + return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())" + case .double: + return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())" + case .jsObject: + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftHeapObject(let className): + return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" + case .swiftProtocol: + // Protocols are handled via JSObject + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .caseEnum(let enumName): + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .rawValueEnum(let enumName, let rawType): + switch rawType { + case .string: + return + "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64, .float, .double: + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + } + case .associatedValueEnum(let enumName): + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftStruct(let structName): + return "\(raw: structName).bridgeJSLiftParameter()" + case .optional(let wrappedType): + return liftOptionalExpression(wrappedType: wrappedType) + case .void: + // Void shouldn't be lifted, but return a placeholder + return "()" + case .namespaceEnum: + // Namespace enums are not passed as values + return "()" + case .closure: + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + } + } + + private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { + switch wrappedType { + case .string: + return + "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .int: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .float: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" + case .double: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" + case .caseEnum(let enumName): + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .rawValueEnum(let enumName, let rawType): + switch rawType { + case .string: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .bool, .int, .float, .double, .int32, .int64, .uint, .uint32, .uint64: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + } + case .swiftStruct(let nestedName): + return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftHeapObject(let className): + return + "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())" + case .associatedValueEnum(let enumName): + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .jsObject: + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + default: + // Fallback for other optional types + return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + } + } + + /// Generates statements to lower/push a value onto the stack. + /// - Parameters: + /// - type: The BridgeType to lower + /// - accessor: The expression to access the value (e.g., "self.name" or "paramName") + /// - varPrefix: A unique prefix for intermediate variables + /// - Returns: An array of CodeBlockItemSyntax representing the lowering statements + func lowerStatements( + for type: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch type { + case .string: + return [ + "var __bjs_\(raw: varPrefix) = \(raw: accessor)", + "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + case .int: + return ["_swift_js_push_int(Int32(\(raw: accessor)))"] + case .bool: + return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"] + case .float: + return ["_swift_js_push_f32(\(raw: accessor))"] + case .double: + return ["_swift_js_push_f64(\(raw: accessor))"] + case .jsObject: + return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + case .swiftHeapObject: + return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + case .swiftProtocol: + return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + case .caseEnum: + return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + case .rawValueEnum: + return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + case .associatedValueEnum: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .swiftStruct: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .optional(let wrappedType): + return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) + case .void: + return [] + case .namespaceEnum: + return [] + case .closure: + return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + } + } + + private func lowerOptionalStatements( + wrappedType: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + var statements: [CodeBlockItemSyntax] = [] + statements.append("let __bjs_isSome_\(raw: varPrefix) = \(raw: accessor) != nil") + statements.append("if let __bjs_unwrapped_\(raw: varPrefix) = \(raw: accessor) {") + + let innerStatements = lowerUnwrappedOptionalStatements( + wrappedType: wrappedType, + unwrappedVar: "__bjs_unwrapped_\(varPrefix)", + varPrefix: varPrefix + ) + for stmt in innerStatements { + statements.append(stmt) + } + + statements.append("}") + statements.append("_swift_js_push_int(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") + return statements + } + + private func lowerUnwrappedOptionalStatements( + wrappedType: BridgeType, + unwrappedVar: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch wrappedType { + case .string: + return [ + "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar)", + "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + case .int: + return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"] + case .bool: + return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"] + case .float: + return ["_swift_js_push_f32(\(raw: unwrappedVar))"] + case .double: + return ["_swift_js_push_f64(\(raw: unwrappedVar))"] + case .caseEnum: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return [ + "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar).rawValue", + "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + default: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + } + case .swiftStruct: + return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] + case .swiftHeapObject: + return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + case .associatedValueEnum: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + case .jsObject: + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + default: + return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] + } + } +} + +// MARK: - EnumCodegen + +struct EnumCodegen { + private let stackCodegen = StackCodegen() + + func renderEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax? { + switch enumDef.enumType { + case .simple: + return renderCaseEnumHelpers(enumDef) + case .rawValue: + return renderRawValueEnumHelpers(enumDef) + case .associatedValue: + return renderAssociatedValueEnumHelpers(enumDef) + case .namespace: + return nil + } + } + + private func renderCaseEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { + let typeName = enumDef.swiftCallName + var initCases: [String] = [] + var valueCases: [String] = [] + for (index, enumCase) in enumDef.cases.enumerated() { + initCases.append("case \(index): self = .\(enumCase.name)") + valueCases.append("case .\(enumCase.name): return \(index)") + } + let initSwitch = (["switch bridgeJSRawValue {"] + initCases + ["default: return nil", "}"]).joined( + separator: "\n" + ) + let valueSwitch = (["switch self {"] + valueCases + ["}"]).joined(separator: "\n") + + return """ + extension \(raw: typeName): _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> \(raw: typeName) { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> \(raw: typeName) { + return \(raw: typeName)(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + \(raw: initSwitch) + } + + private var bridgeJSRawValue: Int32 { + \(raw: valueSwitch) + } + } + """ + } + + private func renderRawValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { + return "extension \(raw: enumDef.swiftCallName): _BridgedSwiftEnumNoPayload {}" + } + + private func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { + let typeName = enumDef.swiftCallName + return """ + extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(raw: typeName) { + switch caseId { + \(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n")) + default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + \(raw: generateLowerParameterSwitchCases(enumDef: enumDef).joined(separator: "\n")) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(raw: typeName) { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + \(raw: generateReturnSwitchCases(enumDef: enumDef).joined(separator: "\n")) + } + } + } + """ + } + + private func generateStackLiftSwitchCases(enumDef: ExportedEnum) -> [String] { + var cases: [String] = [] + for (caseIndex, enumCase) in enumDef.cases.enumerated() { + if enumCase.associatedValues.isEmpty { + cases.append("case \(caseIndex): return .\(enumCase.name)") + } else { + var lines: [String] = [] + lines.append("case \(caseIndex):") + let argList = enumCase.associatedValues.map { associatedValue in + let labelPrefix: String + if let label = associatedValue.label { + labelPrefix = "\(label): " + } else { + labelPrefix = "" + } + let liftExpr = stackCodegen.liftExpression(for: associatedValue.type) + return "\(labelPrefix)\(liftExpr)" + } + lines.append("return .\(enumCase.name)(\(argList.joined(separator: ", ")))") + cases.append(lines.joined(separator: "\n")) + } + } + return cases + } + + private func generatePayloadPushingCode( + associatedValues: [AssociatedValue] + ) -> [String] { + var bodyLines: [String] = [] + for (index, associatedValue) in associatedValues.enumerated() { + let paramName = associatedValue.label ?? "param\(index)" + let statements = stackCodegen.lowerStatements( + for: associatedValue.type, + accessor: paramName, + varPrefix: paramName + ) + for stmt in statements { + bodyLines.append(stmt.description) + } + } + return bodyLines + } + + private func generateLowerParameterSwitchCases(enumDef: ExportedEnum) -> [String] { + var cases: [String] = [] + for (caseIndex, enumCase) in enumDef.cases.enumerated() { + if enumCase.associatedValues.isEmpty { + cases.append("case .\(enumCase.name):") + cases.append("return Int32(\(caseIndex))") + } else { + let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) + let pattern = enumCase.associatedValues.enumerated() + .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } + .joined(separator: ", ") + cases.append("case .\(enumCase.name)(\(pattern)):") + cases.append(contentsOf: payloadCode) + cases.append("return Int32(\(caseIndex))") + } + } + return cases + } + + private func generateReturnSwitchCases(enumDef: ExportedEnum) -> [String] { + var cases: [String] = [] + for (caseIndex, enumCase) in enumDef.cases.enumerated() { + if enumCase.associatedValues.isEmpty { + cases.append("case .\(enumCase.name):") + cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") + } else { + let pattern = enumCase.associatedValues.enumerated() + .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } + .joined(separator: ", ") + cases.append("case .\(enumCase.name)(\(pattern)):") + cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") + let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) + cases.append(contentsOf: payloadCode) + } + } + return cases + } +} + +// MARK: - StructCodegen + +struct StructCodegen { + private let stackCodegen = StackCodegen() + + func renderStructHelpers(_ structDef: ExportedStruct) -> DeclSyntax { + let typeName = structDef.swiftCallName + let liftCode = generateStructLiftCode(structDef: structDef) + let lowerCode = generateStructLowerCode(structDef: structDef) + + return """ + extension \(raw: typeName): _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(raw: typeName) { + \(raw: liftCode.joined(separator: "\n")) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + \(raw: lowerCode.joined(separator: "\n")) + } + } + """ + } + + private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { + var lines: [String] = [] + let instanceProps = structDef.properties.filter { !$0.isStatic } + + for property in instanceProps.reversed() { + let fieldName = property.name + let liftExpr = stackCodegen.liftExpression(for: property.type) + lines.append("let \(fieldName) = \(liftExpr)") + } + + let initArgs = instanceProps.map { "\($0.name): \($0.name)" }.joined(separator: ", ") + lines.append("return \(structDef.swiftCallName)(\(initArgs))") + + return lines + } + + private func generateStructLowerCode(structDef: ExportedStruct) -> [String] { + var lines: [String] = [] + let instanceProps = structDef.properties.filter { !$0.isStatic } + + for property in instanceProps { + let accessor = "self.\(property.name)" + let statements = stackCodegen.lowerStatements( + for: property.type, + accessor: accessor, + varPrefix: property.name + ) + for stmt in statements { + lines.append(stmt.description) + } + } + + return lines + } +} + +// MARK: - ProtocolCodegen + +struct ProtocolCodegen { + func renderProtocolWrapper(_ proto: ExportedProtocol, moduleName: String) throws -> [DeclSyntax] { let wrapperName = "Any\(proto.name)" let protocolName = proto.name @@ -3176,7 +3208,6 @@ public class ExportSwift { let getterBody: String if usesSideChannel { - // Optional case/raw enums use side-channel reading (Void return) getterReturnType = "" getterBody = """ \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) @@ -3367,18 +3398,7 @@ extension BridgeType { return LiftingIntrinsicInfo(parameters: optionalParams) case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): - switch rawType { - case .bool: return .bool - case .int: return .int - case .float: return .float - case .double: return .double - case .string: return .string - case .int32: return .int - case .int64: return .int - case .uint: return .int - case .uint32: return .int - case .uint64: return .int - } + return rawType.liftingIntrinsicInfo case .associatedValueEnum: return .associatedValueEnum case .swiftStruct: @@ -3422,18 +3442,7 @@ extension BridgeType { case .optional: return .optional case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): - switch rawType { - case .bool: return .bool - case .int: return .int - case .float: return .float - case .double: return .double - case .string: return .string - case .int32: return .int - case .int64: return .int - case .uint: return .int - case .uint32: return .int - case .uint64: return .int - } + return rawType.loweringIntrinsicInfo case .associatedValueEnum: return .associatedValueEnum case .swiftStruct: @@ -3446,6 +3455,28 @@ extension BridgeType { } } +extension SwiftEnumRawType { + var liftingIntrinsicInfo: BridgeType.LiftingIntrinsicInfo { + switch self { + case .bool: return .bool + case .int, .int32, .int64, .uint, .uint32, .uint64: return .int + case .float: return .float + case .double: return .double + case .string: return .string + } + } + + var loweringIntrinsicInfo: BridgeType.LoweringIntrinsicInfo { + switch self { + case .bool: return .bool + case .int, .int32, .int64, .uint, .uint32, .uint64: return .int + case .float: return .float + case .double: return .double + case .string: return .string + } + } +} + extension DeclModifierSyntax { var isAccessControl: Bool { switch self.name.tokenKind { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 32a211716..4f58e9a60 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1254,6 +1254,16 @@ struct BridgeJSLink { ] } + /// Renders the thunk body (body code, cleanup, exception handling, and optional return) into a printer. + func renderFunctionBody(into printer: CodeFragmentPrinter, returnExpr: String?) { + printer.write(contentsOf: body) + printer.write(contentsOf: cleanupCode) + printer.write(lines: checkExceptionLines()) + if let returnExpr = returnExpr { + printer.write("return \(returnExpr);") + } + } + func renderFunction( name: String, parameters: [Parameter], @@ -1268,12 +1278,7 @@ struct BridgeJSLink { "\(declarationPrefixKeyword.map { "\($0) "} ?? "")\(name)(\(parameterList)) {" ) printer.indent { - printer.write(contentsOf: body) - printer.write(contentsOf: cleanupCode) - printer.write(lines: checkExceptionLines()) - if let returnExpr = returnExpr { - printer.write("return \(returnExpr);") - } + renderFunctionBody(into: printer, returnExpr: returnExpr) } printer.write("}") @@ -1300,16 +1305,10 @@ struct BridgeJSLink { if enumDef.name == name || enumDef.swiftCallName == name { // Use the stored tsFullPath which has the full namespace switch type { - case .caseEnum: - return "\(enumDef.tsFullPath)Tag" - case .rawValueEnum: - return "\(enumDef.tsFullPath)Tag" - case .associatedValueEnum: - return "\(enumDef.tsFullPath)Tag" case .namespaceEnum: return enumDef.tsFullPath default: - return type.tsType + return "\(enumDef.tsFullPath)Tag" } } } @@ -1395,12 +1394,7 @@ struct BridgeJSLink { let paramList = DefaultValueUtils.formatParameterList(constructor.parameters) constructorPrinter.write("init: function(\(paramList)) {") constructorPrinter.indent { - constructorPrinter.write(contentsOf: thunkBuilder.body) - constructorPrinter.write(contentsOf: thunkBuilder.cleanupCode) - constructorPrinter.write(lines: thunkBuilder.checkExceptionLines()) - if let returnExpr = returnExpr { - constructorPrinter.write("return \(returnExpr);") - } + thunkBuilder.renderFunctionBody(into: constructorPrinter, returnExpr: returnExpr) } constructorPrinter.write("},") jsPrinter.write(lines: constructorPrinter.lines) @@ -1709,12 +1703,7 @@ extension BridgeJSLink { let printer = CodeFragmentPrinter() printer.write("\(function.name)(\(function.parameters.map { $0.name }.joined(separator: ", "))) {") printer.indent { - printer.write(contentsOf: thunkBuilder.body) - printer.write(contentsOf: thunkBuilder.cleanupCode) - printer.write(lines: thunkBuilder.checkExceptionLines()) - if let returnExpr = returnExpr { - printer.write("return \(returnExpr);") - } + thunkBuilder.renderFunctionBody(into: printer, returnExpr: returnExpr) } printer.write("},") @@ -1766,12 +1755,7 @@ extension BridgeJSLink { "\(method.name): function(\(method.parameters.map { $0.name }.joined(separator: ", "))) {" ) methodPrinter.indent { - methodPrinter.write(contentsOf: thunkBuilder.body) - methodPrinter.write(contentsOf: thunkBuilder.cleanupCode) - methodPrinter.write(lines: thunkBuilder.checkExceptionLines()) - if let returnExpr = returnExpr { - methodPrinter.write("return \(returnExpr);") - } + thunkBuilder.renderFunctionBody(into: methodPrinter, returnExpr: returnExpr) } methodPrinter.write("},") return methodPrinter.lines @@ -1795,12 +1779,7 @@ extension BridgeJSLink { propertyPrinter.write("get \(property.name)() {") propertyPrinter.indent { - propertyPrinter.write(contentsOf: getterThunkBuilder.body) - propertyPrinter.write(contentsOf: getterThunkBuilder.cleanupCode) - propertyPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) - if let returnExpr = getterReturnExpr { - propertyPrinter.write("return \(returnExpr);") - } + getterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: getterReturnExpr) } propertyPrinter.write("},") @@ -1821,9 +1800,7 @@ extension BridgeJSLink { propertyPrinter.write("set \(property.name)(value) {") propertyPrinter.indent { - propertyPrinter.write(contentsOf: setterThunkBuilder.body) - propertyPrinter.write(contentsOf: setterThunkBuilder.cleanupCode) - propertyPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) + setterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: nil) } propertyPrinter.write("},") } @@ -1866,10 +1843,10 @@ extension BridgeJSLink { jsPrinter.write("constructor(\(constructorParamList)) {") let returnExpr = thunkBuilder.callConstructor(abiName: constructor.abiName) jsPrinter.indent { - jsPrinter.write(contentsOf: thunkBuilder.body) - jsPrinter.write(contentsOf: thunkBuilder.cleanupCode) - jsPrinter.write(lines: thunkBuilder.checkExceptionLines()) - jsPrinter.write("return \(klass.name).__construct(\(returnExpr));") + thunkBuilder.renderFunctionBody( + into: jsPrinter, + returnExpr: "\(klass.name).__construct(\(returnExpr))" + ) } jsPrinter.write("}") } @@ -1938,114 +1915,80 @@ extension BridgeJSLink { // Generate property getters and setters for property in klass.properties { - if property.isStatic { - // Generate static property getter - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) - let getterReturnExpr = try getterThunkBuilder.call( - abiName: property.getterAbiName(), - returnType: property.type - ) + try renderClassProperty( + property: property, + className: klass.name, + isStatic: property.isStatic, + jsPrinter: jsPrinter, + dtsPrinter: property.isStatic ? dtsExportEntryPrinter : dtsTypePrinter + ) + } - jsPrinter.indent { - jsPrinter.write( - lines: getterThunkBuilder.renderFunction( - name: property.name, - parameters: [], - returnExpr: getterReturnExpr, - declarationPrefixKeyword: "static get" - ) - ) - } + jsPrinter.write("}") + dtsTypePrinter.write("}") + dtsExportEntryPrinter.write("}") - // Generate static property setter if not readonly - if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false) - ) - try setterThunkBuilder.lowerParameter( - param: Parameter(label: "value", name: "value", type: property.type) - ) - _ = try setterThunkBuilder.call( - abiName: property.setterAbiName(), - returnType: .void - ) + return (jsPrinter.lines, dtsTypePrinter.lines, dtsExportEntryPrinter.lines) + } - jsPrinter.indent { - jsPrinter.write( - lines: setterThunkBuilder.renderFunction( - name: property.name, - parameters: [.init(label: nil, name: "value", type: property.type)], - returnExpr: nil, - declarationPrefixKeyword: "static set" - ) - ) - } - } + private func renderClassProperty( + property: ExportedProperty, + className: String, + isStatic: Bool, + jsPrinter: CodeFragmentPrinter, + dtsPrinter: CodeFragmentPrinter + ) throws { + let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + if !isStatic { + getterThunkBuilder.lowerSelf() + } - // Add static property to TypeScript exports definition (not instance interface) - let readonly = property.isReadonly ? "readonly " : "" - dtsExportEntryPrinter.indent { - dtsExportEntryPrinter.write("\(readonly)\(property.name): \(property.type.tsType);") - } - } else { - // Generate instance property getter - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) - getterThunkBuilder.lowerSelf() - let getterReturnExpr = try getterThunkBuilder.call( - abiName: property.getterAbiName(className: klass.name), - returnType: property.type - ) + let getterAbiName = isStatic ? property.getterAbiName() : property.getterAbiName(className: className) + let getterReturnExpr = try getterThunkBuilder.call(abiName: getterAbiName, returnType: property.type) - jsPrinter.indent { - jsPrinter.write( - lines: getterThunkBuilder.renderFunction( - name: property.name, - parameters: [], - returnExpr: getterReturnExpr, - declarationPrefixKeyword: "get" - ) - ) - } + let getterKeyword = isStatic ? "static get" : "get" + jsPrinter.indent { + jsPrinter.write( + lines: getterThunkBuilder.renderFunction( + name: property.name, + parameters: [], + returnExpr: getterReturnExpr, + declarationPrefixKeyword: getterKeyword + ) + ) + } - // Generate instance property setter if not readonly - if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false) - ) - setterThunkBuilder.lowerSelf() - try setterThunkBuilder.lowerParameter( - param: Parameter(label: "value", name: "value", type: property.type) - ) - _ = try setterThunkBuilder.call( - abiName: property.setterAbiName(className: klass.name), - returnType: .void - ) + // Generate setter if not readonly + if !property.isReadonly { + let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + if !isStatic { + setterThunkBuilder.lowerSelf() + } + try setterThunkBuilder.lowerParameter( + param: Parameter(label: "value", name: "value", type: property.type) + ) - jsPrinter.indent { - jsPrinter.write( - lines: setterThunkBuilder.renderFunction( - name: property.name, - parameters: [.init(label: nil, name: "value", type: property.type)], - returnExpr: nil, - declarationPrefixKeyword: "set" - ) - ) - } - } + let setterAbiName = isStatic ? property.setterAbiName() : property.setterAbiName(className: className) + _ = try setterThunkBuilder.call(abiName: setterAbiName, returnType: .void) - // Add instance property to TypeScript interface definition - let readonly = property.isReadonly ? "readonly " : "" - dtsTypePrinter.indent { - dtsTypePrinter.write("\(readonly)\(property.name): \(property.type.tsType);") - } + let setterKeyword = isStatic ? "static set" : "set" + jsPrinter.indent { + jsPrinter.write( + lines: setterThunkBuilder.renderFunction( + name: property.name, + parameters: [.init(label: nil, name: "value", type: property.type)], + returnExpr: nil, + declarationPrefixKeyword: setterKeyword + ) + ) } } - jsPrinter.write("}") - dtsTypePrinter.write("}") - dtsExportEntryPrinter.write("}") - - return (jsPrinter.lines, dtsTypePrinter.lines, dtsExportEntryPrinter.lines) + // Add instance property to TypeScript interface definition + let readonly = property.isReadonly ? "readonly " : "" + dtsPrinter.indent { + dtsPrinter.write("\(readonly)\(property.name): \(property.type.tsType);") + } } class ImportedThunkBuilder { diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 7f2dab8ee..286c9a380 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1,5 +1,6 @@ import XCTest import JavaScriptKit +import JavaScriptEventLoop @_extern(wasm, module: "BridgeJSRuntimeTests", name: "runJsWorks") @_extern(c) @@ -1383,7 +1384,7 @@ class ExportAPITests: XCTestCase { XCTAssertTrue(hasDeinitCalculator, "Calculator (without @JS init) should have been deinitialized") } - // func testAllAsync() async throws { - // _ = try await runAsyncWorks().value() - // } + func testAllAsync() async throws { + _ = try await runAsyncWorks().value() + } } From d5399ebdeb4c0a8493c49b743b4f5649d425c635 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 7 Jan 2026 14:41:47 +0000 Subject: [PATCH 056/252] Use `swift format` command provided by the Swift toolchain As `swift-format` is included in recent Swift toolchains, we can rely on that instead of requiring `swift-format` to be preinstalled. Without this change the formatting script produces `swift-format not found in PATH` error, when `swift-format` is not redundantly installed outside of the Swift toolchain. --- Utilities/format.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/format.swift b/Utilities/format.swift index 9df282ad7..d26cbe2f3 100755 --- a/Utilities/format.swift +++ b/Utilities/format.swift @@ -38,7 +38,7 @@ func which(_ executable: String) -> URL? { /// Runs the `swift-format` command with the given arguments in the project root. func swiftFormat(_ arguments: [String]) throws { - guard let swiftFormat = which("swift-format") else { + guard let swiftFormat = which("swift") else { print("swift-format not found in PATH") exit(1) } @@ -93,7 +93,7 @@ switch arguments.first { case "lint": try swiftFormat(["lint", "--parallel", "--recursive"] + filesToFormat()) case "format", nil: - try swiftFormat(["format", "--parallel", "--in-place", "--recursive"] + filesToFormat()) + try swiftFormat(["format", "format", "--parallel", "--in-place", "--recursive"] + filesToFormat()) case let subcommand?: print("Unknown subcommand: \(subcommand)") print("Usage: format.swift lint|format") From 721f662a4a253187b01a7d00c24f356b9909d34e Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 7 Jan 2026 18:01:00 +0000 Subject: [PATCH 057/252] Fix typo: rename `BridgeJSInstrincics` to `BridgeJSIntrinsics` (#485) * Fix typo: rename `BridgeJSInstrincics` to `BridgeJSIntrinsic` * Rename`BridgeJSIntrincics.h` * Fix typo in modulemap header filename * Fix typo in documentation comment for IntrinsicJSFragment * Rename BridgeJSIntrinsic.swift to BridgeJSIntrinsics.swift * Fix typo in BridgeJSIntrinsics reference --- CONTRIBUTING.md | 2 +- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 2 +- .../{BridgeJSInstrincics.swift => BridgeJSIntrinsics.swift} | 0 .../include/{BridgeJSInstrincics.h => BridgeJSIntrinsics.h} | 4 ++-- Sources/_CJavaScriptKit/include/module.modulemap | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename Sources/JavaScriptKit/{BridgeJSInstrincics.swift => BridgeJSIntrinsics.swift} (100%) rename Sources/_CJavaScriptKit/include/{BridgeJSInstrincics.h => BridgeJSIntrinsics.h} (74%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ca71ef13..712aeffb7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -114,7 +114,7 @@ These changes require updating the pre-generated Swift bindings committed to the **Adding new BridgeJS intrinsics:** -If you add new `@_extern(wasm, module: "bjs")` functions to [`BridgeJSInstrincics.swift`](Sources/JavaScriptKit/BridgeJSInstrincics.swift), also add corresponding stub entries to [`Plugins/PackageToJS/Templates/instantiate.js`](Plugins/PackageToJS/Templates/instantiate.js) in the `importObject["bjs"]` object. This allows packages without BridgeJS-generated code to instantiate successfully. +If you add new `@_extern(wasm, module: "bjs")` functions to [`BridgeJSIntrinsics.swift`](Sources/JavaScriptKit/BridgeJSIntrinsics.swift), also add corresponding stub entries to [`Plugins/PackageToJS/Templates/instantiate.js`](Plugins/PackageToJS/Templates/instantiate.js) in the `importObject["bjs"]` object. This allows packages without BridgeJS-generated code to instantiate successfully. ## Support If you have any questions or need assistance, feel free to reach out via [GitHub Issues](https://github.com/swiftwasm/JavaScriptKit/issues) or [Discord](https://discord.gg/ashJW8T8yp). diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 23fb2b533..feaf34832 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -78,7 +78,7 @@ final class JSGlueVariableScope { /// A fragment of JS code used to convert a value between Swift and JS. /// -/// See `BridgeJSInstrincics.swift` in the main JavaScriptKit module for Swift side lowering/lifting implementation. +/// See `BridgeJSIntrinsics.swift` in the main JavaScriptKit module for Swift side lowering/lifting implementation. struct IntrinsicJSFragment: Sendable { /// The names of the parameters that the fragment expects. let parameters: [String] diff --git a/Sources/JavaScriptKit/BridgeJSInstrincics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift similarity index 100% rename from Sources/JavaScriptKit/BridgeJSInstrincics.swift rename to Sources/JavaScriptKit/BridgeJSIntrinsics.swift diff --git a/Sources/_CJavaScriptKit/include/BridgeJSInstrincics.h b/Sources/_CJavaScriptKit/include/BridgeJSIntrinsics.h similarity index 74% rename from Sources/_CJavaScriptKit/include/BridgeJSInstrincics.h rename to Sources/_CJavaScriptKit/include/BridgeJSIntrinsics.h index 7ca098609..f396d1f23 100644 --- a/Sources/_CJavaScriptKit/include/BridgeJSInstrincics.h +++ b/Sources/_CJavaScriptKit/include/BridgeJSIntrinsics.h @@ -1,5 +1,5 @@ -#ifndef _CJavaScriptKit_BridgeJSInstrincics_h -#define _CJavaScriptKit_BridgeJSInstrincics_h +#ifndef _CJavaScriptKit_BridgeJSIntrinsics_h +#define _CJavaScriptKit_BridgeJSIntrinsics_h #include #include "WasmGlobalMacros.h" diff --git a/Sources/_CJavaScriptKit/include/module.modulemap b/Sources/_CJavaScriptKit/include/module.modulemap index 3afe12831..f2d3c162e 100644 --- a/Sources/_CJavaScriptKit/include/module.modulemap +++ b/Sources/_CJavaScriptKit/include/module.modulemap @@ -1,5 +1,5 @@ module _CJavaScriptKit { header "_CJavaScriptKit.h" - header "BridgeJSInstrincics.h" + header "BridgeJSIntrinsics.h" export * } From b8311c47f76889e93be9eb03637ca67a6c85149b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 8 Jan 2026 17:34:23 +0900 Subject: [PATCH 058/252] BridgeJS: Fix multifile declaration resolution order issue Close https://github.com/swiftwasm/JavaScriptKit/issues/487 --- Plugins/BridgeJS/Package.swift | 2 +- .../Sources/BridgeJSCore/ExportSwift.swift | 33 ++-- .../BridgeJSToolTests/ExportSwiftTests.swift | 74 +++++++++ .../MultifileInputs/CrossFileClassA.swift | 3 + .../MultifileInputs/CrossFileClassB.swift | 3 + .../MultifileInputs/CrossFileFunctionA.swift | 18 +++ .../MultifileInputs/CrossFileFunctionB.swift | 7 + .../CrossFileFunctionTypes.ReverseOrder.json | 150 ++++++++++++++++++ .../CrossFileFunctionTypes.ReverseOrder.swift | 125 +++++++++++++++ .../CrossFileFunctionTypes.json | 150 ++++++++++++++++++ .../CrossFileFunctionTypes.swift | 125 +++++++++++++++ .../CrossFileTypeResolution.ReverseOrder.json | 62 ++++++++ ...CrossFileTypeResolution.ReverseOrder.swift | 81 ++++++++++ .../CrossFileTypeResolution.json | 62 ++++++++ .../CrossFileTypeResolution.swift | 81 ++++++++++ 15 files changed, 966 insertions(+), 10 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index bb7daac25..36b920521 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -54,7 +54,7 @@ let package = Package( "BridgeJSLink", "TS2Skeleton", ], - exclude: ["__Snapshots__", "Inputs"] + exclude: ["__Snapshots__", "Inputs", "MultifileInputs"] ), ] ) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 6ced425a1..e5344a45e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -28,6 +28,7 @@ public class ExportSwift { private var exportedProtocols: [ExportedProtocol] = [] private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() + private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] public init(progress: ProgressReporting, moduleName: String, exposeToGlobal: Bool) { self.progress = progress @@ -41,16 +42,9 @@ public class ExportSwift { /// - sourceFile: The parsed Swift source file to process /// - inputFilePath: The file path for error reporting public func addSourceFile(_ sourceFile: SourceFileSyntax, _ inputFilePath: String) throws { - progress.print("Processing \(inputFilePath)") + // First, register type declarations before walking for exposed APIs typeDeclResolver.addSourceFile(sourceFile) - - let errors = try parseSingleFile(sourceFile) - if errors.count > 0 { - throw BridgeJSCoreError( - errors.map { $0.formattedDescription(fileName: inputFilePath) } - .joined(separator: "\n") - ) - } + sourceFiles.append((sourceFile, inputFilePath)) } /// Finalizes the export process and generates the bridge code @@ -60,6 +54,27 @@ public class ExportSwift { /// - Returns: A tuple containing the generated Swift code and a skeleton /// describing the exported APIs public func finalize() throws -> (outputSwift: String, outputSkeleton: ExportedSkeleton)? { + // Walk through each source file and collect exported APIs + var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = [] + for (sourceFile, inputFilePath) in sourceFiles { + progress.print("Processing \(inputFilePath)") + let errors = try parseSingleFile(sourceFile) + if errors.count > 0 { + perSourceErrors.append((inputFilePath: inputFilePath, errors: errors)) + } + } + + if !perSourceErrors.isEmpty { + // Aggregate and throw all errors + var allErrors: [String] = [] + for (inputFilePath, errors) in perSourceErrors { + for error in errors { + allErrors.append(error.formattedDescription(fileName: inputFilePath)) + } + } + throw BridgeJSCoreError(allErrors.joined(separator: "\n")) + } + guard let outputSwift = try renderSwiftGlue() else { return nil } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift index 32c3aae73..41e118315 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift @@ -39,6 +39,11 @@ import Testing "Inputs" ) + static let multifileInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() + .appendingPathComponent( + "MultifileInputs" + ) + static func collectInputs() -> [String] { let fileManager = FileManager.default let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path) @@ -69,4 +74,73 @@ import Testing let name = url.deletingPathExtension().lastPathComponent try snapshot(swiftAPI: swiftAPI, name: name + ".Global") } + + @Test + func snapshotCrossFileTypeResolution() throws { + // Test that types defined in one file can be referenced from another file + // This tests the fix for cross-file type resolution in BridgeJS + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + + // Add ClassB first, then ClassA (which references ClassB) + let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") + let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) + try swiftAPI.addSourceFile(classBSourceFile, "CrossFileClassB.swift") + + let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") + let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) + try swiftAPI.addSourceFile(classASourceFile, "CrossFileClassA.swift") + + try snapshot(swiftAPI: swiftAPI, name: "CrossFileTypeResolution") + } + + @Test + func snapshotCrossFileTypeResolutionReverseOrder() throws { + // Test that types can be resolved regardless of the order files are added + // Add ClassA first (which references ClassB), then ClassB + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + + let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") + let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) + try swiftAPI.addSourceFile(classASourceFile, "CrossFileClassA.swift") + + let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") + let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) + try swiftAPI.addSourceFile(classBSourceFile, "CrossFileClassB.swift") + + try snapshot(swiftAPI: swiftAPI, name: "CrossFileTypeResolution.ReverseOrder") + } + + @Test + func snapshotCrossFileFunctionTypes() throws { + // Test that functions and methods can use cross-file types as parameters and return types + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + + // Add FunctionB first, then FunctionA (which references FunctionB in methods and functions) + let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") + let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) + try swiftAPI.addSourceFile(functionBSourceFile, "CrossFileFunctionB.swift") + + let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") + let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) + try swiftAPI.addSourceFile(functionASourceFile, "CrossFileFunctionA.swift") + + try snapshot(swiftAPI: swiftAPI, name: "CrossFileFunctionTypes") + } + + @Test + func snapshotCrossFileFunctionTypesReverseOrder() throws { + // Test that function types can be resolved regardless of the order files are added + let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + + // Add FunctionA first (which references FunctionB), then FunctionB + let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") + let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) + try swiftAPI.addSourceFile(functionASourceFile, "CrossFileFunctionA.swift") + + let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") + let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) + try swiftAPI.addSourceFile(functionBSourceFile, "CrossFileFunctionB.swift") + + try snapshot(swiftAPI: swiftAPI, name: "CrossFileFunctionTypes.ReverseOrder") + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift new file mode 100644 index 000000000..a26cae313 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift @@ -0,0 +1,3 @@ +@JS class ClassA { + @JS var linkedB: ClassB? +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift new file mode 100644 index 000000000..c7c5b80d9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift @@ -0,0 +1,3 @@ +@JS class ClassB { + @JS init() {} +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift new file mode 100644 index 000000000..9a2929e8e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift @@ -0,0 +1,18 @@ +@JS class FunctionA { + @JS init() {} + + // Method that takes a cross-file type as parameter + @JS func processB(b: FunctionB) -> String { + return "Processed \(b.value)" + } + + // Method that returns a cross-file type + @JS func createB(value: String) -> FunctionB { + return FunctionB(value: value) + } +} + +// Standalone function that uses cross-file types +@JS func standaloneFunction(b: FunctionB) -> FunctionB { + return b +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift new file mode 100644 index 000000000..9c1828219 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift @@ -0,0 +1,7 @@ +@JS class FunctionB { + @JS var value: String + + @JS init(value: String) { + self.value = value + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json new file mode 100644 index 000000000..faff44843 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json @@ -0,0 +1,150 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_FunctionA_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_FunctionA_processB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processB", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_FunctionA_createB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createB", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "name" : "FunctionA", + "properties" : [ + + ], + "swiftCallName" : "FunctionA" + }, + { + "constructor" : { + "abiName" : "bjs_FunctionB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "FunctionB", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "FunctionB" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_standaloneFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "standaloneFunction", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ], + "structs" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift new file mode 100644 index 000000000..e50c67861 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift @@ -0,0 +1,125 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_standaloneFunction") +@_cdecl("bjs_standaloneFunction") +public func _bjs_standaloneFunction(b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_init") +@_cdecl("bjs_FunctionA_init") +public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionA() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_processB") +@_cdecl("bjs_FunctionA_processB") +public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_createB") +@_cdecl("bjs_FunctionA_createB") +public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_deinit") +@_cdecl("bjs_FunctionA_deinit") +public func _bjs_FunctionA_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_FunctionA_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") +fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_FunctionB_init") +@_cdecl("bjs_FunctionB_init") +public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_value_get") +@_cdecl("bjs_FunctionB_value_get") +public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = FunctionB.bridgeJSLiftParameter(_self).value + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_value_set") +@_cdecl("bjs_FunctionB_value_set") +public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_deinit") +@_cdecl("bjs_FunctionB_deinit") +public func _bjs_FunctionB_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_FunctionB_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") +fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json new file mode 100644 index 000000000..a0caf3bc9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json @@ -0,0 +1,150 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_FunctionB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "FunctionB", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "FunctionB" + }, + { + "constructor" : { + "abiName" : "bjs_FunctionA_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_FunctionA_processB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processB", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_FunctionA_createB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createB", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "name" : "FunctionA", + "properties" : [ + + ], + "swiftCallName" : "FunctionA" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_standaloneFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "standaloneFunction", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "moduleName" : "TestModule", + "protocols" : [ + + ], + "structs" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift new file mode 100644 index 000000000..e8077c5c4 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift @@ -0,0 +1,125 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_standaloneFunction") +@_cdecl("bjs_standaloneFunction") +public func _bjs_standaloneFunction(b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_init") +@_cdecl("bjs_FunctionB_init") +public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_value_get") +@_cdecl("bjs_FunctionB_value_get") +public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = FunctionB.bridgeJSLiftParameter(_self).value + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_value_set") +@_cdecl("bjs_FunctionB_value_set") +public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { + #if arch(wasm32) + FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionB_deinit") +@_cdecl("bjs_FunctionB_deinit") +public func _bjs_FunctionB_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_FunctionB_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") +fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_FunctionA_init") +@_cdecl("bjs_FunctionA_init") +public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionA() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_processB") +@_cdecl("bjs_FunctionA_processB") +public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_createB") +@_cdecl("bjs_FunctionA_createB") +public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_FunctionA_deinit") +@_cdecl("bjs_FunctionA_deinit") +public func _bjs_FunctionA_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_FunctionA_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") +fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json new file mode 100644 index 000000000..aa4242cd7 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json @@ -0,0 +1,62 @@ +{ + "classes" : [ + { + "methods" : [ + + ], + "name" : "ClassA", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "linkedB", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "ClassB" + } + } + } + } + } + ], + "swiftCallName" : "ClassA" + }, + { + "constructor" : { + "abiName" : "bjs_ClassB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "ClassB", + "properties" : [ + + ], + "swiftCallName" : "ClassB" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ], + "structs" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift new file mode 100644 index 000000000..a270c0e9d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift @@ -0,0 +1,81 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_ClassA_linkedB_get") +@_cdecl("bjs_ClassA_linkedB_get") +public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ClassA.bridgeJSLiftParameter(_self).linkedB + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassA_linkedB_set") +@_cdecl("bjs_ClassA_linkedB_set") +public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassA_deinit") +@_cdecl("bjs_ClassA_deinit") +public func _bjs_ClassA_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClassA_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") +fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_ClassB_init") +@_cdecl("bjs_ClassB_init") +public func _bjs_ClassB_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassB() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassB_deinit") +@_cdecl("bjs_ClassB_deinit") +public func _bjs_ClassB_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClassB_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") +fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json new file mode 100644 index 000000000..e6acc7f35 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json @@ -0,0 +1,62 @@ +{ + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_ClassB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "ClassB", + "properties" : [ + + ], + "swiftCallName" : "ClassB" + }, + { + "methods" : [ + + ], + "name" : "ClassA", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "linkedB", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "ClassB" + } + } + } + } + } + ], + "swiftCallName" : "ClassA" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "moduleName" : "TestModule", + "protocols" : [ + + ], + "structs" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift new file mode 100644 index 000000000..ed05f7c24 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift @@ -0,0 +1,81 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(BridgeJS) import JavaScriptKit + +@_expose(wasm, "bjs_ClassB_init") +@_cdecl("bjs_ClassB_init") +public func _bjs_ClassB_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ClassB() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassB_deinit") +@_cdecl("bjs_ClassB_deinit") +public func _bjs_ClassB_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClassB_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") +fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_ClassA_linkedB_get") +@_cdecl("bjs_ClassA_linkedB_get") +public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ClassA.bridgeJSLiftParameter(_self).linkedB + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassA_linkedB_set") +@_cdecl("bjs_ClassA_linkedB_set") +public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClassA_deinit") +@_cdecl("bjs_ClassA_deinit") +public func _bjs_ClassA_deinit(pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClassA_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") +fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file From b050829c7a5c29c9644a85c33c40a2086ffbc89a Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 8 Jan 2026 08:55:11 +0000 Subject: [PATCH 059/252] Merge pull request #483 from swiftwasm/maxd/fix-embedded-example Fix `Examples/Embedded` not building with Swift 6.2.3 --- Examples/Embedded/Package.swift | 21 ++--------- .../_thingsThatShouldNotBeNeeded.swift | 36 ------------------- Examples/Embedded/build.sh | 5 ++- Plugins/PackageToJS/Tests/ExampleTests.swift | 12 ------- 4 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift diff --git a/Examples/Embedded/Package.swift b/Examples/Embedded/Package.swift index 5ae19adc6..42702394a 100644 --- a/Examples/Embedded/Package.swift +++ b/Examples/Embedded/Package.swift @@ -5,32 +5,17 @@ import PackageDescription let package = Package( name: "Embedded", dependencies: [ - .package(name: "JavaScriptKit", path: "../../"), - .package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"), + .package(name: "JavaScriptKit", path: "../../") ], targets: [ .executableTarget( name: "EmbeddedApp", dependencies: [ - "JavaScriptKit", - .product(name: "dlmalloc", package: "swift-dlmalloc"), + "JavaScriptKit" ], - cSettings: [.unsafeFlags(["-fdeclspec"])], swiftSettings: [ - .enableExperimentalFeature("Embedded"), - .enableExperimentalFeature("Extern"), - .unsafeFlags([ - "-Xfrontend", "-gnone", - "-Xfrontend", "-disable-stack-protector", - ]), + .enableExperimentalFeature("Extern") ], - linkerSettings: [ - .unsafeFlags([ - "-Xclang-linker", "-nostdlib", - "-Xlinker", "--no-entry", - "-Xlinker", "--export-if-defined=__main_argc_argv", - ]) - ] ) ], swiftLanguageModes: [.v5] diff --git a/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift b/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift deleted file mode 100644 index 8f45ccee9..000000000 --- a/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift +++ /dev/null @@ -1,36 +0,0 @@ -import JavaScriptKit - -// NOTE: it seems the embedded tree shaker gets rid of these exports if they are not used somewhere -func _i_need_to_be_here_for_wasm_exports_to_work() { - _ = _swjs_library_features - _ = _swjs_call_host_function - _ = _swjs_free_host_function -} - -// TODO: why do I need this? and surely this is not ideal... figure this out, or at least have this come from a C lib -@_cdecl("strlen") -func strlen(_ s: UnsafePointer) -> Int { - var p = s - while p.pointee != 0 { - p += 1 - } - return p - s -} - -enum LCG { - static var x: UInt8 = 0 - static let a: UInt8 = 0x05 - static let c: UInt8 = 0x0b - - static func next() -> UInt8 { - x = a &* x &+ c - return x - } -} - -@_cdecl("arc4random_buf") -public func arc4random_buf(_ buffer: UnsafeMutableRawPointer, _ size: Int) { - for i in 0..=6.3) - @Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm")) - func embeddedWasmUnknownNone() throws { - try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in - try runSwift( - ["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"], - [ - "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true" - ] - ) - } - } - @Test(.requireEmbeddedSwiftInSwiftSDK()) func embeddedWasmUnknownWasi() throws { let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID()) From a277afbbc057d468961a42dbd4b9e3f6b404c7ff Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 12 Jan 2026 14:39:33 +0900 Subject: [PATCH 060/252] Documentation: Add JavaScript Interop Cheat Sheet (#491) --- .../JavaScript-Interop-Cheat-Sheet.md | 376 ++++++++++++++++++ .../Documentation.docc/Documentation.md | 1 + 2 files changed, 377 insertions(+) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md new file mode 100644 index 000000000..4280a4637 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md @@ -0,0 +1,376 @@ +# JavaScript Interop Cheat Sheet + +Practical recipes for manipulating JavaScript values from Swift with JavaScriptKit. Each section shows the shortest path to access, call, or convert the APIs you interact with the most. + +## Access JavaScript Values + +### Global entry points + +```swift +let global: JSObject = JSObject.global +let document: JSObject = global.document.object! +let math: JSObject = global.Math.object! +``` + +- Use ``JSObject/global`` for `globalThis` and drill into properties. +- Accessing through [dynamic member lookup](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0195-dynamic-member-lookup.md) returns ``JSValue``; call `.object`, `.number`, `.string`, etc. to unwrap a concrete type (callable values are represented as ``JSObject`` as well). +- Prefer storing ``JSObject`` references (`document` above) when you call multiple members to avoid repeated conversions (for performance). + +### Properties, subscripts, and symbols + +```swift +extension JSObject { + public subscript(_ name: String) -> JSValue { get set } + public subscript(_ index: Int) -> JSValue { get set } + public subscript(_ name: JSSymbol) -> JSValue { get set } + /// Use this API when you want to avoid repeated String serialization overhead + public subscript(_ name: JSString) -> JSValue { get set } + /// A convenience method of `subscript(_ name: String) -> JSValue` + /// to access the member through Dynamic Member Lookup. + /// ```swift + /// let document: JSObject = JSObject.global.document.object! + /// ``` + public subscript(dynamicMember name: String) -> JSValue { get set } +} +extension JSValue { + /// An unsafe convenience method of `JSObject.subscript(_ index: Int) -> JSValue` + /// - Precondition: `self` must be a JavaScript Object. + public subscript(dynamicMember name: String) -> JSValue + public subscript(_ index: Int) -> JSValue +} +``` + +**Example** + +```swift +document.title = .string("Swift <3 Web") +let obj = JSObject.global.myObject.object! +let value = obj["key"].string // Access object property with String +let propName = JSString("key") +let value2 = obj[propName].string // Access object property with JSString + +let array = JSObject.global.Array.object!.new(1, 2, 3) +array[0] = .number(10) // Assign to array index + +let symbol = JSSymbol("secret") +let data = obj[symbol].object +``` + +## Call Functions and Methods + +```swift +extension JSObject { + /// Call this function with given `arguments` using [Callable values of user-defined nominal types](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0253-callable.md) + /// ```swift + /// let alert = JSObject.global.alert.object! + /// alert("Hello from Swift") + /// ``` + public func callAsFunction(_ arguments: ConvertibleToJSValue...) -> JSValue + public func callAsFunction(this: JSObject, _ arguments: ConvertibleToJSValue...) -> JSValue + + /// Returns the `name` member method binding this object as `this` context. + public subscript(_ name: String) -> ((ConvertibleToJSValue...) -> JSValue)? { get } + public subscript(_ name: JSString) -> ((ConvertibleToJSValue...) -> JSValue)? { get } + /// A convenience method of `subscript(_ name: String) -> ((ConvertibleToJSValue...) -> JSValue)?` to access the member through Dynamic Member Lookup. + /// ```swift + /// let document = JSObject.global.document.object! + /// let divElement = document.createElement!("div") + /// ``` + public subscript(dynamicMember name: String) -> ((ConvertibleToJSValue...) -> JSValue)? { get } +} +extension JSValue { + /// An unsafe convenience method of `JSObject.subscript(_ name: String) -> ((ConvertibleToJSValue...) -> JSValue)?` + /// - Precondition: `self` must be a JavaScript Object and specified member should be a callable object. + public subscript(dynamicMember name: String) -> ((ConvertibleToJSValue...) -> JSValue) +} +``` + +**Example** + +```swift +let alert = JSObject.global.alert.object! +alert("Hello from Swift") + +let console = JSObject.global.console.object! +_ = console.log!("Cheat sheet ready", 1, true) + +let document = JSObject.global.document.object! +let button = document.createElement!("button").object! +_ = button.classList.add("primary") +``` + +- **Dynamic Member Lookup and `!`**: When calling a method on ``JSObject`` (like `createElement!`), it returns an optional closure, so `!` is used to unwrap and call it. In contrast, calling on ``JSValue`` (like `button.classList.add`) returns a non-optional closure that traps on failure for convenience. + +Need to bind manually? Grab the function object and supply `this`: + +```swift +let appendChild = document.body.appendChild.object! +appendChild(this: document.body.object!, document.createElement!("div")) +``` + +### Passing options objects + +When JavaScript APIs require an options object, create one using ``JSObject``: + +```swift +public class JSObject: ExpressibleByDictionaryLiteral { + /// Creates an empty JavaScript object (equivalent to {} or new Object()) + public init() + + /// Creates a new object with the key-value pairs in the dictionary literal + public init(dictionaryLiteral elements: (String, JSValue)...) +} +``` + +**Example** + +```swift +// Create options object with dictionary literal +let listeningOptions: JSObject = ["once": .boolean(true), "passive": .boolean(true)] +button.addEventListener!("click", handler, listeningOptions) + +// Create empty object and add properties +let fetchOptions = JSObject() +fetchOptions["method"] = .string("POST") +let headers: JSObject = ["Content-Type": .string("application/json")] +fetchOptions["headers"] = headers.jsValue +fetchOptions["body"] = "{}".jsValue + +let fetch = JSObject.global.fetch.object! +let response = fetch("https://api.example.com", fetchOptions) +``` + +### Throwing JavaScript + +JavaScript exceptions surface as ``JSException``. Wrap the function (or object) in a throwing helper. + +```swift +// Method +let JSON = JSObject.global.JSON.object! +do { + let value = try JSON.throwing.parse!("{\"flag\":true}") +} catch let error as JSException { + print("Invalid JSON", error) +} + +// Function +let validateAge: JSObject = JSObject.global.validateAge.object! +do { + try validateAge.throws(-3) +} catch let error as JSException { + print("Validation failed:", error) +} +``` + +- Use ``JSObject/throwing`` to access object methods that may throw JavaScript exceptions. +- Use ``JSObject/throws`` to call the callable object itself that may throw JavaScript exceptions. + +### Constructors and `new` + +```swift +let url = JSObject.global.URL.object!.new("https://example.com", "https://example.com") +let searchParams = url.searchParams.object! +``` + +Use ``JSThrowingFunction/new(_:)`` (via `throws.new`) when the constructor can throw. + +## Convert Between Swift and JavaScript + +### Swift -> JavaScript + +Types conforming to ``ConvertibleToJSValue`` can be converted via the `.jsValue` property. Conversion behavior depends on the context: + +| Swift type | JavaScript result | Notes | +|------------|------------------|-------| +| `Bool` | `JSValue.boolean(Bool)` | | +| `String` | `JSValue.string(JSString)` | Wrapped in ``JSString`` to avoid extra copies | +| `Int`, `UInt`, `Int8-32`, `UInt8-32`, `Float`, `Double` | `JSValue.number(Double)` | All numeric types convert to `Double` | +| `Int64`, `UInt64` | `JSValue.bigInt(JSBigInt)` | Converted to `BigInt` (requires `import JavaScriptBigIntSupport`) | +| `Data` | `Uint8Array` | Converted to `Uint8Array` (requires `import JavaScriptFoundationCompat`) | +| `Array` where `Element: ConvertibleToJSValue` | JavaScript Array | Each element converted via `.jsValue` | +| `Dictionary` where `Value: ConvertibleToJSValue` | Plain JavaScript object | Keys must be `String` | +| `Optional.none` | `JSValue.null` | Use ``JSValue/undefined`` when you specifically need `undefined` | +| `Optional.some(wrapped)` | `wrapped.jsValue` | | +| ``JSValue``, ``JSObject``, ``JSString`` | Passed through | No conversion needed | + +**Function arguments**: Automatic conversion when passing to JavaScript functions: + +```swift +let alert = JSObject.global.alert.object! +alert("Hello") // String automatically converts via .jsValue + +let console = JSObject.global.console.object! +console.log!("Count", 42, true) // All arguments auto-convert +``` + +**Property assignment**: Explicit conversion required: + +```swift +let obj = JSObject.global.myObject.object! +let count: Int = 42 +let message = "Hello" + +obj["count"] = count.jsValue +obj["message"] = message.jsValue + +obj.count = count.jsValue +obj.message = message.jsValue + +// Alternative: use JSValue static methods +obj["count"] = .number(Double(count)) +obj.message = .string(message) +divElement.innerText = .string("Count \(count)") +canvasElement.width = .number(Double(size)) +``` + +### JavaScript -> Swift + +Access JavaScript values through ``JSValue`` accessors: + +```swift +let jsValue: JSValue = // ... some JavaScript value + +// Primitive types via direct accessors (most common pattern) +let message: String? = jsValue.string +let n: Double? = jsValue.number +let flag: Bool? = jsValue.boolean +let obj: JSObject? = jsValue.object + +// Access nested properties through JSObject subscripts +if let obj = jsValue.object { + let nested = obj.key.string + let arrayItem = obj.items[0].string + let count = obj.count.number +} + +// Arrays (if elements conform to ConstructibleFromJSValue) +if let items = [String].construct(from: jsValue) { + // Use items +} + +// Dictionaries (if values conform to ConstructibleFromJSValue) +if let data = [String: Int].construct(from: jsValue) { + // Use data +} + +// For complex Decodable types, use JSValueDecoder +struct User: Decodable { + let name: String + let age: Int +} +let user = try JSValueDecoder().decode(User.self, from: jsValue) +``` + +## Pass Swift Closures back to JavaScript + +```swift +public class JSClosure: JSObject, JSClosureProtocol { + public init(_ body: @escaping (sending [JSValue]) -> JSValue) + public static func async( + priority: TaskPriority? = nil, + _ body: @escaping (sending [JSValue]) async throws(JSException) -> JSValue + ) -> JSClosure + public func release() +} + +public class JSOneshotClosure: JSObject, JSClosureProtocol { + public init(_ body: @escaping (sending [JSValue]) -> JSValue) + public static func async( + priority: TaskPriority? = nil, + _ body: @escaping (sending [JSValue]) async throws(JSException) -> JSValue + ) -> JSOneshotClosure + public func release() +} +``` + +**Example** + +```swift +let document = JSObject.global.document.object! +let console = JSObject.global.console.object! + +// Persistent closure - keep reference while JavaScript can call it +let button = document.createElement!("button").object! +let handler = JSClosure { args in + console.log!("Clicked", args[0]) + return .undefined +} +button.addEventListener!("click", handler) + +// One-shot closure - automatically released after first call +button.addEventListener!( + "click", + JSOneshotClosure { _ in + console.log!("One-off click") + return .undefined + }, + ["once": true] +) + +// Async closure - bridges Swift async to JavaScript Promise +let asyncHandler = JSClosure.async { _ async throws(JSException) -> JSValue in + try! await Task.sleep(nanoseconds: 1_000_000) + console.log!("Async closure finished") + return .undefined +} +button.addEventListener!("async", asyncHandler) +``` + +## Promises and `async/await` + +```swift +public final class JSPromise: JSBridgedClass { + public init(unsafelyWrapping object: JSObject) + public init(resolver: @escaping (@escaping (Result) -> Void) -> Void) + public static func async( + body: @escaping () async throws(JSException) -> Void + ) -> JSPromise + public static func async( + body: @escaping () async throws(JSException) -> JSValue + ) -> JSPromise + + public enum Result { + case success(JSValue) + case failure(JSValue) + } + + // Available when JavaScriptEventLoop is linked + public var value: JSValue { get async throws(JSException) } + public var result: Result { get async } +} +``` + +**Example** + +```swift +import JavaScriptEventLoop + +JavaScriptEventLoop.installGlobalExecutor() + +let console = JSObject.global.console.object! +let fetch = JSObject.global.fetch.object! + +// Wrap existing JavaScript Promise and await from Swift +Task { + do { + let response = try await JSPromise( + unsafelyWrapping: fetch("https://example.com").object! + ).value + console.log!("Fetched data", response) + } catch let error as JSException { + console.error!("Fetch failed", error.thrownValue) + } +} + +// Expose Swift async work to JavaScript +let swiftPromise = JSPromise.async { + try await Task.sleep(nanoseconds: 1_000_000_000) + return .string("Swift async complete") +} +``` + +- Wrap existing promise-returning APIs with ``JSPromise/init(unsafelyWrapping:)``. +- Use `JSPromise.async(body:)` (with `Void` or `JSValue` return type) to expose Swift `async/await` work to JavaScript callers. +- To await JavaScript `Promise` from Swift, import `JavaScriptEventLoop`, call `JavaScriptEventLoop.installGlobalExecutor()` early, and use the `value` property. +- The `value` property suspends until the promise resolves or rejects, rethrowing rejections as ``JSException``. + diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index 60808a894..51ee62539 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -51,6 +51,7 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex ### Articles +- - - - From 8d23cdb9e9ca6c935c6f985fb036fc461e700a2e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 12 Jan 2026 16:59:51 +0900 Subject: [PATCH 061/252] Documentation: Fix example code snippet in Hello World tutorial --- .../Hello-World/Resources/hello-world-2-1-main-swift.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-1-main-swift.swift b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-1-main-swift.swift index a528e65b1..b8e5041dd 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-1-main-swift.swift +++ b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-1-main-swift.swift @@ -1,6 +1,6 @@ import JavaScriptKit let document = JSObject.global.document -var div = document.createElement("div") +let div = document.createElement("div") div.innerText = "Hello from Swift!" -document.body.appendChild(div) +_ = document.body.appendChild(div) From c1dbce8eee746b69e03e74b37f6bf0444eaa88e5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 13 Jan 2026 22:07:19 +0900 Subject: [PATCH 062/252] BridgeJS: Remove call to `getImports` when no JS interface is imported --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 6 +++++- .../__Snapshots__/BridgeJSLinkTests/Async.Export.js | 1 - .../BridgeJSLinkTests/DefaultParameters.Export.js | 1 - .../BridgeJSLinkTests/EnumAssociatedValue.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js | 1 - .../BridgeJSLinkTests/EnumNamespace.Global.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js | 1 - .../BridgeJSLinkTests/Namespaces.Global.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/Optionals.Export.js | 1 - .../BridgeJSLinkTests/PrimitiveParameters.Export.js | 1 - .../BridgeJSLinkTests/PrimitiveReturn.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/Protocol.Export.js | 1 - .../BridgeJSLinkTests/StaticFunctions.Export.js | 1 - .../BridgeJSLinkTests/StaticFunctions.Global.Export.js | 1 - .../BridgeJSLinkTests/StaticProperties.Export.js | 1 - .../BridgeJSLinkTests/StaticProperties.Global.Export.js | 1 - .../BridgeJSLinkTests/StringParameter.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js | 1 - .../__Snapshots__/BridgeJSLinkTests/Throws.Export.js | 1 - .../BridgeJSLinkTests/VoidParameterVoidReturn.Export.js | 1 - 29 files changed, 5 insertions(+), 29 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 4f58e9a60..52a2ef8ae 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -313,8 +313,12 @@ struct BridgeJSLink { printer.write(lines: [ "bjs = {};", "importObject[\"bjs\"] = bjs;", - "const imports = options.getImports(importsContext);", ]) + if self.importedSkeletons.count > 0 { + printer.write(lines: [ + "const imports = options.getImports(importsContext);" + ]) + } printer.write("bjs[\"swift_js_return_string\"] = function(ptr, len) {") printer.indent { printer.write( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index c9c2e484f..3739663bc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 9836ffe95..c03ecf971 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -93,7 +93,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index f0fbf6f75..754f8b4ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -515,7 +515,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 4a0ebe848..bd0cbbe90 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -63,7 +63,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 96127eba5..cc2821568 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -64,7 +64,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index c766f08ef..386fee68f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -83,7 +83,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 2331d1c78..a4456953e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -114,7 +114,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index 737a40046..80367b223 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index ccf941dec..2b803f936 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index 1e1e9563a..35139ff68 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index da5566616..7e1c8bb75 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index c051fcd21..38442a431 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 015d5a1c0..6ba65869a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index 5e7ae2094..39a0ec28c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index f2e1bbe0c..ff2e8a01a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 4bfa5f698..39e9501a1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index efb6b11e7..ce9800583 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -104,7 +104,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 782a38605..ad85837a7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -91,7 +91,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index f0ce10325..3910c8381 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -91,7 +91,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index d1039d0f4..950e992f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -44,7 +44,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 086a2ca31..39a967962 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -44,7 +44,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 2f182b630..6614e02e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 712563448..99d7de127 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 2def00d13..a372059fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 74b2cfe4f..6d1ee5af1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -142,7 +142,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index fe359bcbe..7324c046f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -200,7 +200,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 928ba5950..43aa45da0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index b39042bda..9e3f6ef0f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -39,7 +39,6 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); From fc5b2d9c00d28ace3bf555ede107d843ec1a3cf8 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 14 Jan 2026 14:44:43 +0800 Subject: [PATCH 063/252] Merge pull request #493 from PassiveLogic/fix/enum-helper-availability BridgeJS: Fix enumHelper availability --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 37 +++------- .../Sources/BridgeJSLink/JSGlueGen.swift | 72 +++++++++++-------- .../ArrayParameter.Import.js | 2 + .../BridgeJSLinkTests/Async.Export.js | 2 + .../BridgeJSLinkTests/Async.Import.js | 2 + .../DefaultParameters.Export.js | 1 + .../EnumAssociatedValue.Export.js | 1 + .../BridgeJSLinkTests/EnumCase.Export.js | 2 + .../BridgeJSLinkTests/EnumNamespace.Export.js | 2 + .../EnumNamespace.Global.Export.js | 2 + .../BridgeJSLinkTests/EnumRawType.Export.js | 2 + .../BridgeJSLinkTests/Interface.Import.js | 2 + .../InvalidPropertyNames.Import.js | 2 + .../BridgeJSLinkTests/MixedGlobal.Export.js | 2 + .../BridgeJSLinkTests/MixedModules.Export.js | 2 + .../BridgeJSLinkTests/MixedPrivate.Export.js | 2 + .../MultipleImportedTypes.Import.js | 2 + .../BridgeJSLinkTests/Namespaces.Export.js | 2 + .../Namespaces.Global.Export.js | 2 + .../BridgeJSLinkTests/Optionals.Export.js | 2 + .../PrimitiveParameters.Export.js | 2 + .../PrimitiveParameters.Import.js | 2 + .../PrimitiveReturn.Export.js | 2 + .../PrimitiveReturn.Import.js | 2 + .../BridgeJSLinkTests/PropertyTypes.Export.js | 2 + .../BridgeJSLinkTests/Protocol.Export.js | 1 + .../StaticFunctions.Export.js | 1 + .../StaticFunctions.Global.Export.js | 1 + .../StaticProperties.Export.js | 2 + .../StaticProperties.Global.Export.js | 2 + .../StringParameter.Export.js | 2 + .../StringParameter.Import.js | 2 + .../BridgeJSLinkTests/StringReturn.Export.js | 2 + .../BridgeJSLinkTests/StringReturn.Import.js | 2 + .../BridgeJSLinkTests/SwiftClass.Export.js | 2 + .../BridgeJSLinkTests/SwiftClosure.Export.js | 1 + .../BridgeJSLinkTests/SwiftStruct.Export.js | 1 + .../TS2SkeletonLike.Import.js | 2 + .../BridgeJSLinkTests/Throws.Export.js | 2 + .../BridgeJSLinkTests/TypeAlias.Import.js | 2 + .../TypeScriptClass.Import.js | 2 + .../VoidParameterVoidReturn.Export.js | 2 + .../VoidParameterVoidReturn.Import.js | 2 + 43 files changed, 129 insertions(+), 55 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 52a2ef8ae..41b323425 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -209,11 +209,7 @@ struct BridgeJSLink { } private func generateVariableDeclarations() -> [String] { - let hasAssociatedValueEnums = exportedSkeletons.contains { skeleton in - skeleton.enums.contains { $0.enumType == .associatedValue } - } - - var declarations = [ + return [ "let \(JSGlueVariableScope.reservedInstance);", "let \(JSGlueVariableScope.reservedMemory);", "let \(JSGlueVariableScope.reservedSetException);", @@ -237,25 +233,12 @@ struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpParamF64s) = [];", "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", + "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", + "const \(JSGlueVariableScope.reservedStructHelpers) = {};", + "", + "let _exports = null;", + "let bjs = null;", ] - - let hasStructs = exportedSkeletons.contains { skeleton in - !skeleton.structs.isEmpty - } - - if hasAssociatedValueEnums { - declarations.append("const enumHelpers = {};") - } - - if hasStructs { - declarations.append("const structHelpers = {};") - } - - declarations.append("") - declarations.append("let _exports = null;") - declarations.append("let bjs = null;") - - return declarations } /// Checks if a skeleton contains any closure types @@ -1050,7 +1033,7 @@ struct BridgeJSLink { printer.write( "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift));" ) - printer.write("enumHelpers.\(enumDef.name) = \(enumDef.name)Helpers;") + printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;") printer.nextLine() } } @@ -1064,9 +1047,11 @@ struct BridgeJSLink { for skeleton in exportedSkeletons { for structDef in skeleton.structs { printer.write( - "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), enumHelpers);" + "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedEnumHelpers));" + ) + printer.write( + "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name) = \(structDef.name)Helpers;" ) - printer.write("structHelpers.\(structDef.name) = \(structDef.name)Helpers;") printer.nextLine() } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index feaf34832..944c1659b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -30,6 +30,8 @@ final class JSGlueVariableScope { static let reservedTmpParamF64s = "tmpParamF64s" static let reservedTmpRetPointers = "tmpRetPointers" static let reservedTmpParamPointers = "tmpParamPointers" + static let reservedEnumHelpers = "enumHelpers" + static let reservedStructHelpers = "structHelpers" private var variables: Set = [ reservedSwift, @@ -56,6 +58,8 @@ final class JSGlueVariableScope { reservedTmpParamF64s, reservedTmpRetPointers, reservedTmpParamPointers, + reservedEnumHelpers, + reservedStructHelpers, ] /// Returns a unique variable name in the scope based on the given name hint. @@ -248,7 +252,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdName = "\(value)CaseId" let cleanupName = "\(value)Cleanup" printer.write( - "const { caseId: \(caseIdName), cleanup: \(cleanupName) } = enumHelpers.\(enumBase).lower(\(value));" + "const { caseId: \(caseIdName), cleanup: \(cleanupName) } = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lower(\(value));" ) cleanup.write("if (\(cleanupName)) { \(cleanupName)(); }") return [caseIdName] @@ -262,7 +266,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = enumHelpers.\(enumBase).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [retName] } @@ -325,7 +329,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(enumVar) = enumHelpers.\(base).raise(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } printer.write("}") @@ -337,7 +341,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(structVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("} else {") @@ -371,7 +375,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let resultVar = scope.variable("structResult") - printer.write("const \(resultVar) = structHelpers.\(base).lower(\(value));") + printer.write( + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" + ) printer.write("\(cleanupVar) = \(resultVar).cleanup;") } printer.write("}") @@ -404,7 +410,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let resultVar = scope.variable("enumResult") - printer.write("const \(resultVar) = enumHelpers.\(base).lower(\(value));") + printer.write( + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + ) printer.write("\(caseIdVar) = \(resultVar).caseId;") printer.write("\(cleanupVar) = \(resultVar).cleanup;") } @@ -525,7 +533,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("} else {") printer.indent { printer.write( - "\(resultVar) = enumHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } printer.write("}") @@ -537,7 +545,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "\(resultVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("} else {") @@ -657,7 +665,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) printer.write("return \(caseIdVar);") } @@ -817,7 +825,7 @@ struct IntrinsicJSFragment: Sendable { let targetVar = arguments[1] let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "let \(targetVar) = enumHelpers.\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [] } @@ -884,7 +892,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "\(targetVar) = enumHelpers.\(base).raise(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) default: fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") @@ -1016,7 +1024,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("cleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(result));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(result));" ) cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") printer.write("return \(caseIdVar);") @@ -1083,7 +1091,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(result)) {") printer.indent() printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(result));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(result));" ) printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(caseIdVar);") cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") @@ -1212,7 +1220,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = enumHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) printer.write("return \(resultVar);") return [] @@ -1425,7 +1433,7 @@ struct IntrinsicJSFragment: Sendable { let caseId = arguments[0] let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = enumHelpers.\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [resultVar] } @@ -1445,7 +1453,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = structHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -1535,7 +1543,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("cleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") printer.write("return \(caseIdVar);") @@ -1982,7 +1990,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let cleanupVar = scope.variable("cleanup") printer.write( - "const { cleanup: \(cleanupVar) } = structHelpers.\(base).lower(\(value));" + "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" ) cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] @@ -1997,7 +2005,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let cleanupVar = scope.variable("cleanup") printer.write( - "const { cleanup: \(cleanupVar) } = structHelpers.\(structBase).lower(\(value));" + "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" ) cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] @@ -2011,7 +2019,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = structHelpers.\(structBase).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2029,7 +2037,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const __bjs_create\(structName)Helpers = () => {") printer.indent() printer.write( - "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), enumHelpers) => ({" + "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedEnumHelpers)) => ({" ) printer.indent() @@ -2146,7 +2154,7 @@ struct IntrinsicJSFragment: Sendable { // Lower the struct instance (this) using the helper's lower function let structCleanupVar = methodScope.variable("structCleanup") printer.write( - "const { cleanup: \(structCleanupVar) } = structHelpers.\(structDef.name).lower(this);" + "const { cleanup: \(structCleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(this);" ) // Lower each parameter and collect forwarding expressions @@ -2353,7 +2361,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let structResultVar = scope.variable("structResult") - printer.write("const \(structResultVar) = structHelpers.\(structName).lower(\(value));") + printer.write( + "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structName).lower(\(value));" + ) printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") } printer.write("}") @@ -2455,7 +2465,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let enumResultVar = scope.variable("enumResult") - printer.write("const \(enumResultVar) = enumHelpers.\(base).lower(\(value));") + printer.write( + "const \(enumResultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + ) printer.write("\(caseIdVar) = \(enumResultVar).caseId;") printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") @@ -2495,7 +2507,9 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let value = arguments[0] let structResultVar = scope.variable("structResult") - printer.write("const \(structResultVar) = structHelpers.\(nestedName).lower(\(value));") + printer.write( + "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lower(\(value));" + ) cleanup.write("if (\(structResultVar).cleanup) { \(structResultVar).cleanup(); }") return [] } @@ -2518,7 +2532,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("enumCleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") @@ -2683,7 +2697,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("enumCaseId") printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") printer.write( - "\(optVar) = enumHelpers.\(base).raise(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } else { let wrappedFragment = structFieldRaiseFragment( @@ -2717,7 +2731,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let structVar = scope.variable("struct") printer.write( - "const \(structVar) = structHelpers.\(nestedName).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [structVar] } @@ -2793,7 +2807,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("value") printer.write( - "const \(varName) = enumHelpers.\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(varName) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [varName] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index e53708aab..d477487e5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index 3739663bc..c01eac976 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index c98f19719..15b2a9742 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index c03ecf971..48dfc0994 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -34,6 +34,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; const structHelpers = {}; let _exports = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index 754f8b4ef..a15e386e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -504,6 +504,7 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index bd0cbbe90..9cd3e1f3b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -52,6 +52,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index cc2821568..34a2e0540 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -53,6 +53,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 386fee68f..074380d00 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -72,6 +72,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index a4456953e..00b542e30 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -103,6 +103,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 1bfd09445..83450b4c5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index c8b242720..a71c8dd71 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index 80367b223..ce9475b0c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index 2b803f936..c4a1c2e3a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index 35139ff68..d0f00f279 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index df998b01b..86edf39ab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 7e1c8bb75..0b6ef40dc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 38442a431..6b4d37fc5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 6ba65869a..9770da2db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index 39a0ec28c..761397287 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 512b48ace..a0f2c8b08 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index ff2e8a01a..ec4dd9cab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 4b486f484..871e16a30 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 39e9501a1..240ee9cd5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index ce9800583..d6b9a4f01 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -93,6 +93,7 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index ad85837a7..9d69f4183 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -80,6 +80,7 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 3910c8381..a7e6c44cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -80,6 +80,7 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 950e992f9..8019f2a44 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -33,6 +33,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 39a967962..7c4c11f69 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -33,6 +33,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 6614e02e4..891f4bb01 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 21caebd02..03a65cc47 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 99d7de127..489fbe092 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index f1ab79072..49fafc92e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index a372059fa..f95ee4367 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 6d1ee5af1..8bdbfa4be 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -131,6 +131,7 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 7324c046f..07a2f320f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; const structHelpers = {}; let _exports = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index b0684f153..2bbae4fec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 43aa45da0..016ebaa53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index c2f477245..8b46062c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 71511ca3c..0e2041822 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index 9e3f6ef0f..148418657 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 8f8328054..c22ff8c5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -28,6 +28,8 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; let _exports = null; let bjs = null; From da703026923979f9022295008d2ee0ab2fd9fefb Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 14 Jan 2026 12:24:51 +0900 Subject: [PATCH 064/252] [NFC] BridgeJS: Unify JS function calling convention code emission --- .../Generated/BridgeJS.ExportSwift.swift | 180 +- .../Sources/Generated/BridgeJS.ImportTS.swift | 7 +- .../Generated/BridgeJS.ExportSwift.swift | 30 +- .../Generated/BridgeJS.ImportTS.swift | 4 +- .../Sources/BridgeJSCore/ExportSwift.swift | 694 ++++---- .../Sources/BridgeJSCore/ImportTS.swift | 636 ++++++-- .../ExportSwiftTests/Async.swift | 12 +- .../CrossFileFunctionTypes.ReverseOrder.swift | 32 +- .../CrossFileFunctionTypes.swift | 32 +- ...CrossFileTypeResolution.ReverseOrder.swift | 24 +- .../CrossFileTypeResolution.swift | 24 +- .../ExportSwiftTests/DefaultParameters.swift | 92 +- .../EnumAssociatedValue.swift | 20 +- .../ExportSwiftTests/EnumCase.swift | 10 +- .../EnumNamespace.Global.swift | 36 +- .../ExportSwiftTests/EnumNamespace.swift | 36 +- .../ExportSwiftTests/EnumRawType.swift | 54 +- .../ExportSwiftTests/MixedGlobal.swift | 12 +- .../ExportSwiftTests/MixedPrivate.swift | 12 +- .../ExportSwiftTests/Namespaces.Global.swift | 38 +- .../ExportSwiftTests/Namespaces.swift | 38 +- .../ExportSwiftTests/Optionals.swift | 72 +- .../PrimitiveParameters.swift | 2 +- .../ExportSwiftTests/PropertyTypes.swift | 70 +- .../ExportSwiftTests/Protocol.swift | 250 +-- .../StaticFunctions.Global.swift | 22 +- .../ExportSwiftTests/StaticFunctions.swift | 22 +- .../StaticProperties.Global.swift | 30 +- .../ExportSwiftTests/StaticProperties.swift | 30 +- .../ExportSwiftTests/StringParameter.swift | 4 +- .../ExportSwiftTests/SwiftClass.swift | 42 +- .../ExportSwiftTests/SwiftClosure.swift | 470 +++--- .../ExportSwiftTests/SwiftStruct.swift | 26 +- .../ImportTSTests/ArrayParameter.swift | 10 +- .../__Snapshots__/ImportTSTests/Async.swift | 18 +- .../ImportTSTests/Interface.swift | 9 +- .../ImportTSTests/InvalidPropertyNames.swift | 32 +- .../ImportTSTests/MultipleImportedTypes.swift | 48 +- .../ImportTSTests/PrimitiveParameters.swift | 4 +- .../ImportTSTests/StringParameter.swift | 7 +- .../ImportTSTests/TS2SkeletonLike.swift | 21 +- .../ImportTSTests/TypeAlias.swift | 3 +- .../ImportTSTests/TypeScriptClass.swift | 20 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 68 +- .../Generated/BridgeJS.ExportSwift.swift | 42 +- .../Generated/BridgeJS.ExportSwift.swift | 1445 ++++++++++------- 46 files changed, 2935 insertions(+), 1855 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift index fcec5e675..2c9d9b6bf 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift @@ -369,7 +369,7 @@ public func _bjs_EnumRoundtrip_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_EnumRoundtrip_take") @_cdecl("bjs_EnumRoundtrip_take") -public func _bjs_EnumRoundtrip_take(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_EnumRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) EnumRoundtrip.bridgeJSLiftParameter(_self).take(_: APIResult.bridgeJSLiftParameter(value)) #else @@ -379,7 +379,7 @@ public func _bjs_EnumRoundtrip_take(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_EnumRoundtrip_makeSuccess") @_cdecl("bjs_EnumRoundtrip_makeSuccess") -public func _bjs_EnumRoundtrip_makeSuccess(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeSuccess() return ret.bridgeJSLowerReturn() @@ -390,7 +390,7 @@ public func _bjs_EnumRoundtrip_makeSuccess(_self: UnsafeMutableRawPointer) -> Vo @_expose(wasm, "bjs_EnumRoundtrip_makeFailure") @_cdecl("bjs_EnumRoundtrip_makeFailure") -public func _bjs_EnumRoundtrip_makeFailure(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makeFailure(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeFailure() return ret.bridgeJSLowerReturn() @@ -401,7 +401,7 @@ public func _bjs_EnumRoundtrip_makeFailure(_self: UnsafeMutableRawPointer) -> Vo @_expose(wasm, "bjs_EnumRoundtrip_makeFlag") @_cdecl("bjs_EnumRoundtrip_makeFlag") -public func _bjs_EnumRoundtrip_makeFlag(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makeFlag(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeFlag() return ret.bridgeJSLowerReturn() @@ -412,7 +412,7 @@ public func _bjs_EnumRoundtrip_makeFlag(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_EnumRoundtrip_makeRate") @_cdecl("bjs_EnumRoundtrip_makeRate") -public func _bjs_EnumRoundtrip_makeRate(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makeRate(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeRate() return ret.bridgeJSLowerReturn() @@ -423,7 +423,7 @@ public func _bjs_EnumRoundtrip_makeRate(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_EnumRoundtrip_makePrecise") @_cdecl("bjs_EnumRoundtrip_makePrecise") -public func _bjs_EnumRoundtrip_makePrecise(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makePrecise(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makePrecise() return ret.bridgeJSLowerReturn() @@ -434,7 +434,7 @@ public func _bjs_EnumRoundtrip_makePrecise(_self: UnsafeMutableRawPointer) -> Vo @_expose(wasm, "bjs_EnumRoundtrip_makeInfo") @_cdecl("bjs_EnumRoundtrip_makeInfo") -public func _bjs_EnumRoundtrip_makeInfo(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_EnumRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeInfo() return ret.bridgeJSLowerReturn() @@ -445,7 +445,7 @@ public func _bjs_EnumRoundtrip_makeInfo(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_EnumRoundtrip_roundtrip") @_cdecl("bjs_EnumRoundtrip_roundtrip") -public func _bjs_EnumRoundtrip_roundtrip(_self: UnsafeMutableRawPointer, result: Int32) -> Void { +public func _bjs_EnumRoundtrip_roundtrip(_ _self: UnsafeMutableRawPointer, _ result: Int32) -> Void { #if arch(wasm32) let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).roundtrip(_: APIResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -456,8 +456,12 @@ public func _bjs_EnumRoundtrip_roundtrip(_self: UnsafeMutableRawPointer, result: @_expose(wasm, "bjs_EnumRoundtrip_deinit") @_cdecl("bjs_EnumRoundtrip_deinit") -public func _bjs_EnumRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_EnumRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension EnumRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -468,9 +472,9 @@ extension EnumRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_EnumRoundtrip_wrap") -fileprivate func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_EnumRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_EnumRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_EnumRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -488,7 +492,7 @@ public func _bjs_ComplexResultRoundtrip_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_ComplexResultRoundtrip_take") @_cdecl("bjs_ComplexResultRoundtrip_take") -public func _bjs_ComplexResultRoundtrip_take(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ComplexResultRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ComplexResultRoundtrip.bridgeJSLiftParameter(_self).take(_: ComplexResult.bridgeJSLiftParameter(value)) #else @@ -498,7 +502,7 @@ public func _bjs_ComplexResultRoundtrip_take(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_ComplexResultRoundtrip_makeSuccess") @_cdecl("bjs_ComplexResultRoundtrip_makeSuccess") -public func _bjs_ComplexResultRoundtrip_makeSuccess(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeSuccess() return ret.bridgeJSLowerReturn() @@ -509,7 +513,7 @@ public func _bjs_ComplexResultRoundtrip_makeSuccess(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_ComplexResultRoundtrip_makeError") @_cdecl("bjs_ComplexResultRoundtrip_makeError") -public func _bjs_ComplexResultRoundtrip_makeError(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeError(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeError() return ret.bridgeJSLowerReturn() @@ -520,7 +524,7 @@ public func _bjs_ComplexResultRoundtrip_makeError(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_ComplexResultRoundtrip_makeLocation") @_cdecl("bjs_ComplexResultRoundtrip_makeLocation") -public func _bjs_ComplexResultRoundtrip_makeLocation(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeLocation(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeLocation() return ret.bridgeJSLowerReturn() @@ -531,7 +535,7 @@ public func _bjs_ComplexResultRoundtrip_makeLocation(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_ComplexResultRoundtrip_makeStatus") @_cdecl("bjs_ComplexResultRoundtrip_makeStatus") -public func _bjs_ComplexResultRoundtrip_makeStatus(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeStatus(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeStatus() return ret.bridgeJSLowerReturn() @@ -542,7 +546,7 @@ public func _bjs_ComplexResultRoundtrip_makeStatus(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_ComplexResultRoundtrip_makeCoordinates") @_cdecl("bjs_ComplexResultRoundtrip_makeCoordinates") -public func _bjs_ComplexResultRoundtrip_makeCoordinates(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeCoordinates(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeCoordinates() return ret.bridgeJSLowerReturn() @@ -553,7 +557,7 @@ public func _bjs_ComplexResultRoundtrip_makeCoordinates(_self: UnsafeMutableRawP @_expose(wasm, "bjs_ComplexResultRoundtrip_makeComprehensive") @_cdecl("bjs_ComplexResultRoundtrip_makeComprehensive") -public func _bjs_ComplexResultRoundtrip_makeComprehensive(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeComprehensive(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeComprehensive() return ret.bridgeJSLowerReturn() @@ -564,7 +568,7 @@ public func _bjs_ComplexResultRoundtrip_makeComprehensive(_self: UnsafeMutableRa @_expose(wasm, "bjs_ComplexResultRoundtrip_makeInfo") @_cdecl("bjs_ComplexResultRoundtrip_makeInfo") -public func _bjs_ComplexResultRoundtrip_makeInfo(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ComplexResultRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeInfo() return ret.bridgeJSLowerReturn() @@ -575,7 +579,7 @@ public func _bjs_ComplexResultRoundtrip_makeInfo(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ComplexResultRoundtrip_roundtrip") @_cdecl("bjs_ComplexResultRoundtrip_roundtrip") -public func _bjs_ComplexResultRoundtrip_roundtrip(_self: UnsafeMutableRawPointer, result: Int32) -> Void { +public func _bjs_ComplexResultRoundtrip_roundtrip(_ _self: UnsafeMutableRawPointer, _ result: Int32) -> Void { #if arch(wasm32) let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).roundtrip(_: ComplexResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -586,8 +590,12 @@ public func _bjs_ComplexResultRoundtrip_roundtrip(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_ComplexResultRoundtrip_deinit") @_cdecl("bjs_ComplexResultRoundtrip_deinit") -public func _bjs_ComplexResultRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ComplexResultRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ComplexResultRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -598,9 +606,9 @@ extension ComplexResultRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_ComplexResultRoundtrip_wrap") -fileprivate func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ComplexResultRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ComplexResultRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ComplexResultRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -618,7 +626,7 @@ public func _bjs_StringRoundtrip_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_StringRoundtrip_take") @_cdecl("bjs_StringRoundtrip_take") -public func _bjs_StringRoundtrip_take(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StringRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StringRoundtrip.bridgeJSLiftParameter(_self).take(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) #else @@ -628,7 +636,7 @@ public func _bjs_StringRoundtrip_take(_self: UnsafeMutableRawPointer, valueBytes @_expose(wasm, "bjs_StringRoundtrip_make") @_cdecl("bjs_StringRoundtrip_make") -public func _bjs_StringRoundtrip_make(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StringRoundtrip_make(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StringRoundtrip.bridgeJSLiftParameter(_self).make() return ret.bridgeJSLowerReturn() @@ -639,8 +647,12 @@ public func _bjs_StringRoundtrip_make(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_StringRoundtrip_deinit") @_cdecl("bjs_StringRoundtrip_deinit") -public func _bjs_StringRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_StringRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension StringRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -651,9 +663,9 @@ extension StringRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_StringRoundtrip_wrap") -fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StringRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -671,7 +683,7 @@ public func _bjs_StructRoundtrip_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_StructRoundtrip_takeSimple") @_cdecl("bjs_StructRoundtrip_takeSimple") -public func _bjs_StructRoundtrip_takeSimple(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_takeSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) StructRoundtrip.bridgeJSLiftParameter(_self).takeSimple(_: SimpleStruct.bridgeJSLiftParameter()) #else @@ -681,7 +693,7 @@ public func _bjs_StructRoundtrip_takeSimple(_self: UnsafeMutableRawPointer) -> V @_expose(wasm, "bjs_StructRoundtrip_makeSimple") @_cdecl("bjs_StructRoundtrip_makeSimple") -public func _bjs_StructRoundtrip_makeSimple(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_makeSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeSimple() return ret.bridgeJSLowerReturn() @@ -692,7 +704,7 @@ public func _bjs_StructRoundtrip_makeSimple(_self: UnsafeMutableRawPointer) -> V @_expose(wasm, "bjs_StructRoundtrip_roundtripSimple") @_cdecl("bjs_StructRoundtrip_roundtripSimple") -public func _bjs_StructRoundtrip_roundtripSimple(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_roundtripSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripSimple(_: SimpleStruct.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() @@ -703,7 +715,7 @@ public func _bjs_StructRoundtrip_roundtripSimple(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_StructRoundtrip_takeAddress") @_cdecl("bjs_StructRoundtrip_takeAddress") -public func _bjs_StructRoundtrip_takeAddress(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_takeAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) StructRoundtrip.bridgeJSLiftParameter(_self).takeAddress(_: Address.bridgeJSLiftParameter()) #else @@ -713,7 +725,7 @@ public func _bjs_StructRoundtrip_takeAddress(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_StructRoundtrip_makeAddress") @_cdecl("bjs_StructRoundtrip_makeAddress") -public func _bjs_StructRoundtrip_makeAddress(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_makeAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeAddress() return ret.bridgeJSLowerReturn() @@ -724,7 +736,7 @@ public func _bjs_StructRoundtrip_makeAddress(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_StructRoundtrip_roundtripAddress") @_cdecl("bjs_StructRoundtrip_roundtripAddress") -public func _bjs_StructRoundtrip_roundtripAddress(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_roundtripAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripAddress(_: Address.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() @@ -735,7 +747,7 @@ public func _bjs_StructRoundtrip_roundtripAddress(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_StructRoundtrip_takePerson") @_cdecl("bjs_StructRoundtrip_takePerson") -public func _bjs_StructRoundtrip_takePerson(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_takePerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) StructRoundtrip.bridgeJSLiftParameter(_self).takePerson(_: Person.bridgeJSLiftParameter()) #else @@ -745,7 +757,7 @@ public func _bjs_StructRoundtrip_takePerson(_self: UnsafeMutableRawPointer) -> V @_expose(wasm, "bjs_StructRoundtrip_makePerson") @_cdecl("bjs_StructRoundtrip_makePerson") -public func _bjs_StructRoundtrip_makePerson(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_makePerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makePerson() return ret.bridgeJSLowerReturn() @@ -756,7 +768,7 @@ public func _bjs_StructRoundtrip_makePerson(_self: UnsafeMutableRawPointer) -> V @_expose(wasm, "bjs_StructRoundtrip_roundtripPerson") @_cdecl("bjs_StructRoundtrip_roundtripPerson") -public func _bjs_StructRoundtrip_roundtripPerson(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_roundtripPerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripPerson(_: Person.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() @@ -767,7 +779,7 @@ public func _bjs_StructRoundtrip_roundtripPerson(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_StructRoundtrip_takeComplex") @_cdecl("bjs_StructRoundtrip_takeComplex") -public func _bjs_StructRoundtrip_takeComplex(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_takeComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) StructRoundtrip.bridgeJSLiftParameter(_self).takeComplex(_: ComplexStruct.bridgeJSLiftParameter()) #else @@ -777,7 +789,7 @@ public func _bjs_StructRoundtrip_takeComplex(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_StructRoundtrip_makeComplex") @_cdecl("bjs_StructRoundtrip_makeComplex") -public func _bjs_StructRoundtrip_makeComplex(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_makeComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeComplex() return ret.bridgeJSLowerReturn() @@ -788,7 +800,7 @@ public func _bjs_StructRoundtrip_makeComplex(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_StructRoundtrip_roundtripComplex") @_cdecl("bjs_StructRoundtrip_roundtripComplex") -public func _bjs_StructRoundtrip_roundtripComplex(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_StructRoundtrip_roundtripComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripComplex(_: ComplexStruct.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() @@ -799,8 +811,12 @@ public func _bjs_StructRoundtrip_roundtripComplex(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_StructRoundtrip_deinit") @_cdecl("bjs_StructRoundtrip_deinit") -public func _bjs_StructRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_StructRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension StructRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -811,16 +827,16 @@ extension StructRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_StructRoundtrip_wrap") -fileprivate func _bjs_StructRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StructRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StructRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StructRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_SimpleClass_init") @_cdecl("bjs_SimpleClass_init") -public func _bjs_SimpleClass_init(nameBytes: Int32, nameLength: Int32, count: Int32, flag: Int32, rate: Float32, precise: Float64) -> UnsafeMutableRawPointer { +public func _bjs_SimpleClass_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ flag: Int32, _ rate: Float32, _ precise: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = SimpleClass(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), flag: Bool.bridgeJSLiftParameter(flag), rate: Float.bridgeJSLiftParameter(rate), precise: Double.bridgeJSLiftParameter(precise)) return ret.bridgeJSLowerReturn() @@ -831,7 +847,7 @@ public func _bjs_SimpleClass_init(nameBytes: Int32, nameLength: Int32, count: In @_expose(wasm, "bjs_SimpleClass_name_get") @_cdecl("bjs_SimpleClass_name_get") -public func _bjs_SimpleClass_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SimpleClass_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SimpleClass.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -842,7 +858,7 @@ public func _bjs_SimpleClass_name_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_SimpleClass_name_set") @_cdecl("bjs_SimpleClass_name_set") -public func _bjs_SimpleClass_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_SimpleClass_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) SimpleClass.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -852,7 +868,7 @@ public func _bjs_SimpleClass_name_set(_self: UnsafeMutableRawPointer, valueBytes @_expose(wasm, "bjs_SimpleClass_count_get") @_cdecl("bjs_SimpleClass_count_get") -public func _bjs_SimpleClass_count_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SimpleClass_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SimpleClass.bridgeJSLiftParameter(_self).count return ret.bridgeJSLowerReturn() @@ -863,7 +879,7 @@ public func _bjs_SimpleClass_count_get(_self: UnsafeMutableRawPointer) -> Int32 @_expose(wasm, "bjs_SimpleClass_count_set") @_cdecl("bjs_SimpleClass_count_set") -public func _bjs_SimpleClass_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_SimpleClass_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) SimpleClass.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) #else @@ -873,7 +889,7 @@ public func _bjs_SimpleClass_count_set(_self: UnsafeMutableRawPointer, value: In @_expose(wasm, "bjs_SimpleClass_flag_get") @_cdecl("bjs_SimpleClass_flag_get") -public func _bjs_SimpleClass_flag_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SimpleClass_flag_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SimpleClass.bridgeJSLiftParameter(_self).flag return ret.bridgeJSLowerReturn() @@ -884,7 +900,7 @@ public func _bjs_SimpleClass_flag_get(_self: UnsafeMutableRawPointer) -> Int32 { @_expose(wasm, "bjs_SimpleClass_flag_set") @_cdecl("bjs_SimpleClass_flag_set") -public func _bjs_SimpleClass_flag_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_SimpleClass_flag_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) SimpleClass.bridgeJSLiftParameter(_self).flag = Bool.bridgeJSLiftParameter(value) #else @@ -894,7 +910,7 @@ public func _bjs_SimpleClass_flag_set(_self: UnsafeMutableRawPointer, value: Int @_expose(wasm, "bjs_SimpleClass_rate_get") @_cdecl("bjs_SimpleClass_rate_get") -public func _bjs_SimpleClass_rate_get(_self: UnsafeMutableRawPointer) -> Float32 { +public func _bjs_SimpleClass_rate_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) let ret = SimpleClass.bridgeJSLiftParameter(_self).rate return ret.bridgeJSLowerReturn() @@ -905,7 +921,7 @@ public func _bjs_SimpleClass_rate_get(_self: UnsafeMutableRawPointer) -> Float32 @_expose(wasm, "bjs_SimpleClass_rate_set") @_cdecl("bjs_SimpleClass_rate_set") -public func _bjs_SimpleClass_rate_set(_self: UnsafeMutableRawPointer, value: Float32) -> Void { +public func _bjs_SimpleClass_rate_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) SimpleClass.bridgeJSLiftParameter(_self).rate = Float.bridgeJSLiftParameter(value) #else @@ -915,7 +931,7 @@ public func _bjs_SimpleClass_rate_set(_self: UnsafeMutableRawPointer, value: Flo @_expose(wasm, "bjs_SimpleClass_precise_get") @_cdecl("bjs_SimpleClass_precise_get") -public func _bjs_SimpleClass_precise_get(_self: UnsafeMutableRawPointer) -> Float64 { +public func _bjs_SimpleClass_precise_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) let ret = SimpleClass.bridgeJSLiftParameter(_self).precise return ret.bridgeJSLowerReturn() @@ -926,7 +942,7 @@ public func _bjs_SimpleClass_precise_get(_self: UnsafeMutableRawPointer) -> Floa @_expose(wasm, "bjs_SimpleClass_precise_set") @_cdecl("bjs_SimpleClass_precise_set") -public func _bjs_SimpleClass_precise_set(_self: UnsafeMutableRawPointer, value: Float64) -> Void { +public func _bjs_SimpleClass_precise_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) SimpleClass.bridgeJSLiftParameter(_self).precise = Double.bridgeJSLiftParameter(value) #else @@ -936,8 +952,12 @@ public func _bjs_SimpleClass_precise_set(_self: UnsafeMutableRawPointer, value: @_expose(wasm, "bjs_SimpleClass_deinit") @_cdecl("bjs_SimpleClass_deinit") -public func _bjs_SimpleClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_SimpleClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension SimpleClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -948,16 +968,16 @@ extension SimpleClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_SimpleClass_wrap") -fileprivate func _bjs_SimpleClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SimpleClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SimpleClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SimpleClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_AddressClass_init") @_cdecl("bjs_AddressClass_init") -public func _bjs_AddressClass_init(streetBytes: Int32, streetLength: Int32, cityBytes: Int32, cityLength: Int32, zipCode: Int32) -> UnsafeMutableRawPointer { +public func _bjs_AddressClass_init(_ streetBytes: Int32, _ streetLength: Int32, _ cityBytes: Int32, _ cityLength: Int32, _ zipCode: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = AddressClass(street: String.bridgeJSLiftParameter(streetBytes, streetLength), city: String.bridgeJSLiftParameter(cityBytes, cityLength), zipCode: Int.bridgeJSLiftParameter(zipCode)) return ret.bridgeJSLowerReturn() @@ -968,7 +988,7 @@ public func _bjs_AddressClass_init(streetBytes: Int32, streetLength: Int32, city @_expose(wasm, "bjs_AddressClass_street_get") @_cdecl("bjs_AddressClass_street_get") -public func _bjs_AddressClass_street_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_AddressClass_street_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = AddressClass.bridgeJSLiftParameter(_self).street return ret.bridgeJSLowerReturn() @@ -979,7 +999,7 @@ public func _bjs_AddressClass_street_get(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_AddressClass_street_set") @_cdecl("bjs_AddressClass_street_set") -public func _bjs_AddressClass_street_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_AddressClass_street_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) AddressClass.bridgeJSLiftParameter(_self).street = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -989,7 +1009,7 @@ public func _bjs_AddressClass_street_set(_self: UnsafeMutableRawPointer, valueBy @_expose(wasm, "bjs_AddressClass_city_get") @_cdecl("bjs_AddressClass_city_get") -public func _bjs_AddressClass_city_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_AddressClass_city_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = AddressClass.bridgeJSLiftParameter(_self).city return ret.bridgeJSLowerReturn() @@ -1000,7 +1020,7 @@ public func _bjs_AddressClass_city_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_AddressClass_city_set") @_cdecl("bjs_AddressClass_city_set") -public func _bjs_AddressClass_city_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_AddressClass_city_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) AddressClass.bridgeJSLiftParameter(_self).city = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -1010,7 +1030,7 @@ public func _bjs_AddressClass_city_set(_self: UnsafeMutableRawPointer, valueByte @_expose(wasm, "bjs_AddressClass_zipCode_get") @_cdecl("bjs_AddressClass_zipCode_get") -public func _bjs_AddressClass_zipCode_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_AddressClass_zipCode_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = AddressClass.bridgeJSLiftParameter(_self).zipCode return ret.bridgeJSLowerReturn() @@ -1021,7 +1041,7 @@ public func _bjs_AddressClass_zipCode_get(_self: UnsafeMutableRawPointer) -> Int @_expose(wasm, "bjs_AddressClass_zipCode_set") @_cdecl("bjs_AddressClass_zipCode_set") -public func _bjs_AddressClass_zipCode_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_AddressClass_zipCode_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) AddressClass.bridgeJSLiftParameter(_self).zipCode = Int.bridgeJSLiftParameter(value) #else @@ -1031,8 +1051,12 @@ public func _bjs_AddressClass_zipCode_set(_self: UnsafeMutableRawPointer, value: @_expose(wasm, "bjs_AddressClass_deinit") @_cdecl("bjs_AddressClass_deinit") -public func _bjs_AddressClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_AddressClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension AddressClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -1043,9 +1067,9 @@ extension AddressClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_AddressClass_wrap") -fileprivate func _bjs_AddressClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_AddressClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_AddressClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_AddressClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -1063,7 +1087,7 @@ public func _bjs_ClassRoundtrip_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_ClassRoundtrip_takeSimpleClass") @_cdecl("bjs_ClassRoundtrip_takeSimpleClass") -public func _bjs_ClassRoundtrip_takeSimpleClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassRoundtrip_takeSimpleClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ClassRoundtrip.bridgeJSLiftParameter(_self).takeSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) #else @@ -1073,7 +1097,7 @@ public func _bjs_ClassRoundtrip_takeSimpleClass(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ClassRoundtrip_makeSimpleClass") @_cdecl("bjs_ClassRoundtrip_makeSimpleClass") -public func _bjs_ClassRoundtrip_makeSimpleClass(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_ClassRoundtrip_makeSimpleClass(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeSimpleClass() return ret.bridgeJSLowerReturn() @@ -1084,7 +1108,7 @@ public func _bjs_ClassRoundtrip_makeSimpleClass(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ClassRoundtrip_roundtripSimpleClass") @_cdecl("bjs_ClassRoundtrip_roundtripSimpleClass") -public func _bjs_ClassRoundtrip_roundtripSimpleClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_ClassRoundtrip_roundtripSimpleClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -1095,7 +1119,7 @@ public func _bjs_ClassRoundtrip_roundtripSimpleClass(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_ClassRoundtrip_takeAddressClass") @_cdecl("bjs_ClassRoundtrip_takeAddressClass") -public func _bjs_ClassRoundtrip_takeAddressClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassRoundtrip_takeAddressClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ClassRoundtrip.bridgeJSLiftParameter(_self).takeAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) #else @@ -1105,7 +1129,7 @@ public func _bjs_ClassRoundtrip_takeAddressClass(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ClassRoundtrip_makeAddressClass") @_cdecl("bjs_ClassRoundtrip_makeAddressClass") -public func _bjs_ClassRoundtrip_makeAddressClass(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_ClassRoundtrip_makeAddressClass(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeAddressClass() return ret.bridgeJSLowerReturn() @@ -1116,7 +1140,7 @@ public func _bjs_ClassRoundtrip_makeAddressClass(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ClassRoundtrip_roundtripAddressClass") @_cdecl("bjs_ClassRoundtrip_roundtripAddressClass") -public func _bjs_ClassRoundtrip_roundtripAddressClass(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_ClassRoundtrip_roundtripAddressClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -1127,8 +1151,12 @@ public func _bjs_ClassRoundtrip_roundtripAddressClass(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_ClassRoundtrip_deinit") @_cdecl("bjs_ClassRoundtrip_deinit") -public func _bjs_ClassRoundtrip_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ClassRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ClassRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -1139,9 +1167,9 @@ extension ClassRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_ClassRoundtrip_wrap") -fileprivate func _bjs_ClassRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassRoundtrip_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift index e885569de..e6bb84c13 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift @@ -32,7 +32,8 @@ fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { #endif func benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { - bjs_benchmarkHelperNoopWithNumber(n.bridgeJSLowerParameter()) + let nValue = n.bridgeJSLowerParameter() + bjs_benchmarkHelperNoopWithNumber(nValue) if let error = _swift_js_take_exception() { throw error } @@ -48,7 +49,9 @@ fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { #endif func benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { - bjs_benchmarkRunner(name.bridgeJSLowerParameter(), body.bridgeJSLowerParameter()) + let nameValue = name.bridgeJSLowerParameter() + let bodyValue = body.bridgeJSLowerParameter() + bjs_benchmarkRunner(nameValue, bodyValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift index be683415c..3391b2fd6 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift @@ -19,7 +19,7 @@ public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_PlayBridgeJS_update") @_cdecl("bjs_PlayBridgeJS_update") -public func _bjs_PlayBridgeJS_update(_self: UnsafeMutableRawPointer, swiftSourceBytes: Int32, swiftSourceLength: Int32, dtsSourceBytes: Int32, dtsSourceLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_PlayBridgeJS_update(_ _self: UnsafeMutableRawPointer, _ swiftSourceBytes: Int32, _ swiftSourceLength: Int32, _ dtsSourceBytes: Int32, _ dtsSourceLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) do { let ret = try PlayBridgeJS.bridgeJSLiftParameter(_self).update(swiftSource: String.bridgeJSLiftParameter(swiftSourceBytes, swiftSourceLength), dtsSource: String.bridgeJSLiftParameter(dtsSourceBytes, dtsSourceLength)) @@ -44,8 +44,12 @@ public func _bjs_PlayBridgeJS_update(_self: UnsafeMutableRawPointer, swiftSource @_expose(wasm, "bjs_PlayBridgeJS_deinit") @_cdecl("bjs_PlayBridgeJS_deinit") -public func _bjs_PlayBridgeJS_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PlayBridgeJS_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PlayBridgeJS: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -56,16 +60,16 @@ extension PlayBridgeJS: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJS_wrap") -fileprivate func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PlayBridgeJS_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PlayBridgeJSOutput_outputJs") @_cdecl("bjs_PlayBridgeJSOutput_outputJs") -public func _bjs_PlayBridgeJSOutput_outputJs(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PlayBridgeJSOutput_outputJs(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).outputJs() return ret.bridgeJSLowerReturn() @@ -76,7 +80,7 @@ public func _bjs_PlayBridgeJSOutput_outputJs(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PlayBridgeJSOutput_outputDts") @_cdecl("bjs_PlayBridgeJSOutput_outputDts") -public func _bjs_PlayBridgeJSOutput_outputDts(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PlayBridgeJSOutput_outputDts(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).outputDts() return ret.bridgeJSLowerReturn() @@ -87,7 +91,7 @@ public func _bjs_PlayBridgeJSOutput_outputDts(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftGlue") @_cdecl("bjs_PlayBridgeJSOutput_importSwiftGlue") -public func _bjs_PlayBridgeJSOutput_importSwiftGlue(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PlayBridgeJSOutput_importSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftGlue() return ret.bridgeJSLowerReturn() @@ -98,7 +102,7 @@ public func _bjs_PlayBridgeJSOutput_importSwiftGlue(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_PlayBridgeJSOutput_exportSwiftGlue") @_cdecl("bjs_PlayBridgeJSOutput_exportSwiftGlue") -public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).exportSwiftGlue() return ret.bridgeJSLowerReturn() @@ -109,8 +113,12 @@ public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_PlayBridgeJSOutput_deinit") @_cdecl("bjs_PlayBridgeJSOutput_deinit") -public func _bjs_PlayBridgeJSOutput_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PlayBridgeJSOutput_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PlayBridgeJSOutput: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -121,9 +129,9 @@ extension PlayBridgeJSOutput: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJSOutput_wrap") -fileprivate func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PlayBridgeJSOutput_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift index fca5dcb20..cd1ef9814 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift @@ -40,7 +40,9 @@ struct TS2Skeleton: _JSBridgedClass { } func convert(_ ts: String) throws(JSException) -> String { - let ret = bjs_TS2Skeleton_convert(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TS2Skeleton_convert(selfValue, tsValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index e5344a45e..e20bb6ab2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1986,10 +1986,10 @@ public class ExportSwift { let body: CodeBlockItemListSyntax if effects.isAsync { body = """ - let ret = JSPromise.async { - \(CodeBlockItemListSyntax(self.body)) - }.jsObject - return ret.bridgeJSLowerReturn() + let ret = JSPromise.async { + \(CodeBlockItemListSyntax(self.body)) + }.jsObject + return ret.bridgeJSLowerReturn() """ } else if effects.isThrows { body = """ @@ -2012,17 +2012,20 @@ public class ExportSwift { } else { body = CodeBlockItemListSyntax(self.body) } - return """ - @_expose(wasm, "\(raw: abiName)") - @_cdecl("\(raw: abiName)") - public func _\(raw: abiName)(\(raw: parameterSignature())) -> \(raw: returnSignature()) { - #if arch(wasm32) - \(body) - #else - fatalError("Only available on WebAssembly") - #endif - } - """ + // Build function signature using SwiftSignatureBuilder + let signature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: abiParameterSignatures, + returnType: abiReturnType + ) + + // Build function declaration using helper function + let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( + abiName: abiName, + signature: signature, + body: body + ) + + return DeclSyntax(funcDecl) } private func returnPlaceholderStmt() -> String { @@ -2035,19 +2038,6 @@ public class ExportSwift { case .none: return "return" } } - - func parameterSignature() -> String { - var nameAndType: [(name: String, abiType: String)] = [] - for (name, type) in abiParameterSignatures { - nameAndType.append((name, type.swiftType)) - } - return nameAndType.map { "\($0.name): \($0.abiType)" }.joined(separator: ", ") - } - - func returnSignature() -> String { - return abiReturnType?.swiftType ?? "Void" - } - } /// Context for property rendering that determines call behavior and ABI generation @@ -2330,15 +2320,17 @@ public class ExportSwift { } do { - decls.append( - """ - @_expose(wasm, "bjs_\(raw: klass.name)_deinit") - @_cdecl("bjs_\(raw: klass.name)_deinit") - public func _bjs_\(raw: klass.name)_deinit(pointer: UnsafeMutableRawPointer) { - Unmanaged<\(raw: klass.swiftCallName)>.fromOpaque(pointer).release() + let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( + abiName: "bjs_\(klass.name)_deinit", + signature: SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: [("pointer", .pointer)], + returnType: nil + ), + body: CodeBlockItemListSyntax { + "Unmanaged<\(raw: klass.swiftCallName)>.fromOpaque(pointer).release()" } - """ ) + decls.append(DeclSyntax(funcDecl)) } // Generate ConvertibleToJSValue extension @@ -2375,16 +2367,40 @@ public class ExportSwift { } } """ - let externDecl: DeclSyntax = """ - #if arch(wasm32) - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: externFunctionName)") - fileprivate func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 - #else - fileprivate func \(raw: wrapFunctionName)(_: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif - """ + // Build common function signature + let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: [("pointer", .pointer)], + returnType: .i32 + ) + + // Build extern function declaration (no body) + let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( + moduleName: moduleName, + abiName: externFunctionName, + functionName: wrapFunctionName, + signature: funcSignature + ) + + // Build stub function declaration (with fatalError body) + let stubFuncDecl = FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.fileprivate)) + }, + funcKeyword: .keyword(.func), + name: .identifier(wrapFunctionName), + signature: funcSignature, + body: CodeBlockSyntax { + "fatalError(\"Only available on WebAssembly\")" + } + ) + + // Use helper function for conditional compilation + let externDecl = DeclSyntax( + SwiftCodePattern.buildWasmConditionalCompilationDecls( + wasmDecl: DeclSyntax(externFuncDecl), + elseDecl: DeclSyntax(stubFuncDecl) + ) + ) return [extensionDecl, externDecl] } } @@ -2413,28 +2429,6 @@ struct ClosureCodegen { } } - private func generateOptionalParameterLowering(_ signature: ClosureSignature) throws -> String { - var lines: [String] = [] - - for (index, paramType) in signature.parameters.enumerated() { - guard case .optional(let wrappedType) = paramType else { - continue - } - let paramName = "param\(index)" - if case .swiftHeapObject = wrappedType { - lines.append( - "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithRetain()" - ) - } else { - lines.append( - "let (\(paramName)IsSome, \(paramName)Value) = \(paramName).bridgeJSLowerParameterWithPresence()" - ) - } - } - - return lines.isEmpty ? "" : lines.joined(separator: "\n") + "\n" - } - func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { let mangledName = signature.mangleName let helperName = "_BJS_Closure_\(mangledName)" @@ -2448,111 +2442,139 @@ struct ClosureCodegen { let swiftReturnType = signature.returnType.swiftType let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" - var invokeParams: [(name: String, type: String)] = [("_", "Int32")] - var invokeCallArgs: [String] = ["callback.bridgeJSLowerParameter()"] - - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - - if case .optional(let wrappedType) = paramType { - invokeParams.append(("_", "Int32")) + let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" - switch wrappedType { - case .swiftHeapObject: - invokeParams.append(("_", "UnsafeMutableRawPointer")) - case .string, .rawValueEnum(_, .string): - invokeParams.append(("_", "Int32")) - default: - let lowerInfo = try wrappedType.loweringReturnInfo() - if let wasmType = lowerInfo.returnType { - invokeParams.append(("_", wasmType.swiftType)) - } else { - invokeParams.append(("_", "Int32")) - } - } + // Use CallJSEmission to generate the callback invocation + let builder = ImportTS.CallJSEmission( + moduleName: "bjs", + abiName: externName, + context: .exportSwift + ) - invokeCallArgs.append("\(paramName)IsSome") - invokeCallArgs.append("\(paramName)Value") - } else { - let lowerInfo = try paramType.loweringReturnInfo() - if let wasmType = lowerInfo.returnType { - invokeParams.append(("_", wasmType.swiftType)) - invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") - } else { - invokeParams.append(("_", "Int32")) - invokeCallArgs.append("\(paramName).bridgeJSLowerParameter()") - } - } - } + // Lower the callback parameter + try builder.lowerParameter(param: Parameter(label: nil, name: "callback", type: .jsObject(nil))) - let invokeSignature = invokeParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") - let invokeReturnType: String - if case .optional = signature.returnType { - invokeReturnType = "Void" - } else if let wasmType = try signature.returnType.liftingReturnInfo(context: .exportSwift).valueToLift { - invokeReturnType = wasmType.swiftType - } else { - invokeReturnType = "Void" + // Lower each closure parameter + for (index, paramType) in signature.parameters.enumerated() { + try builder.lowerParameter(param: Parameter(label: nil, name: "param\(index)", type: paramType)) } - let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" - - let returnLifting: String - if signature.returnType == .void { - returnLifting = "\(externName)(\(invokeCallArgs.joined(separator: ", ")))" - } else if case .optional = signature.returnType { - returnLifting = """ - \(externName)(\(invokeCallArgs.joined(separator: ", "))) - return \(signature.returnType.swiftType).bridgeJSLiftReturnFromSideChannel() - """ - } else { - returnLifting = """ - let resultId = \(externName)(\(invokeCallArgs.joined(separator: ", "))) - return \(signature.returnType.swiftType).bridgeJSLiftReturn(resultId) - """ - } + // Generate the call and return value lifting + try builder.call(returnType: signature.returnType) + try builder.liftReturnValue(returnType: signature.returnType) - let optionalLoweringCode = try generateOptionalParameterLowering(signature) + // Get the body code + let bodyCode = builder.getBody() - let externDecl: DeclSyntax = """ - @_extern(wasm, module: "bjs", name: "\(raw: externName)") - fileprivate func \(raw: externName)(\(raw: invokeSignature)) -> \(raw: invokeReturnType) - """ + // Generate extern declaration using CallJSEmission + let externDecl = builder.renderImportDecl() - let boxDecl: DeclSyntax = """ + let boxClassDecl: DeclSyntax = """ private final class \(raw: boxClassName): _BridgedSwiftClosureBox { let closure: \(raw: closureType) init(_ closure: @escaping \(raw: closureType)) { self.closure = closure } } + """ - private enum \(raw: helperName) { - static func bridgeJSLower(_ closure: @escaping \(raw: closureType)) -> UnsafeMutableRawPointer { - let box = \(raw: boxClassName)(closure) - return Unmanaged.passRetained(box).toOpaque() - } + let helperEnumDecl = EnumDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.private)) + }, + name: .identifier(helperName), + memberBlockBuilder: { + DeclSyntax( + FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.static)) + }, + name: .identifier("bridgeJSLower"), + signature: FunctionSignatureSyntax( + parameterClause: FunctionParameterClauseSyntax { + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier("closure"), + colon: .colonToken(), + type: TypeSyntax("@escaping \(raw: closureType)") + ) + }, + returnClause: ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier("UnsafeMutableRawPointer")) + ) + ), + body: CodeBlockSyntax { + "let box = \(raw: boxClassName)(closure)" + "return Unmanaged.passRetained(box).toOpaque()" + } + ) + ) - static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in - #if arch(wasm32) - \(raw: optionalLoweringCode)\(raw: returnLifting) - #else - fatalError("Only available on WebAssembly") - #endif + DeclSyntax( + FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.static)) + }, + name: .identifier("bridgeJSLift"), + signature: FunctionSignatureSyntax( + parameterClause: FunctionParameterClauseSyntax { + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier("callbackId"), + colon: .colonToken(), + type: IdentifierTypeSyntax(name: .identifier("Int32")) + ) + }, + returnClause: ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier(closureType)) + ) + ), + body: CodeBlockSyntax { + "let callback = JSObject.bridgeJSLiftParameter(callbackId)" + ReturnStmtSyntax( + expression: ClosureExprSyntax( + leftBrace: .leftBraceToken(), + signature: ClosureSignatureSyntax( + capture: ClosureCaptureClauseSyntax( + leftSquare: .leftSquareToken(), + items: ClosureCaptureListSyntax { + ClosureCaptureSyntax( + expression: ExprSyntax("callback") + ) + }, + rightSquare: .rightSquareToken() + ), + parameterClause: .simpleInput( + ClosureShorthandParameterListSyntax { + for (index, _) in signature.parameters.enumerated() { + ClosureShorthandParameterSyntax(name: .identifier("param\(index)")) + } + } + ), + inKeyword: .keyword(.in) + ), + statements: CodeBlockItemListSyntax { + SwiftCodePattern.buildWasmConditionalCompilation(wasmBody: bodyCode.statements) + }, + rightBrace: .rightBraceToken() + ) + ) } - } + ) + ) } - """ - return [externDecl, boxDecl] + ) + return [externDecl, boxClassDecl, DeclSyntax(helperEnumDecl)] } func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" - var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")] + // Build ABI parameters directly with WasmCoreType (no string conversion needed) + var abiParams: [(name: String, type: WasmCoreType)] = [("boxPtr", .pointer)] var liftedParams: [String] = [] for (index, paramType) in signature.parameters.enumerated() { @@ -2562,7 +2584,7 @@ struct ClosureCodegen { for (argName, wasmType) in liftInfo.parameters { let fullName = liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - abiParams.append((fullName, wasmType.swiftType)) + abiParams.append((fullName, wasmType)) } let argNames = liftInfo.parameters.map { (argName, _) in @@ -2571,40 +2593,43 @@ struct ClosureCodegen { liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") } - let paramSignature = abiParams.map { "\($0.name): \($0.type)" }.joined(separator: ", ") - let closureCall = "box.closure(\(liftedParams.joined(separator: ", ")))" - - let returnCode: String - if signature.returnType == .void { - returnCode = closureCall - } else { - returnCode = """ - let result = \(closureCall) - return result.bridgeJSLowerReturn() - """ - } + let closureCallExpr = ExprSyntax("box.closure(\(raw: liftedParams.joined(separator: ", ")))") - let abiReturnType: String + // Determine return type + let abiReturnWasmType: WasmCoreType? if signature.returnType == .void { - abiReturnType = "Void" + abiReturnWasmType = nil } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { - abiReturnType = wasmType.swiftType + abiReturnWasmType = wasmType } else { - abiReturnType = "Void" + abiReturnWasmType = nil } - return """ - @_expose(wasm, "\(raw: abiName)") - @_cdecl("\(raw: abiName)") - public func _\(raw: abiName)(\(raw: paramSignature)) -> \(raw: abiReturnType) { - #if arch(wasm32) - let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue() - \(raw: returnCode) - #else - fatalError("Only available on WebAssembly") - #endif + // Build signature using SwiftSignatureBuilder + let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: abiParams, + returnType: abiReturnWasmType + ) + + // Build body + let body = CodeBlockItemListSyntax { + "let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue()" + if signature.returnType == .void { + closureCallExpr + } else { + "let result = \(closureCallExpr)" + "return result.bridgeJSLowerReturn()" } - """ + } + + // Build function declaration using helper + let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( + abiName: abiName, + signature: funcSignature, + body: body + ) + + return DeclSyntax(funcDecl) } } @@ -3072,104 +3097,45 @@ struct ProtocolCodegen { var externDecls: [DeclSyntax] = [] for method in proto.methods { - var swiftParams: [String] = [] - for param in method.parameters { - let label = param.label ?? param.name - if label == param.name { - swiftParams.append("\(param.name): \(param.type.swiftType)") - } else { - swiftParams.append("\(label) \(param.name): \(param.type.swiftType)") - } - } - - var externParams: [String] = ["this: Int32"] - for param in method.parameters { - let loweringInfo = try param.type.loweringParameterInfo(context: .exportSwift) - for (paramName, wasmType) in loweringInfo.loweredParameters { - let fullParamName = - loweringInfo.loweredParameters.count > 1 - ? "\(param.name)\(paramName.capitalizedFirstLetter)" : param.name - externParams.append("\(fullParamName): \(wasmType.swiftType)") - } - } - - var preCallStatements: [String] = [] - var callArgs: [String] = ["this: Int32(bitPattern: jsObject.id)"] + let builder = ImportTS.CallJSEmission( + moduleName: moduleName, + abiName: "_extern_\(method.name)", + context: .exportSwift + ) + try builder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil))) for param in method.parameters { - let loweringInfo = try param.type.loweringParameterInfo(context: .exportSwift) - if case .optional = param.type, loweringInfo.loweredParameters.count > 1 { - let isSomeName = "\(param.name)\(loweringInfo.loweredParameters[0].name.capitalizedFirstLetter)" - let wrappedName = "\(param.name)\(loweringInfo.loweredParameters[1].name.capitalizedFirstLetter)" - preCallStatements.append( - "let (\(isSomeName), \(wrappedName)) = \(param.name).bridgeJSLowerParameterWithPresence()" - ) - callArgs.append("\(isSomeName): \(isSomeName)") - callArgs.append("\(wrappedName): \(wrappedName)") - } else { - callArgs.append("\(param.name): \(param.name).bridgeJSLowerParameter()") - } + try builder.lowerParameter(param: param) } + try builder.call(returnType: method.returnType) + try builder.liftReturnValue(returnType: method.returnType) - let returnTypeStr: String - let externReturnType: String - let callCode: DeclSyntax - - let preCallCode = preCallStatements.isEmpty ? "" : preCallStatements.joined(separator: "\n") + "\n" + // Build function signature using SwiftSignatureBuilder + let signature = SwiftSignatureBuilder.buildFunctionSignature( + parameters: method.parameters, + returnType: method.returnType, + effects: nil + ) - if method.returnType == .void { - returnTypeStr = "" - externReturnType = "" - callCode = """ - \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - """ - } else { - returnTypeStr = " -> \(method.returnType.swiftType)" - let liftingInfo = try method.returnType.liftingReturnInfo( - context: .exportSwift + // Build extern declaration using helper function + let externSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: builder.abiParameterSignatures, + returnType: builder.abiReturnType + ) + let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( + moduleName: moduleName, + abiName: method.abiName, + functionName: "_extern_\(method.name)", + signature: externSignature + ) + externDecls.append(DeclSyntax(externFuncDecl)) + let methodImplementation = DeclSyntax( + FunctionDeclSyntax( + name: .identifier(method.name), + signature: signature, + body: builder.getBody() ) - - if case .optional = method.returnType { - if let abiType = liftingInfo.valueToLift { - externReturnType = " -> \(abiType.swiftType)" - callCode = """ - \(raw: preCallCode)let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) - """ - } else { - externReturnType = "" - callCode = """ - \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() - """ - } - } else if let abiType = liftingInfo.valueToLift { - externReturnType = " -> \(abiType.swiftType)" - callCode = """ - \(raw: preCallCode)let ret = _extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - return \(raw: method.returnType.swiftType).bridgeJSLiftReturn(ret) - """ - } else { - externReturnType = "" - callCode = """ - \(raw: preCallCode)_extern_\(raw: method.name)(\(raw: callArgs.joined(separator: ", "))) - return \(raw: method.returnType.swiftType).bridgeJSLiftReturn() - """ - } - } - - externDecls.append( - """ - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: method.abiName)") - fileprivate func _extern_\(raw: method.name)(\(raw: externParams.joined(separator: ", ")))\(raw: externReturnType) - """ ) - let methodImplementation: DeclSyntax = """ - func \(raw: method.name)(\(raw: swiftParams.joined(separator: ", ")))\(raw: returnTypeStr) { - \(raw: callCode) - } - """ - methodDecls.append(methodImplementation) } @@ -3185,20 +3151,35 @@ struct ProtocolCodegen { externDecls.append(contentsOf: propertyExternDecls) } - let allDecls = (methodDecls + propertyDecls).map { $0.description }.joined(separator: "\n\n") - - let structDecl: DeclSyntax = """ - struct \(raw: wrapperName): \(raw: protocolName), _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - - \(raw: allDecls) + let structDecl = StructDeclSyntax( + name: .identifier(wrapperName), + inheritanceClause: InheritanceClauseSyntax( + inheritedTypesBuilder: { + InheritedTypeSyntax(type: IdentifierTypeSyntax(name: .identifier(protocolName))) + InheritedTypeSyntax(type: IdentifierTypeSyntax(name: .identifier("_BridgedSwiftProtocolWrapper"))) + } + ), + memberBlockBuilder: { + DeclSyntax( + """ + let jsObject: JSObject + """ + ).with(\.trailingTrivia, .newlines(2)) - static func bridgeJSLiftParameter(_ value: Int32) -> Self { - return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) + for decl in methodDecls + propertyDecls { + decl.with(\.trailingTrivia, .newlines(2)) } + + DeclSyntax( + """ + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) + } + """ + ) } - """ - return [structDecl] + externDecls + ) + return [DeclSyntax(structDecl)] + externDecls } private func renderProtocolProperty( @@ -3217,87 +3198,98 @@ struct ProtocolCodegen { className: protocolName ) - let usesSideChannel = property.type.usesSideChannelForOptionalReturn() - let liftingInfo = try property.type.liftingReturnInfo(context: .exportSwift) - let getterReturnType: String - let getterBody: String - - if usesSideChannel { - getterReturnType = "" - getterBody = """ - \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) - return \(property.type.swiftType).bridgeJSLiftReturnFromSideChannel() - """ - } else if let abiType = liftingInfo.valueToLift { - getterReturnType = " -> \(abiType.swiftType)" - getterBody = """ - let ret = \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) - return \(property.type.swiftType).bridgeJSLiftReturn(ret) - """ - } else { - getterReturnType = "" - getterBody = """ - \(getterAbiName)(this: Int32(bitPattern: jsObject.id)) - return \(property.type.swiftType).bridgeJSLiftReturn() - """ - } - - let getterExternDecl: DeclSyntax = """ - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: getterAbiName)") - fileprivate func \(raw: getterAbiName)(this: Int32)\(raw: getterReturnType) - """ + let getterBuilder = ImportTS.CallJSEmission( + moduleName: moduleName, + abiName: getterAbiName, + context: .exportSwift + ) + try getterBuilder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil))) + try getterBuilder.call(returnType: property.type) + try getterBuilder.liftReturnValue(returnType: property.type) + + // Build getter extern declaration using helper function + let getterExternSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: getterBuilder.abiParameterSignatures, + returnType: getterBuilder.abiReturnType + ) + let getterExternDecl = SwiftCodePattern.buildExternFunctionDecl( + moduleName: moduleName, + abiName: getterAbiName, + functionName: getterAbiName, + signature: getterExternSignature + ) if property.isReadonly { - return ( - """ - var \(raw: property.name): \(raw: property.type.swiftType) { - get { - \(raw: getterBody) - } + let propertyDecl = VariableDeclSyntax( + bindingSpecifier: .keyword(.var), + bindings: PatternBindingListSyntax { + PatternBindingSyntax( + pattern: IdentifierPatternSyntax(identifier: .identifier(property.name)), + typeAnnotation: TypeAnnotationSyntax( + type: IdentifierTypeSyntax(name: .identifier(property.type.swiftType)) + ), + accessorBlock: AccessorBlockSyntax( + accessors: .accessors( + AccessorDeclListSyntax { + AccessorDeclSyntax( + accessorSpecifier: .keyword(.get), + body: getterBuilder.getBody() + ) + } + ) + ) + ) } - """, - [getterExternDecl] ) + return (DeclSyntax(propertyDecl), [DeclSyntax(getterExternDecl)]) } else { - let loweringInfo = try property.type.loweringParameterInfo(context: .exportSwift) - - let setterParams = - (["this: Int32"] + loweringInfo.loweredParameters.map { "\($0.name): \($0.type.swiftType)" }).joined( - separator: ", " - ) - - let setterBody: String - if case .optional = property.type, loweringInfo.loweredParameters.count > 1 { - let isSomeParam = loweringInfo.loweredParameters[0].name - let wrappedParam = loweringInfo.loweredParameters[1].name - setterBody = """ - let (\(isSomeParam), \(wrappedParam)) = newValue.bridgeJSLowerParameterWithPresence() - \(setterAbiName)(this: Int32(bitPattern: jsObject.id), \(isSomeParam): \(isSomeParam), \(wrappedParam): \(wrappedParam)) - """ - } else { - let paramName = loweringInfo.loweredParameters[0].name - setterBody = - "\(setterAbiName)(this: Int32(bitPattern: jsObject.id), \(paramName): newValue.bridgeJSLowerParameter())" - } - - let setterExternDecl: DeclSyntax = """ - @_extern(wasm, module: "\(raw: moduleName)", name: "\(raw: setterAbiName)") - fileprivate func \(raw: setterAbiName)(\(raw: setterParams)) - """ + let setterBuilder = ImportTS.CallJSEmission( + moduleName: moduleName, + abiName: setterAbiName, + context: .exportSwift + ) + try setterBuilder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil))) + try setterBuilder.lowerParameter(param: Parameter(label: nil, name: "newValue", type: property.type)) + try setterBuilder.call(returnType: .void) + + // Build setter extern declaration using helper function + let setterExternSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: setterBuilder.abiParameterSignatures, + returnType: setterBuilder.abiReturnType + ) + let setterExternDecl = SwiftCodePattern.buildExternFunctionDecl( + moduleName: moduleName, + abiName: setterAbiName, + functionName: setterAbiName, + signature: setterExternSignature + ) - return ( - """ - var \(raw: property.name): \(raw: property.type.swiftType) { - get { - \(raw: getterBody) - } - set { - \(raw: setterBody) - } + let propertyDecl = VariableDeclSyntax( + bindingSpecifier: .keyword(.var), + bindings: PatternBindingListSyntax { + PatternBindingSyntax( + pattern: IdentifierPatternSyntax(identifier: .identifier(property.name)), + typeAnnotation: TypeAnnotationSyntax( + type: IdentifierTypeSyntax(name: .identifier(property.type.swiftType)) + ), + accessorBlock: AccessorBlockSyntax( + accessors: .accessors( + AccessorDeclListSyntax { + AccessorDeclSyntax( + accessorSpecifier: .keyword(.get), + body: getterBuilder.getBody() + ) + AccessorDeclSyntax( + accessorSpecifier: .keyword(.set), + body: setterBuilder.getBody() + ) + } + ) + ) + ) } - """, - [getterExternDecl, setterExternDecl] ) + return (DeclSyntax(propertyDecl), [DeclSyntax(getterExternDecl), DeclSyntax(setterExternDecl)]) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index a3ae96abb..1a3bd0ceb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -56,54 +56,163 @@ public struct ImportTS { return allDecls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") } - class ImportedThunkBuilder { + class CallJSEmission { let abiName: String let moduleName: String + let context: BridgeContext var body: [CodeBlockItemSyntax] = [] var abiParameterForwardings: [LabeledExprSyntax] = [] var abiParameterSignatures: [(name: String, type: WasmCoreType)] = [] var abiReturnType: WasmCoreType? + // Track destructured variable names for multiple lowered parameters + var destructuredVarNames: [String] = [] - init(moduleName: String, abiName: String) { + init(moduleName: String, abiName: String, context: BridgeContext = .importTS) { self.moduleName = moduleName self.abiName = abiName + self.context = context } func lowerParameter(param: Parameter) throws { - let loweringInfo = try param.type.loweringParameterInfo() - assert( - loweringInfo.loweredParameters.count == 1, - "For now, we require a single parameter to be lowered to a single Wasm core type" - ) - let (_, type) = loweringInfo.loweredParameters[0] - abiParameterForwardings.append( - LabeledExprSyntax( - label: param.label, - expression: ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + let loweringInfo = try param.type.loweringParameterInfo(context: context) + + // Generate destructured variable names for all lowered parameters + let destructuredNames = loweringInfo.loweredParameters.map { + "\(param.name)\($0.name.capitalizedFirstLetter)" + } + + // Always add destructuring statement to body (unified for single and multiple) + let pattern: PatternSyntax + if destructuredNames.count == 1 { + pattern = PatternSyntax(IdentifierPatternSyntax(identifier: .identifier(destructuredNames[0]))) + } else { + pattern = PatternSyntax( + TuplePatternSyntax { + for name in destructuredNames { + TuplePatternElementSyntax( + pattern: IdentifierPatternSyntax(identifier: .identifier(name)) + ) + } + } + ) + } + + body.append( + CodeBlockItemSyntax( + item: .decl( + DeclSyntax( + VariableDeclSyntax( + bindingSpecifier: .keyword(.let), + bindings: PatternBindingListSyntax { + PatternBindingSyntax( + pattern: pattern, + initializer: InitializerClauseSyntax( + value: ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + ) + ) + } + ) + ) + ) ) ) - abiParameterSignatures.append((param.name, type)) + destructuredVarNames.append(contentsOf: destructuredNames) + + // Add to signatures and forwardings (unified for both single and multiple) + for (index, (paramName, type)) in loweringInfo.loweredParameters.enumerated() { + // For single parameter, use param.name; for multiple, use constructed name + let abiParamName: String + if loweringInfo.loweredParameters.count == 1 { + abiParamName = param.name + } else { + abiParamName = "\(param.name)\(paramName.capitalizedFirstLetter)" + } + abiParameterSignatures.append((abiParamName, type)) + + // Always use destructured variable in call without labels + // Swift allows omitting labels when they match parameter names + let callExpr = ExprSyntax("\(raw: destructuredNames[index])") + abiParameterForwardings.append( + LabeledExprSyntax(expression: callExpr) + ) + } } - func call(returnType: BridgeType) { - let call: ExprSyntax = - "\(raw: abiName)(\(raw: abiParameterForwardings.map { $0.description }.joined(separator: ", ")))" + func call(returnType: BridgeType) throws { + // Build function call expression + let callExpr = FunctionCallExprSyntax( + calledExpression: ExprSyntax("\(raw: abiName)"), + leftParen: .leftParenToken(), + arguments: LabeledExprListSyntax { + for forwarding in abiParameterForwardings { + forwarding + } + }, + rightParen: .rightParenToken() + ) + if returnType == .void { - body.append("\(raw: call)") + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) + } else if returnType.usesSideChannelForOptionalReturn() { + // Side channel returns don't need "let ret =" + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) } else { - body.append("let ret = \(raw: call)") + body.append("let ret = \(raw: callExpr)") + } + + // Add exception check for ImportTS context + if context == .importTS { + body.append("if let error = _swift_js_take_exception() { throw error }") } - body.append("if let error = _swift_js_take_exception() { throw error }") } func liftReturnValue(returnType: BridgeType) throws { - let liftingInfo = try returnType.liftingReturnInfo() - abiReturnType = liftingInfo.valueToLift + let liftingInfo = try returnType.liftingReturnInfo(context: context) + if returnType == .void { + abiReturnType = nil return } - body.append("return \(raw: returnType.swiftType).bridgeJSLiftReturn(ret)") + + if returnType.usesSideChannelForOptionalReturn() { + // Side channel returns: extern function returns Void, value is retrieved via side channel + abiReturnType = nil + body.append( + CodeBlockItemSyntax( + item: .stmt( + StmtSyntax( + ReturnStmtSyntax( + expression: ExprSyntax( + "\(raw: returnType.swiftType).bridgeJSLiftReturnFromSideChannel()" + ) + ) + ) + ) + ) + ) + } else { + abiReturnType = liftingInfo.valueToLift + let liftExpr: ExprSyntax + if liftingInfo.valueToLift != nil { + liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn(ret)" + } else { + liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn()" + } + body.append( + CodeBlockItemSyntax( + item: .stmt( + StmtSyntax( + ReturnStmtSyntax(expression: liftExpr) + ) + ) + ) + ) + } + } + + func getBody() -> CodeBlockSyntax { + return CodeBlockSyntax(statements: CodeBlockItemListSyntax(body)) } func assignThis(returnType: BridgeType) { @@ -115,68 +224,56 @@ public struct ImportTS { } func renderImportDecl() -> DeclSyntax { - let baseDecl = FunctionDeclSyntax( - modifiers: DeclModifierListSyntax(itemsBuilder: { + let signature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: abiParameterSignatures, + returnType: abiReturnType + ) + + // Build extern function declaration (no body) + let externFuncDecl = FunctionDeclSyntax( + attributes: SwiftCodePattern.buildExternAttribute(moduleName: moduleName, abiName: abiName), + modifiers: DeclModifierListSyntax { DeclModifierSyntax(name: .keyword(.fileprivate)).with(\.trailingTrivia, .space) - }), + }, funcKeyword: .keyword(.func).with(\.trailingTrivia, .space), name: .identifier(abiName), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax(parametersBuilder: { - for param in abiParameterSignatures { - FunctionParameterSyntax( - firstName: .wildcardToken().with(\.trailingTrivia, .space), - secondName: .identifier(param.name), - type: IdentifierTypeSyntax(name: .identifier(param.type.swiftType)) - ) - } - }), - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(abiReturnType.map { $0.swiftType } ?? "Void")) - ) + signature: signature + ) + + // Build stub function declaration (with fatalError body) + let stubFuncDecl = FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.fileprivate)).with(\.trailingTrivia, .space) + }, + funcKeyword: .keyword(.func).with(\.trailingTrivia, .space), + name: .identifier(abiName), + signature: signature, + body: CodeBlockSyntax { + "fatalError(\"Only available on WebAssembly\")" + } + ) + + // Use conditional compilation helper + return DeclSyntax( + SwiftCodePattern.buildWasmConditionalCompilationDecls( + wasmDecl: DeclSyntax(externFuncDecl), + elseDecl: DeclSyntax(stubFuncDecl) ) ) - var externDecl = baseDecl - externDecl.attributes = AttributeListSyntax(itemsBuilder: { - "@_extern(wasm, module: \"\(raw: moduleName)\", name: \"\(raw: abiName)\")" - }).with(\.trailingTrivia, .newline) - var stubDecl = baseDecl - stubDecl.body = CodeBlockSyntax { - """ - fatalError("Only available on WebAssembly") - """ - } - return """ - #if arch(wasm32) - \(externDecl) - #else - \(stubDecl) - #endif - """ } func renderThunkDecl(name: String, parameters: [Parameter], returnType: BridgeType) -> DeclSyntax { + let effects = Effects(isAsync: false, isThrows: true) + let signature = SwiftSignatureBuilder.buildFunctionSignature( + parameters: parameters, + returnType: returnType, + effects: effects, + useWildcardLabels: true + ) return DeclSyntax( FunctionDeclSyntax( name: .identifier(name.backtickIfNeeded()), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax(parametersBuilder: { - for param in parameters { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier(param.name), - colon: .colonToken(), - type: IdentifierTypeSyntax(name: .identifier(param.type.swiftType)) - ) - } - }), - effectSpecifiers: ImportTS.buildFunctionEffect(throws: true, async: false), - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(returnType.swiftType)) - ) - ), + signature: signature, body: CodeBlockSyntax { body } @@ -185,22 +282,18 @@ public struct ImportTS { } func renderConstructorDecl(parameters: [Parameter]) -> DeclSyntax { + let effects = Effects(isAsync: false, isThrows: true) + // Constructors don't have return types, so build signature without return clause + let signature = FunctionSignatureSyntax( + parameterClause: SwiftSignatureBuilder.buildParameterClause( + parameters: parameters, + useWildcardLabels: true + ), + effectSpecifiers: SwiftSignatureBuilder.buildEffectSpecifiers(effects: effects) + ) return DeclSyntax( InitializerDeclSyntax( - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax( - parametersBuilder: { - for param in parameters { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier(param.name), - type: IdentifierTypeSyntax(name: .identifier(param.type.swiftType)) - ) - } - } - ), - effectSpecifiers: ImportTS.buildFunctionEffect(throws: true, async: false) - ), + signature: signature, bodyBuilder: { body } @@ -223,11 +316,11 @@ public struct ImportTS { _ function: ImportedFunctionSkeleton, topLevelDecls: inout [DeclSyntax] ) throws -> [DeclSyntax] { - let builder = ImportedThunkBuilder(moduleName: moduleName, abiName: function.abiName(context: nil)) + let builder = CallJSEmission(moduleName: moduleName, abiName: function.abiName(context: nil)) for param in function.parameters { try builder.lowerParameter(param: param) } - builder.call(returnType: function.returnType) + try builder.call(returnType: function.returnType) try builder.liftReturnValue(returnType: function.returnType) topLevelDecls.append(builder.renderImportDecl()) return [ @@ -244,12 +337,12 @@ public struct ImportTS { let name = type.name func renderMethod(method: ImportedFunctionSkeleton) throws -> [DeclSyntax] { - let builder = ImportedThunkBuilder(moduleName: moduleName, abiName: method.abiName(context: type)) + let builder = CallJSEmission(moduleName: moduleName, abiName: method.abiName(context: type)) try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) for param in method.parameters { try builder.lowerParameter(param: param) } - builder.call(returnType: method.returnType) + try builder.call(returnType: method.returnType) try builder.liftReturnValue(returnType: method.returnType) topLevelDecls.append(builder.renderImportDecl()) return [ @@ -263,11 +356,11 @@ public struct ImportTS { } func renderConstructorDecl(constructor: ImportedConstructorSkeleton) throws -> [DeclSyntax] { - let builder = ImportedThunkBuilder(moduleName: moduleName, abiName: constructor.abiName(context: type)) + let builder = CallJSEmission(moduleName: moduleName, abiName: constructor.abiName(context: type)) for param in constructor.parameters { try builder.lowerParameter(param: param) } - builder.call(returnType: .jsObject(name)) + try builder.call(returnType: .jsObject(name)) builder.assignThis(returnType: .jsObject(name)) topLevelDecls.append(builder.renderImportDecl()) return [ @@ -276,12 +369,12 @@ public struct ImportTS { } func renderGetterDecl(property: ImportedPropertySkeleton) throws -> AccessorDeclSyntax { - let builder = ImportedThunkBuilder( + let builder = CallJSEmission( moduleName: moduleName, abiName: property.getterAbiName(context: type) ) try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) - builder.call(returnType: property.type) + try builder.call(returnType: property.type) try builder.liftReturnValue(returnType: property.type) topLevelDecls.append(builder.renderImportDecl()) return AccessorDeclSyntax( @@ -294,14 +387,14 @@ public struct ImportTS { } func renderSetterDecl(property: ImportedPropertySkeleton) throws -> DeclSyntax { - let builder = ImportedThunkBuilder( + let builder = CallJSEmission( moduleName: moduleName, abiName: property.setterAbiName(context: type) ) let newValue = Parameter(label: nil, name: "newValue", type: property.type) try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) try builder.lowerParameter(param: newValue) - builder.call(returnType: .void) + try builder.call(returnType: .void) topLevelDecls.append(builder.renderImportDecl()) return builder.renderThunkDecl( name: "set\(property.name.capitalizedFirstLetter)", @@ -416,6 +509,355 @@ public struct ImportTS { } } +/// Unified utility for building Swift function signatures using SwiftSyntax +/// +/// This struct eliminates code duplication by providing a single source of truth +/// for generating Swift function signatures across ImportTS, ExportSwift, and +/// other code generators. +struct SwiftSignatureBuilder { + /// Builds a complete function signature from parameters, return type, and effects + /// + /// - Parameters: + /// - parameters: Array of Parameter structs for Swift function signatures + /// - returnType: The return type of the function + /// - effects: Optional effects (async/throws) + /// - Returns: A FunctionSignatureSyntax node + static func buildFunctionSignature( + parameters: [Parameter], + returnType: BridgeType, + effects: Effects? = nil, + useWildcardLabels: Bool = false + ) -> FunctionSignatureSyntax { + return FunctionSignatureSyntax( + parameterClause: buildParameterClause(parameters: parameters, useWildcardLabels: useWildcardLabels), + effectSpecifiers: effects.flatMap { buildEffectSpecifiers(effects: $0) }, + returnClause: buildReturnClause(returnType: returnType) + ) + } + + /// Builds a function signature for ABI/extern functions using WasmCoreType parameters + /// + /// - Parameters: + /// - abiParameters: Array of (name, WasmCoreType) tuples for ABI signatures + /// - returnType: The return type as WasmCoreType (nil for Void) + /// - effects: Optional effects (async/throws) + /// - Returns: A FunctionSignatureSyntax node + static func buildABIFunctionSignature( + abiParameters: [(name: String, type: WasmCoreType)], + returnType: WasmCoreType?, + effects: Effects? = nil + ) -> FunctionSignatureSyntax { + return FunctionSignatureSyntax( + parameterClause: buildABIParameterClause(abiParameters: abiParameters), + effectSpecifiers: effects.flatMap { buildEffectSpecifiers(effects: $0) }, + returnClause: buildABIReturnClause(returnType: returnType) + ) + } + + /// Builds a parameter clause from an array of Parameter structs + /// + /// - Parameters: + /// - parameters: Array of Parameter structs + /// - useWildcardLabels: If true, all parameters use wildcard labels ("_ name: Type"). + /// If false, handles parameter labels: + /// - If label == name: single identifier (e.g., "count: Int") + /// - If label != name: labeled parameter (e.g., "label count: Int") + /// - If label == nil: wildcard label (e.g., "_ count: Int") + static func buildParameterClause( + parameters: [Parameter], + useWildcardLabels: Bool = false + ) -> FunctionParameterClauseSyntax { + return FunctionParameterClauseSyntax(parametersBuilder: { + for param in parameters { + if useWildcardLabels { + // Always use wildcard labels: "_ name: Type" + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier(param.name), + colon: .colonToken(), + type: buildTypeSyntax(from: param.type) + ) + } else { + let label = param.label ?? param.name + if label == param.name { + // External label same as parameter name: "count: Int" + FunctionParameterSyntax( + firstName: .identifier(label), + secondName: nil, + colon: .colonToken(), + type: buildTypeSyntax(from: param.type) + ) + } else if param.label == nil { + // No label specified: use wildcard "_ name: Type" + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier(param.name), + colon: .colonToken(), + type: buildTypeSyntax(from: param.type) + ) + } else { + // External label differs: "label count: Int" + FunctionParameterSyntax( + firstName: .identifier(label), + secondName: .identifier(param.name), + colon: .colonToken(), + type: buildTypeSyntax(from: param.type) + ) + } + } + } + }) + } + + /// Builds a parameter clause for ABI/extern functions + /// + /// All parameters use wildcard labels: "_ name: Type" + static func buildABIParameterClause( + abiParameters: [(name: String, type: WasmCoreType)] + ) -> FunctionParameterClauseSyntax { + return FunctionParameterClauseSyntax(parametersBuilder: { + for param in abiParameters { + FunctionParameterSyntax( + firstName: .wildcardToken().with(\.trailingTrivia, .space), + secondName: .identifier(param.name), + type: IdentifierTypeSyntax(name: .identifier(param.type.swiftType)) + ) + } + }) + } + + /// Builds a return clause from a BridgeType + /// + /// Always returns a ReturnClauseSyntax, including for Void types + /// (to match original behavior that explicitly includes "-> Void") + static func buildReturnClause(returnType: BridgeType) -> ReturnClauseSyntax? { + return ReturnClauseSyntax( + arrow: .arrowToken(), + type: buildTypeSyntax(from: returnType) + ) + } + + /// Builds a return clause for ABI/extern functions + /// + /// Returns nil for Void (when returnType is nil), otherwise returns a ReturnClauseSyntax + static func buildABIReturnClause(returnType: WasmCoreType?) -> ReturnClauseSyntax? { + guard let returnType = returnType else { + return ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier("Void")) + ) + } + return ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier(returnType.swiftType)) + ) + } + + /// Builds effect specifiers (async/throws) from an Effects struct + /// + /// Uses JSException as the thrown error type for throws clauses + static func buildEffectSpecifiers(effects: Effects) -> FunctionEffectSpecifiersSyntax? { + guard effects.isAsync || effects.isThrows else { + return nil + } + return FunctionEffectSpecifiersSyntax( + asyncSpecifier: effects.isAsync ? .keyword(.async) : nil, + throwsClause: effects.isThrows + ? ThrowsClauseSyntax( + throwsSpecifier: .keyword(.throws), + leftParen: .leftParenToken(), + type: IdentifierTypeSyntax(name: .identifier("JSException")), + rightParen: .rightParenToken() + ) : nil + ) + } + + /// Builds a TypeSyntax node from a BridgeType + /// + /// Converts BridgeType to its Swift type representation as a TypeSyntax node + static func buildTypeSyntax(from type: BridgeType) -> TypeSyntax { + let identifierType = IdentifierTypeSyntax(name: .identifier(type.swiftType)) + return TypeSyntax(identifierType) + } + + /// Formats a FunctionSignatureSyntax to a string representation + /// + /// Useful when string interpolation is needed (e.g., in renderExternDecl) + static func formatSignatureToString(_ signature: FunctionSignatureSyntax) -> String { + let format = BasicFormat() + return signature.formatted(using: format).description + } + + /// Formats a FunctionParameterClauseSyntax to a string representation + /// + /// Useful for building parameter signature strings + static func formatParameterClauseToString(_ clause: FunctionParameterClauseSyntax) -> String { + let format = BasicFormat() + return clause.formatted(using: format).description + } + + /// Formats a ReturnClauseSyntax to a string representation + /// + /// Useful for building return type signature strings + static func formatReturnClauseToString(_ clause: ReturnClauseSyntax?) -> String { + guard let clause = clause else { + return "" + } + let format = BasicFormat() + return clause.formatted(using: format).description + } +} + +enum SwiftCodePattern { + /// Builds a conditional compilation block with #if arch(wasm32) and #else fatalError + static func buildWasmConditionalCompilation( + wasmBody: CodeBlockItemListSyntax + ) -> IfConfigDeclSyntax { + return IfConfigDeclSyntax( + clauses: IfConfigClauseListSyntax { + IfConfigClauseSyntax( + poundKeyword: .poundIfToken(), + condition: ExprSyntax("arch(wasm32)"), + elements: .statements(wasmBody) + ) + IfConfigClauseSyntax( + poundKeyword: .poundElseToken(), + elements: .statements( + CodeBlockItemListSyntax { + "fatalError(\"Only available on WebAssembly\")" + } + ) + ) + } + ) + } + + /// Builds a conditional compilation block with #if arch(wasm32) and #else for declarations + static func buildWasmConditionalCompilationDecls( + wasmDecl: DeclSyntax, + elseDecl: DeclSyntax + ) -> IfConfigDeclSyntax { + return IfConfigDeclSyntax( + clauses: IfConfigClauseListSyntax { + IfConfigClauseSyntax( + poundKeyword: .poundIfToken(), + condition: ExprSyntax("arch(wasm32)"), + elements: .statements( + CodeBlockItemListSyntax { + CodeBlockItemSyntax(item: .decl(wasmDecl)) + } + ) + ) + IfConfigClauseSyntax( + poundKeyword: .poundElseToken(), + elements: .statements( + CodeBlockItemListSyntax { + CodeBlockItemSyntax(item: .decl(elseDecl)) + } + ) + ) + } + ) + } + + /// Builds the @_extern attribute for WebAssembly extern function declarations + /// Builds an @_extern function declaration (no body, just the declaration) + static func buildExternFunctionDecl( + moduleName: String, + abiName: String, + functionName: String, + signature: FunctionSignatureSyntax + ) -> FunctionDeclSyntax { + return FunctionDeclSyntax( + attributes: buildExternAttribute(moduleName: moduleName, abiName: abiName), + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.fileprivate)) + }, + funcKeyword: .keyword(.func), + name: .identifier(functionName), + signature: signature + ) + } + + /// Builds the standard @_expose and @_cdecl attributes for WebAssembly-exposed functions + static func buildExposeAttributes(abiName: String) -> AttributeListSyntax { + return AttributeListSyntax { + AttributeSyntax( + attributeName: IdentifierTypeSyntax(name: .identifier("_expose")), + leftParen: .leftParenToken(), + arguments: .exposeAttributeArguments( + ExposeAttributeArgumentsSyntax( + language: .identifier("wasm"), + comma: .commaToken(), + cxxName: StringLiteralExprSyntax(content: abiName) + ) + ), + rightParen: .rightParenToken() + ) + .with(\.trailingTrivia, .newline) + + AttributeSyntax( + attributeName: IdentifierTypeSyntax(name: .identifier("_cdecl")), + leftParen: .leftParenToken(), + arguments: .string(StringLiteralExprSyntax(content: abiName)), + rightParen: .rightParenToken() + ) + .with(\.trailingTrivia, .newline) + } + } + + /// Builds a function declaration with @_expose/@_cdecl attributes and conditional compilation + static func buildExposedFunctionDecl( + abiName: String, + signature: FunctionSignatureSyntax, + body: CodeBlockItemListSyntax + ) -> FunctionDeclSyntax { + let funcBody = CodeBlockSyntax { + buildWasmConditionalCompilation(wasmBody: body) + } + + return FunctionDeclSyntax( + attributes: buildExposeAttributes(abiName: abiName), + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.public)) + }, + funcKeyword: .keyword(.func), + name: .identifier("_\(abiName)"), + signature: signature, + body: funcBody + ) + } + + /// Builds the @_extern attribute for WebAssembly extern function declarations + static func buildExternAttribute(moduleName: String, abiName: String) -> AttributeListSyntax { + return AttributeListSyntax { + AttributeSyntax( + attributeName: IdentifierTypeSyntax(name: .identifier("_extern")), + leftParen: .leftParenToken(), + arguments: .argumentList( + LabeledExprListSyntax { + LabeledExprSyntax( + expression: ExprSyntax("wasm") + ) + LabeledExprSyntax( + label: .identifier("module"), + colon: .colonToken(), + expression: StringLiteralExprSyntax(content: moduleName) + ) + LabeledExprSyntax( + label: .identifier("name"), + colon: .colonToken(), + expression: StringLiteralExprSyntax(content: abiName) + ) + } + ), + rightParen: .rightParenToken() + ) + .with(\.trailingTrivia, .newline) + } + } +} + extension BridgeType { struct LoweringParameterInfo { let loweredParameters: [(name: String, type: WasmCoreType)] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift index 33ddda258..08e384350 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift @@ -21,7 +21,7 @@ public func _bjs_asyncReturnVoid() -> Int32 { @_expose(wasm, "bjs_asyncRoundTripInt") @_cdecl("bjs_asyncRoundTripInt") -public func _bjs_asyncRoundTripInt(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripInt(_: Int.bridgeJSLiftParameter(v)).jsValue @@ -34,7 +34,7 @@ public func _bjs_asyncRoundTripInt(v: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripString") @_cdecl("bjs_asyncRoundTripString") -public func _bjs_asyncRoundTripString(vBytes: Int32, vLength: Int32) -> Int32 { +public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripString(_: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue @@ -47,7 +47,7 @@ public func _bjs_asyncRoundTripString(vBytes: Int32, vLength: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripBool") @_cdecl("bjs_asyncRoundTripBool") -public func _bjs_asyncRoundTripBool(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripBool(_: Bool.bridgeJSLiftParameter(v)).jsValue @@ -60,7 +60,7 @@ public func _bjs_asyncRoundTripBool(v: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripFloat") @_cdecl("bjs_asyncRoundTripFloat") -public func _bjs_asyncRoundTripFloat(v: Float32) -> Int32 { +public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripFloat(_: Float.bridgeJSLiftParameter(v)).jsValue @@ -73,7 +73,7 @@ public func _bjs_asyncRoundTripFloat(v: Float32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripDouble") @_cdecl("bjs_asyncRoundTripDouble") -public func _bjs_asyncRoundTripDouble(v: Float64) -> Int32 { +public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripDouble(_: Double.bridgeJSLiftParameter(v)).jsValue @@ -86,7 +86,7 @@ public func _bjs_asyncRoundTripDouble(v: Float64) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripJSObject") @_cdecl("bjs_asyncRoundTripJSObject") -public func _bjs_asyncRoundTripJSObject(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripJSObject(_: JSObject.bridgeJSLiftParameter(v)).jsValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift index e50c67861..eef86b6d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_standaloneFunction") @_cdecl("bjs_standaloneFunction") -public func _bjs_standaloneFunction(b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -30,7 +30,7 @@ public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_FunctionA_processB") @_cdecl("bjs_FunctionA_processB") -public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMutableRawPointer) -> Void { +public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMut @_expose(wasm, "bjs_FunctionA_createB") @_cdecl("bjs_FunctionA_createB") -public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_FunctionA_createB(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -52,8 +52,12 @@ public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: I @_expose(wasm, "bjs_FunctionA_deinit") @_cdecl("bjs_FunctionA_deinit") -public func _bjs_FunctionA_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_FunctionA_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -64,16 +68,16 @@ extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") -fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_FunctionB_init") @_cdecl("bjs_FunctionB_init") -public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -84,7 +88,7 @@ public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> Unsafe @_expose(wasm, "bjs_FunctionB_value_get") @_cdecl("bjs_FunctionB_value_get") -public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = FunctionB.bridgeJSLiftParameter(_self).value return ret.bridgeJSLowerReturn() @@ -95,7 +99,7 @@ public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_FunctionB_value_set") @_cdecl("bjs_FunctionB_value_set") -public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_FunctionB_value_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -105,8 +109,12 @@ public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: @_expose(wasm, "bjs_FunctionB_deinit") @_cdecl("bjs_FunctionB_deinit") -public func _bjs_FunctionB_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_FunctionB_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -117,9 +125,9 @@ extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") -fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift index e8077c5c4..729520362 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_standaloneFunction") @_cdecl("bjs_standaloneFunction") -public func _bjs_standaloneFunction(b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -19,7 +19,7 @@ public func _bjs_standaloneFunction(b: UnsafeMutableRawPointer) -> UnsafeMutable @_expose(wasm, "bjs_FunctionB_init") @_cdecl("bjs_FunctionB_init") -public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -30,7 +30,7 @@ public func _bjs_FunctionB_init(valueBytes: Int32, valueLength: Int32) -> Unsafe @_expose(wasm, "bjs_FunctionB_value_get") @_cdecl("bjs_FunctionB_value_get") -public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = FunctionB.bridgeJSLiftParameter(_self).value return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_FunctionB_value_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_FunctionB_value_set") @_cdecl("bjs_FunctionB_value_set") -public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_FunctionB_value_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -51,8 +51,12 @@ public func _bjs_FunctionB_value_set(_self: UnsafeMutableRawPointer, valueBytes: @_expose(wasm, "bjs_FunctionB_deinit") @_cdecl("bjs_FunctionB_deinit") -public func _bjs_FunctionB_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_FunctionB_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -63,9 +67,9 @@ extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") -fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionB_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -83,7 +87,7 @@ public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_FunctionA_processB") @_cdecl("bjs_FunctionA_processB") -public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMutableRawPointer) -> Void { +public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -94,7 +98,7 @@ public func _bjs_FunctionA_processB(_self: UnsafeMutableRawPointer, b: UnsafeMut @_expose(wasm, "bjs_FunctionA_createB") @_cdecl("bjs_FunctionA_createB") -public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_FunctionA_createB(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -105,8 +109,12 @@ public func _bjs_FunctionA_createB(_self: UnsafeMutableRawPointer, valueBytes: I @_expose(wasm, "bjs_FunctionA_deinit") @_cdecl("bjs_FunctionA_deinit") -public func _bjs_FunctionA_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_FunctionA_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -117,9 +125,9 @@ extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") -fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionA_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift index a270c0e9d..7504b289c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_ClassA_linkedB_get") @_cdecl("bjs_ClassA_linkedB_get") -public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ClassA.bridgeJSLiftParameter(_self).linkedB return ret.bridgeJSLowerReturn() @@ -19,7 +19,7 @@ public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_ClassA_linkedB_set") @_cdecl("bjs_ClassA_linkedB_set") -public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassA_linkedB_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -29,8 +29,12 @@ public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: @_expose(wasm, "bjs_ClassA_deinit") @_cdecl("bjs_ClassA_deinit") -public func _bjs_ClassA_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ClassA_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -41,9 +45,9 @@ extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") -fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -61,8 +65,12 @@ public func _bjs_ClassB_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_ClassB_deinit") @_cdecl("bjs_ClassB_deinit") -public func _bjs_ClassB_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ClassB_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -73,9 +81,9 @@ extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") -fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift index ed05f7c24..04130f749 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift @@ -19,8 +19,12 @@ public func _bjs_ClassB_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_ClassB_deinit") @_cdecl("bjs_ClassB_deinit") -public func _bjs_ClassB_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ClassB_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -31,16 +35,16 @@ extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") -fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassB_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_ClassA_linkedB_get") @_cdecl("bjs_ClassA_linkedB_get") -public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ClassA.bridgeJSLiftParameter(_self).linkedB return ret.bridgeJSLowerReturn() @@ -51,7 +55,7 @@ public func _bjs_ClassA_linkedB_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_ClassA_linkedB_set") @_cdecl("bjs_ClassA_linkedB_set") -public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_ClassA_linkedB_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -61,8 +65,12 @@ public func _bjs_ClassA_linkedB_set(_self: UnsafeMutableRawPointer, valueIsSome: @_expose(wasm, "bjs_ClassA_deinit") @_cdecl("bjs_ClassA_deinit") -public func _bjs_ClassA_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ClassA_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -73,9 +81,9 @@ extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") -fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassA_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 03d037e98..f624dc33c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -76,7 +76,7 @@ extension MathOperations: _BridgedSwiftStruct { @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") -public func _bjs_MathOperations_init(baseValue: Float64) -> Void { +public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { #if arch(wasm32) let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) return ret.bridgeJSLowerReturn() @@ -87,7 +87,7 @@ public func _bjs_MathOperations_init(baseValue: Float64) -> Void { @_expose(wasm, "bjs_MathOperations_add") @_cdecl("bjs_MathOperations_add") -public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -98,7 +98,7 @@ public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { @_expose(wasm, "bjs_MathOperations_multiply") @_cdecl("bjs_MathOperations_multiply") -public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -109,7 +109,7 @@ public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { @_expose(wasm, "bjs_MathOperations_static_subtract") @_cdecl("bjs_MathOperations_static_subtract") -public func _bjs_MathOperations_static_subtract(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -120,7 +120,7 @@ public func _bjs_MathOperations_static_subtract(a: Float64, b: Float64) -> Float @_expose(wasm, "bjs_testStringDefault") @_cdecl("bjs_testStringDefault") -public func _bjs_testStringDefault(messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -131,7 +131,7 @@ public func _bjs_testStringDefault(messageBytes: Int32, messageLength: Int32) -> @_expose(wasm, "bjs_testNegativeIntDefault") @_cdecl("bjs_testNegativeIntDefault") -public func _bjs_testNegativeIntDefault(value: Int32) -> Int32 { +public func _bjs_testNegativeIntDefault(_ value: Int32) -> Int32 { #if arch(wasm32) let ret = testNegativeIntDefault(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -142,7 +142,7 @@ public func _bjs_testNegativeIntDefault(value: Int32) -> Int32 { @_expose(wasm, "bjs_testBoolDefault") @_cdecl("bjs_testBoolDefault") -public func _bjs_testBoolDefault(flag: Int32) -> Int32 { +public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { #if arch(wasm32) let ret = testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) return ret.bridgeJSLowerReturn() @@ -153,7 +153,7 @@ public func _bjs_testBoolDefault(flag: Int32) -> Int32 { @_expose(wasm, "bjs_testNegativeFloatDefault") @_cdecl("bjs_testNegativeFloatDefault") -public func _bjs_testNegativeFloatDefault(temp: Float32) -> Float32 { +public func _bjs_testNegativeFloatDefault(_ temp: Float32) -> Float32 { #if arch(wasm32) let ret = testNegativeFloatDefault(temp: Float.bridgeJSLiftParameter(temp)) return ret.bridgeJSLowerReturn() @@ -164,7 +164,7 @@ public func _bjs_testNegativeFloatDefault(temp: Float32) -> Float32 { @_expose(wasm, "bjs_testDoubleDefault") @_cdecl("bjs_testDoubleDefault") -public func _bjs_testDoubleDefault(precision: Float64) -> Float64 { +public func _bjs_testDoubleDefault(_ precision: Float64) -> Float64 { #if arch(wasm32) let ret = testDoubleDefault(precision: Double.bridgeJSLiftParameter(precision)) return ret.bridgeJSLowerReturn() @@ -175,7 +175,7 @@ public func _bjs_testDoubleDefault(precision: Float64) -> Float64 { @_expose(wasm, "bjs_testOptionalDefault") @_cdecl("bjs_testOptionalDefault") -public func _bjs_testOptionalDefault(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -186,7 +186,7 @@ public func _bjs_testOptionalDefault(nameIsSome: Int32, nameBytes: Int32, nameLe @_expose(wasm, "bjs_testOptionalStringDefault") @_cdecl("bjs_testOptionalStringDefault") -public func _bjs_testOptionalStringDefault(greetingIsSome: Int32, greetingBytes: Int32, greetingLength: Int32) -> Void { +public func _bjs_testOptionalStringDefault(_ greetingIsSome: Int32, _ greetingBytes: Int32, _ greetingLength: Int32) -> Void { #if arch(wasm32) let ret = testOptionalStringDefault(greeting: Optional.bridgeJSLiftParameter(greetingIsSome, greetingBytes, greetingLength)) return ret.bridgeJSLowerReturn() @@ -197,7 +197,7 @@ public func _bjs_testOptionalStringDefault(greetingIsSome: Int32, greetingBytes: @_expose(wasm, "bjs_testMultipleDefaults") @_cdecl("bjs_testMultipleDefaults") -public func _bjs_testMultipleDefaults(titleBytes: Int32, titleLength: Int32, count: Int32, enabled: Int32) -> Void { +public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) let ret = testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) return ret.bridgeJSLowerReturn() @@ -208,7 +208,7 @@ public func _bjs_testMultipleDefaults(titleBytes: Int32, titleLength: Int32, cou @_expose(wasm, "bjs_testEnumDefault") @_cdecl("bjs_testEnumDefault") -public func _bjs_testEnumDefault(status: Int32) -> Int32 { +public func _bjs_testEnumDefault(_ status: Int32) -> Int32 { #if arch(wasm32) let ret = testEnumDefault(status: Status.bridgeJSLiftParameter(status)) return ret.bridgeJSLowerReturn() @@ -219,7 +219,7 @@ public func _bjs_testEnumDefault(status: Int32) -> Int32 { @_expose(wasm, "bjs_testComplexInit") @_cdecl("bjs_testComplexInit") -public func _bjs_testComplexInit(greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = testComplexInit(greeter: DefaultGreeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() @@ -230,7 +230,7 @@ public func _bjs_testComplexInit(greeter: UnsafeMutableRawPointer) -> UnsafeMuta @_expose(wasm, "bjs_testEmptyInit") @_cdecl("bjs_testEmptyInit") -public func _bjs_testEmptyInit(greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_testEmptyInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = testEmptyInit(greeter: EmptyGreeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() @@ -241,7 +241,7 @@ public func _bjs_testEmptyInit(greeter: UnsafeMutableRawPointer) -> UnsafeMutabl @_expose(wasm, "bjs_testOptionalStructDefault") @_cdecl("bjs_testOptionalStructDefault") -public func _bjs_testOptionalStructDefault(point: Int32) -> Void { +public func _bjs_testOptionalStructDefault(_ point: Int32) -> Void { #if arch(wasm32) let ret = testOptionalStructDefault(point: Optional.bridgeJSLiftParameter(point)) return ret.bridgeJSLowerReturn() @@ -252,7 +252,7 @@ public func _bjs_testOptionalStructDefault(point: Int32) -> Void { @_expose(wasm, "bjs_testOptionalStructWithValueDefault") @_cdecl("bjs_testOptionalStructWithValueDefault") -public func _bjs_testOptionalStructWithValueDefault(point: Int32) -> Void { +public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { #if arch(wasm32) let ret = testOptionalStructWithValueDefault(point: Optional.bridgeJSLiftParameter(point)) return ret.bridgeJSLowerReturn() @@ -263,7 +263,7 @@ public func _bjs_testOptionalStructWithValueDefault(point: Int32) -> Void { @_expose(wasm, "bjs_DefaultGreeter_init") @_cdecl("bjs_DefaultGreeter_init") -public func _bjs_DefaultGreeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_DefaultGreeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = DefaultGreeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -274,7 +274,7 @@ public func _bjs_DefaultGreeter_init(nameBytes: Int32, nameLength: Int32) -> Uns @_expose(wasm, "bjs_DefaultGreeter_name_get") @_cdecl("bjs_DefaultGreeter_name_get") -public func _bjs_DefaultGreeter_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DefaultGreeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DefaultGreeter.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -285,7 +285,7 @@ public func _bjs_DefaultGreeter_name_get(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_DefaultGreeter_name_set") @_cdecl("bjs_DefaultGreeter_name_set") -public func _bjs_DefaultGreeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_DefaultGreeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) DefaultGreeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -295,8 +295,12 @@ public func _bjs_DefaultGreeter_name_set(_self: UnsafeMutableRawPointer, valueBy @_expose(wasm, "bjs_DefaultGreeter_deinit") @_cdecl("bjs_DefaultGreeter_deinit") -public func _bjs_DefaultGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_DefaultGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension DefaultGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -307,9 +311,9 @@ extension DefaultGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_DefaultGreeter_wrap") -fileprivate func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_DefaultGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_DefaultGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_DefaultGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -327,8 +331,12 @@ public func _bjs_EmptyGreeter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_EmptyGreeter_deinit") @_cdecl("bjs_EmptyGreeter_deinit") -public func _bjs_EmptyGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_EmptyGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension EmptyGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -339,16 +347,16 @@ extension EmptyGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_EmptyGreeter_wrap") -fileprivate func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_EmptyGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_EmptyGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_EmptyGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") -public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, count: Int32, enabled: Int32, status: Int32, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_ConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) return ret.bridgeJSLowerReturn() @@ -359,7 +367,7 @@ public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, c @_expose(wasm, "bjs_ConstructorDefaults_name_get") @_cdecl("bjs_ConstructorDefaults_name_get") -public func _bjs_ConstructorDefaults_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -370,7 +378,7 @@ public func _bjs_ConstructorDefaults_name_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_ConstructorDefaults_name_set") @_cdecl("bjs_ConstructorDefaults_name_set") -public func _bjs_ConstructorDefaults_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -380,7 +388,7 @@ public func _bjs_ConstructorDefaults_name_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_ConstructorDefaults_count_get") @_cdecl("bjs_ConstructorDefaults_count_get") -public func _bjs_ConstructorDefaults_count_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).count return ret.bridgeJSLowerReturn() @@ -391,7 +399,7 @@ public func _bjs_ConstructorDefaults_count_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_ConstructorDefaults_count_set") @_cdecl("bjs_ConstructorDefaults_count_set") -public func _bjs_ConstructorDefaults_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) #else @@ -401,7 +409,7 @@ public func _bjs_ConstructorDefaults_count_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_ConstructorDefaults_enabled_get") @_cdecl("bjs_ConstructorDefaults_enabled_get") -public func _bjs_ConstructorDefaults_enabled_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).enabled return ret.bridgeJSLowerReturn() @@ -412,7 +420,7 @@ public func _bjs_ConstructorDefaults_enabled_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ConstructorDefaults_enabled_set") @_cdecl("bjs_ConstructorDefaults_enabled_set") -public func _bjs_ConstructorDefaults_enabled_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value) #else @@ -422,7 +430,7 @@ public func _bjs_ConstructorDefaults_enabled_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ConstructorDefaults_status_get") @_cdecl("bjs_ConstructorDefaults_status_get") -public func _bjs_ConstructorDefaults_status_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).status return ret.bridgeJSLowerReturn() @@ -433,7 +441,7 @@ public func _bjs_ConstructorDefaults_status_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ConstructorDefaults_status_set") @_cdecl("bjs_ConstructorDefaults_status_set") -public func _bjs_ConstructorDefaults_status_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value) #else @@ -443,7 +451,7 @@ public func _bjs_ConstructorDefaults_status_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ConstructorDefaults_tag_get") @_cdecl("bjs_ConstructorDefaults_tag_get") -public func _bjs_ConstructorDefaults_tag_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).tag return ret.bridgeJSLowerReturn() @@ -454,7 +462,7 @@ public func _bjs_ConstructorDefaults_tag_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_ConstructorDefaults_tag_set") @_cdecl("bjs_ConstructorDefaults_tag_set") -public func _bjs_ConstructorDefaults_tag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -464,8 +472,12 @@ public func _bjs_ConstructorDefaults_tag_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_ConstructorDefaults_deinit") @_cdecl("bjs_ConstructorDefaults_deinit") -public func _bjs_ConstructorDefaults_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ConstructorDefaults_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -476,9 +488,9 @@ extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ConstructorDefaults_wrap") -fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index bcc95ef4c..1a1bc9baf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -491,7 +491,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { @_expose(wasm, "bjs_handle") @_cdecl("bjs_handle") -public func _bjs_handle(result: Int32) -> Void { +public func _bjs_handle(_ result: Int32) -> Void { #if arch(wasm32) handle(result: APIResult.bridgeJSLiftParameter(result)) #else @@ -512,7 +512,7 @@ public func _bjs_getResult() -> Void { @_expose(wasm, "bjs_roundtripAPIResult") @_cdecl("bjs_roundtripAPIResult") -public func _bjs_roundtripAPIResult(result: Int32) -> Void { +public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -523,7 +523,7 @@ public func _bjs_roundtripAPIResult(result: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalAPIResult") @_cdecl("bjs_roundTripOptionalAPIResult") -public func _bjs_roundTripOptionalAPIResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalAPIResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalAPIResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -534,7 +534,7 @@ public func _bjs_roundTripOptionalAPIResult(resultIsSome: Int32, resultCaseId: I @_expose(wasm, "bjs_handleComplex") @_cdecl("bjs_handleComplex") -public func _bjs_handleComplex(result: Int32) -> Void { +public func _bjs_handleComplex(_ result: Int32) -> Void { #if arch(wasm32) handleComplex(result: ComplexResult.bridgeJSLiftParameter(result)) #else @@ -555,7 +555,7 @@ public func _bjs_getComplexResult() -> Void { @_expose(wasm, "bjs_roundtripComplexResult") @_cdecl("bjs_roundtripComplexResult") -public func _bjs_roundtripComplexResult(result: Int32) -> Void { +public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -566,7 +566,7 @@ public func _bjs_roundtripComplexResult(result: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalComplexResult") @_cdecl("bjs_roundTripOptionalComplexResult") -public func _bjs_roundTripOptionalComplexResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalComplexResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -577,7 +577,7 @@ public func _bjs_roundTripOptionalComplexResult(resultIsSome: Int32, resultCaseI @_expose(wasm, "bjs_roundTripOptionalUtilitiesResult") @_cdecl("bjs_roundTripOptionalUtilitiesResult") -public func _bjs_roundTripOptionalUtilitiesResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalUtilitiesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalUtilitiesResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -588,7 +588,7 @@ public func _bjs_roundTripOptionalUtilitiesResult(resultIsSome: Int32, resultCas @_expose(wasm, "bjs_roundTripOptionalNetworkingResult") @_cdecl("bjs_roundTripOptionalNetworkingResult") -public func _bjs_roundTripOptionalNetworkingResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalNetworkingResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalNetworkingResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -599,7 +599,7 @@ public func _bjs_roundTripOptionalNetworkingResult(resultIsSome: Int32, resultCa @_expose(wasm, "bjs_roundTripOptionalAPIOptionalResult") @_cdecl("bjs_roundTripOptionalAPIOptionalResult") -public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalAPIOptionalResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -610,7 +610,7 @@ public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultC @_expose(wasm, "bjs_compareAPIResults") @_cdecl("bjs_compareAPIResults") -public func _bjs_compareAPIResults(result1IsSome: Int32, result1CaseId: Int32, result2IsSome: Int32, result2CaseId: Int32) -> Void { +public func _bjs_compareAPIResults(_ result1IsSome: Int32, _ result1CaseId: Int32, _ result2IsSome: Int32, _ result2CaseId: Int32) -> Void { #if arch(wasm32) let _tmp_result2 = Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId) let _tmp_result1 = Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift index 06bfa86af..a513a22ab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift @@ -164,7 +164,7 @@ extension PublicStatus: _BridgedSwiftCaseEnum { @_expose(wasm, "bjs_setDirection") @_cdecl("bjs_setDirection") -public func _bjs_setDirection(direction: Int32) -> Void { +public func _bjs_setDirection(_ direction: Int32) -> Void { #if arch(wasm32) setDirection(_: Direction.bridgeJSLiftParameter(direction)) #else @@ -185,7 +185,7 @@ public func _bjs_getDirection() -> Int32 { @_expose(wasm, "bjs_processDirection") @_cdecl("bjs_processDirection") -public func _bjs_processDirection(input: Int32) -> Int32 { +public func _bjs_processDirection(_ input: Int32) -> Int32 { #if arch(wasm32) let ret = processDirection(_: Direction.bridgeJSLiftParameter(input)) return ret.bridgeJSLowerReturn() @@ -196,7 +196,7 @@ public func _bjs_processDirection(input: Int32) -> Int32 { @_expose(wasm, "bjs_roundTripOptionalDirection") @_cdecl("bjs_roundTripOptionalDirection") -public func _bjs_roundTripOptionalDirection(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalDirection(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalDirection(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -207,7 +207,7 @@ public func _bjs_roundTripOptionalDirection(inputIsSome: Int32, inputValue: Int3 @_expose(wasm, "bjs_setTSDirection") @_cdecl("bjs_setTSDirection") -public func _bjs_setTSDirection(direction: Int32) -> Void { +public func _bjs_setTSDirection(_ direction: Int32) -> Void { #if arch(wasm32) setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction)) #else @@ -228,7 +228,7 @@ public func _bjs_getTSDirection() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalTSDirection") @_cdecl("bjs_roundTripOptionalTSDirection") -public func _bjs_roundTripOptionalTSDirection(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalTSDirection(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTSDirection(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift index cf4977501..66f8e22a6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -103,7 +103,7 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Converter_toString") @_cdecl("bjs_Converter_toString") -public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -114,8 +114,12 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_Converter_deinit") @_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -126,9 +130,9 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -146,7 +150,7 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_HTTPServer_call") @_cdecl("bjs_HTTPServer_call") -public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) #else @@ -156,8 +160,12 @@ public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_HTTPServer_deinit") @_cdecl("bjs_HTTPServer_deinit") -public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -168,9 +176,9 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -188,7 +196,7 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_TestServer_call") @_cdecl("bjs_TestServer_call") -public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) #else @@ -198,8 +206,12 @@ public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_TestServer_deinit") @_cdecl("bjs_TestServer_deinit") -public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -210,9 +222,9 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index cf4977501..66f8e22a6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -103,7 +103,7 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Converter_toString") @_cdecl("bjs_Converter_toString") -public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -114,8 +114,12 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_Converter_deinit") @_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -126,9 +130,9 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -146,7 +150,7 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_HTTPServer_call") @_cdecl("bjs_HTTPServer_call") -public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) #else @@ -156,8 +160,12 @@ public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_HTTPServer_deinit") @_cdecl("bjs_HTTPServer_deinit") -public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -168,9 +176,9 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -188,7 +196,7 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_TestServer_call") @_cdecl("bjs_TestServer_call") -public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) #else @@ -198,8 +206,12 @@ public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_TestServer_deinit") @_cdecl("bjs_TestServer_deinit") -public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -210,9 +222,9 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift index 9e03a6659..5d88fce46 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift @@ -44,7 +44,7 @@ extension Ratio: _BridgedSwiftEnumNoPayload { @_expose(wasm, "bjs_setTheme") @_cdecl("bjs_setTheme") -public func _bjs_setTheme(themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) #else @@ -65,7 +65,7 @@ public func _bjs_getTheme() -> Void { @_expose(wasm, "bjs_roundTripOptionalTheme") @_cdecl("bjs_roundTripOptionalTheme") -public func _bjs_roundTripOptionalTheme(inputIsSome: Int32, inputBytes: Int32, inputLength: Int32) -> Void { +public func _bjs_roundTripOptionalTheme(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTheme(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) return ret.bridgeJSLowerReturn() @@ -76,7 +76,7 @@ public func _bjs_roundTripOptionalTheme(inputIsSome: Int32, inputBytes: Int32, i @_expose(wasm, "bjs_setTSTheme") @_cdecl("bjs_setTSTheme") -public func _bjs_setTSTheme(themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength)) #else @@ -97,7 +97,7 @@ public func _bjs_getTSTheme() -> Void { @_expose(wasm, "bjs_roundTripOptionalTSTheme") @_cdecl("bjs_roundTripOptionalTSTheme") -public func _bjs_roundTripOptionalTSTheme(inputIsSome: Int32, inputBytes: Int32, inputLength: Int32) -> Void { +public func _bjs_roundTripOptionalTSTheme(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTSTheme(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) return ret.bridgeJSLowerReturn() @@ -108,7 +108,7 @@ public func _bjs_roundTripOptionalTSTheme(inputIsSome: Int32, inputBytes: Int32, @_expose(wasm, "bjs_setFeatureFlag") @_cdecl("bjs_setFeatureFlag") -public func _bjs_setFeatureFlag(flag: Int32) -> Void { +public func _bjs_setFeatureFlag(_ flag: Int32) -> Void { #if arch(wasm32) setFeatureFlag(_: FeatureFlag.bridgeJSLiftParameter(flag)) #else @@ -129,7 +129,7 @@ public func _bjs_getFeatureFlag() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalFeatureFlag") @_cdecl("bjs_roundTripOptionalFeatureFlag") -public func _bjs_roundTripOptionalFeatureFlag(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalFeatureFlag(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalFeatureFlag(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -140,7 +140,7 @@ public func _bjs_roundTripOptionalFeatureFlag(inputIsSome: Int32, inputValue: In @_expose(wasm, "bjs_setHttpStatus") @_cdecl("bjs_setHttpStatus") -public func _bjs_setHttpStatus(status: Int32) -> Void { +public func _bjs_setHttpStatus(_ status: Int32) -> Void { #if arch(wasm32) setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status)) #else @@ -161,7 +161,7 @@ public func _bjs_getHttpStatus() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalHttpStatus") @_cdecl("bjs_roundTripOptionalHttpStatus") -public func _bjs_roundTripOptionalHttpStatus(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalHttpStatus(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -172,7 +172,7 @@ public func _bjs_roundTripOptionalHttpStatus(inputIsSome: Int32, inputValue: Int @_expose(wasm, "bjs_setTSHttpStatus") @_cdecl("bjs_setTSHttpStatus") -public func _bjs_setTSHttpStatus(status: Int32) -> Void { +public func _bjs_setTSHttpStatus(_ status: Int32) -> Void { #if arch(wasm32) setTSHttpStatus(_: TSHttpStatus.bridgeJSLiftParameter(status)) #else @@ -193,7 +193,7 @@ public func _bjs_getTSHttpStatus() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalHttpStatus") @_cdecl("bjs_roundTripOptionalHttpStatus") -public func _bjs_roundTripOptionalHttpStatus(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalHttpStatus(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -204,7 +204,7 @@ public func _bjs_roundTripOptionalHttpStatus(inputIsSome: Int32, inputValue: Int @_expose(wasm, "bjs_setPriority") @_cdecl("bjs_setPriority") -public func _bjs_setPriority(priority: Int32) -> Void { +public func _bjs_setPriority(_ priority: Int32) -> Void { #if arch(wasm32) setPriority(_: Priority.bridgeJSLiftParameter(priority)) #else @@ -225,7 +225,7 @@ public func _bjs_getPriority() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalPriority") @_cdecl("bjs_roundTripOptionalPriority") -public func _bjs_roundTripOptionalPriority(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalPriority(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalPriority(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -236,7 +236,7 @@ public func _bjs_roundTripOptionalPriority(inputIsSome: Int32, inputValue: Int32 @_expose(wasm, "bjs_setFileSize") @_cdecl("bjs_setFileSize") -public func _bjs_setFileSize(size: Int32) -> Void { +public func _bjs_setFileSize(_ size: Int32) -> Void { #if arch(wasm32) setFileSize(_: FileSize.bridgeJSLiftParameter(size)) #else @@ -257,7 +257,7 @@ public func _bjs_getFileSize() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalFileSize") @_cdecl("bjs_roundTripOptionalFileSize") -public func _bjs_roundTripOptionalFileSize(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalFileSize(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalFileSize(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -268,7 +268,7 @@ public func _bjs_roundTripOptionalFileSize(inputIsSome: Int32, inputValue: Int32 @_expose(wasm, "bjs_setUserId") @_cdecl("bjs_setUserId") -public func _bjs_setUserId(id: Int32) -> Void { +public func _bjs_setUserId(_ id: Int32) -> Void { #if arch(wasm32) setUserId(_: UserId.bridgeJSLiftParameter(id)) #else @@ -289,7 +289,7 @@ public func _bjs_getUserId() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalUserId") @_cdecl("bjs_roundTripOptionalUserId") -public func _bjs_roundTripOptionalUserId(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalUserId(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalUserId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -300,7 +300,7 @@ public func _bjs_roundTripOptionalUserId(inputIsSome: Int32, inputValue: Int32) @_expose(wasm, "bjs_setTokenId") @_cdecl("bjs_setTokenId") -public func _bjs_setTokenId(token: Int32) -> Void { +public func _bjs_setTokenId(_ token: Int32) -> Void { #if arch(wasm32) setTokenId(_: TokenId.bridgeJSLiftParameter(token)) #else @@ -321,7 +321,7 @@ public func _bjs_getTokenId() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalTokenId") @_cdecl("bjs_roundTripOptionalTokenId") -public func _bjs_roundTripOptionalTokenId(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalTokenId(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTokenId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -332,7 +332,7 @@ public func _bjs_roundTripOptionalTokenId(inputIsSome: Int32, inputValue: Int32) @_expose(wasm, "bjs_setSessionId") @_cdecl("bjs_setSessionId") -public func _bjs_setSessionId(session: Int32) -> Void { +public func _bjs_setSessionId(_ session: Int32) -> Void { #if arch(wasm32) setSessionId(_: SessionId.bridgeJSLiftParameter(session)) #else @@ -353,7 +353,7 @@ public func _bjs_getSessionId() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalSessionId") @_cdecl("bjs_roundTripOptionalSessionId") -public func _bjs_roundTripOptionalSessionId(inputIsSome: Int32, inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalSessionId(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalSessionId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -364,7 +364,7 @@ public func _bjs_roundTripOptionalSessionId(inputIsSome: Int32, inputValue: Int3 @_expose(wasm, "bjs_setPrecision") @_cdecl("bjs_setPrecision") -public func _bjs_setPrecision(precision: Float32) -> Void { +public func _bjs_setPrecision(_ precision: Float32) -> Void { #if arch(wasm32) setPrecision(_: Precision.bridgeJSLiftParameter(precision)) #else @@ -385,7 +385,7 @@ public func _bjs_getPrecision() -> Float32 { @_expose(wasm, "bjs_roundTripOptionalPrecision") @_cdecl("bjs_roundTripOptionalPrecision") -public func _bjs_roundTripOptionalPrecision(inputIsSome: Int32, inputValue: Float32) -> Void { +public func _bjs_roundTripOptionalPrecision(_ inputIsSome: Int32, _ inputValue: Float32) -> Void { #if arch(wasm32) let ret = roundTripOptionalPrecision(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -396,7 +396,7 @@ public func _bjs_roundTripOptionalPrecision(inputIsSome: Int32, inputValue: Floa @_expose(wasm, "bjs_setRatio") @_cdecl("bjs_setRatio") -public func _bjs_setRatio(ratio: Float64) -> Void { +public func _bjs_setRatio(_ ratio: Float64) -> Void { #if arch(wasm32) setRatio(_: Ratio.bridgeJSLiftParameter(ratio)) #else @@ -417,7 +417,7 @@ public func _bjs_getRatio() -> Float64 { @_expose(wasm, "bjs_roundTripOptionalRatio") @_cdecl("bjs_roundTripOptionalRatio") -public func _bjs_roundTripOptionalRatio(inputIsSome: Int32, inputValue: Float64) -> Void { +public func _bjs_roundTripOptionalRatio(_ inputIsSome: Int32, _ inputValue: Float64) -> Void { #if arch(wasm32) let ret = roundTripOptionalRatio(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) return ret.bridgeJSLowerReturn() @@ -428,7 +428,7 @@ public func _bjs_roundTripOptionalRatio(inputIsSome: Int32, inputValue: Float64) @_expose(wasm, "bjs_processTheme") @_cdecl("bjs_processTheme") -public func _bjs_processTheme(themeBytes: Int32, themeLength: Int32) -> Int32 { +public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 { #if arch(wasm32) let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() @@ -439,7 +439,7 @@ public func _bjs_processTheme(themeBytes: Int32, themeLength: Int32) -> Int32 { @_expose(wasm, "bjs_convertPriority") @_cdecl("bjs_convertPriority") -public func _bjs_convertPriority(status: Int32) -> Int32 { +public func _bjs_convertPriority(_ status: Int32) -> Int32 { #if arch(wasm32) let ret = convertPriority(_: HttpStatus.bridgeJSLiftParameter(status)) return ret.bridgeJSLowerReturn() @@ -450,7 +450,7 @@ public func _bjs_convertPriority(status: Int32) -> Int32 { @_expose(wasm, "bjs_validateSession") @_cdecl("bjs_validateSession") -public func _bjs_validateSession(session: Int32) -> Void { +public func _bjs_validateSession(_ session: Int32) -> Void { #if arch(wasm32) let ret = validateSession(_: SessionId.bridgeJSLiftParameter(session)) return ret.bridgeJSLowerReturn() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift index 774bf075c..3e38fee4b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift @@ -30,7 +30,7 @@ public func _bjs_GlobalClass_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_GlobalClass_greet") @_cdecl("bjs_GlobalClass_greet") -public func _bjs_GlobalClass_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_GlobalClass_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = GlobalClass.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -41,8 +41,12 @@ public func _bjs_GlobalClass_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_GlobalClass_deinit") @_cdecl("bjs_GlobalClass_deinit") -public func _bjs_GlobalClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_GlobalClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension GlobalClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -53,9 +57,9 @@ extension GlobalClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_GlobalClass_wrap") -fileprivate func _bjs_GlobalClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_GlobalClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift index 10c62bb03..76a1a6c2a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift @@ -30,7 +30,7 @@ public func _bjs_PrivateClass_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_PrivateClass_greet") @_cdecl("bjs_PrivateClass_greet") -public func _bjs_PrivateClass_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PrivateClass_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PrivateClass.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -41,8 +41,12 @@ public func _bjs_PrivateClass_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_PrivateClass_deinit") @_cdecl("bjs_PrivateClass_deinit") -public func _bjs_PrivateClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PrivateClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PrivateClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -53,9 +57,9 @@ extension PrivateClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PrivateClass_wrap") -fileprivate func _bjs_PrivateClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PrivateClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift index 3e7714464..19fe8ea9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift @@ -30,7 +30,7 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void { @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMuta @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -52,8 +52,12 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -64,9 +68,9 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -84,7 +88,7 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Converter_toString") @_cdecl("bjs_Converter_toString") -public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -95,8 +99,12 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_Converter_deinit") @_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -107,16 +115,16 @@ extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") -public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = UUID.bridgeJSLiftParameter(_self).uuidString() return ret.bridgeJSLowerReturn() @@ -127,8 +135,12 @@ public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_UUID_deinit") @_cdecl("bjs_UUID_deinit") -public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -139,9 +151,9 @@ extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") -fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift index 3e7714464..19fe8ea9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift @@ -30,7 +30,7 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void { @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMuta @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -52,8 +52,12 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -64,9 +68,9 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -84,7 +88,7 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Converter_toString") @_cdecl("bjs_Converter_toString") -public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -95,8 +99,12 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_Converter_deinit") @_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -107,16 +115,16 @@ extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") -public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = UUID.bridgeJSLiftParameter(_self).uuidString() return ret.bridgeJSLowerReturn() @@ -127,8 +135,12 @@ public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_UUID_deinit") @_cdecl("bjs_UUID_deinit") -public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -139,9 +151,9 @@ extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") -fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_UUID_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift index 0834943eb..f2f19f9af 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_roundTripOptionalClass") @_cdecl("bjs_roundTripOptionalClass") -public func _bjs_roundTripOptionalClass(valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = roundTripOptionalClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -19,7 +19,7 @@ public func _bjs_roundTripOptionalClass(valueIsSome: Int32, valueValue: UnsafeMu @_expose(wasm, "bjs_testOptionalPropertyRoundtrip") @_cdecl("bjs_testOptionalPropertyRoundtrip") -public func _bjs_testOptionalPropertyRoundtrip(holderIsSome: Int32, holderValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_testOptionalPropertyRoundtrip(_ holderIsSome: Int32, _ holderValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = testOptionalPropertyRoundtrip(_: Optional.bridgeJSLiftParameter(holderIsSome, holderValue)) return ret.bridgeJSLowerReturn() @@ -30,7 +30,7 @@ public func _bjs_testOptionalPropertyRoundtrip(holderIsSome: Int32, holderValue: @_expose(wasm, "bjs_roundTripString") @_cdecl("bjs_roundTripString") -public func _bjs_roundTripString(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripString(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_roundTripString(nameIsSome: Int32, nameBytes: Int32, nameLength @_expose(wasm, "bjs_roundTripInt") @_cdecl("bjs_roundTripInt") -public func _bjs_roundTripInt(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_roundTripInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripInt(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -52,7 +52,7 @@ public func _bjs_roundTripInt(valueIsSome: Int32, valueValue: Int32) -> Void { @_expose(wasm, "bjs_roundTripBool") @_cdecl("bjs_roundTripBool") -public func _bjs_roundTripBool(flagIsSome: Int32, flagValue: Int32) -> Void { +public func _bjs_roundTripBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripBool(flag: Optional.bridgeJSLiftParameter(flagIsSome, flagValue)) return ret.bridgeJSLowerReturn() @@ -63,7 +63,7 @@ public func _bjs_roundTripBool(flagIsSome: Int32, flagValue: Int32) -> Void { @_expose(wasm, "bjs_roundTripFloat") @_cdecl("bjs_roundTripFloat") -public func _bjs_roundTripFloat(numberIsSome: Int32, numberValue: Float32) -> Void { +public func _bjs_roundTripFloat(_ numberIsSome: Int32, _ numberValue: Float32) -> Void { #if arch(wasm32) let ret = roundTripFloat(number: Optional.bridgeJSLiftParameter(numberIsSome, numberValue)) return ret.bridgeJSLowerReturn() @@ -74,7 +74,7 @@ public func _bjs_roundTripFloat(numberIsSome: Int32, numberValue: Float32) -> Vo @_expose(wasm, "bjs_roundTripDouble") @_cdecl("bjs_roundTripDouble") -public func _bjs_roundTripDouble(precisionIsSome: Int32, precisionValue: Float64) -> Void { +public func _bjs_roundTripDouble(_ precisionIsSome: Int32, _ precisionValue: Float64) -> Void { #if arch(wasm32) let ret = roundTripDouble(precision: Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue)) return ret.bridgeJSLowerReturn() @@ -85,7 +85,7 @@ public func _bjs_roundTripDouble(precisionIsSome: Int32, precisionValue: Float64 @_expose(wasm, "bjs_roundTripSyntax") @_cdecl("bjs_roundTripSyntax") -public func _bjs_roundTripSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -96,7 +96,7 @@ public func _bjs_roundTripSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength @_expose(wasm, "bjs_roundTripMixSyntax") @_cdecl("bjs_roundTripMixSyntax") -public func _bjs_roundTripMixSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripMixSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -107,7 +107,7 @@ public func _bjs_roundTripMixSyntax(nameIsSome: Int32, nameBytes: Int32, nameLen @_expose(wasm, "bjs_roundTripSwiftSyntax") @_cdecl("bjs_roundTripSwiftSyntax") -public func _bjs_roundTripSwiftSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -118,7 +118,7 @@ public func _bjs_roundTripSwiftSyntax(nameIsSome: Int32, nameBytes: Int32, nameL @_expose(wasm, "bjs_roundTripMixedSwiftSyntax") @_cdecl("bjs_roundTripMixedSwiftSyntax") -public func _bjs_roundTripMixedSwiftSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripMixedSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripMixedSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -129,7 +129,7 @@ public func _bjs_roundTripMixedSwiftSyntax(nameIsSome: Int32, nameBytes: Int32, @_expose(wasm, "bjs_roundTripWithSpaces") @_cdecl("bjs_roundTripWithSpaces") -public func _bjs_roundTripWithSpaces(valueIsSome: Int32, valueValue: Float64) -> Void { +public func _bjs_roundTripWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) let ret = roundTripWithSpaces(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -140,7 +140,7 @@ public func _bjs_roundTripWithSpaces(valueIsSome: Int32, valueValue: Float64) -> @_expose(wasm, "bjs_roundTripAlias") @_cdecl("bjs_roundTripAlias") -public func _bjs_roundTripAlias(ageIsSome: Int32, ageValue: Int32) -> Void { +public func _bjs_roundTripAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripAlias(age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue)) return ret.bridgeJSLowerReturn() @@ -151,7 +151,7 @@ public func _bjs_roundTripAlias(ageIsSome: Int32, ageValue: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalAlias") @_cdecl("bjs_roundTripOptionalAlias") -public func _bjs_roundTripOptionalAlias(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripOptionalAlias(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalAlias(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -162,7 +162,7 @@ public func _bjs_roundTripOptionalAlias(nameIsSome: Int32, nameBytes: Int32, nam @_expose(wasm, "bjs_testMixedOptionals") @_cdecl("bjs_testMixedOptionals") -public func _bjs_testMixedOptionals(firstNameIsSome: Int32, firstNameBytes: Int32, firstNameLength: Int32, lastNameIsSome: Int32, lastNameBytes: Int32, lastNameLength: Int32, ageIsSome: Int32, ageValue: Int32, active: Int32) -> Void { +public func _bjs_testMixedOptionals(_ firstNameIsSome: Int32, _ firstNameBytes: Int32, _ firstNameLength: Int32, _ lastNameIsSome: Int32, _ lastNameBytes: Int32, _ lastNameLength: Int32, _ ageIsSome: Int32, _ ageValue: Int32, _ active: Int32) -> Void { #if arch(wasm32) let ret = testMixedOptionals(firstName: Optional.bridgeJSLiftParameter(firstNameIsSome, firstNameBytes, firstNameLength), lastName: Optional.bridgeJSLiftParameter(lastNameIsSome, lastNameBytes, lastNameLength), age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue), active: Bool.bridgeJSLiftParameter(active)) return ret.bridgeJSLowerReturn() @@ -173,7 +173,7 @@ public func _bjs_testMixedOptionals(firstNameIsSome: Int32, firstNameBytes: Int3 @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -184,7 +184,7 @@ public func _bjs_Greeter_init(nameIsSome: Int32, nameBytes: Int32, nameLength: I @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -195,7 +195,7 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_changeName") @_cdecl("bjs_Greeter_changeName") -public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).changeName(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) #else @@ -205,7 +205,7 @@ public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameIsSome: @_expose(wasm, "bjs_Greeter_name_get") @_cdecl("bjs_Greeter_name_get") -public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -216,7 +216,7 @@ public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_name_set") @_cdecl("bjs_Greeter_name_set") -public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).name = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -226,8 +226,12 @@ public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueIsSome: I @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -238,9 +242,9 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -258,7 +262,7 @@ public func _bjs_OptionalPropertyHolder_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get") @_cdecl("bjs_OptionalPropertyHolder_optionalName_get") -public func _bjs_OptionalPropertyHolder_optionalName_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName return ret.bridgeJSLowerReturn() @@ -269,7 +273,7 @@ public func _bjs_OptionalPropertyHolder_optionalName_get(_self: UnsafeMutableRaw @_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") @_cdecl("bjs_OptionalPropertyHolder_optionalName_set") -public func _bjs_OptionalPropertyHolder_optionalName_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -279,7 +283,7 @@ public func _bjs_OptionalPropertyHolder_optionalName_set(_self: UnsafeMutableRaw @_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") @_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") -public func _bjs_OptionalPropertyHolder_optionalAge_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge return ret.bridgeJSLowerReturn() @@ -290,7 +294,7 @@ public func _bjs_OptionalPropertyHolder_optionalAge_get(_self: UnsafeMutableRawP @_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") @_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") -public func _bjs_OptionalPropertyHolder_optionalAge_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -300,7 +304,7 @@ public func _bjs_OptionalPropertyHolder_optionalAge_set(_self: UnsafeMutableRawP @_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") -public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter return ret.bridgeJSLowerReturn() @@ -311,7 +315,7 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_self: UnsafeMutable @_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") -public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -321,8 +325,12 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_self: UnsafeMutable @_expose(wasm, "bjs_OptionalPropertyHolder_deinit") @_cdecl("bjs_OptionalPropertyHolder_deinit") -public func _bjs_OptionalPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -333,9 +341,9 @@ extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift index 330977265..4f906704f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_check") @_cdecl("bjs_check") -public func _bjs_check(a: Int32, b: Float32, c: Float64, d: Int32) -> Void { +public func _bjs_check(_ a: Int32, _ b: Float32, _ c: Float64, _ d: Int32) -> Void { #if arch(wasm32) check(a: Int.bridgeJSLiftParameter(a), b: Float.bridgeJSLiftParameter(b), c: Double.bridgeJSLiftParameter(c), d: Bool.bridgeJSLiftParameter(d)) #else diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift index f622e3ac6..96bde51e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_createPropertyHolder") @_cdecl("bjs_createPropertyHolder") -public func _bjs_createPropertyHolder(intValue: Int32, floatValue: Float32, doubleValue: Float64, boolValue: Int32, stringValueBytes: Int32, stringValueLength: Int32, jsObject: Int32) -> UnsafeMutableRawPointer { +public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) return ret.bridgeJSLowerReturn() @@ -19,7 +19,7 @@ public func _bjs_createPropertyHolder(intValue: Int32, floatValue: Float32, doub @_expose(wasm, "bjs_testPropertyHolder") @_cdecl("bjs_testPropertyHolder") -public func _bjs_testPropertyHolder(holder: UnsafeMutableRawPointer) -> Void { +public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) return ret.bridgeJSLowerReturn() @@ -30,7 +30,7 @@ public func _bjs_testPropertyHolder(holder: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_PropertyHolder_init") @_cdecl("bjs_PropertyHolder_init") -public func _bjs_PropertyHolder_init(intValue: Int32, floatValue: Float32, doubleValue: Float64, boolValue: Int32, stringValueBytes: Int32, stringValueLength: Int32, jsObject: Int32) -> UnsafeMutableRawPointer { +public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) return ret.bridgeJSLowerReturn() @@ -41,7 +41,7 @@ public func _bjs_PropertyHolder_init(intValue: Int32, floatValue: Float32, doubl @_expose(wasm, "bjs_PropertyHolder_getAllValues") @_cdecl("bjs_PropertyHolder_getAllValues") -public func _bjs_PropertyHolder_getAllValues(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues() return ret.bridgeJSLowerReturn() @@ -52,7 +52,7 @@ public func _bjs_PropertyHolder_getAllValues(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_intValue_get") @_cdecl("bjs_PropertyHolder_intValue_get") -public func _bjs_PropertyHolder_intValue_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue return ret.bridgeJSLowerReturn() @@ -63,7 +63,7 @@ public func _bjs_PropertyHolder_intValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_intValue_set") @_cdecl("bjs_PropertyHolder_intValue_set") -public func _bjs_PropertyHolder_intValue_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value) #else @@ -73,7 +73,7 @@ public func _bjs_PropertyHolder_intValue_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_PropertyHolder_floatValue_get") @_cdecl("bjs_PropertyHolder_floatValue_get") -public func _bjs_PropertyHolder_floatValue_get(_self: UnsafeMutableRawPointer) -> Float32 { +public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue return ret.bridgeJSLowerReturn() @@ -84,7 +84,7 @@ public func _bjs_PropertyHolder_floatValue_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_PropertyHolder_floatValue_set") @_cdecl("bjs_PropertyHolder_floatValue_set") -public func _bjs_PropertyHolder_floatValue_set(_self: UnsafeMutableRawPointer, value: Float32) -> Void { +public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value) #else @@ -94,7 +94,7 @@ public func _bjs_PropertyHolder_floatValue_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_PropertyHolder_doubleValue_get") @_cdecl("bjs_PropertyHolder_doubleValue_get") -public func _bjs_PropertyHolder_doubleValue_get(_self: UnsafeMutableRawPointer) -> Float64 { +public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue return ret.bridgeJSLowerReturn() @@ -105,7 +105,7 @@ public func _bjs_PropertyHolder_doubleValue_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_doubleValue_set") @_cdecl("bjs_PropertyHolder_doubleValue_set") -public func _bjs_PropertyHolder_doubleValue_set(_self: UnsafeMutableRawPointer, value: Float64) -> Void { +public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value) #else @@ -115,7 +115,7 @@ public func _bjs_PropertyHolder_doubleValue_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_PropertyHolder_boolValue_get") @_cdecl("bjs_PropertyHolder_boolValue_get") -public func _bjs_PropertyHolder_boolValue_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue return ret.bridgeJSLowerReturn() @@ -126,7 +126,7 @@ public func _bjs_PropertyHolder_boolValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_boolValue_set") @_cdecl("bjs_PropertyHolder_boolValue_set") -public func _bjs_PropertyHolder_boolValue_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value) #else @@ -136,7 +136,7 @@ public func _bjs_PropertyHolder_boolValue_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_PropertyHolder_stringValue_get") @_cdecl("bjs_PropertyHolder_stringValue_get") -public func _bjs_PropertyHolder_stringValue_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue return ret.bridgeJSLowerReturn() @@ -147,7 +147,7 @@ public func _bjs_PropertyHolder_stringValue_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_stringValue_set") @_cdecl("bjs_PropertyHolder_stringValue_set") -public func _bjs_PropertyHolder_stringValue_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -157,7 +157,7 @@ public func _bjs_PropertyHolder_stringValue_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_PropertyHolder_readonlyInt_get") @_cdecl("bjs_PropertyHolder_readonlyInt_get") -public func _bjs_PropertyHolder_readonlyInt_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt return ret.bridgeJSLowerReturn() @@ -168,7 +168,7 @@ public func _bjs_PropertyHolder_readonlyInt_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_readonlyFloat_get") @_cdecl("bjs_PropertyHolder_readonlyFloat_get") -public func _bjs_PropertyHolder_readonlyFloat_get(_self: UnsafeMutableRawPointer) -> Float32 { +public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat return ret.bridgeJSLowerReturn() @@ -179,7 +179,7 @@ public func _bjs_PropertyHolder_readonlyFloat_get(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_PropertyHolder_readonlyDouble_get") @_cdecl("bjs_PropertyHolder_readonlyDouble_get") -public func _bjs_PropertyHolder_readonlyDouble_get(_self: UnsafeMutableRawPointer) -> Float64 { +public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble return ret.bridgeJSLowerReturn() @@ -190,7 +190,7 @@ public func _bjs_PropertyHolder_readonlyDouble_get(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_PropertyHolder_readonlyBool_get") @_cdecl("bjs_PropertyHolder_readonlyBool_get") -public func _bjs_PropertyHolder_readonlyBool_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool return ret.bridgeJSLowerReturn() @@ -201,7 +201,7 @@ public func _bjs_PropertyHolder_readonlyBool_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_readonlyString_get") @_cdecl("bjs_PropertyHolder_readonlyString_get") -public func _bjs_PropertyHolder_readonlyString_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString return ret.bridgeJSLowerReturn() @@ -212,7 +212,7 @@ public func _bjs_PropertyHolder_readonlyString_get(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_PropertyHolder_jsObject_get") @_cdecl("bjs_PropertyHolder_jsObject_get") -public func _bjs_PropertyHolder_jsObject_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject return ret.bridgeJSLowerReturn() @@ -223,7 +223,7 @@ public func _bjs_PropertyHolder_jsObject_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_jsObject_set") @_cdecl("bjs_PropertyHolder_jsObject_set") -public func _bjs_PropertyHolder_jsObject_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value) #else @@ -233,7 +233,7 @@ public func _bjs_PropertyHolder_jsObject_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_PropertyHolder_sibling_get") @_cdecl("bjs_PropertyHolder_sibling_get") -public func _bjs_PropertyHolder_sibling_get(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling return ret.bridgeJSLowerReturn() @@ -244,7 +244,7 @@ public func _bjs_PropertyHolder_sibling_get(_self: UnsafeMutableRawPointer) -> U @_expose(wasm, "bjs_PropertyHolder_sibling_set") @_cdecl("bjs_PropertyHolder_sibling_set") -public func _bjs_PropertyHolder_sibling_set(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).sibling = PropertyHolder.bridgeJSLiftParameter(value) #else @@ -254,7 +254,7 @@ public func _bjs_PropertyHolder_sibling_set(_self: UnsafeMutableRawPointer, valu @_expose(wasm, "bjs_PropertyHolder_lazyValue_get") @_cdecl("bjs_PropertyHolder_lazyValue_get") -public func _bjs_PropertyHolder_lazyValue_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue return ret.bridgeJSLowerReturn() @@ -265,7 +265,7 @@ public func _bjs_PropertyHolder_lazyValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_lazyValue_set") @_cdecl("bjs_PropertyHolder_lazyValue_set") -public func _bjs_PropertyHolder_lazyValue_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -275,7 +275,7 @@ public func _bjs_PropertyHolder_lazyValue_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_PropertyHolder_computedReadonly_get") @_cdecl("bjs_PropertyHolder_computedReadonly_get") -public func _bjs_PropertyHolder_computedReadonly_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly return ret.bridgeJSLowerReturn() @@ -286,7 +286,7 @@ public func _bjs_PropertyHolder_computedReadonly_get(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_computedReadWrite_get") @_cdecl("bjs_PropertyHolder_computedReadWrite_get") -public func _bjs_PropertyHolder_computedReadWrite_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite return ret.bridgeJSLowerReturn() @@ -297,7 +297,7 @@ public func _bjs_PropertyHolder_computedReadWrite_get(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_PropertyHolder_computedReadWrite_set") @_cdecl("bjs_PropertyHolder_computedReadWrite_set") -public func _bjs_PropertyHolder_computedReadWrite_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -307,7 +307,7 @@ public func _bjs_PropertyHolder_computedReadWrite_set(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_PropertyHolder_observedProperty_get") @_cdecl("bjs_PropertyHolder_observedProperty_get") -public func _bjs_PropertyHolder_observedProperty_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty return ret.bridgeJSLowerReturn() @@ -318,7 +318,7 @@ public func _bjs_PropertyHolder_observedProperty_get(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_observedProperty_set") @_cdecl("bjs_PropertyHolder_observedProperty_set") -public func _bjs_PropertyHolder_observedProperty_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value) #else @@ -328,8 +328,12 @@ public func _bjs_PropertyHolder_observedProperty_set(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_deinit") @_cdecl("bjs_PropertyHolder_deinit") -public func _bjs_PropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -340,9 +344,9 @@ extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyHolder_wrap") -fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index ef6160d28..318b908b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -9,170 +9,214 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func onSomethingHappened() { - _extern_onSomethingHappened(this: Int32(bitPattern: jsObject.id)) + func onSomethingHappened() -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + _extern_onSomethingHappened(jsObjectValue) } - func onValueChanged(_ value: String) { - _extern_onValueChanged(this: Int32(bitPattern: jsObject.id), value: value.bridgeJSLowerParameter()) + func onValueChanged(_ value: String) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let valueValue = value.bridgeJSLowerParameter() + _extern_onValueChanged(jsObjectValue, valueValue) } func onCountUpdated(count: Int) -> Bool { - let ret = _extern_onCountUpdated(this: Int32(bitPattern: jsObject.id), count: count.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let countValue = count.bridgeJSLowerParameter() + let ret = _extern_onCountUpdated(jsObjectValue, countValue) return Bool.bridgeJSLiftReturn(ret) } - func onLabelUpdated(_ prefix: String, _ suffix: String) { - _extern_onLabelUpdated(this: Int32(bitPattern: jsObject.id), prefix: prefix.bridgeJSLowerParameter(), suffix: suffix.bridgeJSLowerParameter()) + func onLabelUpdated(_ prefix: String, _ suffix: String) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let prefixValue = prefix.bridgeJSLowerParameter() + let suffixValue = suffix.bridgeJSLowerParameter() + _extern_onLabelUpdated(jsObjectValue, prefixValue, suffixValue) } func isCountEven() -> Bool { - let ret = _extern_isCountEven(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_isCountEven(jsObjectValue) return Bool.bridgeJSLiftReturn(ret) } - func onHelperUpdated(_ helper: Helper) { - _extern_onHelperUpdated(this: Int32(bitPattern: jsObject.id), helper: helper.bridgeJSLowerParameter()) + func onHelperUpdated(_ helper: Helper) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let helperPointer = helper.bridgeJSLowerParameter() + _extern_onHelperUpdated(jsObjectValue, helperPointer) } func createHelper() -> Helper { - let ret = _extern_createHelper(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_createHelper(jsObjectValue) return Helper.bridgeJSLiftReturn(ret) } - func onOptionalHelperUpdated(_ helper: Optional) { - let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameterWithPresence() - _extern_onOptionalHelperUpdated(this: Int32(bitPattern: jsObject.id), helperIsSome: helperIsSome, helperPointer: helperPointer) + func onOptionalHelperUpdated(_ helper: Optional) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameter() + _extern_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer) } func createOptionalHelper() -> Optional { - let ret = _extern_createOptionalHelper(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_createOptionalHelper(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } func createEnum() -> ExampleEnum { - let ret = _extern_createEnum(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_createEnum(jsObjectValue) return ExampleEnum.bridgeJSLiftReturn(ret) } - func handleResult(_ result: Result) { - _extern_handleResult(this: Int32(bitPattern: jsObject.id), result: result.bridgeJSLowerParameter()) + func handleResult(_ result: Result) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let resultCaseId = result.bridgeJSLowerParameter() + _extern_handleResult(jsObjectValue, resultCaseId) } func getResult() -> Result { - let ret = _extern_getResult(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_getResult(jsObjectValue) return Result.bridgeJSLiftReturn(ret) } var eventCount: Int { get { - let ret = bjs_MyViewControllerDelegate_eventCount_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_eventCount_get(jsObjectValue) return Int.bridgeJSLiftReturn(ret) } set { - bjs_MyViewControllerDelegate_eventCount_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_eventCount_set(jsObjectValue, newValueValue) } } var delegateName: String { get { - let ret = bjs_MyViewControllerDelegate_delegateName_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_delegateName_get(jsObjectValue) return String.bridgeJSLiftReturn(ret) } } var optionalName: Optional { get { - bjs_MyViewControllerDelegate_optionalName_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_optionalName_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_MyViewControllerDelegate_optionalName_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_optionalName_set(jsObjectValue, newValueIsSome, newValueValue) } } var optionalRawEnum: Optional { get { - bjs_MyViewControllerDelegate_optionalRawEnum_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_optionalRawEnum_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_MyViewControllerDelegate_optionalRawEnum_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_optionalRawEnum_set(jsObjectValue, newValueIsSome, newValueValue) } } var rawStringEnum: ExampleEnum { get { - let ret = bjs_MyViewControllerDelegate_rawStringEnum_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_rawStringEnum_get(jsObjectValue) return ExampleEnum.bridgeJSLiftReturn(ret) } set { - bjs_MyViewControllerDelegate_rawStringEnum_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_rawStringEnum_set(jsObjectValue, newValueValue) } } var result: Result { get { - let ret = bjs_MyViewControllerDelegate_result_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_result_get(jsObjectValue) return Result.bridgeJSLiftReturn(ret) } set { - bjs_MyViewControllerDelegate_result_set(this: Int32(bitPattern: jsObject.id), caseId: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueCaseId = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_result_set(jsObjectValue, newValueCaseId) } } var optionalResult: Optional { get { - let ret = bjs_MyViewControllerDelegate_optionalResult_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_optionalResult_get(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } set { - let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() - bjs_MyViewControllerDelegate_optionalResult_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueCaseId) = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_optionalResult_set(jsObjectValue, newValueIsSome, newValueCaseId) } } var direction: Direction { get { - let ret = bjs_MyViewControllerDelegate_direction_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_direction_get(jsObjectValue) return Direction.bridgeJSLiftReturn(ret) } set { - bjs_MyViewControllerDelegate_direction_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_direction_set(jsObjectValue, newValueValue) } } var directionOptional: Optional { get { - let ret = bjs_MyViewControllerDelegate_directionOptional_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_directionOptional_get(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_MyViewControllerDelegate_directionOptional_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_directionOptional_set(jsObjectValue, newValueIsSome, newValueValue) } } var priority: Priority { get { - let ret = bjs_MyViewControllerDelegate_priority_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_priority_get(jsObjectValue) return Priority.bridgeJSLiftReturn(ret) } set { - bjs_MyViewControllerDelegate_priority_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_priority_set(jsObjectValue, newValueValue) } } var priorityOptional: Optional { get { - bjs_MyViewControllerDelegate_priorityOptional_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_priorityOptional_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_MyViewControllerDelegate_priorityOptional_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_priorityOptional_set(jsObjectValue, newValueIsSome, newValueValue) } } @@ -182,103 +226,103 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") -fileprivate func _extern_onSomethingHappened(this: Int32) +fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") -fileprivate func _extern_onValueChanged(this: Int32, value: Int32) +fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") -fileprivate func _extern_onCountUpdated(this: Int32, count: Int32) -> Int32 +fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") -fileprivate func _extern_onLabelUpdated(this: Int32, prefix: Int32, suffix: Int32) +fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") -fileprivate func _extern_isCountEven(this: Int32) -> Int32 +fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") -fileprivate func _extern_onHelperUpdated(this: Int32, helper: UnsafeMutableRawPointer) +fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") -fileprivate func _extern_createHelper(this: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") -fileprivate func _extern_onOptionalHelperUpdated(this: Int32, helperIsSome: Int32, helperPointer: UnsafeMutableRawPointer) +fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") -fileprivate func _extern_createOptionalHelper(this: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") -fileprivate func _extern_createEnum(this: Int32) -> Int32 +fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") -fileprivate func _extern_handleResult(this: Int32, result: Int32) +fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") -fileprivate func _extern_getResult(this: Int32) -> Int32 +fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") -fileprivate func bjs_MyViewControllerDelegate_eventCount_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") -fileprivate func bjs_MyViewControllerDelegate_eventCount_set(this: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") -fileprivate func bjs_MyViewControllerDelegate_delegateName_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") -fileprivate func bjs_MyViewControllerDelegate_optionalName_get(this: Int32) +fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") -fileprivate func bjs_MyViewControllerDelegate_optionalName_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(this: Int32) +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(this: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") -fileprivate func bjs_MyViewControllerDelegate_result_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") -fileprivate func bjs_MyViewControllerDelegate_result_set(this: Int32, caseId: Int32) +fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") -fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") -fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(this: Int32, isSome: Int32, caseId: Int32) +fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") -fileprivate func bjs_MyViewControllerDelegate_direction_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") -fileprivate func bjs_MyViewControllerDelegate_direction_set(this: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") -fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") -fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") -fileprivate func bjs_MyViewControllerDelegate_priority_get(this: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") -fileprivate func bjs_MyViewControllerDelegate_priority_set(this: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(this: Int32) +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -384,7 +428,7 @@ extension Priority: _BridgedSwiftEnumNoPayload { @_expose(wasm, "bjs_Helper_init") @_cdecl("bjs_Helper_init") -public func _bjs_Helper_init(value: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Helper_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Helper(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -395,7 +439,7 @@ public func _bjs_Helper_init(value: Int32) -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Helper_increment") @_cdecl("bjs_Helper_increment") -public func _bjs_Helper_increment(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Helper_increment(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) Helper.bridgeJSLiftParameter(_self).increment() #else @@ -405,7 +449,7 @@ public func _bjs_Helper_increment(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Helper_value_get") @_cdecl("bjs_Helper_value_get") -public func _bjs_Helper_value_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_Helper_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = Helper.bridgeJSLiftParameter(_self).value return ret.bridgeJSLowerReturn() @@ -416,7 +460,7 @@ public func _bjs_Helper_value_get(_self: UnsafeMutableRawPointer) -> Int32 { @_expose(wasm, "bjs_Helper_value_set") @_cdecl("bjs_Helper_value_set") -public func _bjs_Helper_value_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Helper_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) Helper.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) #else @@ -426,8 +470,12 @@ public func _bjs_Helper_value_set(_self: UnsafeMutableRawPointer, value: Int32) @_expose(wasm, "bjs_Helper_deinit") @_cdecl("bjs_Helper_deinit") -public func _bjs_Helper_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Helper_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Helper: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -438,16 +486,16 @@ extension Helper: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Helper_wrap") -fileprivate func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Helper_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Helper_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Helper_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_MyViewController_init") @_cdecl("bjs_MyViewController_init") -public func _bjs_MyViewController_init(delegate: Int32) -> UnsafeMutableRawPointer { +public func _bjs_MyViewController_init(_ delegate: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = MyViewController(delegate: AnyMyViewControllerDelegate.bridgeJSLiftParameter(delegate)) return ret.bridgeJSLowerReturn() @@ -458,7 +506,7 @@ public func _bjs_MyViewController_init(delegate: Int32) -> UnsafeMutableRawPoint @_expose(wasm, "bjs_MyViewController_triggerEvent") @_cdecl("bjs_MyViewController_triggerEvent") -public func _bjs_MyViewController_triggerEvent(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_MyViewController_triggerEvent(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).triggerEvent() #else @@ -468,7 +516,7 @@ public func _bjs_MyViewController_triggerEvent(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_MyViewController_updateValue") @_cdecl("bjs_MyViewController_updateValue") -public func _bjs_MyViewController_updateValue(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_MyViewController_updateValue(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).updateValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) #else @@ -478,7 +526,7 @@ public func _bjs_MyViewController_updateValue(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_MyViewController_updateCount") @_cdecl("bjs_MyViewController_updateCount") -public func _bjs_MyViewController_updateCount(_self: UnsafeMutableRawPointer, count: Int32) -> Int32 { +public func _bjs_MyViewController_updateCount(_ _self: UnsafeMutableRawPointer, _ count: Int32) -> Int32 { #if arch(wasm32) let ret = MyViewController.bridgeJSLiftParameter(_self).updateCount(_: Int.bridgeJSLiftParameter(count)) return ret.bridgeJSLowerReturn() @@ -489,7 +537,7 @@ public func _bjs_MyViewController_updateCount(_self: UnsafeMutableRawPointer, co @_expose(wasm, "bjs_MyViewController_updateLabel") @_cdecl("bjs_MyViewController_updateLabel") -public func _bjs_MyViewController_updateLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { +public func _bjs_MyViewController_updateLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).updateLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) #else @@ -499,7 +547,7 @@ public func _bjs_MyViewController_updateLabel(_self: UnsafeMutableRawPointer, pr @_expose(wasm, "bjs_MyViewController_checkEvenCount") @_cdecl("bjs_MyViewController_checkEvenCount") -public func _bjs_MyViewController_checkEvenCount(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_MyViewController_checkEvenCount(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = MyViewController.bridgeJSLiftParameter(_self).checkEvenCount() return ret.bridgeJSLowerReturn() @@ -510,7 +558,7 @@ public func _bjs_MyViewController_checkEvenCount(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_MyViewController_sendHelper") @_cdecl("bjs_MyViewController_sendHelper") -public func _bjs_MyViewController_sendHelper(_self: UnsafeMutableRawPointer, helper: UnsafeMutableRawPointer) -> Void { +public func _bjs_MyViewController_sendHelper(_ _self: UnsafeMutableRawPointer, _ helper: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).sendHelper(_: Helper.bridgeJSLiftParameter(helper)) #else @@ -520,7 +568,7 @@ public func _bjs_MyViewController_sendHelper(_self: UnsafeMutableRawPointer, hel @_expose(wasm, "bjs_MyViewController_delegate_get") @_cdecl("bjs_MyViewController_delegate_get") -public func _bjs_MyViewController_delegate_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_MyViewController_delegate_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = MyViewController.bridgeJSLiftParameter(_self).delegate as! AnyMyViewControllerDelegate return ret.bridgeJSLowerReturn() @@ -531,7 +579,7 @@ public func _bjs_MyViewController_delegate_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_MyViewController_delegate_set") @_cdecl("bjs_MyViewController_delegate_set") -public func _bjs_MyViewController_delegate_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_MyViewController_delegate_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).delegate = AnyMyViewControllerDelegate.bridgeJSLiftParameter(value) #else @@ -541,7 +589,7 @@ public func _bjs_MyViewController_delegate_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_MyViewController_secondDelegate_get") @_cdecl("bjs_MyViewController_secondDelegate_get") -public func _bjs_MyViewController_secondDelegate_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_MyViewController_secondDelegate_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate.flatMap { $0 as? AnyMyViewControllerDelegate @@ -554,7 +602,7 @@ public func _bjs_MyViewController_secondDelegate_get(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_MyViewController_secondDelegate_set") @_cdecl("bjs_MyViewController_secondDelegate_set") -public func _bjs_MyViewController_secondDelegate_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_MyViewController_secondDelegate_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) MyViewController.bridgeJSLiftParameter(_self).secondDelegate = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -564,8 +612,12 @@ public func _bjs_MyViewController_secondDelegate_set(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_MyViewController_deinit") @_cdecl("bjs_MyViewController_deinit") -public func _bjs_MyViewController_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_MyViewController_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension MyViewController: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -576,9 +628,9 @@ extension MyViewController: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewController_wrap") -fileprivate func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MyViewController_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 81ea282fe..8ea228dc5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -43,7 +43,7 @@ extension Calculator: _BridgedSwiftCaseEnum { @_expose(wasm, "bjs_Calculator_static_square") @_cdecl("bjs_Calculator_static_square") -public func _bjs_Calculator_static_square(value: Int32) -> Int32 { +public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { #if arch(wasm32) let ret = Calculator.square(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -107,7 +107,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_expose(wasm, "bjs_APIResult_static_roundtrip") @_cdecl("bjs_APIResult_static_roundtrip") -public func _bjs_APIResult_static_roundtrip(value: Int32) -> Void { +public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { #if arch(wasm32) let ret = APIResult.roundtrip(value: APIResult.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -118,7 +118,7 @@ public func _bjs_APIResult_static_roundtrip(value: Int32) -> Void { @_expose(wasm, "bjs_Utils_String_static_uppercase") @_cdecl("bjs_Utils_String_static_uppercase") -public func _bjs_Utils_String_static_uppercase(textBytes: Int32, textLength: Int32) -> Void { +public func _bjs_Utils_String_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) let ret = Utils.String.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) return ret.bridgeJSLowerReturn() @@ -140,7 +140,7 @@ public func _bjs_MathUtils_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_MathUtils_static_subtract") @_cdecl("bjs_MathUtils_static_subtract") -public func _bjs_MathUtils_static_subtract(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.subtract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -151,7 +151,7 @@ public func _bjs_MathUtils_static_subtract(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_static_add") @_cdecl("bjs_MathUtils_static_add") -public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -162,7 +162,7 @@ public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_multiply") @_cdecl("bjs_MathUtils_multiply") -public func _bjs_MathUtils_multiply(_self: UnsafeMutableRawPointer, x: Int32, y: Int32) -> Int32 { +public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.bridgeJSLiftParameter(_self).multiply(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) return ret.bridgeJSLowerReturn() @@ -173,8 +173,12 @@ public func _bjs_MathUtils_multiply(_self: UnsafeMutableRawPointer, x: Int32, y: @_expose(wasm, "bjs_MathUtils_deinit") @_cdecl("bjs_MathUtils_deinit") -public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_MathUtils_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -185,9 +189,9 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 81ea282fe..8ea228dc5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -43,7 +43,7 @@ extension Calculator: _BridgedSwiftCaseEnum { @_expose(wasm, "bjs_Calculator_static_square") @_cdecl("bjs_Calculator_static_square") -public func _bjs_Calculator_static_square(value: Int32) -> Int32 { +public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { #if arch(wasm32) let ret = Calculator.square(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -107,7 +107,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_expose(wasm, "bjs_APIResult_static_roundtrip") @_cdecl("bjs_APIResult_static_roundtrip") -public func _bjs_APIResult_static_roundtrip(value: Int32) -> Void { +public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { #if arch(wasm32) let ret = APIResult.roundtrip(value: APIResult.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -118,7 +118,7 @@ public func _bjs_APIResult_static_roundtrip(value: Int32) -> Void { @_expose(wasm, "bjs_Utils_String_static_uppercase") @_cdecl("bjs_Utils_String_static_uppercase") -public func _bjs_Utils_String_static_uppercase(textBytes: Int32, textLength: Int32) -> Void { +public func _bjs_Utils_String_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) let ret = Utils.String.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) return ret.bridgeJSLowerReturn() @@ -140,7 +140,7 @@ public func _bjs_MathUtils_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_MathUtils_static_subtract") @_cdecl("bjs_MathUtils_static_subtract") -public func _bjs_MathUtils_static_subtract(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.subtract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -151,7 +151,7 @@ public func _bjs_MathUtils_static_subtract(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_static_add") @_cdecl("bjs_MathUtils_static_add") -public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -162,7 +162,7 @@ public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_multiply") @_cdecl("bjs_MathUtils_multiply") -public func _bjs_MathUtils_multiply(_self: UnsafeMutableRawPointer, x: Int32, y: Int32) -> Int32 { +public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.bridgeJSLiftParameter(_self).multiply(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) return ret.bridgeJSLowerReturn() @@ -173,8 +173,12 @@ public func _bjs_MathUtils_multiply(_self: UnsafeMutableRawPointer, x: Int32, y: @_expose(wasm, "bjs_MathUtils_deinit") @_cdecl("bjs_MathUtils_deinit") -public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_MathUtils_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -185,9 +189,9 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift index e34f26f8c..91577ebfc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift @@ -54,7 +54,7 @@ public func _bjs_PropertyEnum_static_enumProperty_get() -> Void { @_expose(wasm, "bjs_PropertyEnum_static_enumProperty_set") @_cdecl("bjs_PropertyEnum_static_enumProperty_set") -public func _bjs_PropertyEnum_static_enumProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -86,7 +86,7 @@ public func _bjs_PropertyEnum_static_computedEnum_get() -> Void { @_expose(wasm, "bjs_PropertyEnum_static_computedEnum_set") @_cdecl("bjs_PropertyEnum_static_computedEnum_set") -public func _bjs_PropertyEnum_static_computedEnum_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyEnum_static_computedEnum_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyEnum.computedEnum = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -107,7 +107,7 @@ public func _bjs_PropertyNamespace_static_namespaceProperty_get() -> Void { @_expose(wasm, "bjs_PropertyNamespace_static_namespaceProperty_set") @_cdecl("bjs_PropertyNamespace_static_namespaceProperty_set") -public func _bjs_PropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -139,7 +139,7 @@ public func _bjs_PropertyNamespace_Nested_static_nestedProperty_get() -> Int32 { @_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedProperty_set") @_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_set") -public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(value: Int32) -> Void { +public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyNamespace.Nested.nestedProperty = Int.bridgeJSLiftParameter(value) #else @@ -171,7 +171,7 @@ public func _bjs_PropertyNamespace_Nested_static_nestedDouble_get() -> Float64 { @_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedDouble_set") @_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_set") -public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(value: Float64) -> Void { +public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) PropertyNamespace.Nested.nestedDouble = Double.bridgeJSLiftParameter(value) #else @@ -214,7 +214,7 @@ public func _bjs_PropertyClass_static_staticVariable_get() -> Int32 { @_expose(wasm, "bjs_PropertyClass_static_staticVariable_set") @_cdecl("bjs_PropertyClass_static_staticVariable_set") -public func _bjs_PropertyClass_static_staticVariable_set(value: Int32) -> Void { +public func _bjs_PropertyClass_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyClass.staticVariable = Int.bridgeJSLiftParameter(value) #else @@ -235,7 +235,7 @@ public func _bjs_PropertyClass_static_jsObjectProperty_get() -> Int32 { @_expose(wasm, "bjs_PropertyClass_static_jsObjectProperty_set") @_cdecl("bjs_PropertyClass_static_jsObjectProperty_set") -public func _bjs_PropertyClass_static_jsObjectProperty_set(value: Int32) -> Void { +public func _bjs_PropertyClass_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyClass.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) #else @@ -256,7 +256,7 @@ public func _bjs_PropertyClass_static_classVariable_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_classVariable_set") @_cdecl("bjs_PropertyClass_static_classVariable_set") -public func _bjs_PropertyClass_static_classVariable_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_classVariable_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.classVariable = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -277,7 +277,7 @@ public func _bjs_PropertyClass_static_computedProperty_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_computedProperty_set") @_cdecl("bjs_PropertyClass_static_computedProperty_set") -public func _bjs_PropertyClass_static_computedProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -309,7 +309,7 @@ public func _bjs_PropertyClass_static_optionalProperty_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_optionalProperty_set") @_cdecl("bjs_PropertyClass_static_optionalProperty_set") -public func _bjs_PropertyClass_static_optionalProperty_set(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_optionalProperty_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.optionalProperty = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -319,8 +319,12 @@ public func _bjs_PropertyClass_static_optionalProperty_set(valueIsSome: Int32, v @_expose(wasm, "bjs_PropertyClass_deinit") @_cdecl("bjs_PropertyClass_deinit") -public func _bjs_PropertyClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PropertyClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -331,9 +335,9 @@ extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") -fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift index e34f26f8c..91577ebfc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift @@ -54,7 +54,7 @@ public func _bjs_PropertyEnum_static_enumProperty_get() -> Void { @_expose(wasm, "bjs_PropertyEnum_static_enumProperty_set") @_cdecl("bjs_PropertyEnum_static_enumProperty_set") -public func _bjs_PropertyEnum_static_enumProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -86,7 +86,7 @@ public func _bjs_PropertyEnum_static_computedEnum_get() -> Void { @_expose(wasm, "bjs_PropertyEnum_static_computedEnum_set") @_cdecl("bjs_PropertyEnum_static_computedEnum_set") -public func _bjs_PropertyEnum_static_computedEnum_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyEnum_static_computedEnum_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyEnum.computedEnum = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -107,7 +107,7 @@ public func _bjs_PropertyNamespace_static_namespaceProperty_get() -> Void { @_expose(wasm, "bjs_PropertyNamespace_static_namespaceProperty_set") @_cdecl("bjs_PropertyNamespace_static_namespaceProperty_set") -public func _bjs_PropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -139,7 +139,7 @@ public func _bjs_PropertyNamespace_Nested_static_nestedProperty_get() -> Int32 { @_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedProperty_set") @_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_set") -public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(value: Int32) -> Void { +public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyNamespace.Nested.nestedProperty = Int.bridgeJSLiftParameter(value) #else @@ -171,7 +171,7 @@ public func _bjs_PropertyNamespace_Nested_static_nestedDouble_get() -> Float64 { @_expose(wasm, "bjs_PropertyNamespace_Nested_static_nestedDouble_set") @_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_set") -public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(value: Float64) -> Void { +public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) PropertyNamespace.Nested.nestedDouble = Double.bridgeJSLiftParameter(value) #else @@ -214,7 +214,7 @@ public func _bjs_PropertyClass_static_staticVariable_get() -> Int32 { @_expose(wasm, "bjs_PropertyClass_static_staticVariable_set") @_cdecl("bjs_PropertyClass_static_staticVariable_set") -public func _bjs_PropertyClass_static_staticVariable_set(value: Int32) -> Void { +public func _bjs_PropertyClass_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyClass.staticVariable = Int.bridgeJSLiftParameter(value) #else @@ -235,7 +235,7 @@ public func _bjs_PropertyClass_static_jsObjectProperty_get() -> Int32 { @_expose(wasm, "bjs_PropertyClass_static_jsObjectProperty_set") @_cdecl("bjs_PropertyClass_static_jsObjectProperty_set") -public func _bjs_PropertyClass_static_jsObjectProperty_set(value: Int32) -> Void { +public func _bjs_PropertyClass_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) PropertyClass.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) #else @@ -256,7 +256,7 @@ public func _bjs_PropertyClass_static_classVariable_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_classVariable_set") @_cdecl("bjs_PropertyClass_static_classVariable_set") -public func _bjs_PropertyClass_static_classVariable_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_classVariable_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.classVariable = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -277,7 +277,7 @@ public func _bjs_PropertyClass_static_computedProperty_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_computedProperty_set") @_cdecl("bjs_PropertyClass_static_computedProperty_set") -public func _bjs_PropertyClass_static_computedProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -309,7 +309,7 @@ public func _bjs_PropertyClass_static_optionalProperty_get() -> Void { @_expose(wasm, "bjs_PropertyClass_static_optionalProperty_set") @_cdecl("bjs_PropertyClass_static_optionalProperty_set") -public func _bjs_PropertyClass_static_optionalProperty_set(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyClass_static_optionalProperty_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyClass.optionalProperty = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -319,8 +319,12 @@ public func _bjs_PropertyClass_static_optionalProperty_set(valueIsSome: Int32, v @_expose(wasm, "bjs_PropertyClass_deinit") @_cdecl("bjs_PropertyClass_deinit") -public func _bjs_PropertyClass_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PropertyClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -331,9 +335,9 @@ extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") -fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyClass_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift index 2a43d7bf3..6e32c00d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_checkString") @_cdecl("bjs_checkString") -public func _bjs_checkString(aBytes: Int32, aLength: Int32) -> Void { +public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) checkString(a: String.bridgeJSLiftParameter(aBytes, aLength)) #else @@ -18,7 +18,7 @@ public func _bjs_checkString(aBytes: Int32, aLength: Int32) -> Void { @_expose(wasm, "bjs_roundtripString") @_cdecl("bjs_roundtripString") -public func _bjs_roundtripString(aBytes: Int32, aLength: Int32) -> Void { +public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) let ret = roundtripString(a: String.bridgeJSLiftParameter(aBytes, aLength)) return ret.bridgeJSLowerReturn() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift index 097f73a97..652792106 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift @@ -8,7 +8,7 @@ @_expose(wasm, "bjs_takeGreeter") @_cdecl("bjs_takeGreeter") -public func _bjs_takeGreeter(greeter: UnsafeMutableRawPointer) -> Void { +public func _bjs_takeGreeter(_ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) takeGreeter(greeter: Greeter.bridgeJSLiftParameter(greeter)) #else @@ -18,7 +18,7 @@ public func _bjs_takeGreeter(greeter: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -29,7 +29,7 @@ public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMuta @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -40,7 +40,7 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_changeName") @_cdecl("bjs_Greeter_changeName") -public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) #else @@ -50,7 +50,7 @@ public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: I @_expose(wasm, "bjs_Greeter_name_get") @_cdecl("bjs_Greeter_name_get") -public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -61,7 +61,7 @@ public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_name_set") @_cdecl("bjs_Greeter_name_set") -public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -71,8 +71,12 @@ public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: In @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -83,17 +87,21 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") -public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PublicGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -104,17 +112,21 @@ extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PublicGreeter_wrap") -fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") -public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PackageGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -125,9 +137,9 @@ extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PackageGreeter_wrap") -fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index c036a7973..2e57a8a56 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -6,8 +6,14 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") -fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule10HttpStatusO_Si: _BridgedSwiftClosureBox { let closure: (HttpStatus) -> Int @@ -21,23 +27,24 @@ private enum _BJS_Closure_10TestModule10HttpStatusO_Si { let box = _BJS_ClosureBox_10TestModule10HttpStatusO_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") @_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") -public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) @@ -47,8 +54,14 @@ public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Theme) -> String @@ -62,23 +75,24 @@ private enum _BJS_Closure_10TestModule5ThemeO_SS { let box = _BJS_ClosureBox_10TestModule5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule5ThemeO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") -public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -88,8 +102,14 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr: Unsa #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule5ThemeO_Sb: _BridgedSwiftClosureBox { let closure: (Theme) -> Bool @@ -103,23 +123,24 @@ private enum _BJS_Closure_10TestModule5ThemeO_Sb { let box = _BJS_ClosureBox_10TestModule5ThemeO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(callbackValue, param0Value) + return Bool.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") @_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") -public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { +public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -129,8 +150,14 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr: Unsa #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_: Int32, _: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule6PersonC_SS: _BridgedSwiftClosureBox { let closure: (Person) -> String @@ -144,23 +171,24 @@ private enum _BJS_Closure_10TestModule6PersonC_SS { let box = _BJS_ClosureBox_10TestModule6PersonC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule6PersonC_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Pointer = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule6PersonC_SS(callbackValue, param0Pointer) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule6PersonC_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_SS") -public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { +public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Person.bridgeJSLiftParameter(param0)) @@ -170,8 +198,14 @@ public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr: Uns #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (APIResult) -> String @@ -185,23 +219,24 @@ private enum _BJS_Closure_10TestModule9APIResultO_SS { let box = _BJS_ClosureBox_10TestModule9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule9APIResultO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0CaseId = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule9APIResultO_SS(callbackValue, param0CaseId) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") -public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) @@ -211,8 +246,14 @@ public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr: #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Direction) -> String @@ -226,23 +267,24 @@ private enum _BJS_Closure_10TestModule9DirectionO_SS { let box = _BJS_ClosureBox_10TestModule9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule9DirectionO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") -public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Direction.bridgeJSLiftParameter(param0)) @@ -252,8 +294,14 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr: #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModule9DirectionO_Sb: _BridgedSwiftClosureBox { let closure: (Direction) -> Bool @@ -267,23 +315,24 @@ private enum _BJS_Closure_10TestModule9DirectionO_Sb { let box = _BJS_ClosureBox_10TestModule9DirectionO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(callbackValue, param0Value) + return Bool.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") @_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") -public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Direction.bridgeJSLiftParameter(param0)) @@ -293,8 +342,14 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr: #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSS_SS: _BridgedSwiftClosureBox { let closure: (String) -> String @@ -308,23 +363,24 @@ private enum _BJS_Closure_10TestModuleSS_SS { let box = _BJS_ClosureBox_10TestModuleSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_TestModule_10TestModuleSS_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSS_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -334,8 +390,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr: UnsafeMut #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSq5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -349,24 +411,24 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { let box = _BJS_ClosureBox_10TestModuleSq5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) @@ -376,8 +438,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr: Un #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer, _: Int32, _: Int32, _: Int32, _: Float64) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Value: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Value: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS: _BridgedSwiftClosureBox { let closure: (Optional, Optional, Optional) -> String @@ -391,26 +459,26 @@ private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { let box = _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1, param2 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let (param1IsSome, param1Value) = param1.bridgeJSLowerParameterWithPresence() -let (param2IsSome, param2Value) = param2.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1, param2 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() + let (param1IsSome, param1Value) = param1.bridgeJSLowerParameter() + let (param2IsSome, param2Value) = param2.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(callbackValue, param0IsSome, param0Pointer, param1IsSome, param1Value, param2IsSome, param2Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer, param1IsSome: Int32, param1Bytes: Int32, param1Length: Int32, param2IsSome: Int32, param2Value: Float64) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) @@ -420,8 +488,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(b #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSq6PersonC_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -435,24 +509,24 @@ private enum _BJS_Closure_10TestModuleSq6PersonC_SS { let box = _BJS_ClosureBox_10TestModuleSq6PersonC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(callbackValue, param0IsSome, param0Pointer) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) @@ -462,8 +536,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr: U #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSq9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -477,24 +557,24 @@ private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { let box = _BJS_ClosureBox_10TestModuleSq9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(callbackValue, param0IsSome, param0CaseId) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) @@ -504,8 +584,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_10TestModuleSq9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -519,24 +605,24 @@ private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { let box = _BJS_ClosureBox_10TestModuleSq9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) @@ -680,7 +766,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_expose(wasm, "bjs_Person_init") @_cdecl("bjs_Person_init") -public func _bjs_Person_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Person_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Person(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -691,8 +777,12 @@ public func _bjs_Person_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutab @_expose(wasm, "bjs_Person_deinit") @_cdecl("bjs_Person_deinit") -public func _bjs_Person_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Person_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -703,16 +793,16 @@ extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") -fileprivate func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Person_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_TestProcessor_init") @_cdecl("bjs_TestProcessor_init") -public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor(transform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() @@ -723,7 +813,7 @@ public func _bjs_TestProcessor_init(transform: Int32) -> UnsafeMutableRawPointer @_expose(wasm, "bjs_TestProcessor_getTransform") @_cdecl("bjs_TestProcessor_getTransform") -public func _bjs_TestProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).getTransform() return _BJS_Closure_10TestModuleSS_SS.bridgeJSLower(ret) @@ -734,7 +824,7 @@ public func _bjs_TestProcessor_getTransform(_self: UnsafeMutableRawPointer) -> U @_expose(wasm, "bjs_TestProcessor_processWithCustom") @_cdecl("bjs_TestProcessor_processWithCustom") -public func _bjs_TestProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { +public func _bjs_TestProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() @@ -745,7 +835,7 @@ public func _bjs_TestProcessor_processWithCustom(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TestProcessor_printTogether") @_cdecl("bjs_TestProcessor_printTogether") -public func _bjs_TestProcessor_printTogether(_self: UnsafeMutableRawPointer, person: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32, ratio: Float64, customTransform: Int32) -> Void { +public func _bjs_TestProcessor_printTogether(_ _self: UnsafeMutableRawPointer, _ person: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32, _ ratio: Float64, _ customTransform: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).printTogether(person: Person.bridgeJSLiftParameter(person), name: String.bridgeJSLiftParameter(nameBytes, nameLength), ratio: Double.bridgeJSLiftParameter(ratio), customTransform: _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() @@ -756,7 +846,7 @@ public func _bjs_TestProcessor_printTogether(_self: UnsafeMutableRawPointer, per @_expose(wasm, "bjs_TestProcessor_roundtrip") @_cdecl("bjs_TestProcessor_roundtrip") -public func _bjs_TestProcessor_roundtrip(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_roundtrip(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLift(personClosure)) return _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLower(ret) @@ -767,7 +857,7 @@ public func _bjs_TestProcessor_roundtrip(_self: UnsafeMutableRawPointer, personC @_expose(wasm, "bjs_TestProcessor_roundtripOptional") @_cdecl("bjs_TestProcessor_roundtripOptional") -public func _bjs_TestProcessor_roundtripOptional(_self: UnsafeMutableRawPointer, personClosure: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_roundtripOptional(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLift(personClosure)) return _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLower(ret) @@ -778,7 +868,7 @@ public func _bjs_TestProcessor_roundtripOptional(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TestProcessor_processDirection") @_cdecl("bjs_TestProcessor_processDirection") -public func _bjs_TestProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_10TestModule9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -789,7 +879,7 @@ public func _bjs_TestProcessor_processDirection(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TestProcessor_processTheme") @_cdecl("bjs_TestProcessor_processTheme") -public func _bjs_TestProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_10TestModule5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -800,7 +890,7 @@ public func _bjs_TestProcessor_processTheme(_self: UnsafeMutableRawPointer, call @_expose(wasm, "bjs_TestProcessor_processHttpStatus") @_cdecl("bjs_TestProcessor_processHttpStatus") -public func _bjs_TestProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { +public func _bjs_TestProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -811,7 +901,7 @@ public func _bjs_TestProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TestProcessor_processAPIResult") @_cdecl("bjs_TestProcessor_processAPIResult") -public func _bjs_TestProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -822,7 +912,7 @@ public func _bjs_TestProcessor_processAPIResult(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TestProcessor_makeDirectionChecker") @_cdecl("bjs_TestProcessor_makeDirectionChecker") -public func _bjs_TestProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() return _BJS_Closure_10TestModule9DirectionO_Sb.bridgeJSLower(ret) @@ -833,7 +923,7 @@ public func _bjs_TestProcessor_makeDirectionChecker(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TestProcessor_makeThemeValidator") @_cdecl("bjs_TestProcessor_makeThemeValidator") -public func _bjs_TestProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() return _BJS_Closure_10TestModule5ThemeO_Sb.bridgeJSLower(ret) @@ -844,7 +934,7 @@ public func _bjs_TestProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_TestProcessor_makeStatusCodeExtractor") @_cdecl("bjs_TestProcessor_makeStatusCodeExtractor") -public func _bjs_TestProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() return _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLower(ret) @@ -855,7 +945,7 @@ public func _bjs_TestProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPo @_expose(wasm, "bjs_TestProcessor_makeAPIResultHandler") @_cdecl("bjs_TestProcessor_makeAPIResultHandler") -public func _bjs_TestProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() return _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLower(ret) @@ -866,7 +956,7 @@ public func _bjs_TestProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TestProcessor_processOptionalDirection") @_cdecl("bjs_TestProcessor_processOptionalDirection") -public func _bjs_TestProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -877,7 +967,7 @@ public func _bjs_TestProcessor_processOptionalDirection(_self: UnsafeMutableRawP @_expose(wasm, "bjs_TestProcessor_processOptionalTheme") @_cdecl("bjs_TestProcessor_processOptionalTheme") -public func _bjs_TestProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_10TestModuleSq5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -888,7 +978,7 @@ public func _bjs_TestProcessor_processOptionalTheme(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TestProcessor_processOptionalAPIResult") @_cdecl("bjs_TestProcessor_processOptionalAPIResult") -public func _bjs_TestProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TestProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_10TestModuleSq9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -899,7 +989,7 @@ public func _bjs_TestProcessor_processOptionalAPIResult(_self: UnsafeMutableRawP @_expose(wasm, "bjs_TestProcessor_makeOptionalDirectionFormatter") @_cdecl("bjs_TestProcessor_makeOptionalDirectionFormatter") -public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() return _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLower(ret) @@ -910,8 +1000,12 @@ public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutab @_expose(wasm, "bjs_TestProcessor_deinit") @_cdecl("bjs_TestProcessor_deinit") -public func _bjs_TestProcessor_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension TestProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -922,9 +1016,9 @@ extension TestProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestProcessor_wrap") -fileprivate func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index 57635c626..f35fc3b02 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -38,7 +38,7 @@ extension DataPoint: _BridgedSwiftStruct { @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") -public func _bjs_DataPoint_init(x: Float64, y: Float64, labelBytes: Int32, labelLength: Int32, optCountIsSome: Int32, optCountValue: Int32, optFlagIsSome: Int32, optFlagValue: Int32) -> Void { +public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { #if arch(wasm32) let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) return ret.bridgeJSLowerReturn() @@ -146,7 +146,7 @@ public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { @_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set") @_cdecl("bjs_ConfigStruct_static_defaultConfig_set") -public func _bjs_ConfigStruct_static_defaultConfig_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -167,7 +167,7 @@ public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { @_expose(wasm, "bjs_ConfigStruct_static_timeout_set") @_cdecl("bjs_ConfigStruct_static_timeout_set") -public func _bjs_ConfigStruct_static_timeout_set(value: Float64) -> Void { +public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void { #if arch(wasm32) ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) #else @@ -188,7 +188,7 @@ public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { @_expose(wasm, "bjs_ConfigStruct_static_update") @_cdecl("bjs_ConfigStruct_static_update") -public func _bjs_ConfigStruct_static_update(timeout: Float64) -> Float64 { +public func _bjs_ConfigStruct_static_update(_ timeout: Float64) -> Float64 { #if arch(wasm32) let ret = ConfigStruct.update(_: Double.bridgeJSLiftParameter(timeout)) return ret.bridgeJSLowerReturn() @@ -210,7 +210,7 @@ public func _bjs_roundtrip() -> Void { @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -221,7 +221,7 @@ public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMuta @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -232,7 +232,7 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_name_get") @_cdecl("bjs_Greeter_name_get") -public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -243,7 +243,7 @@ public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_name_set") @_cdecl("bjs_Greeter_name_set") -public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -253,8 +253,12 @@ public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: In @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -265,9 +269,9 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift index 1806d8aad..56425b208 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift @@ -16,7 +16,8 @@ fileprivate func bjs_checkArray(_ a: Int32) -> Void { #endif func checkArray(_ a: JSObject) throws(JSException) -> Void { - bjs_checkArray(a.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + bjs_checkArray(aValue) if let error = _swift_js_take_exception() { throw error } @@ -32,7 +33,9 @@ fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { #endif func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { - bjs_checkArrayWithLength(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + let bValue = b.bridgeJSLowerParameter() + bjs_checkArrayWithLength(aValue, bValue) if let error = _swift_js_take_exception() { throw error } @@ -48,7 +51,8 @@ fileprivate func bjs_checkArray(_ a: Int32) -> Void { #endif func checkArray(_ a: JSObject) throws(JSException) -> Void { - bjs_checkArray(a.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + bjs_checkArray(aValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift index 5e564aa3a..41a89ad2f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift @@ -33,7 +33,8 @@ fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { #endif func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripInt(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripInt(vValue) if let error = _swift_js_take_exception() { throw error } @@ -50,7 +51,8 @@ fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { #endif func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripString(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripString(vValue) if let error = _swift_js_take_exception() { throw error } @@ -67,7 +69,8 @@ fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #endif func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripBool(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripBool(vValue) if let error = _swift_js_take_exception() { throw error } @@ -84,7 +87,8 @@ fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { #endif func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripFloat(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripFloat(vValue) if let error = _swift_js_take_exception() { throw error } @@ -101,7 +105,8 @@ fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #endif func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripDouble(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripDouble(vValue) if let error = _swift_js_take_exception() { throw error } @@ -118,7 +123,8 @@ fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #endif func asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise { - let ret = bjs_asyncRoundTripJSObject(v.bridgeJSLowerParameter()) + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_asyncRoundTripJSObject(vValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift index 12e04e054..122771716 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift @@ -49,7 +49,10 @@ struct Animatable: _JSBridgedClass { } func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { - let ret = bjs_Animatable_animate(self.bridgeJSLowerParameter(), keyframes.bridgeJSLowerParameter(), options.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let keyframesValue = keyframes.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue) if let error = _swift_js_take_exception() { throw error } @@ -57,7 +60,9 @@ struct Animatable: _JSBridgedClass { } func getAnimations(_ options: JSObject) throws(JSException) -> JSObject { - let ret = bjs_Animatable_getAnimations(self.bridgeJSLowerParameter(), options.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_getAnimations(selfValue, optionsValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index 9fa2feafb..c78682994 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -67,7 +67,8 @@ struct ArrayBufferLike: _JSBridgedClass { var byteLength: Double { get throws(JSException) { - let ret = bjs_ArrayBufferLike_byteLength_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_ArrayBufferLike_byteLength_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -76,7 +77,10 @@ struct ArrayBufferLike: _JSBridgedClass { } func slice(_ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike { - let ret = bjs_ArrayBufferLike_slice(self.bridgeJSLowerParameter(), begin.bridgeJSLowerParameter(), end.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let beginValue = begin.bridgeJSLowerParameter() + let endValue = end.bridgeJSLowerParameter() + let ret = bjs_ArrayBufferLike_slice(selfValue, beginValue, endValue) if let error = _swift_js_take_exception() { throw error } @@ -157,7 +161,8 @@ struct WeirdNaming: _JSBridgedClass { var normalProperty: String { get throws(JSException) { - let ret = bjs_WeirdNaming_normalProperty_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_normalProperty_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -166,7 +171,9 @@ struct WeirdNaming: _JSBridgedClass { } func setNormalProperty(_ newValue: String) throws(JSException) -> Void { - bjs_WeirdNaming_normalProperty_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_normalProperty_set(selfValue, newValueValue) if let error = _swift_js_take_exception() { throw error } @@ -174,7 +181,8 @@ struct WeirdNaming: _JSBridgedClass { var `for`: String { get throws(JSException) { - let ret = bjs_WeirdNaming_for_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_for_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -183,7 +191,9 @@ struct WeirdNaming: _JSBridgedClass { } func setFor(_ newValue: String) throws(JSException) -> Void { - bjs_WeirdNaming_for_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_for_set(selfValue, newValueValue) if let error = _swift_js_take_exception() { throw error } @@ -191,7 +201,8 @@ struct WeirdNaming: _JSBridgedClass { var `Any`: String { get throws(JSException) { - let ret = bjs_WeirdNaming_Any_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_Any_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -200,14 +211,17 @@ struct WeirdNaming: _JSBridgedClass { } func setAny(_ newValue: String) throws(JSException) -> Void { - bjs_WeirdNaming_Any_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_Any_set(selfValue, newValueValue) if let error = _swift_js_take_exception() { throw error } } func `as`() throws(JSException) -> Void { - bjs_WeirdNaming_as(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + bjs_WeirdNaming_as(selfValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift index 3102cd6e8..1f8a14800 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift @@ -16,7 +16,8 @@ fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { #endif func createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection { - let ret = bjs_createDatabaseConnection(config.bridgeJSLowerParameter()) + let configValue = config.bridgeJSLowerParameter() + let ret = bjs_createDatabaseConnection(configValue) if let error = _swift_js_take_exception() { throw error } @@ -33,7 +34,8 @@ fileprivate func bjs_createLogger(_ level: Int32) -> Int32 { #endif func createLogger(_ level: String) throws(JSException) -> Logger { - let ret = bjs_createLogger(level.bridgeJSLowerParameter()) + let levelValue = level.bridgeJSLowerParameter() + let ret = bjs_createLogger(levelValue) if let error = _swift_js_take_exception() { throw error } @@ -111,7 +113,8 @@ struct DatabaseConnection: _JSBridgedClass { var isConnected: Bool { get throws(JSException) { - let ret = bjs_DatabaseConnection_isConnected_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_isConnected_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -121,7 +124,8 @@ struct DatabaseConnection: _JSBridgedClass { var connectionTimeout: Double { get throws(JSException) { - let ret = bjs_DatabaseConnection_connectionTimeout_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_connectionTimeout_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -130,21 +134,27 @@ struct DatabaseConnection: _JSBridgedClass { } func setConnectionTimeout(_ newValue: Double) throws(JSException) -> Void { - bjs_DatabaseConnection_connectionTimeout_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_DatabaseConnection_connectionTimeout_set(selfValue, newValueValue) if let error = _swift_js_take_exception() { throw error } } func connect(_ url: String) throws(JSException) -> Void { - bjs_DatabaseConnection_connect(self.bridgeJSLowerParameter(), url.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let urlValue = url.bridgeJSLowerParameter() + bjs_DatabaseConnection_connect(selfValue, urlValue) if let error = _swift_js_take_exception() { throw error } } func execute(_ query: String) throws(JSException) -> JSObject { - let ret = bjs_DatabaseConnection_execute(self.bridgeJSLowerParameter(), query.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let queryValue = query.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_execute(selfValue, queryValue) if let error = _swift_js_take_exception() { throw error } @@ -189,7 +199,8 @@ struct Logger: _JSBridgedClass { var level: String { get throws(JSException) { - let ret = bjs_Logger_level_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Logger_level_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -198,14 +209,19 @@ struct Logger: _JSBridgedClass { } func log(_ message: String) throws(JSException) -> Void { - bjs_Logger_log(self.bridgeJSLowerParameter(), message.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + bjs_Logger_log(selfValue, messageValue) if let error = _swift_js_take_exception() { throw error } } func error(_ message: String, _ error: JSObject) throws(JSException) -> Void { - bjs_Logger_error(self.bridgeJSLowerParameter(), message.bridgeJSLowerParameter(), error.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + let errorValue = error.bridgeJSLowerParameter() + bjs_Logger_error(selfValue, messageValue, errorValue) if let error = _swift_js_take_exception() { throw error } @@ -249,7 +265,8 @@ struct ConfigManager: _JSBridgedClass { var configPath: String { get throws(JSException) { - let ret = bjs_ConfigManager_configPath_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_ConfigManager_configPath_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -258,7 +275,9 @@ struct ConfigManager: _JSBridgedClass { } func get(_ key: String) throws(JSException) -> JSObject { - let ret = bjs_ConfigManager_get(self.bridgeJSLowerParameter(), key.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let keyValue = key.bridgeJSLowerParameter() + let ret = bjs_ConfigManager_get(selfValue, keyValue) if let error = _swift_js_take_exception() { throw error } @@ -266,7 +285,10 @@ struct ConfigManager: _JSBridgedClass { } func set(_ key: String, _ value: JSObject) throws(JSException) -> Void { - bjs_ConfigManager_set(self.bridgeJSLowerParameter(), key.bridgeJSLowerParameter(), value.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let keyValue = key.bridgeJSLowerParameter() + let valueValue = value.bridgeJSLowerParameter() + bjs_ConfigManager_set(selfValue, keyValue, valueValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift index 2643eaa08..90088799d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift @@ -16,7 +16,9 @@ fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { #endif func check(_ a: Double, _ b: Bool) throws(JSException) -> Void { - bjs_check(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + let bValue = b.bridgeJSLowerParameter() + bjs_check(aValue, bValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift index 68b341ca7..35502a7cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift @@ -16,7 +16,8 @@ fileprivate func bjs_checkString(_ a: Int32) -> Void { #endif func checkString(_ a: String) throws(JSException) -> Void { - bjs_checkString(a.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + bjs_checkString(aValue) if let error = _swift_js_take_exception() { throw error } @@ -32,7 +33,9 @@ fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { #endif func checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { - bjs_checkStringWithLength(a.bridgeJSLowerParameter(), b.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + let bValue = b.bridgeJSLowerParameter() + bjs_checkStringWithLength(aValue, bValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift index 2e4331c78..26d37a909 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift @@ -33,7 +33,8 @@ fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 { #endif func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator { - let ret = bjs_createCodeGenerator(format.bridgeJSLowerParameter()) + let formatValue = format.bridgeJSLowerParameter() + let ret = bjs_createCodeGenerator(formatValue) if let error = _swift_js_take_exception() { throw error } @@ -76,7 +77,8 @@ struct TypeScriptProcessor: _JSBridgedClass { var version: String { get throws(JSException) { - let ret = bjs_TypeScriptProcessor_version_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_version_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -85,7 +87,9 @@ struct TypeScriptProcessor: _JSBridgedClass { } func convert(_ ts: String) throws(JSException) -> String { - let ret = bjs_TypeScriptProcessor_convert(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_convert(selfValue, tsValue) if let error = _swift_js_take_exception() { throw error } @@ -93,7 +97,9 @@ struct TypeScriptProcessor: _JSBridgedClass { } func validate(_ ts: String) throws(JSException) -> Bool { - let ret = bjs_TypeScriptProcessor_validate(self.bridgeJSLowerParameter(), ts.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_validate(selfValue, tsValue) if let error = _swift_js_take_exception() { throw error } @@ -129,7 +135,8 @@ struct CodeGenerator: _JSBridgedClass { var outputFormat: String { get throws(JSException) { - let ret = bjs_CodeGenerator_outputFormat_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_CodeGenerator_outputFormat_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -138,7 +145,9 @@ struct CodeGenerator: _JSBridgedClass { } func generate(_ input: JSObject) throws(JSException) -> String { - let ret = bjs_CodeGenerator_generate(self.bridgeJSLowerParameter(), input.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let inputValue = input.bridgeJSLowerParameter() + let ret = bjs_CodeGenerator_generate(selfValue, inputValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift index e539e65df..afd99723e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift @@ -16,7 +16,8 @@ fileprivate func bjs_checkSimple(_ a: Float64) -> Void { #endif func checkSimple(_ a: Double) throws(JSException) -> Void { - bjs_checkSimple(a.bridgeJSLowerParameter()) + let aValue = a.bridgeJSLowerParameter() + bjs_checkSimple(aValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift index 148419de2..6d1bdca34 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift @@ -68,7 +68,8 @@ struct Greeter: _JSBridgedClass { } init(_ name: String) throws(JSException) { - let ret = bjs_Greeter_init(name.bridgeJSLowerParameter()) + let nameValue = name.bridgeJSLowerParameter() + let ret = bjs_Greeter_init(nameValue) if let error = _swift_js_take_exception() { throw error } @@ -77,7 +78,8 @@ struct Greeter: _JSBridgedClass { var name: String { get throws(JSException) { - let ret = bjs_Greeter_name_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_name_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -86,7 +88,9 @@ struct Greeter: _JSBridgedClass { } func setName(_ newValue: String) throws(JSException) -> Void { - bjs_Greeter_name_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_Greeter_name_set(selfValue, newValueValue) if let error = _swift_js_take_exception() { throw error } @@ -94,7 +98,8 @@ struct Greeter: _JSBridgedClass { var age: Double { get throws(JSException) { - let ret = bjs_Greeter_age_get(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_age_get(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -103,7 +108,8 @@ struct Greeter: _JSBridgedClass { } func greet() throws(JSException) -> String { - let ret = bjs_Greeter_greet(self.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_greet(selfValue) if let error = _swift_js_take_exception() { throw error } @@ -111,7 +117,9 @@ struct Greeter: _JSBridgedClass { } func changeName(_ name: String) throws(JSException) -> Void { - bjs_Greeter_changeName(self.bridgeJSLowerParameter(), name.bridgeJSLowerParameter()) + let selfValue = self.bridgeJSLowerParameter() + let nameValue = name.bridgeJSLowerParameter() + bjs_Greeter_changeName(selfValue, nameValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index b3262cb9e..92ab52f04 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -78,7 +78,6 @@ import _CJavaScriptKit // - `func bridgeJSLowerReturn() -> <#WasmCoreType#>`: lower the given higher-level return value to a Wasm core type // // Optional types (ExportSwift only) additionally define: -// - `func bridgeJSLowerParameterWithPresence()`: lower optional as (isSome, value) tuple for protocol setters/parameters (borrows object) // - `func bridgeJSLowerParameterWithRetain()`: lower optional heap object with ownership transfer for escaping closures // - `func bridgeJSLiftReturnFromSideChannel()`: lift optional from side-channel storage for protocol property getters // @@ -653,7 +652,7 @@ extension Optional where Wrapped == Bool { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { @@ -703,7 +702,7 @@ extension Optional where Wrapped == Int { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { @@ -743,7 +742,7 @@ extension Optional where Wrapped == Int { extension Optional where Wrapped == String { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { @@ -786,7 +785,7 @@ extension Optional where Wrapped == String { extension Optional where Wrapped == JSObject { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { @@ -840,18 +839,7 @@ extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { /// Optional support for Swift heap objects extension Optional where Wrapped: _BridgedSwiftHeapObject { - // MARK: ImportTS - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { - switch consume self { - case .none: - // Return null pointer for nil - return UnsafeMutableRawPointer(bitPattern: 0).unsafelyUnwrapped - case .some(let value): - // Pass unretained pointer since JS will manage the lifetime - return Unmanaged.passUnretained(value).toOpaque() - } - } - + // MARK: ExportSwift /// Lowers optional Swift heap object as (isSome, pointer) tuple for protocol parameters. /// /// This method uses `passUnretained()` because the caller (JavaScript protocol implementation) @@ -859,7 +847,7 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { /// duration of the call. /// /// - Returns: A tuple containing presence flag (0 for nil, 1 for some) and unretained pointer - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, pointer: UnsafeMutableRawPointer ) { switch consume self { @@ -931,13 +919,19 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } extension Optional where Wrapped == Float { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional Float type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( + isSome: Int32, value: Float32 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0.0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Float? { if isSome == 0 { return nil @@ -967,13 +961,19 @@ extension Optional where Wrapped == Float { /// Optional support for Double extension Optional where Wrapped == Double { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional Double type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( + isSome: Int32, value: Float64 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0.0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Double? { if isSome == 0 { return nil @@ -1005,7 +1005,7 @@ extension Optional where Wrapped == Double { extension Optional where Wrapped: _BridgedSwiftCaseEnum { // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, value: Int32) { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { switch consume self { case .none: return (isSome: 0, value: 0) @@ -1061,7 +1061,7 @@ extension Optional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { @@ -1099,7 +1099,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, value: Int32) { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { switch consume self { case .none: return (isSome: 0, value: 0) @@ -1146,7 +1146,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Float32 ) { switch consume self { @@ -1181,7 +1181,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Float64 ) { switch consume self { @@ -1218,7 +1218,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { // MARK: ExportSwift - @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithPresence() -> (isSome: Int32, caseId: Int32) { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { switch consume self { case .none: return (isSome: 0, caseId: 0) diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift index 8e0c5f187..09cd79ecc 100644 --- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift @@ -103,7 +103,7 @@ public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_get() -> @_expose(wasm, "bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set") @_cdecl("bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set") -public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) GlobalStaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -135,7 +135,7 @@ public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedPro @_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set") @_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set") -public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set(value: Int32) -> Void { +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) GlobalStaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value) #else @@ -167,7 +167,7 @@ public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDou @_expose(wasm, "bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set") @_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set") -public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set(value: Float64) -> Void { +public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) GlobalStaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value) #else @@ -188,7 +188,7 @@ public func _bjs_TestHTTPServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_TestHTTPServer_call") @_cdecl("bjs_TestHTTPServer_call") -public func _bjs_TestHTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_TestHTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) GlobalNetworking.API.TestHTTPServer.bridgeJSLiftParameter(_self).call(_: GlobalNetworking.API.CallMethod.bridgeJSLiftParameter(method)) #else @@ -198,8 +198,12 @@ public func _bjs_TestHTTPServer_call(_self: UnsafeMutableRawPointer, method: Int @_expose(wasm, "bjs_TestHTTPServer_deinit") @_cdecl("bjs_TestHTTPServer_deinit") -public func _bjs_TestHTTPServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestHTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension GlobalNetworking.API.TestHTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -210,9 +214,9 @@ extension GlobalNetworking.API.TestHTTPServer: ConvertibleToJSValue, _BridgedSwi #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestHTTPServer_wrap") -fileprivate func _bjs_TestHTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestHTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -230,7 +234,7 @@ public func _bjs_TestInternalServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_TestInternalServer_call") @_cdecl("bjs_TestInternalServer_call") -public func _bjs_TestInternalServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_TestInternalServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Internal.TestInternalServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedServerMethod.bridgeJSLiftParameter(method)) #else @@ -240,8 +244,12 @@ public func _bjs_TestInternalServer_call(_self: UnsafeMutableRawPointer, method: @_expose(wasm, "bjs_TestInternalServer_deinit") @_cdecl("bjs_TestInternalServer_deinit") -public func _bjs_TestInternalServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestInternalServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Internal.TestInternalServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -252,9 +260,9 @@ extension Internal.TestInternalServer: ConvertibleToJSValue, _BridgedSwiftHeapOb #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestInternalServer_wrap") -fileprivate func _bjs_TestInternalServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestInternalServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -272,7 +280,7 @@ public func _bjs_PublicConverter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_PublicConverter_toString") @_cdecl("bjs_PublicConverter_toString") -public func _bjs_PublicConverter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PublicConverter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -283,8 +291,12 @@ public func _bjs_PublicConverter_toString(_self: UnsafeMutableRawPointer, value: @_expose(wasm, "bjs_PublicConverter_deinit") @_cdecl("bjs_PublicConverter_deinit") -public func _bjs_PublicConverter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PublicConverter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension GlobalUtils.PublicConverter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -295,9 +307,9 @@ extension GlobalUtils.PublicConverter: ConvertibleToJSValue, _BridgedSwiftHeapOb #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_PublicConverter_wrap") -fileprivate func _bjs_PublicConverter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicConverter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift index addeedb1e..0a95e88f9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift @@ -6,8 +6,14 @@ @_spi(BridgeJS) import JavaScriptKit +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si: _BridgedSwiftClosureBox { let closure: (HttpStatus) -> Int @@ -21,23 +27,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) @@ -47,8 +54,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10H #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Theme) -> String @@ -62,23 +75,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -88,8 +102,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb: _BridgedSwiftClosureBox { let closure: (Theme) -> Bool @@ -103,23 +123,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callbackValue, param0Value) + return Bool.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Int32 { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -129,8 +150,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_: Int32, _: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS: _BridgedSwiftClosureBox { let closure: (Greeter) -> String @@ -144,23 +171,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Greeter) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Pointer = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(callbackValue, param0Pointer) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(boxPtr: UnsafeMutableRawPointer, param0: UnsafeMutableRawPointer) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Greeter.bridgeJSLiftParameter(param0)) @@ -170,8 +198,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7Gr #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (APIResult) -> String @@ -185,23 +219,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0CaseId = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(callbackValue, param0CaseId) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) @@ -211,8 +246,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9AP #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Direction) -> String @@ -226,23 +267,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Direction.bridgeJSLiftParameter(param0)) @@ -252,8 +294,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb: _BridgedSwiftClosureBox { let closure: (Direction) -> Bool @@ -267,23 +315,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Bool.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(callbackValue, param0Value) + return Bool.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Direction.bridgeJSLiftParameter(param0)) @@ -293,8 +342,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_: Int32, _: Int32) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC: _BridgedSwiftClosureBox { let closure: (String) -> Greeter @@ -308,23 +363,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Greeter.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callbackValue, param0Value) + return Greeter.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> UnsafeMutableRawPointer { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -334,8 +390,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS: _BridgedSwiftClosureBox { let closure: (String) -> String @@ -349,23 +411,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callbackValue, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(boxPtr: UnsafeMutableRawPointer, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) @@ -375,8 +438,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_: Int32, _: Int32, _: Int32, _: Float64) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS: _BridgedSwiftClosureBox { let closure: (Int, String, Double) -> String @@ -390,23 +459,26 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1, param2 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter(), param1.bridgeJSLowerParameter(), param2.bridgeJSLowerParameter()) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1, param2 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let param1Value = param1.bridgeJSLowerParameter() + let param2Value = param2.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callbackValue, param0Value, param1Value, param2Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(boxPtr: UnsafeMutableRawPointer, param0: Int32, param1Bytes: Int32, param1Length: Int32, param2: Float64) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) @@ -416,8 +488,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiS #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si: _BridgedSwiftClosureBox { let closure: (Int) -> Int @@ -431,23 +509,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callback.bridgeJSLowerParameter(), param0.bridgeJSLowerParameter()) - return Int.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(boxPtr: UnsafeMutableRawPointer, param0: Int32) -> Int32 { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Int.bridgeJSLiftParameter(param0)) @@ -457,8 +536,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_ #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -472,24 +557,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) @@ -499,8 +584,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5 #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_: Int32, _: Int32, _: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -514,24 +605,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithRetain() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(callbackValue, param0IsSome, param0Pointer) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: UnsafeMutableRawPointer) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) @@ -541,8 +632,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7 #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -556,24 +653,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(callbackValue, param0IsSome, param0CaseId) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0CaseId: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) @@ -583,8 +680,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -598,24 +701,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) @@ -625,8 +728,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -640,24 +749,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Bytes: Int32, param0Length: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) @@ -667,8 +776,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_: Int32, _: Int32, _: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS: _BridgedSwiftClosureBox { let closure: (Optional) -> String @@ -682,24 +797,24 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0 in - #if arch(wasm32) - let (param0IsSome, param0Value) = param0.bridgeJSLowerParameterWithPresence() -let resultId = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(callback.bridgeJSLowerParameter(), param0IsSome, param0Value) - return String.bridgeJSLiftReturn(resultId) - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(callbackValue, param0IsSome, param0Value) + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(boxPtr: UnsafeMutableRawPointer, param0IsSome: Int32, param0Value: Int32) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) @@ -709,8 +824,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #endif } +#if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC: _BridgedSwiftClosureBox { let closure: () -> Optional @@ -724,23 +845,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC(closure) return Unmanaged.passRetained(box).toOpaque() } - static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional { - let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] in - #if arch(wasm32) - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(callback.bridgeJSLowerParameter()) - return Optional.bridgeJSLiftReturnFromSideChannel() - #else - fatalError("Only available on WebAssembly") - #endif - } + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(callbackValue) + return Optional.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif } + } } @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(boxPtr: UnsafeMutableRawPointer) -> Void { +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure() @@ -753,161 +874,197 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_S struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func increment(by amount: Int) { - _extern_increment(this: Int32(bitPattern: jsObject.id), amount: amount.bridgeJSLowerParameter()) + func increment(by amount: Int) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let amountValue = amount.bridgeJSLowerParameter() + _extern_increment(jsObjectValue, amountValue) } func getValue() -> Int { - let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_getValue(jsObjectValue) return Int.bridgeJSLiftReturn(ret) } - func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) { - _extern_setLabelElements(this: Int32(bitPattern: jsObject.id), labelPrefix: labelPrefix.bridgeJSLowerParameter(), labelSuffix: labelSuffix.bridgeJSLowerParameter()) + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let labelPrefixValue = labelPrefix.bridgeJSLowerParameter() + let labelSuffixValue = labelSuffix.bridgeJSLowerParameter() + _extern_setLabelElements(jsObjectValue, labelPrefixValue, labelSuffixValue) } func getLabel() -> String { - let ret = _extern_getLabel(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_getLabel(jsObjectValue) return String.bridgeJSLiftReturn(ret) } func isEven() -> Bool { - let ret = _extern_isEven(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_isEven(jsObjectValue) return Bool.bridgeJSLiftReturn(ret) } func processGreeter(_ greeter: Greeter) -> String { - let ret = _extern_processGreeter(this: Int32(bitPattern: jsObject.id), greeter: greeter.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let greeterPointer = greeter.bridgeJSLowerParameter() + let ret = _extern_processGreeter(jsObjectValue, greeterPointer) return String.bridgeJSLiftReturn(ret) } func createGreeter() -> Greeter { - let ret = _extern_createGreeter(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_createGreeter(jsObjectValue) return Greeter.bridgeJSLiftReturn(ret) } func processOptionalGreeter(_ greeter: Optional) -> String { - let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameterWithPresence() - let ret = _extern_processOptionalGreeter(this: Int32(bitPattern: jsObject.id), greeterIsSome: greeterIsSome, greeterPointer: greeterPointer) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() + let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer) return String.bridgeJSLiftReturn(ret) } func createOptionalGreeter() -> Optional { - let ret = _extern_createOptionalGreeter(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_createOptionalGreeter(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } - func handleAPIResult(_ result: Optional) { - let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameterWithPresence() - _extern_handleAPIResult(this: Int32(bitPattern: jsObject.id), resultIsSome: resultIsSome, resultCaseId: resultCaseId) + func handleAPIResult(_ result: Optional) -> Void { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter() + _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId) } func getAPIResult() -> Optional { - let ret = _extern_getAPIResult(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = _extern_getAPIResult(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } var count: Int { get { - let ret = bjs_DataProcessor_count_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_count_get(jsObjectValue) return Int.bridgeJSLiftReturn(ret) } set { - bjs_DataProcessor_count_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_count_set(jsObjectValue, newValueValue) } } var name: String { get { - let ret = bjs_DataProcessor_name_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_name_get(jsObjectValue) return String.bridgeJSLiftReturn(ret) } } var optionalTag: Optional { get { - bjs_DataProcessor_optionalTag_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_optionalTag_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_optionalTag_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_optionalTag_set(jsObjectValue, newValueIsSome, newValueValue) } } var optionalCount: Optional { get { - bjs_DataProcessor_optionalCount_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_optionalCount_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_optionalCount_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_optionalCount_set(jsObjectValue, newValueIsSome, newValueValue) } } var direction: Optional { get { - let ret = bjs_DataProcessor_direction_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_direction_get(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_direction_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_direction_set(jsObjectValue, newValueIsSome, newValueValue) } } var optionalTheme: Optional { get { - bjs_DataProcessor_optionalTheme_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_optionalTheme_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_optionalTheme_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_optionalTheme_set(jsObjectValue, newValueIsSome, newValueValue) } } var httpStatus: Optional { get { - bjs_DataProcessor_httpStatus_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_httpStatus_get(jsObjectValue) return Optional.bridgeJSLiftReturnFromSideChannel() } set { - let (isSome, value) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_httpStatus_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, value: value) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_httpStatus_set(jsObjectValue, newValueIsSome, newValueValue) } } var apiResult: Optional { get { - let ret = bjs_DataProcessor_apiResult_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_apiResult_get(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } set { - let (isSome, caseId) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_apiResult_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, caseId: caseId) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValueCaseId) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_apiResult_set(jsObjectValue, newValueIsSome, newValueCaseId) } } var helper: Greeter { get { - let ret = bjs_DataProcessor_helper_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_helper_get(jsObjectValue) return Greeter.bridgeJSLiftReturn(ret) } set { - bjs_DataProcessor_helper_set(this: Int32(bitPattern: jsObject.id), pointer: newValue.bridgeJSLowerParameter()) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let newValuePointer = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_helper_set(jsObjectValue, newValuePointer) } } var optionalHelper: Optional { get { - let ret = bjs_DataProcessor_optionalHelper_get(this: Int32(bitPattern: jsObject.id)) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_optionalHelper_get(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } set { - let (isSome, pointer) = newValue.bridgeJSLowerParameterWithPresence() - bjs_DataProcessor_optionalHelper_set(this: Int32(bitPattern: jsObject.id), isSome: isSome, pointer: pointer) + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let (newValueIsSome, newValuePointer) = newValue.bridgeJSLowerParameter() + bjs_DataProcessor_optionalHelper_set(jsObjectValue, newValueIsSome, newValuePointer) } } @@ -917,94 +1074,94 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { } @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") -fileprivate func _extern_increment(this: Int32, amount: Int32) +fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") -fileprivate func _extern_getValue(this: Int32) -> Int32 +fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") -fileprivate func _extern_setLabelElements(this: Int32, labelPrefix: Int32, labelSuffix: Int32) +fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") -fileprivate func _extern_getLabel(this: Int32) -> Int32 +fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") -fileprivate func _extern_isEven(this: Int32) -> Int32 +fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") -fileprivate func _extern_processGreeter(this: Int32, greeter: UnsafeMutableRawPointer) -> Int32 +fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") -fileprivate func _extern_createGreeter(this: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") -fileprivate func _extern_processOptionalGreeter(this: Int32, greeterIsSome: Int32, greeterPointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") -fileprivate func _extern_createOptionalGreeter(this: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") -fileprivate func _extern_handleAPIResult(this: Int32, resultIsSome: Int32, resultCaseId: Int32) +fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") -fileprivate func _extern_getAPIResult(this: Int32) -> Int32 +fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") -fileprivate func bjs_DataProcessor_count_get(this: Int32) -> Int32 +fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") -fileprivate func bjs_DataProcessor_count_set(this: Int32, value: Int32) +fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") -fileprivate func bjs_DataProcessor_name_get(this: Int32) -> Int32 +fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") -fileprivate func bjs_DataProcessor_optionalTag_get(this: Int32) +fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") -fileprivate func bjs_DataProcessor_optionalTag_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") -fileprivate func bjs_DataProcessor_optionalCount_get(this: Int32) +fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") -fileprivate func bjs_DataProcessor_optionalCount_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") -fileprivate func bjs_DataProcessor_direction_get(this: Int32) -> Int32 +fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") -fileprivate func bjs_DataProcessor_direction_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") -fileprivate func bjs_DataProcessor_optionalTheme_get(this: Int32) +fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") -fileprivate func bjs_DataProcessor_optionalTheme_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") -fileprivate func bjs_DataProcessor_httpStatus_get(this: Int32) +fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") -fileprivate func bjs_DataProcessor_httpStatus_set(this: Int32, isSome: Int32, value: Int32) +fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") -fileprivate func bjs_DataProcessor_apiResult_get(this: Int32) -> Int32 +fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") -fileprivate func bjs_DataProcessor_apiResult_set(this: Int32, isSome: Int32, caseId: Int32) +fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") -fileprivate func bjs_DataProcessor_helper_get(this: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") -fileprivate func bjs_DataProcessor_helper_set(this: Int32, pointer: UnsafeMutableRawPointer) +fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") -fileprivate func bjs_DataProcessor_optionalHelper_get(this: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") -fileprivate func bjs_DataProcessor_optionalHelper_set(this: Int32, isSome: Int32, pointer: UnsafeMutableRawPointer) +fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -1762,7 +1919,7 @@ extension StaticCalculator: _BridgedSwiftCaseEnum { @_expose(wasm, "bjs_StaticCalculator_static_roundtrip") @_cdecl("bjs_StaticCalculator_static_roundtrip") -public func _bjs_StaticCalculator_static_roundtrip(value: Int32) -> Int32 { +public func _bjs_StaticCalculator_static_roundtrip(_ value: Int32) -> Int32 { #if arch(wasm32) let ret = StaticCalculator.roundtrip(_: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -1773,7 +1930,7 @@ public func _bjs_StaticCalculator_static_roundtrip(value: Int32) -> Int32 { @_expose(wasm, "bjs_StaticUtils_Nested_static_roundtrip") @_cdecl("bjs_StaticUtils_Nested_static_roundtrip") -public func _bjs_StaticUtils_Nested_static_roundtrip(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) let ret = StaticUtils.Nested.roundtrip(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -1830,7 +1987,7 @@ public func _bjs_StaticPropertyEnum_static_enumProperty_get() -> Void { @_expose(wasm, "bjs_StaticPropertyEnum_static_enumProperty_set") @_cdecl("bjs_StaticPropertyEnum_static_enumProperty_set") -public func _bjs_StaticPropertyEnum_static_enumProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -1862,7 +2019,7 @@ public func _bjs_StaticPropertyEnum_static_enumBool_get() -> Int32 { @_expose(wasm, "bjs_StaticPropertyEnum_static_enumBool_set") @_cdecl("bjs_StaticPropertyEnum_static_enumBool_set") -public func _bjs_StaticPropertyEnum_static_enumBool_set(value: Int32) -> Void { +public func _bjs_StaticPropertyEnum_static_enumBool_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyEnum.enumBool = Bool.bridgeJSLiftParameter(value) #else @@ -1883,7 +2040,7 @@ public func _bjs_StaticPropertyEnum_static_enumVariable_get() -> Int32 { @_expose(wasm, "bjs_StaticPropertyEnum_static_enumVariable_set") @_cdecl("bjs_StaticPropertyEnum_static_enumVariable_set") -public func _bjs_StaticPropertyEnum_static_enumVariable_set(value: Int32) -> Void { +public func _bjs_StaticPropertyEnum_static_enumVariable_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyEnum.enumVariable = Int.bridgeJSLiftParameter(value) #else @@ -1915,7 +2072,7 @@ public func _bjs_StaticPropertyEnum_static_computedReadWrite_get() -> Void { @_expose(wasm, "bjs_StaticPropertyEnum_static_computedReadWrite_set") @_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_set") -public func _bjs_StaticPropertyEnum_static_computedReadWrite_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyEnum_static_computedReadWrite_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyEnum.computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -1936,7 +2093,7 @@ public func _bjs_StaticPropertyNamespace_static_namespaceProperty_get() -> Void @_expose(wasm, "bjs_StaticPropertyNamespace_static_namespaceProperty_set") @_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_set") -public func _bjs_StaticPropertyNamespace_static_namespaceProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -1968,7 +2125,7 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_ @_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set") @_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set") -public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set(value: Int32) -> Void { +public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value) #else @@ -2000,7 +2157,7 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_ge @_expose(wasm, "bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set") @_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set") -public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set(value: Float64) -> Void { +public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) StaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value) #else @@ -2040,7 +2197,7 @@ extension DataPoint: _BridgedSwiftStruct { @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") -public func _bjs_DataPoint_init(x: Float64, y: Float64, labelBytes: Int32, labelLength: Int32, optCountIsSome: Int32, optCountValue: Int32, optFlagIsSome: Int32, optFlagValue: Int32) -> Void { +public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { #if arch(wasm32) let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) return ret.bridgeJSLowerReturn() @@ -2193,7 +2350,7 @@ extension MathOperations: _BridgedSwiftStruct { @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") -public func _bjs_MathOperations_init(baseValue: Float64) -> Void { +public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { #if arch(wasm32) let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) return ret.bridgeJSLowerReturn() @@ -2204,7 +2361,7 @@ public func _bjs_MathOperations_init(baseValue: Float64) -> Void { @_expose(wasm, "bjs_MathOperations_add") @_cdecl("bjs_MathOperations_add") -public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -2215,7 +2372,7 @@ public func _bjs_MathOperations_add(a: Float64, b: Float64) -> Float64 { @_expose(wasm, "bjs_MathOperations_multiply") @_cdecl("bjs_MathOperations_multiply") -public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -2226,7 +2383,7 @@ public func _bjs_MathOperations_multiply(a: Float64, b: Float64) -> Float64 { @_expose(wasm, "bjs_MathOperations_static_subtract") @_cdecl("bjs_MathOperations_static_subtract") -public func _bjs_MathOperations_static_subtract(a: Float64, b: Float64) -> Float64 { +public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -2264,7 +2421,7 @@ public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { @_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_set") @_cdecl("bjs_ConfigStruct_static_defaultConfig_set") -public func _bjs_ConfigStruct_static_defaultConfig_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -2296,7 +2453,7 @@ public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { @_expose(wasm, "bjs_ConfigStruct_static_timeout_set") @_cdecl("bjs_ConfigStruct_static_timeout_set") -public func _bjs_ConfigStruct_static_timeout_set(value: Float64) -> Void { +public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void { #if arch(wasm32) ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) #else @@ -2327,7 +2484,7 @@ public func _bjs_roundTripVoid() -> Void { @_expose(wasm, "bjs_roundTripInt") @_cdecl("bjs_roundTripInt") -public func _bjs_roundTripInt(v: Int32) -> Int32 { +public func _bjs_roundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = roundTripInt(v: Int.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2338,7 +2495,7 @@ public func _bjs_roundTripInt(v: Int32) -> Int32 { @_expose(wasm, "bjs_roundTripFloat") @_cdecl("bjs_roundTripFloat") -public func _bjs_roundTripFloat(v: Float32) -> Float32 { +public func _bjs_roundTripFloat(_ v: Float32) -> Float32 { #if arch(wasm32) let ret = roundTripFloat(v: Float.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2349,7 +2506,7 @@ public func _bjs_roundTripFloat(v: Float32) -> Float32 { @_expose(wasm, "bjs_roundTripDouble") @_cdecl("bjs_roundTripDouble") -public func _bjs_roundTripDouble(v: Float64) -> Float64 { +public func _bjs_roundTripDouble(_ v: Float64) -> Float64 { #if arch(wasm32) let ret = roundTripDouble(v: Double.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2360,7 +2517,7 @@ public func _bjs_roundTripDouble(v: Float64) -> Float64 { @_expose(wasm, "bjs_roundTripBool") @_cdecl("bjs_roundTripBool") -public func _bjs_roundTripBool(v: Int32) -> Int32 { +public func _bjs_roundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = roundTripBool(v: Bool.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2371,7 +2528,7 @@ public func _bjs_roundTripBool(v: Int32) -> Int32 { @_expose(wasm, "bjs_roundTripString") @_cdecl("bjs_roundTripString") -public func _bjs_roundTripString(vBytes: Int32, vLength: Int32) -> Void { +public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)) return ret.bridgeJSLowerReturn() @@ -2382,7 +2539,7 @@ public func _bjs_roundTripString(vBytes: Int32, vLength: Int32) -> Void { @_expose(wasm, "bjs_roundTripSwiftHeapObject") @_cdecl("bjs_roundTripSwiftHeapObject") -public func _bjs_roundTripSwiftHeapObject(v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = roundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2393,7 +2550,7 @@ public func _bjs_roundTripSwiftHeapObject(v: UnsafeMutableRawPointer) -> UnsafeM @_expose(wasm, "bjs_roundTripJSObject") @_cdecl("bjs_roundTripJSObject") -public func _bjs_roundTripJSObject(v: Int32) -> Int32 { +public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = roundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)) return ret.bridgeJSLowerReturn() @@ -2404,7 +2561,7 @@ public func _bjs_roundTripJSObject(v: Int32) -> Int32 { @_expose(wasm, "bjs_throwsSwiftError") @_cdecl("bjs_throwsSwiftError") -public func _bjs_throwsSwiftError(shouldThrow: Int32) -> Void { +public func _bjs_throwsSwiftError(_ shouldThrow: Int32) -> Void { #if arch(wasm32) do { try throwsSwiftError(shouldThrow: Bool.bridgeJSLiftParameter(shouldThrow)) @@ -2616,7 +2773,7 @@ public func _bjs_asyncRoundTripVoid() -> Int32 { @_expose(wasm, "bjs_asyncRoundTripInt") @_cdecl("bjs_asyncRoundTripInt") -public func _bjs_asyncRoundTripInt(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripInt(v: Int.bridgeJSLiftParameter(v)).jsValue @@ -2629,7 +2786,7 @@ public func _bjs_asyncRoundTripInt(v: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripFloat") @_cdecl("bjs_asyncRoundTripFloat") -public func _bjs_asyncRoundTripFloat(v: Float32) -> Int32 { +public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripFloat(v: Float.bridgeJSLiftParameter(v)).jsValue @@ -2642,7 +2799,7 @@ public func _bjs_asyncRoundTripFloat(v: Float32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripDouble") @_cdecl("bjs_asyncRoundTripDouble") -public func _bjs_asyncRoundTripDouble(v: Float64) -> Int32 { +public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripDouble(v: Double.bridgeJSLiftParameter(v)).jsValue @@ -2655,7 +2812,7 @@ public func _bjs_asyncRoundTripDouble(v: Float64) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripBool") @_cdecl("bjs_asyncRoundTripBool") -public func _bjs_asyncRoundTripBool(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripBool(v: Bool.bridgeJSLiftParameter(v)).jsValue @@ -2668,7 +2825,7 @@ public func _bjs_asyncRoundTripBool(v: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripString") @_cdecl("bjs_asyncRoundTripString") -public func _bjs_asyncRoundTripString(vBytes: Int32, vLength: Int32) -> Int32 { +public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue @@ -2681,7 +2838,7 @@ public func _bjs_asyncRoundTripString(vBytes: Int32, vLength: Int32) -> Int32 { @_expose(wasm, "bjs_asyncRoundTripSwiftHeapObject") @_cdecl("bjs_asyncRoundTripSwiftHeapObject") -public func _bjs_asyncRoundTripSwiftHeapObject(v: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)).jsValue @@ -2694,7 +2851,7 @@ public func _bjs_asyncRoundTripSwiftHeapObject(v: UnsafeMutableRawPointer) -> In @_expose(wasm, "bjs_asyncRoundTripJSObject") @_cdecl("bjs_asyncRoundTripJSObject") -public func _bjs_asyncRoundTripJSObject(v: Int32) -> Int32 { +public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)).jsValue @@ -2707,7 +2864,7 @@ public func _bjs_asyncRoundTripJSObject(v: Int32) -> Int32 { @_expose(wasm, "bjs_takeGreeter") @_cdecl("bjs_takeGreeter") -public func _bjs_takeGreeter(g: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_takeGreeter(_ g: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) takeGreeter(g: Greeter.bridgeJSLiftParameter(g), name: String.bridgeJSLiftParameter(nameBytes, nameLength)) #else @@ -2728,7 +2885,7 @@ public func _bjs_createCalculator() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_useCalculator") @_cdecl("bjs_useCalculator") -public func _bjs_useCalculator(calc: UnsafeMutableRawPointer, x: Int32, y: Int32) -> Int32 { +public func _bjs_useCalculator(_ calc: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) let ret = useCalculator(calc: Calculator.bridgeJSLiftParameter(calc), x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) return ret.bridgeJSLowerReturn() @@ -2761,7 +2918,7 @@ public func _bjs_testCalculatorToJSValue() -> Int32 { @_expose(wasm, "bjs_testSwiftClassAsJSValue") @_cdecl("bjs_testSwiftClassAsJSValue") -public func _bjs_testSwiftClassAsJSValue(greeter: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_testSwiftClassAsJSValue(_ greeter: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = testSwiftClassAsJSValue(greeter: Greeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() @@ -2772,7 +2929,7 @@ public func _bjs_testSwiftClassAsJSValue(greeter: UnsafeMutableRawPointer) -> In @_expose(wasm, "bjs_setDirection") @_cdecl("bjs_setDirection") -public func _bjs_setDirection(direction: Int32) -> Int32 { +public func _bjs_setDirection(_ direction: Int32) -> Int32 { #if arch(wasm32) let ret = setDirection(_: Direction.bridgeJSLiftParameter(direction)) return ret.bridgeJSLowerReturn() @@ -2794,7 +2951,7 @@ public func _bjs_getDirection() -> Int32 { @_expose(wasm, "bjs_processDirection") @_cdecl("bjs_processDirection") -public func _bjs_processDirection(input: Int32) -> Int32 { +public func _bjs_processDirection(_ input: Int32) -> Int32 { #if arch(wasm32) let ret = processDirection(_: Direction.bridgeJSLiftParameter(input)) return ret.bridgeJSLowerReturn() @@ -2805,7 +2962,7 @@ public func _bjs_processDirection(input: Int32) -> Int32 { @_expose(wasm, "bjs_setTheme") @_cdecl("bjs_setTheme") -public func _bjs_setTheme(themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) let ret = setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() @@ -2827,7 +2984,7 @@ public func _bjs_getTheme() -> Void { @_expose(wasm, "bjs_setHttpStatus") @_cdecl("bjs_setHttpStatus") -public func _bjs_setHttpStatus(status: Int32) -> Int32 { +public func _bjs_setHttpStatus(_ status: Int32) -> Int32 { #if arch(wasm32) let ret = setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status)) return ret.bridgeJSLowerReturn() @@ -2849,7 +3006,7 @@ public func _bjs_getHttpStatus() -> Int32 { @_expose(wasm, "bjs_processTheme") @_cdecl("bjs_processTheme") -public func _bjs_processTheme(themeBytes: Int32, themeLength: Int32) -> Int32 { +public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 { #if arch(wasm32) let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() @@ -2860,7 +3017,7 @@ public func _bjs_processTheme(themeBytes: Int32, themeLength: Int32) -> Int32 { @_expose(wasm, "bjs_setTSDirection") @_cdecl("bjs_setTSDirection") -public func _bjs_setTSDirection(direction: Int32) -> Int32 { +public func _bjs_setTSDirection(_ direction: Int32) -> Int32 { #if arch(wasm32) let ret = setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction)) return ret.bridgeJSLowerReturn() @@ -2882,7 +3039,7 @@ public func _bjs_getTSDirection() -> Int32 { @_expose(wasm, "bjs_setTSTheme") @_cdecl("bjs_setTSTheme") -public func _bjs_setTSTheme(themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) let ret = setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() @@ -2904,7 +3061,7 @@ public func _bjs_getTSTheme() -> Void { @_expose(wasm, "bjs_roundtripNetworkingAPIMethod") @_cdecl("bjs_roundtripNetworkingAPIMethod") -public func _bjs_roundtripNetworkingAPIMethod(method: Int32) -> Int32 { +public func _bjs_roundtripNetworkingAPIMethod(_ method: Int32) -> Int32 { #if arch(wasm32) let ret = roundtripNetworkingAPIMethod(_: Networking.API.Method.bridgeJSLiftParameter(method)) return ret.bridgeJSLowerReturn() @@ -2915,7 +3072,7 @@ public func _bjs_roundtripNetworkingAPIMethod(method: Int32) -> Int32 { @_expose(wasm, "bjs_roundtripConfigurationLogLevel") @_cdecl("bjs_roundtripConfigurationLogLevel") -public func _bjs_roundtripConfigurationLogLevel(levelBytes: Int32, levelLength: Int32) -> Void { +public func _bjs_roundtripConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Void { #if arch(wasm32) let ret = roundtripConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength)) return ret.bridgeJSLowerReturn() @@ -2926,7 +3083,7 @@ public func _bjs_roundtripConfigurationLogLevel(levelBytes: Int32, levelLength: @_expose(wasm, "bjs_roundtripConfigurationPort") @_cdecl("bjs_roundtripConfigurationPort") -public func _bjs_roundtripConfigurationPort(port: Int32) -> Int32 { +public func _bjs_roundtripConfigurationPort(_ port: Int32) -> Int32 { #if arch(wasm32) let ret = roundtripConfigurationPort(_: Configuration.Port.bridgeJSLiftParameter(port)) return ret.bridgeJSLowerReturn() @@ -2937,7 +3094,7 @@ public func _bjs_roundtripConfigurationPort(port: Int32) -> Int32 { @_expose(wasm, "bjs_processConfigurationLogLevel") @_cdecl("bjs_processConfigurationLogLevel") -public func _bjs_processConfigurationLogLevel(levelBytes: Int32, levelLength: Int32) -> Int32 { +public func _bjs_processConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Int32 { #if arch(wasm32) let ret = processConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength)) return ret.bridgeJSLowerReturn() @@ -2948,7 +3105,7 @@ public func _bjs_processConfigurationLogLevel(levelBytes: Int32, levelLength: In @_expose(wasm, "bjs_roundtripInternalSupportedMethod") @_cdecl("bjs_roundtripInternalSupportedMethod") -public func _bjs_roundtripInternalSupportedMethod(method: Int32) -> Int32 { +public func _bjs_roundtripInternalSupportedMethod(_ method: Int32) -> Int32 { #if arch(wasm32) let ret = roundtripInternalSupportedMethod(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) return ret.bridgeJSLowerReturn() @@ -2959,7 +3116,7 @@ public func _bjs_roundtripInternalSupportedMethod(method: Int32) -> Int32 { @_expose(wasm, "bjs_roundtripAPIResult") @_cdecl("bjs_roundtripAPIResult") -public func _bjs_roundtripAPIResult(result: Int32) -> Void { +public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -2970,7 +3127,7 @@ public func _bjs_roundtripAPIResult(result: Int32) -> Void { @_expose(wasm, "bjs_makeAPIResultSuccess") @_cdecl("bjs_makeAPIResultSuccess") -public func _bjs_makeAPIResultSuccess(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_makeAPIResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) let ret = makeAPIResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -2981,7 +3138,7 @@ public func _bjs_makeAPIResultSuccess(valueBytes: Int32, valueLength: Int32) -> @_expose(wasm, "bjs_makeAPIResultFailure") @_cdecl("bjs_makeAPIResultFailure") -public func _bjs_makeAPIResultFailure(value: Int32) -> Void { +public func _bjs_makeAPIResultFailure(_ value: Int32) -> Void { #if arch(wasm32) let ret = makeAPIResultFailure(_: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3003,7 +3160,7 @@ public func _bjs_makeAPIResultInfo() -> Void { @_expose(wasm, "bjs_makeAPIResultFlag") @_cdecl("bjs_makeAPIResultFlag") -public func _bjs_makeAPIResultFlag(value: Int32) -> Void { +public func _bjs_makeAPIResultFlag(_ value: Int32) -> Void { #if arch(wasm32) let ret = makeAPIResultFlag(_: Bool.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3014,7 +3171,7 @@ public func _bjs_makeAPIResultFlag(value: Int32) -> Void { @_expose(wasm, "bjs_makeAPIResultRate") @_cdecl("bjs_makeAPIResultRate") -public func _bjs_makeAPIResultRate(value: Float32) -> Void { +public func _bjs_makeAPIResultRate(_ value: Float32) -> Void { #if arch(wasm32) let ret = makeAPIResultRate(_: Float.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3025,7 +3182,7 @@ public func _bjs_makeAPIResultRate(value: Float32) -> Void { @_expose(wasm, "bjs_makeAPIResultPrecise") @_cdecl("bjs_makeAPIResultPrecise") -public func _bjs_makeAPIResultPrecise(value: Float64) -> Void { +public func _bjs_makeAPIResultPrecise(_ value: Float64) -> Void { #if arch(wasm32) let ret = makeAPIResultPrecise(_: Double.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3036,7 +3193,7 @@ public func _bjs_makeAPIResultPrecise(value: Float64) -> Void { @_expose(wasm, "bjs_roundtripComplexResult") @_cdecl("bjs_roundtripComplexResult") -public func _bjs_roundtripComplexResult(result: Int32) -> Void { +public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -3047,7 +3204,7 @@ public func _bjs_roundtripComplexResult(result: Int32) -> Void { @_expose(wasm, "bjs_makeComplexResultSuccess") @_cdecl("bjs_makeComplexResultSuccess") -public func _bjs_makeComplexResultSuccess(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_makeComplexResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) let ret = makeComplexResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -3058,7 +3215,7 @@ public func _bjs_makeComplexResultSuccess(valueBytes: Int32, valueLength: Int32) @_expose(wasm, "bjs_makeComplexResultError") @_cdecl("bjs_makeComplexResultError") -public func _bjs_makeComplexResultError(messageBytes: Int32, messageLength: Int32, code: Int32) -> Void { +public func _bjs_makeComplexResultError(_ messageBytes: Int32, _ messageLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) let ret = makeComplexResultError(_: String.bridgeJSLiftParameter(messageBytes, messageLength), _: Int.bridgeJSLiftParameter(code)) return ret.bridgeJSLowerReturn() @@ -3069,7 +3226,7 @@ public func _bjs_makeComplexResultError(messageBytes: Int32, messageLength: Int3 @_expose(wasm, "bjs_makeComplexResultLocation") @_cdecl("bjs_makeComplexResultLocation") -public func _bjs_makeComplexResultLocation(lat: Float64, lng: Float64, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_makeComplexResultLocation(_ lat: Float64, _ lng: Float64, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = makeComplexResultLocation(_: Double.bridgeJSLiftParameter(lat), _: Double.bridgeJSLiftParameter(lng), _: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3080,7 +3237,7 @@ public func _bjs_makeComplexResultLocation(lat: Float64, lng: Float64, nameBytes @_expose(wasm, "bjs_makeComplexResultStatus") @_cdecl("bjs_makeComplexResultStatus") -public func _bjs_makeComplexResultStatus(active: Int32, code: Int32, messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_makeComplexResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = makeComplexResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -3091,7 +3248,7 @@ public func _bjs_makeComplexResultStatus(active: Int32, code: Int32, messageByte @_expose(wasm, "bjs_makeComplexResultCoordinates") @_cdecl("bjs_makeComplexResultCoordinates") -public func _bjs_makeComplexResultCoordinates(x: Float64, y: Float64, z: Float64) -> Void { +public func _bjs_makeComplexResultCoordinates(_ x: Float64, _ y: Float64, _ z: Float64) -> Void { #if arch(wasm32) let ret = makeComplexResultCoordinates(_: Double.bridgeJSLiftParameter(x), _: Double.bridgeJSLiftParameter(y), _: Double.bridgeJSLiftParameter(z)) return ret.bridgeJSLowerReturn() @@ -3102,7 +3259,7 @@ public func _bjs_makeComplexResultCoordinates(x: Float64, y: Float64, z: Float64 @_expose(wasm, "bjs_makeComplexResultComprehensive") @_cdecl("bjs_makeComplexResultComprehensive") -public func _bjs_makeComplexResultComprehensive(flag1: Int32, flag2: Int32, count1: Int32, count2: Int32, value1: Float64, value2: Float64, text1Bytes: Int32, text1Length: Int32, text2Bytes: Int32, text2Length: Int32, text3Bytes: Int32, text3Length: Int32) -> Void { +public func _bjs_makeComplexResultComprehensive(_ flag1: Int32, _ flag2: Int32, _ count1: Int32, _ count2: Int32, _ value1: Float64, _ value2: Float64, _ text1Bytes: Int32, _ text1Length: Int32, _ text2Bytes: Int32, _ text2Length: Int32, _ text3Bytes: Int32, _ text3Length: Int32) -> Void { #if arch(wasm32) let ret = makeComplexResultComprehensive(_: Bool.bridgeJSLiftParameter(flag1), _: Bool.bridgeJSLiftParameter(flag2), _: Int.bridgeJSLiftParameter(count1), _: Int.bridgeJSLiftParameter(count2), _: Double.bridgeJSLiftParameter(value1), _: Double.bridgeJSLiftParameter(value2), _: String.bridgeJSLiftParameter(text1Bytes, text1Length), _: String.bridgeJSLiftParameter(text2Bytes, text2Length), _: String.bridgeJSLiftParameter(text3Bytes, text3Length)) return ret.bridgeJSLowerReturn() @@ -3124,7 +3281,7 @@ public func _bjs_makeComplexResultInfo() -> Void { @_expose(wasm, "bjs_makeUtilitiesResultSuccess") @_cdecl("bjs_makeUtilitiesResultSuccess") -public func _bjs_makeUtilitiesResultSuccess(messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_makeUtilitiesResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = makeUtilitiesResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -3135,7 +3292,7 @@ public func _bjs_makeUtilitiesResultSuccess(messageBytes: Int32, messageLength: @_expose(wasm, "bjs_makeUtilitiesResultFailure") @_cdecl("bjs_makeUtilitiesResultFailure") -public func _bjs_makeUtilitiesResultFailure(errorBytes: Int32, errorLength: Int32, code: Int32) -> Void { +public func _bjs_makeUtilitiesResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) let ret = makeUtilitiesResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code)) return ret.bridgeJSLowerReturn() @@ -3146,7 +3303,7 @@ public func _bjs_makeUtilitiesResultFailure(errorBytes: Int32, errorLength: Int3 @_expose(wasm, "bjs_makeUtilitiesResultStatus") @_cdecl("bjs_makeUtilitiesResultStatus") -public func _bjs_makeUtilitiesResultStatus(active: Int32, code: Int32, messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_makeUtilitiesResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = makeUtilitiesResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -3157,7 +3314,7 @@ public func _bjs_makeUtilitiesResultStatus(active: Int32, code: Int32, messageBy @_expose(wasm, "bjs_makeAPINetworkingResultSuccess") @_cdecl("bjs_makeAPINetworkingResultSuccess") -public func _bjs_makeAPINetworkingResultSuccess(messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_makeAPINetworkingResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = makeAPINetworkingResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -3168,7 +3325,7 @@ public func _bjs_makeAPINetworkingResultSuccess(messageBytes: Int32, messageLeng @_expose(wasm, "bjs_makeAPINetworkingResultFailure") @_cdecl("bjs_makeAPINetworkingResultFailure") -public func _bjs_makeAPINetworkingResultFailure(errorBytes: Int32, errorLength: Int32, code: Int32) -> Void { +public func _bjs_makeAPINetworkingResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) let ret = makeAPINetworkingResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code)) return ret.bridgeJSLowerReturn() @@ -3179,7 +3336,7 @@ public func _bjs_makeAPINetworkingResultFailure(errorBytes: Int32, errorLength: @_expose(wasm, "bjs_roundtripUtilitiesResult") @_cdecl("bjs_roundtripUtilitiesResult") -public func _bjs_roundtripUtilitiesResult(result: Int32) -> Void { +public func _bjs_roundtripUtilitiesResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripUtilitiesResult(_: Utilities.Result.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -3190,7 +3347,7 @@ public func _bjs_roundtripUtilitiesResult(result: Int32) -> Void { @_expose(wasm, "bjs_roundtripAPINetworkingResult") @_cdecl("bjs_roundtripAPINetworkingResult") -public func _bjs_roundtripAPINetworkingResult(result: Int32) -> Void { +public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void { #if arch(wasm32) let ret = roundtripAPINetworkingResult(_: API.NetworkingResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() @@ -3201,7 +3358,7 @@ public func _bjs_roundtripAPINetworkingResult(result: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalString") @_cdecl("bjs_roundTripOptionalString") -public func _bjs_roundTripOptionalString(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripOptionalString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalString(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3212,7 +3369,7 @@ public func _bjs_roundTripOptionalString(nameIsSome: Int32, nameBytes: Int32, na @_expose(wasm, "bjs_roundTripOptionalInt") @_cdecl("bjs_roundTripOptionalInt") -public func _bjs_roundTripOptionalInt(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_roundTripOptionalInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalInt(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3223,7 +3380,7 @@ public func _bjs_roundTripOptionalInt(valueIsSome: Int32, valueValue: Int32) -> @_expose(wasm, "bjs_roundTripOptionalBool") @_cdecl("bjs_roundTripOptionalBool") -public func _bjs_roundTripOptionalBool(flagIsSome: Int32, flagValue: Int32) -> Void { +public func _bjs_roundTripOptionalBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalBool(flag: Optional.bridgeJSLiftParameter(flagIsSome, flagValue)) return ret.bridgeJSLowerReturn() @@ -3234,7 +3391,7 @@ public func _bjs_roundTripOptionalBool(flagIsSome: Int32, flagValue: Int32) -> V @_expose(wasm, "bjs_roundTripOptionalFloat") @_cdecl("bjs_roundTripOptionalFloat") -public func _bjs_roundTripOptionalFloat(numberIsSome: Int32, numberValue: Float32) -> Void { +public func _bjs_roundTripOptionalFloat(_ numberIsSome: Int32, _ numberValue: Float32) -> Void { #if arch(wasm32) let ret = roundTripOptionalFloat(number: Optional.bridgeJSLiftParameter(numberIsSome, numberValue)) return ret.bridgeJSLowerReturn() @@ -3245,7 +3402,7 @@ public func _bjs_roundTripOptionalFloat(numberIsSome: Int32, numberValue: Float3 @_expose(wasm, "bjs_roundTripOptionalDouble") @_cdecl("bjs_roundTripOptionalDouble") -public func _bjs_roundTripOptionalDouble(precisionIsSome: Int32, precisionValue: Float64) -> Void { +public func _bjs_roundTripOptionalDouble(_ precisionIsSome: Int32, _ precisionValue: Float64) -> Void { #if arch(wasm32) let ret = roundTripOptionalDouble(precision: Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue)) return ret.bridgeJSLowerReturn() @@ -3256,7 +3413,7 @@ public func _bjs_roundTripOptionalDouble(precisionIsSome: Int32, precisionValue: @_expose(wasm, "bjs_roundTripOptionalSyntax") @_cdecl("bjs_roundTripOptionalSyntax") -public func _bjs_roundTripOptionalSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripOptionalSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3267,7 +3424,7 @@ public func _bjs_roundTripOptionalSyntax(nameIsSome: Int32, nameBytes: Int32, na @_expose(wasm, "bjs_roundTripOptionalMixSyntax") @_cdecl("bjs_roundTripOptionalMixSyntax") -public func _bjs_roundTripOptionalMixSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripOptionalMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalMixSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3278,7 +3435,7 @@ public func _bjs_roundTripOptionalMixSyntax(nameIsSome: Int32, nameBytes: Int32, @_expose(wasm, "bjs_roundTripOptionalSwiftSyntax") @_cdecl("bjs_roundTripOptionalSwiftSyntax") -public func _bjs_roundTripOptionalSwiftSyntax(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_roundTripOptionalSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3289,7 +3446,7 @@ public func _bjs_roundTripOptionalSwiftSyntax(nameIsSome: Int32, nameBytes: Int3 @_expose(wasm, "bjs_roundTripOptionalWithSpaces") @_cdecl("bjs_roundTripOptionalWithSpaces") -public func _bjs_roundTripOptionalWithSpaces(valueIsSome: Int32, valueValue: Float64) -> Void { +public func _bjs_roundTripOptionalWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) let ret = roundTripOptionalWithSpaces(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3300,7 +3457,7 @@ public func _bjs_roundTripOptionalWithSpaces(valueIsSome: Int32, valueValue: Flo @_expose(wasm, "bjs_roundTripOptionalTypeAlias") @_cdecl("bjs_roundTripOptionalTypeAlias") -public func _bjs_roundTripOptionalTypeAlias(ageIsSome: Int32, ageValue: Int32) -> Void { +public func _bjs_roundTripOptionalTypeAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTypeAlias(age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue)) return ret.bridgeJSLowerReturn() @@ -3311,7 +3468,7 @@ public func _bjs_roundTripOptionalTypeAlias(ageIsSome: Int32, ageValue: Int32) - @_expose(wasm, "bjs_roundTripOptionalStatus") @_cdecl("bjs_roundTripOptionalStatus") -public func _bjs_roundTripOptionalStatus(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_roundTripOptionalStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3322,7 +3479,7 @@ public func _bjs_roundTripOptionalStatus(valueIsSome: Int32, valueValue: Int32) @_expose(wasm, "bjs_roundTripOptionalTheme") @_cdecl("bjs_roundTripOptionalTheme") -public func _bjs_roundTripOptionalTheme(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_roundTripOptionalTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -3333,7 +3490,7 @@ public func _bjs_roundTripOptionalTheme(valueIsSome: Int32, valueBytes: Int32, v @_expose(wasm, "bjs_roundTripOptionalHttpStatus") @_cdecl("bjs_roundTripOptionalHttpStatus") -public func _bjs_roundTripOptionalHttpStatus(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_roundTripOptionalHttpStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalHttpStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3344,7 +3501,7 @@ public func _bjs_roundTripOptionalHttpStatus(valueIsSome: Int32, valueValue: Int @_expose(wasm, "bjs_roundTripOptionalTSDirection") @_cdecl("bjs_roundTripOptionalTSDirection") -public func _bjs_roundTripOptionalTSDirection(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_roundTripOptionalTSDirection(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTSDirection(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3355,7 +3512,7 @@ public func _bjs_roundTripOptionalTSDirection(valueIsSome: Int32, valueValue: In @_expose(wasm, "bjs_roundTripOptionalTSTheme") @_cdecl("bjs_roundTripOptionalTSTheme") -public func _bjs_roundTripOptionalTSTheme(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_roundTripOptionalTSTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalTSTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) return ret.bridgeJSLowerReturn() @@ -3366,7 +3523,7 @@ public func _bjs_roundTripOptionalTSTheme(valueIsSome: Int32, valueBytes: Int32, @_expose(wasm, "bjs_roundTripOptionalNetworkingAPIMethod") @_cdecl("bjs_roundTripOptionalNetworkingAPIMethod") -public func _bjs_roundTripOptionalNetworkingAPIMethod(methodIsSome: Int32, methodValue: Int32) -> Void { +public func _bjs_roundTripOptionalNetworkingAPIMethod(_ methodIsSome: Int32, _ methodValue: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalNetworkingAPIMethod(_: Optional.bridgeJSLiftParameter(methodIsSome, methodValue)) return ret.bridgeJSLowerReturn() @@ -3377,7 +3534,7 @@ public func _bjs_roundTripOptionalNetworkingAPIMethod(methodIsSome: Int32, metho @_expose(wasm, "bjs_roundTripOptionalAPIResult") @_cdecl("bjs_roundTripOptionalAPIResult") -public func _bjs_roundTripOptionalAPIResult(valueIsSome: Int32, valueCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalAPIResult(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalAPIResult(value: Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId)) return ret.bridgeJSLowerReturn() @@ -3388,7 +3545,7 @@ public func _bjs_roundTripOptionalAPIResult(valueIsSome: Int32, valueCaseId: Int @_expose(wasm, "bjs_compareAPIResults") @_cdecl("bjs_compareAPIResults") -public func _bjs_compareAPIResults(r1IsSome: Int32, r1CaseId: Int32, r2IsSome: Int32, r2CaseId: Int32) -> Void { +public func _bjs_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { #if arch(wasm32) let _tmp_r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) let _tmp_r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) @@ -3401,7 +3558,7 @@ public func _bjs_compareAPIResults(r1IsSome: Int32, r1CaseId: Int32, r2IsSome: I @_expose(wasm, "bjs_roundTripOptionalComplexResult") @_cdecl("bjs_roundTripOptionalComplexResult") -public func _bjs_roundTripOptionalComplexResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalComplexResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -3412,7 +3569,7 @@ public func _bjs_roundTripOptionalComplexResult(resultIsSome: Int32, resultCaseI @_expose(wasm, "bjs_roundTripOptionalClass") @_cdecl("bjs_roundTripOptionalClass") -public func _bjs_roundTripOptionalClass(valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = roundTripOptionalClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) return ret.bridgeJSLowerReturn() @@ -3423,7 +3580,7 @@ public func _bjs_roundTripOptionalClass(valueIsSome: Int32, valueValue: UnsafeMu @_expose(wasm, "bjs_roundTripOptionalAPIOptionalResult") @_cdecl("bjs_roundTripOptionalAPIOptionalResult") -public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) let ret = roundTripOptionalAPIOptionalResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() @@ -3434,7 +3591,7 @@ public func _bjs_roundTripOptionalAPIOptionalResult(resultIsSome: Int32, resultC @_expose(wasm, "bjs_createPropertyHolder") @_cdecl("bjs_createPropertyHolder") -public func _bjs_createPropertyHolder(intValue: Int32, floatValue: Float32, doubleValue: Float64, boolValue: Int32, stringValueBytes: Int32, stringValueLength: Int32, jsObject: Int32) -> UnsafeMutableRawPointer { +public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) return ret.bridgeJSLowerReturn() @@ -3445,7 +3602,7 @@ public func _bjs_createPropertyHolder(intValue: Int32, floatValue: Float32, doub @_expose(wasm, "bjs_testPropertyHolder") @_cdecl("bjs_testPropertyHolder") -public func _bjs_testPropertyHolder(holder: UnsafeMutableRawPointer) -> Void { +public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) return ret.bridgeJSLowerReturn() @@ -3477,7 +3634,7 @@ public func _bjs_getObserverStats() -> Void { @_expose(wasm, "bjs_testStringDefault") @_cdecl("bjs_testStringDefault") -public func _bjs_testStringDefault(messageBytes: Int32, messageLength: Int32) -> Void { +public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) let ret = testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() @@ -3488,7 +3645,7 @@ public func _bjs_testStringDefault(messageBytes: Int32, messageLength: Int32) -> @_expose(wasm, "bjs_testIntDefault") @_cdecl("bjs_testIntDefault") -public func _bjs_testIntDefault(count: Int32) -> Int32 { +public func _bjs_testIntDefault(_ count: Int32) -> Int32 { #if arch(wasm32) let ret = testIntDefault(count: Int.bridgeJSLiftParameter(count)) return ret.bridgeJSLowerReturn() @@ -3499,7 +3656,7 @@ public func _bjs_testIntDefault(count: Int32) -> Int32 { @_expose(wasm, "bjs_testBoolDefault") @_cdecl("bjs_testBoolDefault") -public func _bjs_testBoolDefault(flag: Int32) -> Int32 { +public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { #if arch(wasm32) let ret = testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) return ret.bridgeJSLowerReturn() @@ -3510,7 +3667,7 @@ public func _bjs_testBoolDefault(flag: Int32) -> Int32 { @_expose(wasm, "bjs_testOptionalDefault") @_cdecl("bjs_testOptionalDefault") -public func _bjs_testOptionalDefault(nameIsSome: Int32, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) let ret = testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3521,7 +3678,7 @@ public func _bjs_testOptionalDefault(nameIsSome: Int32, nameBytes: Int32, nameLe @_expose(wasm, "bjs_testMultipleDefaults") @_cdecl("bjs_testMultipleDefaults") -public func _bjs_testMultipleDefaults(titleBytes: Int32, titleLength: Int32, count: Int32, enabled: Int32) -> Void { +public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) let ret = testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) return ret.bridgeJSLowerReturn() @@ -3532,7 +3689,7 @@ public func _bjs_testMultipleDefaults(titleBytes: Int32, titleLength: Int32, cou @_expose(wasm, "bjs_testSimpleEnumDefault") @_cdecl("bjs_testSimpleEnumDefault") -public func _bjs_testSimpleEnumDefault(status: Int32) -> Int32 { +public func _bjs_testSimpleEnumDefault(_ status: Int32) -> Int32 { #if arch(wasm32) let ret = testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status)) return ret.bridgeJSLowerReturn() @@ -3543,7 +3700,7 @@ public func _bjs_testSimpleEnumDefault(status: Int32) -> Int32 { @_expose(wasm, "bjs_testDirectionDefault") @_cdecl("bjs_testDirectionDefault") -public func _bjs_testDirectionDefault(direction: Int32) -> Int32 { +public func _bjs_testDirectionDefault(_ direction: Int32) -> Int32 { #if arch(wasm32) let ret = testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction)) return ret.bridgeJSLowerReturn() @@ -3554,7 +3711,7 @@ public func _bjs_testDirectionDefault(direction: Int32) -> Int32 { @_expose(wasm, "bjs_testRawStringEnumDefault") @_cdecl("bjs_testRawStringEnumDefault") -public func _bjs_testRawStringEnumDefault(themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) let ret = testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() @@ -3565,7 +3722,7 @@ public func _bjs_testRawStringEnumDefault(themeBytes: Int32, themeLength: Int32) @_expose(wasm, "bjs_testComplexInit") @_cdecl("bjs_testComplexInit") -public func _bjs_testComplexInit(greeter: UnsafeMutableRawPointer) -> Void { +public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() @@ -3576,7 +3733,7 @@ public func _bjs_testComplexInit(greeter: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_testEmptyInit") @_cdecl("bjs_testEmptyInit") -public func _bjs_testEmptyInit(object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object)) return ret.bridgeJSLowerReturn() @@ -3587,7 +3744,7 @@ public func _bjs_testEmptyInit(object: UnsafeMutableRawPointer) -> UnsafeMutable @_expose(wasm, "bjs_formatName") @_cdecl("bjs_formatName") -public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int32) -> Void { +public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void { #if arch(wasm32) let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() @@ -3598,7 +3755,7 @@ public func _bjs_formatName(nameBytes: Int32, nameLength: Int32, transform: Int3 @_expose(wasm, "bjs_makeFormatter") @_cdecl("bjs_makeFormatter") -public func _bjs_makeFormatter(prefixBytes: Int32, prefixLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) @@ -3609,7 +3766,7 @@ public func _bjs_makeFormatter(prefixBytes: Int32, prefixLength: Int32) -> Unsaf @_expose(wasm, "bjs_makeAdder") @_cdecl("bjs_makeAdder") -public func _bjs_makeAdder(base: Int32) -> UnsafeMutableRawPointer { +public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(ret) @@ -3686,7 +3843,7 @@ public func _bjs_roundTripValidationReport() -> Void { @_expose(wasm, "bjs_updateValidationReport") @_cdecl("bjs_updateValidationReport") -public func _bjs_updateValidationReport(newResultIsSome: Int32, newResultCaseId: Int32) -> Void { +public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCaseId: Int32) -> Void { #if arch(wasm32) let _tmp_report = ValidationReport.bridgeJSLiftParameter() let _tmp_newResult = Optional.bridgeJSLiftParameter(newResultIsSome, newResultCaseId) @@ -3710,7 +3867,7 @@ public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") -public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() @@ -3721,7 +3878,7 @@ public func _bjs_Greeter_init(nameBytes: Int32, nameLength: Int32) -> UnsafeMuta @_expose(wasm, "bjs_Greeter_greet") @_cdecl("bjs_Greeter_greet") -public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greet() return ret.bridgeJSLowerReturn() @@ -3732,7 +3889,7 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_changeName") @_cdecl("bjs_Greeter_changeName") -public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: Int32, nameLength: Int32) -> Void { +public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) #else @@ -3742,7 +3899,7 @@ public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: I @_expose(wasm, "bjs_Greeter_greetWith") @_cdecl("bjs_Greeter_greetWith") -public func _bjs_Greeter_greetWith(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer, customGreeting: Int32) -> Void { +public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer, _ customGreeting: Int32) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting)) return ret.bridgeJSLowerReturn() @@ -3753,7 +3910,7 @@ public func _bjs_Greeter_greetWith(_self: UnsafeMutableRawPointer, greeter: Unsa @_expose(wasm, "bjs_Greeter_makeFormatter") @_cdecl("bjs_Greeter_makeFormatter") -public func _bjs_Greeter_makeFormatter(_self: UnsafeMutableRawPointer, suffixBytes: Int32, suffixLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) @@ -3764,7 +3921,7 @@ public func _bjs_Greeter_makeFormatter(_self: UnsafeMutableRawPointer, suffixByt @_expose(wasm, "bjs_Greeter_static_makeCreator") @_cdecl("bjs_Greeter_static_makeCreator") -public func _bjs_Greeter_static_makeCreator(defaultNameBytes: Int32, defaultNameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) return _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC.bridgeJSLower(ret) @@ -3775,7 +3932,7 @@ public func _bjs_Greeter_static_makeCreator(defaultNameBytes: Int32, defaultName @_expose(wasm, "bjs_Greeter_makeCustomGreeter") @_cdecl("bjs_Greeter_makeCustomGreeter") -public func _bjs_Greeter_makeCustomGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter() return _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLower(ret) @@ -3786,7 +3943,7 @@ public func _bjs_Greeter_makeCustomGreeter(_self: UnsafeMutableRawPointer) -> Un @_expose(wasm, "bjs_Greeter_name_get") @_cdecl("bjs_Greeter_name_get") -public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -3797,7 +3954,7 @@ public func _bjs_Greeter_name_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_name_set") @_cdecl("bjs_Greeter_name_set") -public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -3807,7 +3964,7 @@ public func _bjs_Greeter_name_set(_self: UnsafeMutableRawPointer, valueBytes: In @_expose(wasm, "bjs_Greeter_prefix_get") @_cdecl("bjs_Greeter_prefix_get") -public func _bjs_Greeter_prefix_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Greeter_prefix_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).prefix return ret.bridgeJSLowerReturn() @@ -3818,8 +3975,12 @@ public func _bjs_Greeter_prefix_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Greeter_deinit") @_cdecl("bjs_Greeter_deinit") -public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3830,16 +3991,16 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_Calculator_square") @_cdecl("bjs_Calculator_square") -public func _bjs_Calculator_square(_self: UnsafeMutableRawPointer, value: Int32) -> Int32 { +public func _bjs_Calculator_square(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { #if arch(wasm32) let ret = Calculator.bridgeJSLiftParameter(_self).square(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3850,7 +4011,7 @@ public func _bjs_Calculator_square(_self: UnsafeMutableRawPointer, value: Int32) @_expose(wasm, "bjs_Calculator_add") @_cdecl("bjs_Calculator_add") -public func _bjs_Calculator_add(_self: UnsafeMutableRawPointer, a: Int32, b: Int32) -> Int32 { +public func _bjs_Calculator_add(_ _self: UnsafeMutableRawPointer, _ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = Calculator.bridgeJSLiftParameter(_self).add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -3861,8 +4022,12 @@ public func _bjs_Calculator_add(_self: UnsafeMutableRawPointer, a: Int32, b: Int @_expose(wasm, "bjs_Calculator_deinit") @_cdecl("bjs_Calculator_deinit") -public func _bjs_Calculator_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Calculator_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3873,17 +4038,21 @@ extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap") -fileprivate func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Calculator_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_InternalGreeter_deinit") @_cdecl("bjs_InternalGreeter_deinit") -public func _bjs_InternalGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_InternalGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3894,17 +4063,21 @@ extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap") -fileprivate func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_InternalGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") -public func _bjs_PublicGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PublicGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3915,17 +4088,21 @@ extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap") -fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") -public func _bjs_PackageGreeter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PackageGreeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3936,9 +4113,9 @@ extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap") -fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PackageGreeter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -3956,7 +4133,7 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Converter_toString") @_cdecl("bjs_Converter_toString") -public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -3967,8 +4144,12 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32 @_expose(wasm, "bjs_Converter_deinit") @_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -3979,9 +4160,9 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -3999,7 +4180,7 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_HTTPServer_call") @_cdecl("bjs_HTTPServer_call") -public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) #else @@ -4009,8 +4190,12 @@ public func _bjs_HTTPServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_HTTPServer_deinit") @_cdecl("bjs_HTTPServer_deinit") -public func _bjs_HTTPServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4021,9 +4206,9 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -4041,7 +4226,7 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_TestServer_call") @_cdecl("bjs_TestServer_call") -public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) -> Void { +public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) #else @@ -4051,8 +4236,12 @@ public func _bjs_TestServer_call(_self: UnsafeMutableRawPointer, method: Int32) @_expose(wasm, "bjs_TestServer_deinit") @_cdecl("bjs_TestServer_deinit") -public func _bjs_TestServer_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4063,16 +4252,16 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") -public func _bjs_OptionalPropertyHolder_init(optionalNameIsSome: Int32, optionalNameBytes: Int32, optionalNameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = OptionalPropertyHolder(optionalName: Optional.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength)) return ret.bridgeJSLowerReturn() @@ -4083,7 +4272,7 @@ public func _bjs_OptionalPropertyHolder_init(optionalNameIsSome: Int32, optional @_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get") @_cdecl("bjs_OptionalPropertyHolder_optionalName_get") -public func _bjs_OptionalPropertyHolder_optionalName_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName return ret.bridgeJSLowerReturn() @@ -4094,7 +4283,7 @@ public func _bjs_OptionalPropertyHolder_optionalName_get(_self: UnsafeMutableRaw @_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") @_cdecl("bjs_OptionalPropertyHolder_optionalName_set") -public func _bjs_OptionalPropertyHolder_optionalName_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -4104,7 +4293,7 @@ public func _bjs_OptionalPropertyHolder_optionalName_set(_self: UnsafeMutableRaw @_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") @_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") -public func _bjs_OptionalPropertyHolder_optionalAge_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge return ret.bridgeJSLowerReturn() @@ -4115,7 +4304,7 @@ public func _bjs_OptionalPropertyHolder_optionalAge_get(_self: UnsafeMutableRawP @_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") @_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") -public func _bjs_OptionalPropertyHolder_optionalAge_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -4125,7 +4314,7 @@ public func _bjs_OptionalPropertyHolder_optionalAge_set(_self: UnsafeMutableRawP @_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") -public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter return ret.bridgeJSLowerReturn() @@ -4136,7 +4325,7 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_self: UnsafeMutable @_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") -public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -4146,8 +4335,12 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_self: UnsafeMutable @_expose(wasm, "bjs_OptionalPropertyHolder_deinit") @_cdecl("bjs_OptionalPropertyHolder_deinit") -public func _bjs_OptionalPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4158,16 +4351,16 @@ extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_SimplePropertyHolder_init") @_cdecl("bjs_SimplePropertyHolder_init") -public func _bjs_SimplePropertyHolder_init(value: Int32) -> UnsafeMutableRawPointer { +public func _bjs_SimplePropertyHolder_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = SimplePropertyHolder(value: Int.bridgeJSLiftParameter(value)) return ret.bridgeJSLowerReturn() @@ -4178,7 +4371,7 @@ public func _bjs_SimplePropertyHolder_init(value: Int32) -> UnsafeMutableRawPoin @_expose(wasm, "bjs_SimplePropertyHolder_value_get") @_cdecl("bjs_SimplePropertyHolder_value_get") -public func _bjs_SimplePropertyHolder_value_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SimplePropertyHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SimplePropertyHolder.bridgeJSLiftParameter(_self).value return ret.bridgeJSLowerReturn() @@ -4189,7 +4382,7 @@ public func _bjs_SimplePropertyHolder_value_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_SimplePropertyHolder_value_set") @_cdecl("bjs_SimplePropertyHolder_value_set") -public func _bjs_SimplePropertyHolder_value_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_SimplePropertyHolder_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) SimplePropertyHolder.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) #else @@ -4199,8 +4392,12 @@ public func _bjs_SimplePropertyHolder_value_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_SimplePropertyHolder_deinit") @_cdecl("bjs_SimplePropertyHolder_deinit") -public func _bjs_SimplePropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_SimplePropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4211,16 +4408,16 @@ extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap") -fileprivate func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SimplePropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_PropertyHolder_init") @_cdecl("bjs_PropertyHolder_init") -public func _bjs_PropertyHolder_init(intValue: Int32, floatValue: Float32, doubleValue: Float64, boolValue: Int32, stringValueBytes: Int32, stringValueLength: Int32, jsObject: Int32, sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32, _ sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject), sibling: SimplePropertyHolder.bridgeJSLiftParameter(sibling)) return ret.bridgeJSLowerReturn() @@ -4231,7 +4428,7 @@ public func _bjs_PropertyHolder_init(intValue: Int32, floatValue: Float32, doubl @_expose(wasm, "bjs_PropertyHolder_getAllValues") @_cdecl("bjs_PropertyHolder_getAllValues") -public func _bjs_PropertyHolder_getAllValues(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues() return ret.bridgeJSLowerReturn() @@ -4242,7 +4439,7 @@ public func _bjs_PropertyHolder_getAllValues(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_intValue_get") @_cdecl("bjs_PropertyHolder_intValue_get") -public func _bjs_PropertyHolder_intValue_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue return ret.bridgeJSLowerReturn() @@ -4253,7 +4450,7 @@ public func _bjs_PropertyHolder_intValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_intValue_set") @_cdecl("bjs_PropertyHolder_intValue_set") -public func _bjs_PropertyHolder_intValue_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value) #else @@ -4263,7 +4460,7 @@ public func _bjs_PropertyHolder_intValue_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_PropertyHolder_floatValue_get") @_cdecl("bjs_PropertyHolder_floatValue_get") -public func _bjs_PropertyHolder_floatValue_get(_self: UnsafeMutableRawPointer) -> Float32 { +public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue return ret.bridgeJSLowerReturn() @@ -4274,7 +4471,7 @@ public func _bjs_PropertyHolder_floatValue_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_PropertyHolder_floatValue_set") @_cdecl("bjs_PropertyHolder_floatValue_set") -public func _bjs_PropertyHolder_floatValue_set(_self: UnsafeMutableRawPointer, value: Float32) -> Void { +public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value) #else @@ -4284,7 +4481,7 @@ public func _bjs_PropertyHolder_floatValue_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_PropertyHolder_doubleValue_get") @_cdecl("bjs_PropertyHolder_doubleValue_get") -public func _bjs_PropertyHolder_doubleValue_get(_self: UnsafeMutableRawPointer) -> Float64 { +public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue return ret.bridgeJSLowerReturn() @@ -4295,7 +4492,7 @@ public func _bjs_PropertyHolder_doubleValue_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_doubleValue_set") @_cdecl("bjs_PropertyHolder_doubleValue_set") -public func _bjs_PropertyHolder_doubleValue_set(_self: UnsafeMutableRawPointer, value: Float64) -> Void { +public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value) #else @@ -4305,7 +4502,7 @@ public func _bjs_PropertyHolder_doubleValue_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_PropertyHolder_boolValue_get") @_cdecl("bjs_PropertyHolder_boolValue_get") -public func _bjs_PropertyHolder_boolValue_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue return ret.bridgeJSLowerReturn() @@ -4316,7 +4513,7 @@ public func _bjs_PropertyHolder_boolValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_boolValue_set") @_cdecl("bjs_PropertyHolder_boolValue_set") -public func _bjs_PropertyHolder_boolValue_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value) #else @@ -4326,7 +4523,7 @@ public func _bjs_PropertyHolder_boolValue_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_PropertyHolder_stringValue_get") @_cdecl("bjs_PropertyHolder_stringValue_get") -public func _bjs_PropertyHolder_stringValue_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue return ret.bridgeJSLowerReturn() @@ -4337,7 +4534,7 @@ public func _bjs_PropertyHolder_stringValue_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_stringValue_set") @_cdecl("bjs_PropertyHolder_stringValue_set") -public func _bjs_PropertyHolder_stringValue_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4347,7 +4544,7 @@ public func _bjs_PropertyHolder_stringValue_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_PropertyHolder_readonlyInt_get") @_cdecl("bjs_PropertyHolder_readonlyInt_get") -public func _bjs_PropertyHolder_readonlyInt_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt return ret.bridgeJSLowerReturn() @@ -4358,7 +4555,7 @@ public func _bjs_PropertyHolder_readonlyInt_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_readonlyFloat_get") @_cdecl("bjs_PropertyHolder_readonlyFloat_get") -public func _bjs_PropertyHolder_readonlyFloat_get(_self: UnsafeMutableRawPointer) -> Float32 { +public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat return ret.bridgeJSLowerReturn() @@ -4369,7 +4566,7 @@ public func _bjs_PropertyHolder_readonlyFloat_get(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_PropertyHolder_readonlyDouble_get") @_cdecl("bjs_PropertyHolder_readonlyDouble_get") -public func _bjs_PropertyHolder_readonlyDouble_get(_self: UnsafeMutableRawPointer) -> Float64 { +public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble return ret.bridgeJSLowerReturn() @@ -4380,7 +4577,7 @@ public func _bjs_PropertyHolder_readonlyDouble_get(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_PropertyHolder_readonlyBool_get") @_cdecl("bjs_PropertyHolder_readonlyBool_get") -public func _bjs_PropertyHolder_readonlyBool_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool return ret.bridgeJSLowerReturn() @@ -4391,7 +4588,7 @@ public func _bjs_PropertyHolder_readonlyBool_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_PropertyHolder_readonlyString_get") @_cdecl("bjs_PropertyHolder_readonlyString_get") -public func _bjs_PropertyHolder_readonlyString_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString return ret.bridgeJSLowerReturn() @@ -4402,7 +4599,7 @@ public func _bjs_PropertyHolder_readonlyString_get(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_PropertyHolder_jsObject_get") @_cdecl("bjs_PropertyHolder_jsObject_get") -public func _bjs_PropertyHolder_jsObject_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject return ret.bridgeJSLowerReturn() @@ -4413,7 +4610,7 @@ public func _bjs_PropertyHolder_jsObject_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_jsObject_set") @_cdecl("bjs_PropertyHolder_jsObject_set") -public func _bjs_PropertyHolder_jsObject_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value) #else @@ -4423,7 +4620,7 @@ public func _bjs_PropertyHolder_jsObject_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_PropertyHolder_sibling_get") @_cdecl("bjs_PropertyHolder_sibling_get") -public func _bjs_PropertyHolder_sibling_get(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling return ret.bridgeJSLowerReturn() @@ -4434,7 +4631,7 @@ public func _bjs_PropertyHolder_sibling_get(_self: UnsafeMutableRawPointer) -> U @_expose(wasm, "bjs_PropertyHolder_sibling_set") @_cdecl("bjs_PropertyHolder_sibling_set") -public func _bjs_PropertyHolder_sibling_set(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).sibling = SimplePropertyHolder.bridgeJSLiftParameter(value) #else @@ -4444,7 +4641,7 @@ public func _bjs_PropertyHolder_sibling_set(_self: UnsafeMutableRawPointer, valu @_expose(wasm, "bjs_PropertyHolder_lazyValue_get") @_cdecl("bjs_PropertyHolder_lazyValue_get") -public func _bjs_PropertyHolder_lazyValue_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue return ret.bridgeJSLowerReturn() @@ -4455,7 +4652,7 @@ public func _bjs_PropertyHolder_lazyValue_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_PropertyHolder_lazyValue_set") @_cdecl("bjs_PropertyHolder_lazyValue_set") -public func _bjs_PropertyHolder_lazyValue_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4465,7 +4662,7 @@ public func _bjs_PropertyHolder_lazyValue_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_PropertyHolder_computedReadonly_get") @_cdecl("bjs_PropertyHolder_computedReadonly_get") -public func _bjs_PropertyHolder_computedReadonly_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly return ret.bridgeJSLowerReturn() @@ -4476,7 +4673,7 @@ public func _bjs_PropertyHolder_computedReadonly_get(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_computedReadWrite_get") @_cdecl("bjs_PropertyHolder_computedReadWrite_get") -public func _bjs_PropertyHolder_computedReadWrite_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite return ret.bridgeJSLowerReturn() @@ -4487,7 +4684,7 @@ public func _bjs_PropertyHolder_computedReadWrite_get(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_PropertyHolder_computedReadWrite_set") @_cdecl("bjs_PropertyHolder_computedReadWrite_set") -public func _bjs_PropertyHolder_computedReadWrite_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4497,7 +4694,7 @@ public func _bjs_PropertyHolder_computedReadWrite_set(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_PropertyHolder_observedProperty_get") @_cdecl("bjs_PropertyHolder_observedProperty_get") -public func _bjs_PropertyHolder_observedProperty_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty return ret.bridgeJSLowerReturn() @@ -4508,7 +4705,7 @@ public func _bjs_PropertyHolder_observedProperty_get(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_observedProperty_set") @_cdecl("bjs_PropertyHolder_observedProperty_set") -public func _bjs_PropertyHolder_observedProperty_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value) #else @@ -4518,8 +4715,12 @@ public func _bjs_PropertyHolder_observedProperty_set(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_PropertyHolder_deinit") @_cdecl("bjs_PropertyHolder_deinit") -public func _bjs_PropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_PropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4530,16 +4731,16 @@ extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap") -fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_MathUtils_static_add") @_cdecl("bjs_MathUtils_static_add") -public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -4550,7 +4751,7 @@ public func _bjs_MathUtils_static_add(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_static_substract") @_cdecl("bjs_MathUtils_static_substract") -public func _bjs_MathUtils_static_substract(a: Int32, b: Int32) -> Int32 { +public func _bjs_MathUtils_static_substract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) let ret = MathUtils.substract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) return ret.bridgeJSLowerReturn() @@ -4561,8 +4762,12 @@ public func _bjs_MathUtils_static_substract(a: Int32, b: Int32) -> Int32 { @_expose(wasm, "bjs_MathUtils_deinit") @_cdecl("bjs_MathUtils_deinit") -public func _bjs_MathUtils_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_MathUtils_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4573,16 +4778,16 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") -public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, count: Int32, enabled: Int32, status: Int32, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_ConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = ConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) return ret.bridgeJSLowerReturn() @@ -4593,7 +4798,7 @@ public func _bjs_ConstructorDefaults_init(nameBytes: Int32, nameLength: Int32, c @_expose(wasm, "bjs_ConstructorDefaults_describe") @_cdecl("bjs_ConstructorDefaults_describe") -public func _bjs_ConstructorDefaults_describe(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ConstructorDefaults_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).describe() return ret.bridgeJSLowerReturn() @@ -4604,7 +4809,7 @@ public func _bjs_ConstructorDefaults_describe(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_ConstructorDefaults_name_get") @_cdecl("bjs_ConstructorDefaults_name_get") -public func _bjs_ConstructorDefaults_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -4615,7 +4820,7 @@ public func _bjs_ConstructorDefaults_name_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_ConstructorDefaults_name_set") @_cdecl("bjs_ConstructorDefaults_name_set") -public func _bjs_ConstructorDefaults_name_set(_self: UnsafeMutableRawPointer, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4625,7 +4830,7 @@ public func _bjs_ConstructorDefaults_name_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_ConstructorDefaults_count_get") @_cdecl("bjs_ConstructorDefaults_count_get") -public func _bjs_ConstructorDefaults_count_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).count return ret.bridgeJSLowerReturn() @@ -4636,7 +4841,7 @@ public func _bjs_ConstructorDefaults_count_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_ConstructorDefaults_count_set") @_cdecl("bjs_ConstructorDefaults_count_set") -public func _bjs_ConstructorDefaults_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) #else @@ -4646,7 +4851,7 @@ public func _bjs_ConstructorDefaults_count_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_ConstructorDefaults_enabled_get") @_cdecl("bjs_ConstructorDefaults_enabled_get") -public func _bjs_ConstructorDefaults_enabled_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).enabled return ret.bridgeJSLowerReturn() @@ -4657,7 +4862,7 @@ public func _bjs_ConstructorDefaults_enabled_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ConstructorDefaults_enabled_set") @_cdecl("bjs_ConstructorDefaults_enabled_set") -public func _bjs_ConstructorDefaults_enabled_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value) #else @@ -4667,7 +4872,7 @@ public func _bjs_ConstructorDefaults_enabled_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ConstructorDefaults_status_get") @_cdecl("bjs_ConstructorDefaults_status_get") -public func _bjs_ConstructorDefaults_status_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_ConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).status return ret.bridgeJSLowerReturn() @@ -4678,7 +4883,7 @@ public func _bjs_ConstructorDefaults_status_get(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_ConstructorDefaults_status_set") @_cdecl("bjs_ConstructorDefaults_status_set") -public func _bjs_ConstructorDefaults_status_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_ConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value) #else @@ -4688,7 +4893,7 @@ public func _bjs_ConstructorDefaults_status_set(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_ConstructorDefaults_tag_get") @_cdecl("bjs_ConstructorDefaults_tag_get") -public func _bjs_ConstructorDefaults_tag_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_ConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).tag return ret.bridgeJSLowerReturn() @@ -4699,7 +4904,7 @@ public func _bjs_ConstructorDefaults_tag_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_ConstructorDefaults_tag_set") @_cdecl("bjs_ConstructorDefaults_tag_set") -public func _bjs_ConstructorDefaults_tag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_ConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) ConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -4709,8 +4914,12 @@ public func _bjs_ConstructorDefaults_tag_set(_self: UnsafeMutableRawPointer, val @_expose(wasm, "bjs_ConstructorDefaults_deinit") @_cdecl("bjs_ConstructorDefaults_deinit") -public func _bjs_ConstructorDefaults_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_ConstructorDefaults_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4721,9 +4930,9 @@ extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ConstructorDefaults_wrap") -fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ConstructorDefaults_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -4763,7 +4972,7 @@ public func _bjs_StaticPropertyHolder_static_staticVariable_get() -> Int32 { @_expose(wasm, "bjs_StaticPropertyHolder_static_staticVariable_set") @_cdecl("bjs_StaticPropertyHolder_static_staticVariable_set") -public func _bjs_StaticPropertyHolder_static_staticVariable_set(value: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.staticVariable = Int.bridgeJSLiftParameter(value) #else @@ -4784,7 +4993,7 @@ public func _bjs_StaticPropertyHolder_static_staticString_get() -> Void { @_expose(wasm, "bjs_StaticPropertyHolder_static_staticString_set") @_cdecl("bjs_StaticPropertyHolder_static_staticString_set") -public func _bjs_StaticPropertyHolder_static_staticString_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_staticString_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.staticString = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4805,7 +5014,7 @@ public func _bjs_StaticPropertyHolder_static_staticBool_get() -> Int32 { @_expose(wasm, "bjs_StaticPropertyHolder_static_staticBool_set") @_cdecl("bjs_StaticPropertyHolder_static_staticBool_set") -public func _bjs_StaticPropertyHolder_static_staticBool_set(value: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_staticBool_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.staticBool = Bool.bridgeJSLiftParameter(value) #else @@ -4826,7 +5035,7 @@ public func _bjs_StaticPropertyHolder_static_staticFloat_get() -> Float32 { @_expose(wasm, "bjs_StaticPropertyHolder_static_staticFloat_set") @_cdecl("bjs_StaticPropertyHolder_static_staticFloat_set") -public func _bjs_StaticPropertyHolder_static_staticFloat_set(value: Float32) -> Void { +public func _bjs_StaticPropertyHolder_static_staticFloat_set(_ value: Float32) -> Void { #if arch(wasm32) StaticPropertyHolder.staticFloat = Float.bridgeJSLiftParameter(value) #else @@ -4847,7 +5056,7 @@ public func _bjs_StaticPropertyHolder_static_staticDouble_get() -> Float64 { @_expose(wasm, "bjs_StaticPropertyHolder_static_staticDouble_set") @_cdecl("bjs_StaticPropertyHolder_static_staticDouble_set") -public func _bjs_StaticPropertyHolder_static_staticDouble_set(value: Float64) -> Void { +public func _bjs_StaticPropertyHolder_static_staticDouble_set(_ value: Float64) -> Void { #if arch(wasm32) StaticPropertyHolder.staticDouble = Double.bridgeJSLiftParameter(value) #else @@ -4868,7 +5077,7 @@ public func _bjs_StaticPropertyHolder_static_computedProperty_get() -> Void { @_expose(wasm, "bjs_StaticPropertyHolder_static_computedProperty_set") @_cdecl("bjs_StaticPropertyHolder_static_computedProperty_set") -public func _bjs_StaticPropertyHolder_static_computedProperty_set(valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) #else @@ -4900,7 +5109,7 @@ public func _bjs_StaticPropertyHolder_static_optionalString_get() -> Void { @_expose(wasm, "bjs_StaticPropertyHolder_static_optionalString_set") @_cdecl("bjs_StaticPropertyHolder_static_optionalString_set") -public func _bjs_StaticPropertyHolder_static_optionalString_set(valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_optionalString_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.optionalString = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -4921,7 +5130,7 @@ public func _bjs_StaticPropertyHolder_static_optionalInt_get() -> Void { @_expose(wasm, "bjs_StaticPropertyHolder_static_optionalInt_set") @_cdecl("bjs_StaticPropertyHolder_static_optionalInt_set") -public func _bjs_StaticPropertyHolder_static_optionalInt_set(valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_optionalInt_set(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.optionalInt = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -4942,7 +5151,7 @@ public func _bjs_StaticPropertyHolder_static_jsObjectProperty_get() -> Int32 { @_expose(wasm, "bjs_StaticPropertyHolder_static_jsObjectProperty_set") @_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_set") -public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(value: Int32) -> Void { +public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) StaticPropertyHolder.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) #else @@ -4952,8 +5161,12 @@ public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(value: Int32) @_expose(wasm, "bjs_StaticPropertyHolder_deinit") @_cdecl("bjs_StaticPropertyHolder_deinit") -public func _bjs_StaticPropertyHolder_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_StaticPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -4964,16 +5177,16 @@ extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap") -fileprivate func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StaticPropertyHolder_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_DataProcessorManager_init") @_cdecl("bjs_DataProcessorManager_init") -public func _bjs_DataProcessorManager_init(processor: Int32) -> UnsafeMutableRawPointer { +public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = DataProcessorManager(processor: AnyDataProcessor.bridgeJSLiftParameter(processor)) return ret.bridgeJSLowerReturn() @@ -4984,7 +5197,7 @@ public func _bjs_DataProcessorManager_init(processor: Int32) -> UnsafeMutableRaw @_expose(wasm, "bjs_DataProcessorManager_incrementByAmount") @_cdecl("bjs_DataProcessorManager_incrementByAmount") -public func _bjs_DataProcessorManager_incrementByAmount(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { +public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) #else @@ -4994,7 +5207,7 @@ public func _bjs_DataProcessorManager_incrementByAmount(_self: UnsafeMutableRawP @_expose(wasm, "bjs_DataProcessorManager_setProcessorLabel") @_cdecl("bjs_DataProcessorManager_setProcessorLabel") -public func _bjs_DataProcessorManager_setProcessorLabel(_self: UnsafeMutableRawPointer, prefixBytes: Int32, prefixLength: Int32, suffixBytes: Int32, suffixLength: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) #else @@ -5004,7 +5217,7 @@ public func _bjs_DataProcessorManager_setProcessorLabel(_self: UnsafeMutableRawP @_expose(wasm, "bjs_DataProcessorManager_isProcessorEven") @_cdecl("bjs_DataProcessorManager_isProcessorEven") -public func _bjs_DataProcessorManager_isProcessorEven(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() return ret.bridgeJSLowerReturn() @@ -5015,7 +5228,7 @@ public func _bjs_DataProcessorManager_isProcessorEven(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_DataProcessorManager_getProcessorLabel") @_cdecl("bjs_DataProcessorManager_getProcessorLabel") -public func _bjs_DataProcessorManager_getProcessorLabel(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() return ret.bridgeJSLowerReturn() @@ -5026,7 +5239,7 @@ public func _bjs_DataProcessorManager_getProcessorLabel(_self: UnsafeMutableRawP @_expose(wasm, "bjs_DataProcessorManager_getCurrentValue") @_cdecl("bjs_DataProcessorManager_getCurrentValue") -public func _bjs_DataProcessorManager_getCurrentValue(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() return ret.bridgeJSLowerReturn() @@ -5037,7 +5250,7 @@ public func _bjs_DataProcessorManager_getCurrentValue(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_DataProcessorManager_incrementBoth") @_cdecl("bjs_DataProcessorManager_incrementBoth") -public func _bjs_DataProcessorManager_incrementBoth(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() #else @@ -5047,7 +5260,7 @@ public func _bjs_DataProcessorManager_incrementBoth(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_DataProcessorManager_getBackupValue") @_cdecl("bjs_DataProcessorManager_getBackupValue") -public func _bjs_DataProcessorManager_getBackupValue(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() return ret.bridgeJSLowerReturn() @@ -5058,7 +5271,7 @@ public func _bjs_DataProcessorManager_getBackupValue(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_DataProcessorManager_hasBackup") @_cdecl("bjs_DataProcessorManager_hasBackup") -public func _bjs_DataProcessorManager_hasBackup(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_DataProcessorManager_hasBackup(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).hasBackup() return ret.bridgeJSLowerReturn() @@ -5069,7 +5282,7 @@ public func _bjs_DataProcessorManager_hasBackup(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalTag") @_cdecl("bjs_DataProcessorManager_getProcessorOptionalTag") -public func _bjs_DataProcessorManager_getProcessorOptionalTag(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorOptionalTag(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalTag() return ret.bridgeJSLowerReturn() @@ -5080,7 +5293,7 @@ public func _bjs_DataProcessorManager_getProcessorOptionalTag(_self: UnsafeMutab @_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalTag") @_cdecl("bjs_DataProcessorManager_setProcessorOptionalTag") -public func _bjs_DataProcessorManager_setProcessorOptionalTag(_self: UnsafeMutableRawPointer, tagIsSome: Int32, tagBytes: Int32, tagLength: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorOptionalTag(_ _self: UnsafeMutableRawPointer, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalTag(_: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) #else @@ -5090,7 +5303,7 @@ public func _bjs_DataProcessorManager_setProcessorOptionalTag(_self: UnsafeMutab @_expose(wasm, "bjs_DataProcessorManager_getProcessorOptionalCount") @_cdecl("bjs_DataProcessorManager_getProcessorOptionalCount") -public func _bjs_DataProcessorManager_getProcessorOptionalCount(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorOptionalCount(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalCount() return ret.bridgeJSLowerReturn() @@ -5101,7 +5314,7 @@ public func _bjs_DataProcessorManager_getProcessorOptionalCount(_self: UnsafeMut @_expose(wasm, "bjs_DataProcessorManager_setProcessorOptionalCount") @_cdecl("bjs_DataProcessorManager_setProcessorOptionalCount") -public func _bjs_DataProcessorManager_setProcessorOptionalCount(_self: UnsafeMutableRawPointer, countIsSome: Int32, countValue: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorOptionalCount(_ _self: UnsafeMutableRawPointer, _ countIsSome: Int32, _ countValue: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalCount(_: Optional.bridgeJSLiftParameter(countIsSome, countValue)) #else @@ -5111,7 +5324,7 @@ public func _bjs_DataProcessorManager_setProcessorOptionalCount(_self: UnsafeMut @_expose(wasm, "bjs_DataProcessorManager_getProcessorDirection") @_cdecl("bjs_DataProcessorManager_getProcessorDirection") -public func _bjs_DataProcessorManager_getProcessorDirection(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorDirection(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorDirection() return ret.bridgeJSLowerReturn() @@ -5122,7 +5335,7 @@ public func _bjs_DataProcessorManager_getProcessorDirection(_self: UnsafeMutable @_expose(wasm, "bjs_DataProcessorManager_setProcessorDirection") @_cdecl("bjs_DataProcessorManager_setProcessorDirection") -public func _bjs_DataProcessorManager_setProcessorDirection(_self: UnsafeMutableRawPointer, directionIsSome: Int32, directionValue: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorDirection(_ _self: UnsafeMutableRawPointer, _ directionIsSome: Int32, _ directionValue: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorDirection(_: Optional.bridgeJSLiftParameter(directionIsSome, directionValue)) #else @@ -5132,7 +5345,7 @@ public func _bjs_DataProcessorManager_setProcessorDirection(_self: UnsafeMutable @_expose(wasm, "bjs_DataProcessorManager_getProcessorTheme") @_cdecl("bjs_DataProcessorManager_getProcessorTheme") -public func _bjs_DataProcessorManager_getProcessorTheme(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorTheme(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorTheme() return ret.bridgeJSLowerReturn() @@ -5143,7 +5356,7 @@ public func _bjs_DataProcessorManager_getProcessorTheme(_self: UnsafeMutableRawP @_expose(wasm, "bjs_DataProcessorManager_setProcessorTheme") @_cdecl("bjs_DataProcessorManager_setProcessorTheme") -public func _bjs_DataProcessorManager_setProcessorTheme(_self: UnsafeMutableRawPointer, themeIsSome: Int32, themeBytes: Int32, themeLength: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorTheme(_ _self: UnsafeMutableRawPointer, _ themeIsSome: Int32, _ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorTheme(_: Optional.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength)) #else @@ -5153,7 +5366,7 @@ public func _bjs_DataProcessorManager_setProcessorTheme(_self: UnsafeMutableRawP @_expose(wasm, "bjs_DataProcessorManager_getProcessorHttpStatus") @_cdecl("bjs_DataProcessorManager_getProcessorHttpStatus") -public func _bjs_DataProcessorManager_getProcessorHttpStatus(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorHttpStatus(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorHttpStatus() return ret.bridgeJSLowerReturn() @@ -5164,7 +5377,7 @@ public func _bjs_DataProcessorManager_getProcessorHttpStatus(_self: UnsafeMutabl @_expose(wasm, "bjs_DataProcessorManager_setProcessorHttpStatus") @_cdecl("bjs_DataProcessorManager_setProcessorHttpStatus") -public func _bjs_DataProcessorManager_setProcessorHttpStatus(_self: UnsafeMutableRawPointer, statusIsSome: Int32, statusValue: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMutableRawPointer, _ statusIsSome: Int32, _ statusValue: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorHttpStatus(_: Optional.bridgeJSLiftParameter(statusIsSome, statusValue)) #else @@ -5174,7 +5387,7 @@ public func _bjs_DataProcessorManager_setProcessorHttpStatus(_self: UnsafeMutabl @_expose(wasm, "bjs_DataProcessorManager_getProcessorAPIResult") @_cdecl("bjs_DataProcessorManager_getProcessorAPIResult") -public func _bjs_DataProcessorManager_getProcessorAPIResult(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() return ret.bridgeJSLowerReturn() @@ -5185,7 +5398,7 @@ public func _bjs_DataProcessorManager_getProcessorAPIResult(_self: UnsafeMutable @_expose(wasm, "bjs_DataProcessorManager_setProcessorAPIResult") @_cdecl("bjs_DataProcessorManager_setProcessorAPIResult") -public func _bjs_DataProcessorManager_setProcessorAPIResult(_self: UnsafeMutableRawPointer, apiResultIsSome: Int32, apiResultCaseId: Int32) -> Void { +public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) #else @@ -5195,7 +5408,7 @@ public func _bjs_DataProcessorManager_setProcessorAPIResult(_self: UnsafeMutable @_expose(wasm, "bjs_DataProcessorManager_processor_get") @_cdecl("bjs_DataProcessorManager_processor_get") -public func _bjs_DataProcessorManager_processor_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_DataProcessorManager_processor_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).processor as! AnyDataProcessor return ret.bridgeJSLowerReturn() @@ -5206,7 +5419,7 @@ public func _bjs_DataProcessorManager_processor_get(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_DataProcessorManager_processor_set") @_cdecl("bjs_DataProcessorManager_processor_set") -public func _bjs_DataProcessorManager_processor_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).processor = AnyDataProcessor.bridgeJSLiftParameter(value) #else @@ -5216,7 +5429,7 @@ public func _bjs_DataProcessorManager_processor_set(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_DataProcessorManager_backupProcessor_get") @_cdecl("bjs_DataProcessorManager_backupProcessor_get") -public func _bjs_DataProcessorManager_backupProcessor_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor.flatMap { $0 as? AnyDataProcessor @@ -5229,7 +5442,7 @@ public func _bjs_DataProcessorManager_backupProcessor_get(_self: UnsafeMutableRa @_expose(wasm, "bjs_DataProcessorManager_backupProcessor_set") @_cdecl("bjs_DataProcessorManager_backupProcessor_set") -public func _bjs_DataProcessorManager_backupProcessor_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_DataProcessorManager_backupProcessor_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -5239,8 +5452,12 @@ public func _bjs_DataProcessorManager_backupProcessor_set(_self: UnsafeMutableRa @_expose(wasm, "bjs_DataProcessorManager_deinit") @_cdecl("bjs_DataProcessorManager_deinit") -public func _bjs_DataProcessorManager_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_DataProcessorManager_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -5251,9 +5468,9 @@ extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap") -fileprivate func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_DataProcessorManager_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -5271,7 +5488,7 @@ public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_SwiftDataProcessor_increment") @_cdecl("bjs_SwiftDataProcessor_increment") -public func _bjs_SwiftDataProcessor_increment(_self: UnsafeMutableRawPointer, amount: Int32) -> Void { +public func _bjs_SwiftDataProcessor_increment(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount)) #else @@ -5281,7 +5498,7 @@ public func _bjs_SwiftDataProcessor_increment(_self: UnsafeMutableRawPointer, am @_expose(wasm, "bjs_SwiftDataProcessor_getValue") @_cdecl("bjs_SwiftDataProcessor_getValue") -public func _bjs_SwiftDataProcessor_getValue(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SwiftDataProcessor_getValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getValue() return ret.bridgeJSLowerReturn() @@ -5292,7 +5509,7 @@ public func _bjs_SwiftDataProcessor_getValue(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_SwiftDataProcessor_setLabelElements") @_cdecl("bjs_SwiftDataProcessor_setLabelElements") -public func _bjs_SwiftDataProcessor_setLabelElements(_self: UnsafeMutableRawPointer, labelPrefixBytes: Int32, labelPrefixLength: Int32, labelSuffixBytes: Int32, labelSuffixLength: Int32) -> Void { +public func _bjs_SwiftDataProcessor_setLabelElements(_ _self: UnsafeMutableRawPointer, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength)) #else @@ -5302,7 +5519,7 @@ public func _bjs_SwiftDataProcessor_setLabelElements(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_SwiftDataProcessor_getLabel") @_cdecl("bjs_SwiftDataProcessor_getLabel") -public func _bjs_SwiftDataProcessor_getLabel(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_getLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getLabel() return ret.bridgeJSLowerReturn() @@ -5313,7 +5530,7 @@ public func _bjs_SwiftDataProcessor_getLabel(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_SwiftDataProcessor_isEven") @_cdecl("bjs_SwiftDataProcessor_isEven") -public func _bjs_SwiftDataProcessor_isEven(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SwiftDataProcessor_isEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).isEven() return ret.bridgeJSLowerReturn() @@ -5324,7 +5541,7 @@ public func _bjs_SwiftDataProcessor_isEven(_self: UnsafeMutableRawPointer) -> In @_expose(wasm, "bjs_SwiftDataProcessor_processGreeter") @_cdecl("bjs_SwiftDataProcessor_processGreeter") -public func _bjs_SwiftDataProcessor_processGreeter(_self: UnsafeMutableRawPointer, greeter: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_processGreeter(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() @@ -5335,7 +5552,7 @@ public func _bjs_SwiftDataProcessor_processGreeter(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_SwiftDataProcessor_createGreeter") @_cdecl("bjs_SwiftDataProcessor_createGreeter") -public func _bjs_SwiftDataProcessor_createGreeter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_SwiftDataProcessor_createGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createGreeter() return ret.bridgeJSLowerReturn() @@ -5346,7 +5563,7 @@ public func _bjs_SwiftDataProcessor_createGreeter(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_SwiftDataProcessor_processOptionalGreeter") @_cdecl("bjs_SwiftDataProcessor_processOptionalGreeter") -public func _bjs_SwiftDataProcessor_processOptionalGreeter(_self: UnsafeMutableRawPointer, greeterIsSome: Int32, greeterValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ greeterIsSome: Int32, _ greeterValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue)) return ret.bridgeJSLowerReturn() @@ -5357,7 +5574,7 @@ public func _bjs_SwiftDataProcessor_processOptionalGreeter(_self: UnsafeMutableR @_expose(wasm, "bjs_SwiftDataProcessor_createOptionalGreeter") @_cdecl("bjs_SwiftDataProcessor_createOptionalGreeter") -public func _bjs_SwiftDataProcessor_createOptionalGreeter(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_createOptionalGreeter(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createOptionalGreeter() return ret.bridgeJSLowerReturn() @@ -5368,7 +5585,7 @@ public func _bjs_SwiftDataProcessor_createOptionalGreeter(_self: UnsafeMutableRa @_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult") @_cdecl("bjs_SwiftDataProcessor_handleAPIResult") -public func _bjs_SwiftDataProcessor_handleAPIResult(_self: UnsafeMutableRawPointer, resultIsSome: Int32, resultCaseId: Int32) -> Void { +public func _bjs_SwiftDataProcessor_handleAPIResult(_ _self: UnsafeMutableRawPointer, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) #else @@ -5378,7 +5595,7 @@ public func _bjs_SwiftDataProcessor_handleAPIResult(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult") @_cdecl("bjs_SwiftDataProcessor_getAPIResult") -public func _bjs_SwiftDataProcessor_getAPIResult(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getAPIResult() return ret.bridgeJSLowerReturn() @@ -5389,7 +5606,7 @@ public func _bjs_SwiftDataProcessor_getAPIResult(_self: UnsafeMutableRawPointer) @_expose(wasm, "bjs_SwiftDataProcessor_count_get") @_cdecl("bjs_SwiftDataProcessor_count_get") -public func _bjs_SwiftDataProcessor_count_get(_self: UnsafeMutableRawPointer) -> Int32 { +public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).count return ret.bridgeJSLowerReturn() @@ -5400,7 +5617,7 @@ public func _bjs_SwiftDataProcessor_count_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_SwiftDataProcessor_count_set") @_cdecl("bjs_SwiftDataProcessor_count_set") -public func _bjs_SwiftDataProcessor_count_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_SwiftDataProcessor_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) #else @@ -5410,7 +5627,7 @@ public func _bjs_SwiftDataProcessor_count_set(_self: UnsafeMutableRawPointer, va @_expose(wasm, "bjs_SwiftDataProcessor_name_get") @_cdecl("bjs_SwiftDataProcessor_name_get") -public func _bjs_SwiftDataProcessor_name_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).name return ret.bridgeJSLowerReturn() @@ -5421,7 +5638,7 @@ public func _bjs_SwiftDataProcessor_name_get(_self: UnsafeMutableRawPointer) -> @_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_get") @_cdecl("bjs_SwiftDataProcessor_optionalTag_get") -public func _bjs_SwiftDataProcessor_optionalTag_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_optionalTag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag return ret.bridgeJSLowerReturn() @@ -5432,7 +5649,7 @@ public func _bjs_SwiftDataProcessor_optionalTag_get(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_SwiftDataProcessor_optionalTag_set") @_cdecl("bjs_SwiftDataProcessor_optionalTag_set") -public func _bjs_SwiftDataProcessor_optionalTag_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_SwiftDataProcessor_optionalTag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -5442,7 +5659,7 @@ public func _bjs_SwiftDataProcessor_optionalTag_set(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_get") @_cdecl("bjs_SwiftDataProcessor_optionalCount_get") -public func _bjs_SwiftDataProcessor_optionalCount_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_optionalCount_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount return ret.bridgeJSLowerReturn() @@ -5453,7 +5670,7 @@ public func _bjs_SwiftDataProcessor_optionalCount_get(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_SwiftDataProcessor_optionalCount_set") @_cdecl("bjs_SwiftDataProcessor_optionalCount_set") -public func _bjs_SwiftDataProcessor_optionalCount_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_SwiftDataProcessor_optionalCount_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -5463,7 +5680,7 @@ public func _bjs_SwiftDataProcessor_optionalCount_set(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_SwiftDataProcessor_direction_get") @_cdecl("bjs_SwiftDataProcessor_direction_get") -public func _bjs_SwiftDataProcessor_direction_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_direction_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).direction return ret.bridgeJSLowerReturn() @@ -5474,7 +5691,7 @@ public func _bjs_SwiftDataProcessor_direction_get(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_SwiftDataProcessor_direction_set") @_cdecl("bjs_SwiftDataProcessor_direction_set") -public func _bjs_SwiftDataProcessor_direction_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_SwiftDataProcessor_direction_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).direction = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -5484,7 +5701,7 @@ public func _bjs_SwiftDataProcessor_direction_set(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_get") @_cdecl("bjs_SwiftDataProcessor_optionalTheme_get") -public func _bjs_SwiftDataProcessor_optionalTheme_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_optionalTheme_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme return ret.bridgeJSLowerReturn() @@ -5495,7 +5712,7 @@ public func _bjs_SwiftDataProcessor_optionalTheme_get(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_SwiftDataProcessor_optionalTheme_set") @_cdecl("bjs_SwiftDataProcessor_optionalTheme_set") -public func _bjs_SwiftDataProcessor_optionalTheme_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueBytes: Int32, valueLength: Int32) -> Void { +public func _bjs_SwiftDataProcessor_optionalTheme_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else @@ -5505,7 +5722,7 @@ public func _bjs_SwiftDataProcessor_optionalTheme_set(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_get") @_cdecl("bjs_SwiftDataProcessor_httpStatus_get") -public func _bjs_SwiftDataProcessor_httpStatus_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_httpStatus_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus return ret.bridgeJSLowerReturn() @@ -5516,7 +5733,7 @@ public func _bjs_SwiftDataProcessor_httpStatus_get(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_SwiftDataProcessor_httpStatus_set") @_cdecl("bjs_SwiftDataProcessor_httpStatus_set") -public func _bjs_SwiftDataProcessor_httpStatus_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: Int32) -> Void { +public func _bjs_SwiftDataProcessor_httpStatus_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -5526,7 +5743,7 @@ public func _bjs_SwiftDataProcessor_httpStatus_set(_self: UnsafeMutableRawPointe @_expose(wasm, "bjs_SwiftDataProcessor_apiResult_get") @_cdecl("bjs_SwiftDataProcessor_apiResult_get") -public func _bjs_SwiftDataProcessor_apiResult_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_apiResult_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult return ret.bridgeJSLowerReturn() @@ -5537,7 +5754,7 @@ public func _bjs_SwiftDataProcessor_apiResult_get(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_SwiftDataProcessor_apiResult_set") @_cdecl("bjs_SwiftDataProcessor_apiResult_set") -public func _bjs_SwiftDataProcessor_apiResult_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueCaseId: Int32) -> Void { +public func _bjs_SwiftDataProcessor_apiResult_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) #else @@ -5547,7 +5764,7 @@ public func _bjs_SwiftDataProcessor_apiResult_set(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_SwiftDataProcessor_helper_get") @_cdecl("bjs_SwiftDataProcessor_helper_get") -public func _bjs_SwiftDataProcessor_helper_get(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_SwiftDataProcessor_helper_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).helper return ret.bridgeJSLowerReturn() @@ -5558,7 +5775,7 @@ public func _bjs_SwiftDataProcessor_helper_get(_self: UnsafeMutableRawPointer) - @_expose(wasm, "bjs_SwiftDataProcessor_helper_set") @_cdecl("bjs_SwiftDataProcessor_helper_set") -public func _bjs_SwiftDataProcessor_helper_set(_self: UnsafeMutableRawPointer, value: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_helper_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).helper = Greeter.bridgeJSLiftParameter(value) #else @@ -5568,7 +5785,7 @@ public func _bjs_SwiftDataProcessor_helper_set(_self: UnsafeMutableRawPointer, v @_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_get") @_cdecl("bjs_SwiftDataProcessor_optionalHelper_get") -public func _bjs_SwiftDataProcessor_optionalHelper_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_optionalHelper_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper return ret.bridgeJSLowerReturn() @@ -5579,7 +5796,7 @@ public func _bjs_SwiftDataProcessor_optionalHelper_get(_self: UnsafeMutableRawPo @_expose(wasm, "bjs_SwiftDataProcessor_optionalHelper_set") @_cdecl("bjs_SwiftDataProcessor_optionalHelper_set") -public func _bjs_SwiftDataProcessor_optionalHelper_set(_self: UnsafeMutableRawPointer, valueIsSome: Int32, valueValue: UnsafeMutableRawPointer) -> Void { +public func _bjs_SwiftDataProcessor_optionalHelper_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else @@ -5589,8 +5806,12 @@ public func _bjs_SwiftDataProcessor_optionalHelper_set(_self: UnsafeMutableRawPo @_expose(wasm, "bjs_SwiftDataProcessor_deinit") @_cdecl("bjs_SwiftDataProcessor_deinit") -public func _bjs_SwiftDataProcessor_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_SwiftDataProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -5601,16 +5822,16 @@ extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap") -fileprivate func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SwiftDataProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_TextProcessor_init") @_cdecl("bjs_TextProcessor_init") -public func _bjs_TextProcessor_init(transform: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor(transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() @@ -5621,7 +5842,7 @@ public func _bjs_TextProcessor_init(transform: Int32) -> UnsafeMutableRawPointer @_expose(wasm, "bjs_TextProcessor_process") @_cdecl("bjs_TextProcessor_process") -public func _bjs_TextProcessor_process(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32) -> Void { +public func _bjs_TextProcessor_process(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).process(_: String.bridgeJSLiftParameter(textBytes, textLength)) return ret.bridgeJSLowerReturn() @@ -5632,7 +5853,7 @@ public func _bjs_TextProcessor_process(_self: UnsafeMutableRawPointer, textBytes @_expose(wasm, "bjs_TextProcessor_processWithCustom") @_cdecl("bjs_TextProcessor_processWithCustom") -public func _bjs_TextProcessor_processWithCustom(_self: UnsafeMutableRawPointer, textBytes: Int32, textLength: Int32, customTransform: Int32) -> Void { +public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform)) return ret.bridgeJSLowerReturn() @@ -5643,7 +5864,7 @@ public func _bjs_TextProcessor_processWithCustom(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TextProcessor_getTransform") @_cdecl("bjs_TextProcessor_getTransform") -public func _bjs_TextProcessor_getTransform(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform() return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) @@ -5654,7 +5875,7 @@ public func _bjs_TextProcessor_getTransform(_self: UnsafeMutableRawPointer) -> U @_expose(wasm, "bjs_TextProcessor_processOptionalString") @_cdecl("bjs_TextProcessor_processOptionalString") -public func _bjs_TextProcessor_processOptionalString(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalString(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5665,7 +5886,7 @@ public func _bjs_TextProcessor_processOptionalString(_self: UnsafeMutableRawPoin @_expose(wasm, "bjs_TextProcessor_processOptionalInt") @_cdecl("bjs_TextProcessor_processOptionalInt") -public func _bjs_TextProcessor_processOptionalInt(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalInt(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5676,7 +5897,7 @@ public func _bjs_TextProcessor_processOptionalInt(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_TextProcessor_processOptionalGreeter") @_cdecl("bjs_TextProcessor_processOptionalGreeter") -public func _bjs_TextProcessor_processOptionalGreeter(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5687,7 +5908,7 @@ public func _bjs_TextProcessor_processOptionalGreeter(_self: UnsafeMutableRawPoi @_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter") @_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") -public func _bjs_TextProcessor_makeOptionalStringFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() return _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLower(ret) @@ -5698,7 +5919,7 @@ public func _bjs_TextProcessor_makeOptionalStringFormatter(_self: UnsafeMutableR @_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator") @_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") -public func _bjs_TextProcessor_makeOptionalGreeterCreator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() return _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC.bridgeJSLower(ret) @@ -5709,7 +5930,7 @@ public func _bjs_TextProcessor_makeOptionalGreeterCreator(_self: UnsafeMutableRa @_expose(wasm, "bjs_TextProcessor_processDirection") @_cdecl("bjs_TextProcessor_processDirection") -public func _bjs_TextProcessor_processDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5720,7 +5941,7 @@ public func _bjs_TextProcessor_processDirection(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TextProcessor_processTheme") @_cdecl("bjs_TextProcessor_processTheme") -public func _bjs_TextProcessor_processTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5731,7 +5952,7 @@ public func _bjs_TextProcessor_processTheme(_self: UnsafeMutableRawPointer, call @_expose(wasm, "bjs_TextProcessor_processHttpStatus") @_cdecl("bjs_TextProcessor_processHttpStatus") -public func _bjs_TextProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, callback: Int32) -> Int32 { +public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5742,7 +5963,7 @@ public func _bjs_TextProcessor_processHttpStatus(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TextProcessor_processAPIResult") @_cdecl("bjs_TextProcessor_processAPIResult") -public func _bjs_TextProcessor_processAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5753,7 +5974,7 @@ public func _bjs_TextProcessor_processAPIResult(_self: UnsafeMutableRawPointer, @_expose(wasm, "bjs_TextProcessor_makeDirectionChecker") @_cdecl("bjs_TextProcessor_makeDirectionChecker") -public func _bjs_TextProcessor_makeDirectionChecker(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() return _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb.bridgeJSLower(ret) @@ -5764,7 +5985,7 @@ public func _bjs_TextProcessor_makeDirectionChecker(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TextProcessor_makeThemeValidator") @_cdecl("bjs_TextProcessor_makeThemeValidator") -public func _bjs_TextProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() return _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb.bridgeJSLower(ret) @@ -5775,7 +5996,7 @@ public func _bjs_TextProcessor_makeThemeValidator(_self: UnsafeMutableRawPointer @_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor") @_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") -public func _bjs_TextProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() return _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLower(ret) @@ -5786,7 +6007,7 @@ public func _bjs_TextProcessor_makeStatusCodeExtractor(_self: UnsafeMutableRawPo @_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler") @_cdecl("bjs_TextProcessor_makeAPIResultHandler") -public func _bjs_TextProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() return _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLower(ret) @@ -5797,7 +6018,7 @@ public func _bjs_TextProcessor_makeAPIResultHandler(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TextProcessor_processOptionalDirection") @_cdecl("bjs_TextProcessor_processOptionalDirection") -public func _bjs_TextProcessor_processOptionalDirection(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5808,7 +6029,7 @@ public func _bjs_TextProcessor_processOptionalDirection(_self: UnsafeMutableRawP @_expose(wasm, "bjs_TextProcessor_processOptionalTheme") @_cdecl("bjs_TextProcessor_processOptionalTheme") -public func _bjs_TextProcessor_processOptionalTheme(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5819,7 +6040,7 @@ public func _bjs_TextProcessor_processOptionalTheme(_self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult") @_cdecl("bjs_TextProcessor_processOptionalAPIResult") -public func _bjs_TextProcessor_processOptionalAPIResult(_self: UnsafeMutableRawPointer, callback: Int32) -> Void { +public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback)) return ret.bridgeJSLowerReturn() @@ -5830,7 +6051,7 @@ public func _bjs_TextProcessor_processOptionalAPIResult(_self: UnsafeMutableRawP @_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter") @_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") -public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() return _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLower(ret) @@ -5841,8 +6062,12 @@ public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_self: UnsafeMutab @_expose(wasm, "bjs_TextProcessor_deinit") @_cdecl("bjs_TextProcessor_deinit") -public func _bjs_TextProcessor_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_TextProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -5853,16 +6078,16 @@ extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") -fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TextProcessor_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @_expose(wasm, "bjs_Container_init") @_cdecl("bjs_Container_init") -public func _bjs_Container_init(config: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Container_init(_ config: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) let _tmp_config = Optional.bridgeJSLiftParameter(config) let _tmp_location = DataPoint.bridgeJSLiftParameter() @@ -5875,7 +6100,7 @@ public func _bjs_Container_init(config: Int32) -> UnsafeMutableRawPointer { @_expose(wasm, "bjs_Container_location_get") @_cdecl("bjs_Container_location_get") -public func _bjs_Container_location_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Container.bridgeJSLiftParameter(_self).location return ret.bridgeJSLowerReturn() @@ -5886,7 +6111,7 @@ public func _bjs_Container_location_get(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_Container_location_set") @_cdecl("bjs_Container_location_set") -public func _bjs_Container_location_set(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter() #else @@ -5896,7 +6121,7 @@ public func _bjs_Container_location_set(_self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_Container_config_get") @_cdecl("bjs_Container_config_get") -public func _bjs_Container_config_get(_self: UnsafeMutableRawPointer) -> Void { +public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = Container.bridgeJSLiftParameter(_self).config return ret.bridgeJSLowerReturn() @@ -5907,7 +6132,7 @@ public func _bjs_Container_config_get(_self: UnsafeMutableRawPointer) -> Void { @_expose(wasm, "bjs_Container_config_set") @_cdecl("bjs_Container_config_set") -public func _bjs_Container_config_set(_self: UnsafeMutableRawPointer, value: Int32) -> Void { +public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter(value) #else @@ -5917,8 +6142,12 @@ public func _bjs_Container_config_set(_self: UnsafeMutableRawPointer, value: Int @_expose(wasm, "bjs_Container_deinit") @_cdecl("bjs_Container_deinit") -public func _bjs_Container_deinit(pointer: UnsafeMutableRawPointer) { +public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif } extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { @@ -5929,9 +6158,9 @@ extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap") -fileprivate func _bjs_Container_wrap(_: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Container_wrap(_: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif \ No newline at end of file From 0a90ab7f1be5b0c5c9e22b81fa29fd73f56bbda7 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 14 Jan 2026 19:56:34 +0900 Subject: [PATCH 065/252] BridgeJS: Remove dead code --- .../Sources/BridgeJSCore/ImportTS.swift | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 1a3bd0ceb..e4f6c89bc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -483,18 +483,6 @@ public struct ImportTS { return Trivia(pieces: lines.flatMap { [TriviaPiece.docLineComment("/// \($0)"), .newlines(1)] }) } - static func buildFunctionEffect(throws: Bool, async: Bool) -> FunctionEffectSpecifiersSyntax { - return FunctionEffectSpecifiersSyntax( - asyncSpecifier: `async` ? .keyword(.async) : nil, - throwsClause: `throws` - ? ThrowsClauseSyntax( - throwsSpecifier: .keyword(.throws), - leftParen: .leftParenToken(), - type: IdentifierTypeSyntax(name: .identifier("JSException")), - rightParen: .rightParenToken() - ) : nil - ) - } static func buildAccessorEffect(throws: Bool, async: Bool) -> AccessorEffectSpecifiersSyntax { return AccessorEffectSpecifiersSyntax( asyncSpecifier: `async` ? .keyword(.async) : nil, @@ -679,33 +667,6 @@ struct SwiftSignatureBuilder { let identifierType = IdentifierTypeSyntax(name: .identifier(type.swiftType)) return TypeSyntax(identifierType) } - - /// Formats a FunctionSignatureSyntax to a string representation - /// - /// Useful when string interpolation is needed (e.g., in renderExternDecl) - static func formatSignatureToString(_ signature: FunctionSignatureSyntax) -> String { - let format = BasicFormat() - return signature.formatted(using: format).description - } - - /// Formats a FunctionParameterClauseSyntax to a string representation - /// - /// Useful for building parameter signature strings - static func formatParameterClauseToString(_ clause: FunctionParameterClauseSyntax) -> String { - let format = BasicFormat() - return clause.formatted(using: format).description - } - - /// Formats a ReturnClauseSyntax to a string representation - /// - /// Useful for building return type signature strings - static func formatReturnClauseToString(_ clause: ReturnClauseSyntax?) -> String { - guard let clause = clause else { - return "" - } - let format = BasicFormat() - return clause.formatted(using: format).description - } } enum SwiftCodePattern { From dbeee8aa950de4c3a7d0757ea485d5093337ba55 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 19:26:23 +0900 Subject: [PATCH 066/252] Drop Swift 6.0 support (#500) --- .github/workflows/test.yml | 5 -- CONTRIBUTING.md | 49 ++++++------------- Package.swift | 2 +- .../Articles/Deploying-Pages.md | 2 +- 4 files changed, 18 insertions(+), 40 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b79d911ab..0ee5bf317 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,11 +9,6 @@ jobs: strategy: matrix: entry: - - os: ubuntu-22.04 - toolchain: - download-url: https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz - wasi-backend: Node - target: "wasm32-unknown-wasi" - os: ubuntu-22.04 toolchain: download-url: https://download.swift.org/swift-6.1-release/ubuntu2204/swift-6.1-RELEASE/swift-6.1-RELEASE-ubuntu22.04.tar.gz diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 712aeffb7..339a268ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,41 +18,24 @@ Thank you for considering contributing to JavaScriptKit! We welcome contribution cd JavaScriptKit ``` -2. Install **OSS** Swift toolchain (not the one from Xcode): -
        - For macOS users - - ```bash - ( - SWIFT_TOOLCHAIN_CHANNEL=swift-6.0.2-release; - SWIFT_TOOLCHAIN_TAG="swift-6.0.2-RELEASE"; - SWIFT_SDK_TAG="swift-wasm-6.0.2-RELEASE"; - SWIFT_SDK_CHECKSUM="6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4"; - pkg="$(mktemp -d)/InstallMe.pkg"; set -ex; - curl -o "$pkg" "https://download.swift.org/$SWIFT_TOOLCHAIN_CHANNEL/xcode/$SWIFT_TOOLCHAIN_TAG/$SWIFT_TOOLCHAIN_TAG-osx.pkg"; - installer -pkg "$pkg" -target CurrentUserHomeDirectory; - export TOOLCHAINS="$(plutil -extract CFBundleIdentifier raw ~/Library/Developer/Toolchains/$SWIFT_TOOLCHAIN_TAG.xctoolchain/Info.plist)"; - swift sdk install "https://github.com/swiftwasm/swift/releases/download/$SWIFT_SDK_TAG/$SWIFT_SDK_TAG-wasm32-unknown-wasi.artifactbundle.zip" --checksum "$SWIFT_SDK_CHECKSUM"; - ) - ``` - -
        - -
        - For Linux users - Install Swift 6.0.2 by following the instructions on the official Swift website. - +2. Install **OSS** Swift toolchain via `swiftly` +3. Install Swift SDK for Wasm corresponding to the Swift version: ```bash ( - SWIFT_SDK_TAG="swift-wasm-6.0.2-RELEASE"; - SWIFT_SDK_CHECKSUM="6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4"; - swift sdk install "https://github.com/swiftwasm/swift/releases/download/$SWIFT_SDK_TAG/$SWIFT_SDK_TAG-wasm32-unknown-wasi.artifactbundle.zip" --checksum "$SWIFT_SDK_CHECKSUM"; + set -eo pipefail; \ + V="$(swiftc --version | head -n1)"; \ + TAG="$(curl -sL "https://raw.githubusercontent.com/swiftwasm/swift-sdk-index/refs/heads/main/v1/tag-by-version.json" | jq -e -r --arg v "$V" '.[$v] | .[-1]')"; \ + curl -sL "https://raw.githubusercontent.com/swiftwasm/swift-sdk-index/refs/heads/main/v1/builds/$TAG.json" | \ + jq -r '.["swift-sdks"]["wasm32-unknown-wasip1"] | "swift sdk install \"\(.url)\" --checksum \"\(.checksum)\""' | sh -x + ); + export SWIFT_SDK_ID=$( + V="$(swiftc --version | head -n1)"; \ + TAG="$(curl -sL "https://raw.githubusercontent.com/swiftwasm/swift-sdk-index/refs/heads/main/v1/tag-by-version.json" | jq -e -r --arg v "$V" '.[$v] | .[-1]')"; \ + curl -sL "https://raw.githubusercontent.com/swiftwasm/swift-sdk-index/refs/heads/main/v1/builds/$TAG.json" | \ + jq -r '.["swift-sdks"]["wasm32-unknown-wasip1"]["id"]' ) ``` - -
        - -3. Install dependencies: +4. Install dependencies: ```bash make bootstrap ``` @@ -62,7 +45,7 @@ Thank you for considering contributing to JavaScriptKit! We welcome contribution Unit tests running on WebAssembly: ```bash -make unittest SWIFT_SDK_ID=wasm32-unknown-wasi +make unittest ``` Tests for `PackageToJS` plugin: @@ -112,7 +95,7 @@ Run this script when you've made changes to: These changes require updating the pre-generated Swift bindings committed to the repository. -**Adding new BridgeJS intrinsics:** +**Adding new BridgeJS intrinsics:** If you add new `@_extern(wasm, module: "bjs")` functions to [`BridgeJSIntrinsics.swift`](Sources/JavaScriptKit/BridgeJSIntrinsics.swift), also add corresponding stub entries to [`Plugins/PackageToJS/Templates/instantiate.js`](Plugins/PackageToJS/Templates/instantiate.js) in the `importObject["bjs"]` object. This allows packages without BridgeJS-generated code to instantiate successfully. diff --git a/Package.swift b/Package.swift index 670b43500..f1e5a04c9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.0 +// swift-tools-version:6.1 import CompilerPluginSupport import PackageDescription diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md index 1de371e40..435a00f53 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Deploying-Pages.md @@ -63,7 +63,7 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest - container: swift:6.0.3 + container: swift:6.2 steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 From 91d2f0617fbcacb53d234104363e20bb091c2aa4 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 16:18:58 +0900 Subject: [PATCH 067/252] BridgeJS: Macro-annotated import notations --- .../Sources/Generated/BridgeJS.ImportTS.swift | 58 - .../Sources/Generated/BridgeJS.Macros.swift | 13 + ...dgeJS.ExportSwift.swift => BridgeJS.swift} | 56 +- .../JavaScript/BridgeJS.ExportSwift.json | 1584 --- .../JavaScript/BridgeJS.ImportTS.json | 67 - .../Generated/JavaScript/BridgeJS.json | 1660 +++ Benchmarks/Sources/bridge-js.d.ts | 6 +- .../PlayBridgeJS/Sources/JavaScript/app.js | 8 +- .../Generated/BridgeJS.ImportTS.swift | 52 - .../Generated/BridgeJS.Macros.swift | 13 + ...dgeJS.ExportSwift.swift => BridgeJS.swift} | 41 +- .../JavaScript/BridgeJS.ExportSwift.json | 149 - .../JavaScript/BridgeJS.ImportTS.json | 48 - .../Generated/JavaScript/BridgeJS.json | 209 + .../Sources/PlayBridgeJS/bridge-js.d.ts | 4 +- .../Sources/PlayBridgeJS/main.swift | 4 +- Package.swift | 12 +- Plugins/BridgeJS/Package.swift | 21 +- Plugins/BridgeJS/README.md | 41 +- .../BridgeJSBuildPlugin.swift | 101 +- .../BridgeJSCommandPlugin.swift | 71 +- .../Sources/BridgeJSCore/ExportSwift.swift | 12 - .../BridgeJSCore/ImportSwiftMacros.swift | 695 ++ .../Sources/BridgeJSCore/ImportTS.swift | 181 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 168 +- .../BridgeJSMacros/BridgeJSMacrosPlugin.swift | 12 + .../Sources/BridgeJSMacros/JSClassMacro.swift | 51 + .../BridgeJSMacros/JSFunctionMacro.swift | 72 + .../BridgeJSMacros/JSGetterMacro.swift | 62 + .../BridgeJSMacros/JSMacroSupport.swift | 100 + .../BridgeJSMacros/JSSetterMacro.swift | 71 + .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 112 +- .../Sources/BridgeJSTool/BridgeJSTool.swift | 253 +- .../Sources/BridgeJSUtilities/Utilities.swift | 23 + .../Sources/TS2Skeleton/JavaScript/README.md | 3 - .../Sources/TS2Swift/JavaScript/README.md | 3 + .../JavaScript/bin/ts2swift.js} | 7 +- .../JavaScript/package.json | 2 +- .../JavaScript/src/cli.js | 13 +- .../JavaScript/src/index.d.ts | 0 .../JavaScript/src/processor.js | 373 +- .../TS2Swift.swift} | 82 +- .../JSClassMacroTests.swift | 289 + .../JSFunctionMacroTests.swift | 377 + .../JSGetterMacroTests.swift | 299 + .../JSSetterMacroTests.swift | 278 + .../BridgeJSToolTests/BridgeJSLinkTests.swift | 56 +- .../BridgeJSToolTests/ImportTSTests.swift | 33 +- .../Tests/BridgeJSToolTests/WhichTests.swift | 2 +- .../InvalidPropertyNames.Import.js | 26 +- .../MultipleImportedTypes.Import.js | 1 - .../TypeScriptClass.Import.js | 16 +- .../__Snapshots__/ExportSwiftTests/Async.json | 1 - .../ExportSwiftTests/Async.swift | 8 - .../CrossFileFunctionTypes.ReverseOrder.json | 1 - .../CrossFileFunctionTypes.ReverseOrder.swift | 8 - .../CrossFileFunctionTypes.json | 1 - .../CrossFileFunctionTypes.swift | 8 - .../CrossFileTypeResolution.ReverseOrder.json | 1 - ...CrossFileTypeResolution.ReverseOrder.swift | 8 - .../CrossFileTypeResolution.json | 1 - .../CrossFileTypeResolution.swift | 8 - .../ExportSwiftTests/DefaultParameters.json | 1 - .../ExportSwiftTests/DefaultParameters.swift | 8 - .../ExportSwiftTests/EnumAssociatedValue.json | 1 - .../EnumAssociatedValue.swift | 8 - .../ExportSwiftTests/EnumCase.json | 1 - .../ExportSwiftTests/EnumCase.swift | 8 - .../EnumNamespace.Global.json | 1 - .../EnumNamespace.Global.swift | 8 - .../ExportSwiftTests/EnumNamespace.json | 1 - .../ExportSwiftTests/EnumNamespace.swift | 8 - .../ExportSwiftTests/EnumRawType.json | 1 - .../ExportSwiftTests/EnumRawType.swift | 8 - .../ExportSwiftTests/MixedGlobal.json | 1 - .../ExportSwiftTests/MixedGlobal.swift | 8 - .../ExportSwiftTests/MixedPrivate.json | 1 - .../ExportSwiftTests/MixedPrivate.swift | 8 - .../ExportSwiftTests/Namespaces.Global.json | 1 - .../ExportSwiftTests/Namespaces.Global.swift | 8 - .../ExportSwiftTests/Namespaces.json | 1 - .../ExportSwiftTests/Namespaces.swift | 8 - .../ExportSwiftTests/Optionals.json | 1 - .../ExportSwiftTests/Optionals.swift | 8 - .../ExportSwiftTests/PrimitiveParameters.json | 1 - .../PrimitiveParameters.swift | 8 - .../ExportSwiftTests/PrimitiveReturn.json | 1 - .../ExportSwiftTests/PrimitiveReturn.swift | 8 - .../ExportSwiftTests/PropertyTypes.json | 1 - .../ExportSwiftTests/PropertyTypes.swift | 8 - .../ExportSwiftTests/Protocol.json | 1 - .../ExportSwiftTests/Protocol.swift | 8 - .../StaticFunctions.Global.json | 1 - .../StaticFunctions.Global.swift | 8 - .../ExportSwiftTests/StaticFunctions.json | 1 - .../ExportSwiftTests/StaticFunctions.swift | 8 - .../StaticProperties.Global.json | 1 - .../StaticProperties.Global.swift | 8 - .../ExportSwiftTests/StaticProperties.json | 1 - .../ExportSwiftTests/StaticProperties.swift | 8 - .../ExportSwiftTests/StringParameter.json | 1 - .../ExportSwiftTests/StringParameter.swift | 8 - .../ExportSwiftTests/StringReturn.json | 1 - .../ExportSwiftTests/StringReturn.swift | 8 - .../ExportSwiftTests/SwiftClass.json | 1 - .../ExportSwiftTests/SwiftClass.swift | 8 - .../ExportSwiftTests/SwiftClosure.json | 1 - .../ExportSwiftTests/SwiftClosure.swift | 8 - .../ExportSwiftTests/SwiftStruct.json | 1 - .../ExportSwiftTests/SwiftStruct.swift | 8 - .../ExportSwiftTests/Throws.json | 1 - .../ExportSwiftTests/Throws.swift | 8 - .../VoidParameterVoidReturn.json | 1 - .../VoidParameterVoidReturn.swift | 8 - .../ImportTSTests/ArrayParameter.Macros.swift | 13 + .../ImportTSTests/ArrayParameter.swift | 14 +- .../ImportTSTests/Async.Macros.swift | 21 + .../__Snapshots__/ImportTSTests/Async.swift | 22 +- .../ImportTSTests/Interface.Macros.swift | 14 + .../ImportTSTests/Interface.swift | 51 +- .../InvalidPropertyNames.Macros.swift | 26 + .../ImportTSTests/InvalidPropertyNames.swift | 192 +- .../MultipleImportedTypes.Macros.swift | 33 + .../ImportTSTests/MultipleImportedTypes.swift | 205 +- .../PrimitiveParameters.Macros.swift | 9 + .../ImportTSTests/PrimitiveParameters.swift | 10 +- .../PrimitiveReturn.Macros.swift | 11 + .../ImportTSTests/PrimitiveReturn.swift | 12 +- .../StringParameter.Macros.swift | 11 + .../ImportTSTests/StringParameter.swift | 12 +- .../ImportTSTests/StringReturn.Macros.swift | 9 + .../ImportTSTests/StringReturn.swift | 10 +- .../TS2SkeletonLike.Macros.swift | 22 + .../ImportTSTests/TS2SkeletonLike.swift | 106 +- .../ImportTSTests/TypeAlias.Macros.swift | 9 + .../ImportTSTests/TypeAlias.swift | 10 +- .../TypeScriptClass.Macros.swift | 16 + .../ImportTSTests/TypeScriptClass.swift | 115 +- .../VoidParameterVoidReturn.Macros.swift | 9 + .../VoidParameterVoidReturn.swift | 10 +- Plugins/PackageToJS/Sources/PackageToJS.swift | 24 +- .../Sources/PackageToJSPlugin.swift | 37 +- Sources/BridgeJSMacros | 1 + Sources/BridgeJSTool/TS2Skeleton | 1 - Sources/BridgeJSTool/TS2Swift | 1 + .../BridgeJS/Ahead-of-Time-Code-Generation.md | 5 +- Sources/JavaScriptKit/Macros.swift | 78 + ...dgeJS.ExportSwift.swift => BridgeJS.swift} | 3 +- .../JavaScript/BridgeJS.ExportSwift.json | 540 - .../Generated/JavaScript/BridgeJS.json | 554 + .../Generated/BridgeJS.ImportTS.swift | 271 - .../Generated/BridgeJS.Macros.swift | 34 + ...dgeJS.ExportSwift.swift => BridgeJS.swift} | 272 +- .../JavaScript/BridgeJS.ExportSwift.json | 8923 ---------------- .../JavaScript/BridgeJS.ImportTS.json | 233 - .../Generated/JavaScript/BridgeJS.json | 9182 +++++++++++++++++ Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 18 + Utilities/bridge-js-generate.sh | 10 +- 158 files changed, 15914 insertions(+), 13414 deletions(-) delete mode 100644 Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift create mode 100644 Benchmarks/Sources/Generated/BridgeJS.Macros.swift rename Benchmarks/Sources/Generated/{BridgeJS.ExportSwift.swift => BridgeJS.swift} (96%) delete mode 100644 Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json delete mode 100644 Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json create mode 100644 Benchmarks/Sources/Generated/JavaScript/BridgeJS.json delete mode 100644 Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift create mode 100644 Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift rename Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/{BridgeJS.ExportSwift.swift => BridgeJS.swift} (80%) delete mode 100644 Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json delete mode 100644 Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json create mode 100644 Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json create mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/BridgeJSMacrosPlugin.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift delete mode 100644 Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/README.md create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/README.md rename Plugins/BridgeJS/Sources/{TS2Skeleton/JavaScript/bin/ts2skeleton.js => TS2Swift/JavaScript/bin/ts2swift.js} (53%) mode change 100755 => 100644 rename Plugins/BridgeJS/Sources/{TS2Skeleton => TS2Swift}/JavaScript/package.json (69%) rename Plugins/BridgeJS/Sources/{TS2Skeleton => TS2Swift}/JavaScript/src/cli.js (90%) rename Plugins/BridgeJS/Sources/{TS2Skeleton => TS2Swift}/JavaScript/src/index.d.ts (100%) rename Plugins/BridgeJS/Sources/{TS2Skeleton => TS2Swift}/JavaScript/src/processor.js (51%) rename Plugins/BridgeJS/Sources/{TS2Skeleton/TS2Skeleton.swift => TS2Swift/TS2Swift.swift} (65%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift create mode 120000 Sources/BridgeJSMacros delete mode 120000 Sources/BridgeJSTool/TS2Skeleton create mode 120000 Sources/BridgeJSTool/TS2Swift rename Tests/BridgeJSGlobalTests/Generated/{BridgeJS.ExportSwift.swift => BridgeJS.swift} (99%) delete mode 100644 Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json create mode 100644 Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json delete mode 100644 Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift create mode 100644 Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift rename Tests/BridgeJSRuntimeTests/Generated/{BridgeJS.ExportSwift.swift => BridgeJS.swift} (96%) delete mode 100644 Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json delete mode 100644 Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json create mode 100644 Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json diff --git a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift b/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift deleted file mode 100644 index e6bb84c13..000000000 --- a/Benchmarks/Sources/Generated/BridgeJS.ImportTS.swift +++ /dev/null @@ -1,58 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - -#if arch(wasm32) -@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") -fileprivate func bjs_benchmarkHelperNoop() -> Void -#else -fileprivate func bjs_benchmarkHelperNoop() -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func benchmarkHelperNoop() throws(JSException) -> Void { - bjs_benchmarkHelperNoop() - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") -fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void -#else -fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { - let nValue = n.bridgeJSLowerParameter() - bjs_benchmarkHelperNoopWithNumber(nValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") -fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void -#else -fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { - let nameValue = name.bridgeJSLowerParameter() - let bodyValue = body.bridgeJSLowerParameter() - bjs_benchmarkRunner(nameValue, bodyValue) - if let error = _swift_js_take_exception() { - throw error - } -} \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift new file mode 100644 index 000000000..c96789495 --- /dev/null +++ b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift @@ -0,0 +1,13 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func benchmarkHelperNoop() throws (JSException) -> Void + +@JSFunction func benchmarkHelperNoopWithNumber(_ n: Double) throws (JSException) -> Void + +@JSFunction func benchmarkRunner(_ name: String, _ body: JSObject) throws (JSException) -> Void diff --git a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift b/Benchmarks/Sources/Generated/BridgeJS.swift similarity index 96% rename from Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift rename to Benchmarks/Sources/Generated/BridgeJS.swift index 2c9d9b6bf..b80dbb56a 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.ExportSwift.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -1,10 +1,11 @@ +// bridge-js: skip // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. // // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { @@ -1172,4 +1173,55 @@ fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") +fileprivate func bjs_benchmarkHelperNoop() -> Void +#else +fileprivate func bjs_benchmarkHelperNoop() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$benchmarkHelperNoop() throws(JSException) -> Void { + bjs_benchmarkHelperNoop() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") +fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void +#else +fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { + let nValue = n.bridgeJSLowerParameter() + bjs_benchmarkHelperNoopWithNumber(nValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") +fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void +#else +fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { + let nameValue = name.bridgeJSLowerParameter() + let bodyValue = body.bridgeJSLowerParameter() + bjs_benchmarkRunner(nameValue, bodyValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json deleted file mode 100644 index e3532d33c..000000000 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ExportSwift.json +++ /dev/null @@ -1,1584 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_EnumRoundtrip_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_EnumRoundtrip_take", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "take", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makeSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeSuccess", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makeFailure", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeFailure", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makeFlag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeFlag", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makeRate", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeRate", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makePrecise", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makePrecise", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_makeInfo", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeInfo", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_EnumRoundtrip_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "name" : "EnumRoundtrip", - "properties" : [ - - ], - "swiftCallName" : "EnumRoundtrip" - }, - { - "constructor" : { - "abiName" : "bjs_ComplexResultRoundtrip_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_ComplexResultRoundtrip_take", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "take", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeSuccess", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeError", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeError", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeLocation", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeLocation", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeStatus", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeCoordinates", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeCoordinates", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeComprehensive", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComprehensive", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_makeInfo", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeInfo", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_ComplexResultRoundtrip_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "name" : "ComplexResultRoundtrip", - "properties" : [ - - ], - "swiftCallName" : "ComplexResultRoundtrip" - }, - { - "constructor" : { - "abiName" : "bjs_StringRoundtrip_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_StringRoundtrip_take", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "take", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_StringRoundtrip_make", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "make", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "StringRoundtrip", - "properties" : [ - - ], - "swiftCallName" : "StringRoundtrip" - }, - { - "constructor" : { - "abiName" : "bjs_StructRoundtrip_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_StructRoundtrip_takeSimple", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeSimple", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "SimpleStruct" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_makeSimple", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeSimple", - "parameters" : [ - - ], - "returnType" : { - "swiftStruct" : { - "_0" : "SimpleStruct" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_roundtripSimple", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripSimple", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "SimpleStruct" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "SimpleStruct" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_takeAddress", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeAddress", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "Address" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_makeAddress", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAddress", - "parameters" : [ - - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Address" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_roundtripAddress", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripAddress", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "Address" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Address" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_takePerson", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takePerson", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "Person" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_makePerson", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makePerson", - "parameters" : [ - - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Person" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_roundtripPerson", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripPerson", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "Person" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Person" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_takeComplex", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeComplex", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "ComplexStruct" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_makeComplex", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplex", - "parameters" : [ - - ], - "returnType" : { - "swiftStruct" : { - "_0" : "ComplexStruct" - } - } - }, - { - "abiName" : "bjs_StructRoundtrip_roundtripComplex", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripComplex", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "ComplexStruct" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "ComplexStruct" - } - } - } - ], - "name" : "StructRoundtrip", - "properties" : [ - - ], - "swiftCallName" : "StructRoundtrip" - }, - { - "constructor" : { - "abiName" : "bjs_SimpleClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "label" : "flag", - "name" : "flag", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "rate", - "name" : "rate", - "type" : { - "float" : { - - } - } - }, - { - "label" : "precise", - "name" : "precise", - "type" : { - "double" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "SimpleClass", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "flag", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "rate", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "precise", - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "SimpleClass" - }, - { - "constructor" : { - "abiName" : "bjs_AddressClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "street", - "name" : "street", - "type" : { - "string" : { - - } - } - }, - { - "label" : "city", - "name" : "city", - "type" : { - "string" : { - - } - } - }, - { - "label" : "zipCode", - "name" : "zipCode", - "type" : { - "int" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "AddressClass", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "street", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "city", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "zipCode", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "AddressClass" - }, - { - "constructor" : { - "abiName" : "bjs_ClassRoundtrip_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_ClassRoundtrip_takeSimpleClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeSimpleClass", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftHeapObject" : { - "_0" : "SimpleClass" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_ClassRoundtrip_makeSimpleClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeSimpleClass", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "SimpleClass" - } - } - }, - { - "abiName" : "bjs_ClassRoundtrip_roundtripSimpleClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripSimpleClass", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftHeapObject" : { - "_0" : "SimpleClass" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "SimpleClass" - } - } - }, - { - "abiName" : "bjs_ClassRoundtrip_takeAddressClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeAddressClass", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftHeapObject" : { - "_0" : "AddressClass" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_ClassRoundtrip_makeAddressClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAddressClass", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "AddressClass" - } - } - }, - { - "abiName" : "bjs_ClassRoundtrip_roundtripAddressClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripAddressClass", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftHeapObject" : { - "_0" : "AddressClass" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "AddressClass" - } - } - } - ], - "name" : "ClassRoundtrip", - "properties" : [ - - ], - "swiftCallName" : "ClassRoundtrip" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - } - ], - "name" : "flag" - }, - { - "associatedValues" : [ - { - "type" : { - "float" : { - - } - } - } - ], - "name" : "rate" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "precise" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "error" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "location" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "status" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "coordinates" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "comprehensive" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "ComplexResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "ComplexResult", - "tsFullPath" : "ComplexResult" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_run", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "run", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - } - ], - "moduleName" : "Benchmarks", - "protocols" : [ - - ], - "structs" : [ - { - "methods" : [ - - ], - "name" : "SimpleStruct", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "flag", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "rate", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "precise", - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "SimpleStruct" - }, - { - "methods" : [ - - ], - "name" : "Address", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "street", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "city", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "zipCode", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "Address" - }, - { - "methods" : [ - - ], - "name" : "Person", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "age", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "address", - "type" : { - "swiftStruct" : { - "_0" : "Address" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "email", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "Person" - }, - { - "methods" : [ - - ], - "name" : "ComplexStruct", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "id", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "title", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "active", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "score", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "tags", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "metadata", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "ComplexStruct" - } - ] -} \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json deleted file mode 100644 index 366342bbc..000000000 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.ImportTS.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "children" : [ - { - "functions" : [ - { - "name" : "benchmarkHelperNoop", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "name" : "benchmarkHelperNoopWithNumber", - "parameters" : [ - { - "name" : "n", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "name" : "benchmarkRunner", - "parameters" : [ - { - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "name" : "body", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "types" : [ - - ] - } - ], - "moduleName" : "Benchmarks" -} \ No newline at end of file diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json new file mode 100644 index 000000000..27a245f56 --- /dev/null +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json @@ -0,0 +1,1660 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_EnumRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_EnumRoundtrip_take", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "take", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makeSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSuccess", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makeFailure", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFailure", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makeFlag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFlag", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makeRate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeRate", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makePrecise", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makePrecise", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_makeInfo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeInfo", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_EnumRoundtrip_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "name" : "EnumRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "EnumRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_ComplexResultRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_ComplexResultRoundtrip_take", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "take", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSuccess", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeError", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeError", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeLocation", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeLocation", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStatus", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeCoordinates", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeCoordinates", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeComprehensive", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComprehensive", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_makeInfo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeInfo", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_ComplexResultRoundtrip_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "name" : "ComplexResultRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "ComplexResultRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_StringRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_StringRoundtrip_take", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "take", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StringRoundtrip_make", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "make", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "StringRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "StringRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_StructRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_StructRoundtrip_takeSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeSimple", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSimple", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripSimple", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripSimple", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SimpleStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takeAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeAddress", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAddress", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripAddress", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAddress", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takePerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takePerson", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makePerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makePerson", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripPerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripPerson", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_takeComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeComplex", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_makeComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplex", + "parameters" : [ + + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + }, + { + "abiName" : "bjs_StructRoundtrip_roundtripComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripComplex", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ComplexStruct" + } + } + } + ], + "name" : "StructRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "StructRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_SimpleClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "label" : "flag", + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "rate", + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "label" : "precise", + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "SimpleClass", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "SimpleClass" + }, + { + "constructor" : { + "abiName" : "bjs_AddressClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "street", + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "label" : "city", + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "label" : "zipCode", + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "AddressClass", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "AddressClass" + }, + { + "constructor" : { + "abiName" : "bjs_ClassRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_ClassRoundtrip_takeSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeSimpleClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_makeSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeSimpleClass", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_roundtripSimpleClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripSimpleClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "SimpleClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_takeAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeAddressClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_makeAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAddressClass", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + }, + { + "abiName" : "bjs_ClassRoundtrip_roundtripAddressClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAddressClass", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "AddressClass" + } + } + } + ], + "name" : "ClassRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "ClassRoundtrip" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ + { + "type" : { + "float" : { + + } + } + } + ], + "name" : "rate" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "error" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "location" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "status" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "coordinates" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "comprehensive" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "ComplexResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_run", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "run", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "methods" : [ + + ], + "name" : "SimpleStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "flag", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "rate", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precise", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "SimpleStruct" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "Person" + }, + { + "methods" : [ + + ], + "name" : "ComplexStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "title", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "active", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "score", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "tags", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "metadata", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "ComplexStruct" + } + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + + ] + }, + { + "functions" : [ + { + "name" : "benchmarkHelperNoop", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "benchmarkHelperNoopWithNumber", + "parameters" : [ + { + "name" : "n", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "benchmarkRunner", + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "body", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "Benchmarks" +} \ No newline at end of file diff --git a/Benchmarks/Sources/bridge-js.d.ts b/Benchmarks/Sources/bridge-js.d.ts index a9eb5d0bf..9f5137e1e 100644 --- a/Benchmarks/Sources/bridge-js.d.ts +++ b/Benchmarks/Sources/bridge-js.d.ts @@ -1,3 +1,3 @@ -declare function benchmarkHelperNoop(): void; -declare function benchmarkHelperNoopWithNumber(n: number): void; -declare function benchmarkRunner(name: string, body: (n: number) => void): void; +export function benchmarkHelperNoop(): void; +export function benchmarkHelperNoopWithNumber(n: number): void; +export function benchmarkRunner(name: string, body: (n: number) => void): void; diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/app.js b/Examples/PlayBridgeJS/Sources/JavaScript/app.js index 2f5267d3e..b82810238 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/app.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/app.js @@ -102,11 +102,11 @@ export class BridgeJSPlayground { // Import the BridgeJS module this.setProgress('Loading BridgeJS…', 50); const { init } = await import("../../Bundle/index.js"); - const virtualHost = await this.createTS2SkeletonFactory(); + const virtualHost = await this.createTS2SwiftFactory(); this.setProgress('Preparing TypeScript host…', 60); const { exports } = await init({ getImports: () => ({ - createTS2Skeleton: () => this.createTS2Skeleton(virtualHost) + createTS2Swift: () => this.createTS2Swift(virtualHost) }) }); this.setProgress('Creating runtime…', 65); @@ -193,7 +193,7 @@ export class BridgeJSPlayground { }); } - async createTS2SkeletonFactory() { + async createTS2SwiftFactory() { const createVirtualHost = async () => { const fsMap = await createDefaultMapFromCDN( { target: ts.ScriptTarget.ES2015 }, @@ -217,7 +217,7 @@ export class BridgeJSPlayground { /** * @param {ReturnType} virtualHost */ - createTS2Skeleton(virtualHost) { + createTS2Swift(virtualHost) { return { /** * @param {string} dtsCode diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift deleted file mode 100644 index cd1ef9814..000000000 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ImportTS.swift +++ /dev/null @@ -1,52 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - -#if arch(wasm32) -@_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Skeleton") -fileprivate func bjs_createTS2Skeleton() -> Int32 -#else -fileprivate func bjs_createTS2Skeleton() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func createTS2Skeleton() throws(JSException) -> TS2Skeleton { - let ret = bjs_createTS2Skeleton() - if let error = _swift_js_take_exception() { - throw error - } - return TS2Skeleton.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Skeleton_convert") -fileprivate func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 -#else -fileprivate func bjs_TS2Skeleton_convert(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -struct TS2Skeleton: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - func convert(_ ts: String) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let tsValue = ts.bridgeJSLowerParameter() - let ret = bjs_TS2Skeleton_convert(selfValue, tsValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } - -} \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift new file mode 100644 index 000000000..feb0a2ead --- /dev/null +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -0,0 +1,13 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func createTS2Swift() throws (JSException) -> TS2Swift + +@JSClass struct TS2Swift: _JSBridgedClass { + @JSFunction func convert(_ ts: String) throws (JSException) -> String +} diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift similarity index 80% rename from Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift rename to Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index 3391b2fd6..469f13de9 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -1,10 +1,11 @@ +// bridge-js: skip // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. // // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit @_expose(wasm, "bjs_PlayBridgeJS_init") @_cdecl("bjs_PlayBridgeJS_init") @@ -134,4 +135,40 @@ fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Swift") +fileprivate func bjs_createTS2Swift() -> Int32 +#else +fileprivate func bjs_createTS2Swift() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$createTS2Swift() throws(JSException) -> TS2Swift { + let ret = bjs_createTS2Swift() + if let error = _swift_js_take_exception() { + throw error + } + return TS2Swift.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Swift_convert") +fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 +#else +fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TS2Swift_convert(selfValue, tsValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json deleted file mode 100644 index a536a23fc..000000000 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_PlayBridgeJS_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_PlayBridgeJS_update", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "update", - "parameters" : [ - { - "label" : "swiftSource", - "name" : "swiftSource", - "type" : { - "string" : { - - } - } - }, - { - "label" : "dtsSource", - "name" : "dtsSource", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "PlayBridgeJSOutput" - } - } - } - ], - "name" : "PlayBridgeJS", - "properties" : [ - - ], - "swiftCallName" : "PlayBridgeJS" - }, - { - "methods" : [ - { - "abiName" : "bjs_PlayBridgeJSOutput_outputJs", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "outputJs", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_PlayBridgeJSOutput_outputDts", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "outputDts", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_PlayBridgeJSOutput_importSwiftGlue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "importSwiftGlue", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_PlayBridgeJSOutput_exportSwiftGlue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "exportSwiftGlue", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "PlayBridgeJSOutput", - "properties" : [ - - ], - "swiftCallName" : "PlayBridgeJSOutput" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "moduleName" : "PlayBridgeJS", - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json deleted file mode 100644 index f1a567cde..000000000 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ImportTS.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "children" : [ - { - "functions" : [ - { - "name" : "createTS2Skeleton", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "TS2Skeleton" - } - } - } - ], - "types" : [ - { - "methods" : [ - { - "name" : "convert", - "parameters" : [ - { - "name" : "ts", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "TS2Skeleton", - "properties" : [ - - ] - } - ] - } - ], - "moduleName" : "PlayBridgeJS" -} \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json new file mode 100644 index 000000000..c1cf453d3 --- /dev/null +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json @@ -0,0 +1,209 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PlayBridgeJS_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_PlayBridgeJS_update", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "update", + "parameters" : [ + { + "label" : "swiftSource", + "name" : "swiftSource", + "type" : { + "string" : { + + } + } + }, + { + "label" : "dtsSource", + "name" : "dtsSource", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "PlayBridgeJSOutput" + } + } + } + ], + "name" : "PlayBridgeJS", + "properties" : [ + + ], + "swiftCallName" : "PlayBridgeJS" + }, + { + "methods" : [ + { + "abiName" : "bjs_PlayBridgeJSOutput_outputJs", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "outputJs", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_PlayBridgeJSOutput_outputDts", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "outputDts", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_PlayBridgeJSOutput_importSwiftGlue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "importSwiftGlue", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_PlayBridgeJSOutput_exportSwiftGlue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "exportSwiftGlue", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PlayBridgeJSOutput", + "properties" : [ + + ], + "swiftCallName" : "PlayBridgeJSOutput" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "createTS2Swift", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "TS2Swift" + } + } + } + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + { + "name" : "convert", + "parameters" : [ + { + "name" : "ts", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "TS2Swift", + "setters" : [ + + ] + } + ] + }, + { + "functions" : [ + + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "PlayBridgeJS" +} \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/bridge-js.d.ts b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/bridge-js.d.ts index 44e79a5cb..7173fab8e 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/bridge-js.d.ts +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/bridge-js.d.ts @@ -1,5 +1,5 @@ -export interface TS2Skeleton { +export interface TS2Swift { convert(ts: string): string; } -export function createTS2Skeleton(): TS2Skeleton; \ No newline at end of file +export function createTS2Swift(): TS2Swift; \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index 52cb0cc27..b82fc6f43 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -22,8 +22,8 @@ import class Foundation.JSONDecoder try exportSwift.addSourceFile(sourceFile, "Playground.swift") let exportResult = try exportSwift.finalize() var importTS = ImportTS(progress: .silent, moduleName: "Playground") - let ts2skeleton = try createTS2Skeleton() - let skeletonJSONString = try ts2skeleton.convert(dtsSource) + let ts2swift = try createTS2Swift() + let skeletonJSONString = try ts2swift.convert(dtsSource) let decoder = JSONDecoder() let importSkeleton = try decoder.decode( ImportedFileSkeleton.self, diff --git a/Package.swift b/Package.swift index f1e5a04c9..521b543cc 100644 --- a/Package.swift +++ b/Package.swift @@ -42,7 +42,7 @@ let package = Package( targets: [ .target( name: "JavaScriptKit", - dependencies: ["_CJavaScriptKit"], + dependencies: ["_CJavaScriptKit", "BridgeJSMacros"], exclude: useLegacyResourceBundling ? [] : ["Runtime"], resources: useLegacyResourceBundling ? [.copy("Runtime")] : [], cSettings: shouldBuildForEmbedded @@ -59,6 +59,14 @@ let package = Package( ] : []) ), .target(name: "_CJavaScriptKit"), + .macro( + name: "BridgeJSMacros", + dependencies: [ + .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), + .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), + ] + ), + .testTarget( name: "JavaScriptKitTests", dependencies: ["JavaScriptKit"], @@ -165,7 +173,7 @@ let package = Package( .product(name: "SwiftBasicFormat", package: "swift-syntax"), .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"), ], - exclude: ["TS2Skeleton/JavaScript", "README.md"] + exclude: ["TS2Swift/JavaScript", "README.md"] ), .testTarget( name: "BridgeJSRuntimeTests", diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index 36b920521..63c74c53e 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -1,5 +1,6 @@ // swift-tools-version: 6.0 +import CompilerPluginSupport import PackageDescription let package = Package( @@ -14,11 +15,11 @@ let package = Package( name: "BridgeJSTool", dependencies: [ "BridgeJSCore", - "TS2Skeleton", + "TS2Swift", ] ), .target( - name: "TS2Skeleton", + name: "TS2Swift", dependencies: [ "BridgeJSCore", "BridgeJSSkeleton", @@ -52,9 +53,23 @@ let package = Package( dependencies: [ "BridgeJSCore", "BridgeJSLink", - "TS2Skeleton", + "TS2Swift", ], exclude: ["__Snapshots__", "Inputs", "MultifileInputs"] ), + .macro( + name: "BridgeJSMacros", + dependencies: [ + .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), + .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), + ] + ), + .testTarget( + name: "BridgeJSMacrosTests", + dependencies: [ + "BridgeJSMacros", + .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"), + ] + ), ] ) diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index f762c294b..0cc4ceba9 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -13,34 +13,39 @@ BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. 1. **Importing TypeScript APIs into Swift**: Use TypeScript/JavaScript APIs directly from Swift code 2. **Exporting Swift APIs to JavaScript**: Make your Swift APIs available to JavaScript code +The workflow is: +1. `ts2swift` converts TypeScript definitions (`bridge-js.d.ts`) to macro-annotated Swift declarations (`BridgeJS.Macros.swift`) +2. `bridge-js generate` processes both Swift source files (for export) and macro-annotated Swift files (for import) to generate: + - `BridgeJS.swift` (Swift glue code) + - `JavaScript/BridgeJS.json` (a unified skeleton for linking) +3. `bridge-js link` combines module skeletons (`JavaScript/BridgeJS.json`) to produce JavaScript glue code (`bridge-js.js` and `bridge-js.d.ts`) + ## Architecture Diagram ```mermaid graph LR - E1 --> G3[ExportSwift.json] subgraph ModuleA - A.swift --> E1[[bridge-js export]] - B.swift --> E1 - E1 --> G1[ExportSwift.swift] - B1[bridge-js.d.ts]-->I1[[bridge-js import]] - I1 --> G2[ImportTS.swift] + A.swift --> G1[bridge-js generate] + B.swift --> G1 + B1[bridge-js.d.ts] --> T1[[ts2swift]] + T1 --> M1[BridgeJS.Macros.swift] + M1 --> G1 + G1 --> G3[BridgeJS.json] + G1 --> G2[BridgeJS.swift] end - I1 --> G4[ImportTS.json] - E2 --> G7[ExportSwift.json] subgraph ModuleB - C.swift --> E2[[bridge-js export]] - D.swift --> E2 - E2 --> G5[ExportSwift.swift] - B2[bridge-js.d.ts]-->I2[[bridge-js import]] - I2 --> G6[ImportTS.swift] + C.swift --> G4[bridge-js generate] + D.swift --> G4 + B2[bridge-js.d.ts] --> T2[[ts2swift]] + T2 --> M2[BridgeJS.Macros.swift] + M2 --> G4 + G4 --> G5[BridgeJS.swift] + G4 --> G6[BridgeJS.json] end - I2 --> G8[ImportTS.json] G3 --> L1[[bridge-js link]] - G4 --> L1 - G7 --> L1 - G8 --> L1 + G6 --> L1 L1 --> F1[bridge-js.js] L1 --> F2[bridge-js.d.ts] @@ -135,4 +140,4 @@ TBD declare var Foo: FooConstructor; ``` - [ ] Use `externref` once it's widely available -- [ ] Test SwiftObject roundtrip \ No newline at end of file +- [ ] Test SwiftObject roundtrip diff --git a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift index 47487bfc2..aec9f3bca 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift @@ -11,95 +11,58 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { guard let swiftSourceModuleTarget = target as? SwiftSourceModuleTarget else { return [] } - var commands: [Command] = [] - commands.append(try createExportSwiftCommand(context: context, target: swiftSourceModuleTarget)) - if let importCommand = try createImportTSCommand(context: context, target: swiftSourceModuleTarget) { - commands.append(importCommand) - } - return commands + return [try createGenerateCommand(context: context, target: swiftSourceModuleTarget)] } private func pathToConfigFile(target: SwiftSourceModuleTarget) -> URL { return target.directoryURL.appending(path: "bridge-js.config.json") } - private func createExportSwiftCommand(context: PluginContext, target: SwiftSourceModuleTarget) throws -> Command { - let outputSwiftPath = context.pluginWorkDirectoryURL.appending(path: "BridgeJS.ExportSwift.swift") - let outputSkeletonPath = context.pluginWorkDirectoryURL.appending(path: "BridgeJS.ExportSwift.json") + private func createGenerateCommand(context: PluginContext, target: SwiftSourceModuleTarget) throws -> Command { + let outputSwiftPath = context.pluginWorkDirectoryURL.appending(path: "BridgeJS.swift") + let inputSwiftFiles = target.sourceFiles.filter { !$0.url.path.hasPrefix(context.pluginWorkDirectoryURL.path + "/") } .map(\.url) + let configFile = pathToConfigFile(target: target) - let inputFiles: [URL] + var inputFiles: [URL] = inputSwiftFiles if FileManager.default.fileExists(atPath: configFile.path) { - inputFiles = inputSwiftFiles + [configFile] - } else { - inputFiles = inputSwiftFiles + inputFiles.append(configFile) } - return .buildCommand( - displayName: "Export Swift API", - executable: try context.tool(named: "BridgeJSTool").url, - arguments: [ - "export", - "--module-name", - target.name, - "--target-dir", - target.directoryURL.path, - "--output-skeleton", - outputSkeletonPath.path, - "--output-swift", - outputSwiftPath.path, - // Generate the output files even if nothing is exported not to surprise - // the build system. - "--always-write", "true", - ] + inputSwiftFiles.map(\.path), - inputFiles: inputFiles, - outputFiles: [ - outputSwiftPath - ] - ) - } - private func createImportTSCommand(context: PluginContext, target: SwiftSourceModuleTarget) throws -> Command? { - let outputSwiftPath = context.pluginWorkDirectoryURL.appending(path: "BridgeJS.ImportTS.swift") - let outputSkeletonPath = context.pluginWorkDirectoryURL.appending(path: "BridgeJS.ImportTS.json") let inputTSFile = target.directoryURL.appending(path: "bridge-js.d.ts") - guard FileManager.default.fileExists(atPath: inputTSFile.path) else { - return nil - } + let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json") - let configFile = pathToConfigFile(target: target) - let inputFiles: [URL] - if FileManager.default.fileExists(atPath: configFile.path) { - inputFiles = [inputTSFile, configFile] - } else { - inputFiles = [inputTSFile] + var arguments: [String] = [ + "generate", + "--module-name", + target.name, + "--target-dir", + target.directoryURL.path, + "--output-dir", + context.pluginWorkDirectoryURL.path, + "--always-write", "true", + ] + + if FileManager.default.fileExists(atPath: inputTSFile.path) { + // Add .d.ts file and tsconfig.json as inputs + inputFiles.append(contentsOf: [inputTSFile, tsconfigPath]) + arguments.append(contentsOf: [ + "--project", + tsconfigPath.path, + ]) } + + arguments.append(contentsOf: inputSwiftFiles.map(\.path)) + return .buildCommand( - displayName: "Import TypeScript API", + displayName: "Generate BridgeJS code", executable: try context.tool(named: "BridgeJSTool").url, - arguments: [ - "import", - "--target-dir", - target.directoryURL.path, - "--output-skeleton", - outputSkeletonPath.path, - "--output-swift", - outputSwiftPath.path, - "--module-name", - target.name, - // Generate the output files even if nothing is imported not to surprise - // the build system. - "--always-write", "true", - "--project", - context.package.directoryURL.appending(path: "tsconfig.json").path, - inputTSFile.path, - ], + arguments: arguments, inputFiles: inputFiles, - outputFiles: [ - outputSwiftPath - ] + outputFiles: [outputSwiftPath] ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift index 26a0d0ef9..3dce62578 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift @@ -97,54 +97,41 @@ extension BridgeJSCommandPlugin.Context { ) throws { printStderr("Generating bridge code for \(target.name)...") - printVerbose("Exporting Swift API for \(target.name)...") - let generatedDirectory = target.directoryURL.appending(path: "Generated") let generatedJavaScriptDirectory = generatedDirectory.appending(path: "JavaScript") - try runBridgeJSTool( - arguments: [ - "export", - "--module-name", - target.name, - "--target-dir", - target.directoryURL.path, - "--output-skeleton", - generatedJavaScriptDirectory.appending(path: "BridgeJS.ExportSwift.json").path, - "--output-swift", - generatedDirectory.appending(path: "BridgeJS.ExportSwift.swift").path, - "--verbose", - options.verbose ? "true" : "false", - ] - + target.sourceFiles.filter { - !$0.url.path.hasPrefix(generatedDirectory.path + "/") - }.map(\.url.path) + remainingArguments - ) - - printVerbose("Importing TypeScript API for \(target.name)...") - let bridgeDtsPath = target.directoryURL.appending(path: "bridge-js.d.ts") - // Execute import only if bridge-js.d.ts exists + let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json") + + // Unified generate command + var generateArguments: [String] = [ + "generate", + "--module-name", + target.name, + "--target-dir", + target.directoryURL.path, + "--output-dir", + generatedDirectory.path, + "--verbose", + options.verbose ? "true" : "false", + ] + if FileManager.default.fileExists(atPath: bridgeDtsPath.path) { - try runBridgeJSTool( - arguments: [ - "import", - "--target-dir", - target.directoryURL.path, - "--output-skeleton", - generatedJavaScriptDirectory.appending(path: "BridgeJS.ImportTS.json").path, - "--output-swift", - generatedDirectory.appending(path: "BridgeJS.ImportTS.swift").path, - "--verbose", - options.verbose ? "true" : "false", - "--module-name", - target.name, - "--project", - context.package.directoryURL.appending(path: "tsconfig.json").path, - bridgeDtsPath.path, - ] + remainingArguments - ) + generateArguments.append(contentsOf: [ + "--project", + tsconfigPath.path, + bridgeDtsPath.path, + ]) } + + generateArguments.append( + contentsOf: target.sourceFiles.filter { + !$0.url.path.hasPrefix(generatedDirectory.path + "/") + }.map(\.url.path) + ) + generateArguments.append(contentsOf: remainingArguments) + + try runBridgeJSTool(arguments: generateArguments) } private func runBridgeJSTool(arguments: [String]) throws { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index e20bb6ab2..b9b9e0634 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -81,7 +81,6 @@ public class ExportSwift { return ( outputSwift: outputSwift, outputSkeleton: ExportedSkeleton( - moduleName: moduleName, functions: exportedFunctions, classes: exportedClasses, enums: exportedEnums, @@ -1659,16 +1658,6 @@ public class ExportSwift { return .swiftHeapObject(swiftCallName) } - static let prelude: DeclSyntax = """ - // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, - // DO NOT EDIT. - // - // To update this file, just rebuild your project or run - // `swift package bridge-js`. - - @_spi(BridgeJS) import JavaScriptKit - """ - func renderSwiftGlue() throws -> String? { var decls: [DeclSyntax] = [] guard @@ -1677,7 +1666,6 @@ public class ExportSwift { else { return nil } - decls.append(Self.prelude) let closureCodegen = ClosureCodegen() var closureSignatures: Set = [] diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift new file mode 100644 index 000000000..90e3d7313 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift @@ -0,0 +1,695 @@ +import SwiftSyntax +#if canImport(BridgeJSSkeleton) +import BridgeJSSkeleton +#endif +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif + +/// Collects macro-annotated Swift declarations and produces ImportedModuleSkeleton. +public final class ImportSwiftMacros { + let progress: ProgressReporting + let moduleName: String + private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] + + public init(progress: ProgressReporting, moduleName: String) { + self.progress = progress + self.moduleName = moduleName + } + + /// Processes a Swift source file to find declarations marked with @JSFunction/@JSGetter/@JSSetter/@JSClass + /// + /// - Parameters: + /// - sourceFile: The parsed Swift source file to process + /// - inputFilePath: The file path for error reporting + public func addSourceFile(_ sourceFile: SourceFileSyntax, _ inputFilePath: String) { + sourceFiles.append((sourceFile, inputFilePath)) + } + + /// Finalizes the import process and generates the bridge code plus skeleton. + public func finalize() throws -> (outputSwift: String?, outputSkeleton: ImportedModuleSkeleton) { + var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = [] + var importedFiles: [ImportedFileSkeleton] = [] + + for (sourceFile, inputFilePath) in sourceFiles { + progress.print("Processing \(inputFilePath)") + let collector = APICollector( + inputFilePath: inputFilePath, + knownJSClassNames: Self.collectJSClassNames(from: sourceFile) + ) + collector.walk(sourceFile) + if !collector.errors.isEmpty { + perSourceErrors.append((inputFilePath: inputFilePath, errors: collector.errors)) + } + importedFiles.append( + ImportedFileSkeleton( + functions: collector.importedFunctions, + types: collector.importedTypes + ) + ) + } + + if !perSourceErrors.isEmpty { + let allErrors = perSourceErrors.flatMap { inputFilePath, errors in + errors.map { $0.formattedDescription(fileName: inputFilePath) } + } + throw BridgeJSCoreError(allErrors.joined(separator: "\n")) + } + + let moduleSkeleton = ImportedModuleSkeleton(children: importedFiles) + + var importer = ImportTS(progress: progress, moduleName: moduleName) + for skeleton in importedFiles { + importer.addSkeleton(skeleton) + } + let outputSwift = try importer.finalize() + return (outputSwift: outputSwift, outputSkeleton: moduleSkeleton) + } + + private static func collectJSClassNames(from sourceFile: SourceFileSyntax) -> Set { + let collector = JSImportTypeNameCollector(viewMode: .sourceAccurate) + collector.walk(sourceFile) + return collector.typeNames + } + + private final class JSImportTypeNameCollector: SyntaxAnyVisitor { + var typeNames: Set = [] + + private func visitTypeDecl(_ attributes: AttributeListSyntax?, _ name: String) -> SyntaxVisitorContinueKind { + if APICollector.AttributeChecker.hasJSClassAttribute(attributes) { + typeNames.insert(name) + } + return .visitChildren + } + + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + visitTypeDecl(node.attributes, node.name.text) + } + + override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { + visitTypeDecl(node.attributes, node.name.text) + } + } + + fileprivate final class APICollector: SyntaxAnyVisitor { + var importedFunctions: [ImportedFunctionSkeleton] = [] + var importedTypes: [ImportedTypeSkeleton] = [] + var errors: [DiagnosticError] = [] + + private let inputFilePath: String + private var jsClassNames: Set + + // MARK: - State Management + + enum State { + case topLevel + case jsClassBody(name: String) + } + + private var stateStack: [State] = [.topLevel] + var state: State { + return stateStack.last! + } + + // Current type being collected (when in jsClassBody state) + private struct CurrentType { + let name: String + var constructor: ImportedConstructorSkeleton? + var methods: [ImportedFunctionSkeleton] + var getters: [ImportedGetterSkeleton] + var setters: [ImportedSetterSkeleton] + } + private var currentType: CurrentType? + + // MARK: - Attribute Checking + + /// Helper struct for checking and extracting attributes + fileprivate struct AttributeChecker { + static func hasJSFunctionAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSFunction") + } + + static func hasJSGetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSGetter") + } + + static func hasJSSetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSSetter") + } + + static func firstJSSetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { + attributes?.first { attribute in + attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSSetter" + }?.as(AttributeSyntax.self) + } + + static func hasJSClassAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSClass") + } + + static func hasAttribute(_ attributes: AttributeListSyntax?, name: String) -> Bool { + guard let attributes else { return false } + return attributes.contains { attribute in + guard let syntax = attribute.as(AttributeSyntax.self) else { return false } + return syntax.attributeName.trimmedDescription == name + } + } + + + /// Extracts the jsName argument value from a @JSSetter attribute, if present. + static func extractJSName(from attribute: AttributeSyntax) -> String? { + guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { + return nil + } + for argument in arguments { + if argument.label?.text == "jsName", + let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self), + let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) + { + return segment.content.text + } + } + return nil + } + } + + // MARK: - Validation Helpers + + /// Common validation result for setter functions + private struct SetterValidationResult { + let effects: Effects + let jsName: String? + let firstParam: FunctionParameterSyntax + let valueType: BridgeType + } + + /// Validates effects (throws required, async not supported) + private func validateEffects( + _ effects: FunctionEffectSpecifiersSyntax?, + node: some SyntaxProtocol, + attributeName: String + ) -> Effects? { + guard let effects = parseEffects(effects) else { + errors.append( + DiagnosticError( + node: node, + message: "@\(attributeName) declarations must be throws.", + hint: "Declare the function as 'throws (JSException)'." + ) + ) + return nil + } + if effects.isAsync { + errors.append( + DiagnosticError( + node: node, + message: "@\(attributeName) declarations do not support async yet." + ) + ) + return nil + } + return effects + } + + /// Validates a setter function and extracts common information + private func validateSetter( + _ node: FunctionDeclSyntax, + jsSetter: AttributeSyntax, + enclosingTypeName: String? + ) -> SetterValidationResult? { + guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") else { + return nil + } + + let jsName = AttributeChecker.extractJSName(from: jsSetter) + let parameters = node.signature.parameterClause.parameters + + guard let firstParam = parameters.first else { + errors.append( + DiagnosticError( + node: node, + message: "@JSSetter function must have at least one parameter." + ) + ) + return nil + } + + if firstParam.type.is(MissingTypeSyntax.self) { + errors.append( + DiagnosticError( + node: firstParam, + message: "All @JSSetter parameters must have explicit types." + ) + ) + return nil + } + + return SetterValidationResult( + effects: effects, + jsName: jsName, + firstParam: firstParam, + valueType: parseType(firstParam.type, enclosingTypeName: enclosingTypeName) + ) + } + + // MARK: - Property Name Resolution + + /// Helper for resolving property names from setter function names and jsName attributes + private struct PropertyNameResolver { + /// Resolves property name and function base name from a setter function and optional jsName + /// - Returns: (propertyName, functionBaseName) where propertyName preserves case for getter matching, + /// and functionBaseName has lowercase first char for ABI generation + static func resolve( + functionName: String, + jsName: String?, + normalizeIdentifier: (String) -> String + ) -> (propertyName: String, functionBaseName: String)? { + if let jsName = jsName { + let propertyName = normalizeIdentifier(jsName) + let functionBaseName = propertyName.prefix(1).lowercased() + propertyName.dropFirst() + return (propertyName: propertyName, functionBaseName: functionBaseName) + } + + let rawFunctionName = functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 + ? String(functionName.dropFirst().dropLast()) + : functionName + + guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { + return nil + } + + let derivedPropertyName = String(rawFunctionName.dropFirst(3)) + let normalized = normalizeIdentifier(derivedPropertyName) + let propertyName = normalized.prefix(1).lowercased() + normalized.dropFirst() + return (propertyName: propertyName, functionBaseName: propertyName) + } + } + + init(inputFilePath: String, knownJSClassNames: Set) { + self.inputFilePath = inputFilePath + self.jsClassNames = knownJSClassNames + super.init(viewMode: .sourceAccurate) + } + + private func enterJSClass(_ typeName: String) { + stateStack.append(.jsClassBody(name: typeName)) + currentType = CurrentType(name: typeName, constructor: nil, methods: [], getters: [], setters: []) + } + + private func exitJSClass() { + if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName { + importedTypes.append( + ImportedTypeSkeleton( + name: type.name, + constructor: type.constructor, + methods: type.methods, + getters: type.getters, + setters: type.setters, + documentation: nil + ) + ) + currentType = nil + } + stateStack.removeLast() + } + + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + enterJSClass(node.name.text) + } + return .visitChildren + } + + override func visitPost(_ node: StructDeclSyntax) { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + exitJSClass() + } + } + + override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + enterJSClass(node.name.text) + } + return .visitChildren + } + + override func visitPost(_ node: ClassDeclSyntax) { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + exitJSClass() + } + } + + // MARK: - Visitor Methods + + override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind { + let typeName = node.extendedType.trimmedDescription + collectStaticMembers(in: node.memberBlock.members, typeName: typeName) + return .skipChildren + } + + override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { + switch state { + case .topLevel: + return handleTopLevelFunction(node) + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + let isStaticMember = isStatic(node.modifiers) + let handled = handleClassFunction(node, typeName: typeName, isStaticMember: isStaticMember, type: &type) + if handled { + currentType = type + } + return .skipChildren + } + } + + private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSFunctionAttribute(node.attributes), + let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) { + importedFunctions.append(function) + return .skipChildren + } + // Top-level setters are not supported + if AttributeChecker.hasJSSetterAttribute(node.attributes) { + errors.append( + DiagnosticError( + node: node, + message: "@JSSetter is not supported at top-level. Use it only in @JSClass types." + ) + ) + return .skipChildren + } + return .visitChildren + } + + private func handleClassFunction( + _ node: FunctionDeclSyntax, + typeName: String, + isStaticMember: Bool, + type: inout CurrentType + ) -> Bool { + if AttributeChecker.hasJSFunctionAttribute(node.attributes) { + if isStaticMember { + parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { importedFunctions.append($0) } + } else { + parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { type.methods.append($0) } + } + return true + } + + if AttributeChecker.hasJSSetterAttribute(node.attributes) { + if isStaticMember { + errors.append( + DiagnosticError( + node: node, + message: "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } else if let jsSetter = AttributeChecker.firstJSSetterAttribute(node.attributes), + let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) { + type.setters.append(setter) + } + return true + } + + return false + } + + override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind { + guard AttributeChecker.hasJSGetterAttribute(node.attributes) else { + return .visitChildren + } + + switch state { + case .topLevel: + errors.append( + DiagnosticError( + node: node, + message: "@JSGetter is not supported at top-level. Use it only in @JSClass types." + ) + ) + return .skipChildren + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + if isStatic(node.modifiers) { + errors.append( + DiagnosticError( + node: node, + message: "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } else if let getter = parseGetterSkeleton(node, enclosingTypeName: typeName) { + type.getters.append(getter) + currentType = type + } + return .skipChildren + } + } + + override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { + guard AttributeChecker.hasJSFunctionAttribute(node.attributes) else { + return .visitChildren + } + + switch state { + case .topLevel: + return .visitChildren + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + if type.constructor != nil { + errors.append( + DiagnosticError( + node: node, + message: "Only one @JSFunction initializer is supported in @JSClass types." + ) + ) + return .skipChildren + } + if let parsed = parseConstructor(node, typeName: typeName) { + type.constructor = parsed + currentType = type + } + return .skipChildren + } + } + + + // MARK: - Member Collection + + private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { + for member in members { + if let function = member.decl.as(FunctionDeclSyntax.self) { + if AttributeChecker.hasJSFunctionAttribute(function.attributes), + let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) { + importedFunctions.append(parsed) + } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { + errors.append( + DiagnosticError( + node: function, + message: "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } + } else if let variable = member.decl.as(VariableDeclSyntax.self), + AttributeChecker.hasJSGetterAttribute(variable.attributes) { + errors.append( + DiagnosticError( + node: variable, + message: "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } + } + } + + // MARK: - Parsing Methods + + private func parseConstructor( + _ initializer: InitializerDeclSyntax, + typeName: String + ) -> ImportedConstructorSkeleton? { + guard validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction") != nil else { + return nil + } + return ImportedConstructorSkeleton( + parameters: parseParameters( + from: initializer.signature.parameterClause, + enclosingTypeName: typeName + ) + ) + } + + private func parseFunction( + _ node: FunctionDeclSyntax, + enclosingTypeName: String?, + isStaticMember: Bool + ) -> ImportedFunctionSkeleton? { + guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil else { + return nil + } + + let baseName = normalizeIdentifier(node.name.text) + let name: String + if isStaticMember, let enclosingTypeName { + name = "\(enclosingTypeName)_\(baseName)" + } else { + name = baseName + } + + let parameters = parseParameters( + from: node.signature.parameterClause, + enclosingTypeName: enclosingTypeName + ) + let returnType: BridgeType + if let returnTypeSyntax = node.signature.returnClause?.type { + returnType = parseType(returnTypeSyntax, enclosingTypeName: enclosingTypeName) + } else { + returnType = .void + } + return ImportedFunctionSkeleton( + name: name, + parameters: parameters, + returnType: returnType, + documentation: nil + ) + } + + + /// Extracts property info from a VariableDeclSyntax (binding, identifier, type) + private func extractPropertyInfo( + _ node: VariableDeclSyntax, + errorMessage: String = "@JSGetter must declare a single stored property with an explicit type." + ) -> (identifier: IdentifierPatternSyntax, type: TypeSyntax)? { + guard let binding = node.bindings.first, + let identifier = binding.pattern.as(IdentifierPatternSyntax.self), + let typeAnnotation = binding.typeAnnotation else { + errors.append(DiagnosticError(node: node, message: errorMessage)) + return nil + } + return (identifier, typeAnnotation.type) + } + + private func parseGetterSkeleton( + _ node: VariableDeclSyntax, + enclosingTypeName: String? + ) -> ImportedGetterSkeleton? { + guard let (identifier, type) = extractPropertyInfo(node) else { + return nil + } + let propertyType = parseType(type, enclosingTypeName: enclosingTypeName) + let propertyName = normalizeIdentifier(identifier.identifier.text) + return ImportedGetterSkeleton( + name: propertyName, + type: propertyType, + documentation: nil, + functionName: nil + ) + } + + /// Parses a setter as part of a type's property system (for instance setters) + private func parseSetterSkeleton( + _ jsSetter: AttributeSyntax, + _ node: FunctionDeclSyntax, + enclosingTypeName: String? + ) -> ImportedSetterSkeleton? { + guard let validation = validateSetter(node, jsSetter: jsSetter, enclosingTypeName: enclosingTypeName) else { + return nil + } + + let functionName = node.name.text + guard let (propertyName, functionBaseName) = PropertyNameResolver.resolve( + functionName: functionName, + jsName: validation.jsName, + normalizeIdentifier: normalizeIdentifier + ) else { + return nil + } + + return ImportedSetterSkeleton( + name: propertyName, + type: validation.valueType, + documentation: nil, + functionName: "\(functionBaseName)_set" + ) + } + + + // MARK: - Type and Parameter Parsing + + private func parseParameters( + from clause: FunctionParameterClauseSyntax, + enclosingTypeName: String? + ) -> [Parameter] { + clause.parameters.compactMap { param in + let type = param.type + if type.is(MissingTypeSyntax.self) { + errors.append( + DiagnosticError( + node: param, + message: "All @JSFunction parameters must have explicit types." + ) + ) + return nil + } + let nameToken = param.secondName ?? param.firstName + let name = normalizeIdentifier(nameToken.text) + let labelToken = param.secondName == nil ? nil : param.firstName + let label = labelToken?.text == "_" ? nil : labelToken?.text + let bridgeType = parseType(type, enclosingTypeName: enclosingTypeName) + return Parameter(label: label, name: name, type: bridgeType) + } + } + + + private func parseType(_ type: TypeSyntax, enclosingTypeName: String?) -> BridgeType { + guard let identifier = type.as(IdentifierTypeSyntax.self) else { + errors.append( + DiagnosticError( + node: type, + message: "Unsupported @JS type '\(type.trimmedDescription)'." + ) + ) + return .void + } + + let name = normalizeIdentifier(identifier.name.text) + if name == "Self", let enclosingTypeName { + return .jsObject(enclosingTypeName) + } + return BridgeType(swiftType: name) ?? .jsObject(name) + } + + // MARK: - Helper Methods + + private func parseEffects(_ effects: FunctionEffectSpecifiersSyntax?) -> Effects? { + let isThrows = effects?.throwsClause != nil + let isAsync = effects?.asyncSpecifier != nil + guard isThrows else { + return nil + } + return Effects(isAsync: isAsync, isThrows: isThrows) + } + + private func isStatic(_ modifiers: DeclModifierListSyntax?) -> Bool { + guard let modifiers else { return false } + return modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + } + + private func normalizeIdentifier(_ name: String) -> String { + guard name.hasPrefix("`"), name.hasSuffix("`"), name.count >= 2 else { + return name + } + return String(name.dropFirst().dropLast()) + } + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index e4f6c89bc..402e6e671 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -19,13 +19,12 @@ import BridgeJSUtilities public struct ImportTS { public let progress: ProgressReporting public private(set) var skeleton: ImportedModuleSkeleton - private var moduleName: String { - skeleton.moduleName - } + private let moduleName: String public init(progress: ProgressReporting, moduleName: String) { self.progress = progress - self.skeleton = ImportedModuleSkeleton(moduleName: moduleName, children: []) + self.moduleName = moduleName + self.skeleton = ImportedModuleSkeleton(children: []) } /// Adds a skeleton to the importer's state @@ -52,8 +51,7 @@ public struct ImportTS { } let format = BasicFormat() - let allDecls: [DeclSyntax] = [Self.prelude] + decls - return allDecls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") } class CallJSEmission { @@ -302,15 +300,27 @@ public struct ImportTS { } } - static let prelude: DeclSyntax = """ - // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, - // DO NOT EDIT. - // - // To update this file, just rebuild your project or run - // `swift package bridge-js`. + private static func thunkName(function: ImportedFunctionSkeleton) -> String { + "_$\(function.name)" + } + + private static func thunkName(type: ImportedTypeSkeleton, method: ImportedFunctionSkeleton) -> String { + "_$\(type.name)_\(method.name)" + } - @_spi(BridgeJS) import JavaScriptKit - """ + private static func thunkName(type: ImportedTypeSkeleton) -> String { + "_$\(type.name)_init" + } + + private static func thunkName( + type: ImportedTypeSkeleton, + propertyName: String, + operation: String + ) + -> String + { + "_$\(type.name)_\(propertyName)_\(operation)" + } func renderSwiftThunk( _ function: ImportedFunctionSkeleton, @@ -325,7 +335,7 @@ public struct ImportTS { topLevelDecls.append(builder.renderImportDecl()) return [ builder.renderThunkDecl( - name: function.name, + name: Self.thunkName(function: function), parameters: function.parameters, returnType: function.returnType ) @@ -334,11 +344,12 @@ public struct ImportTS { } func renderSwiftType(_ type: ImportedTypeSkeleton, topLevelDecls: inout [DeclSyntax]) throws -> [DeclSyntax] { - let name = type.name + let selfParameter = Parameter(label: nil, name: "self", type: .jsObject(nil)) + var decls: [DeclSyntax] = [] func renderMethod(method: ImportedFunctionSkeleton) throws -> [DeclSyntax] { let builder = CallJSEmission(moduleName: moduleName, abiName: method.abiName(context: type)) - try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) + try builder.lowerParameter(param: selfParameter) for param in method.parameters { try builder.lowerParameter(param: param) } @@ -347,11 +358,10 @@ public struct ImportTS { topLevelDecls.append(builder.renderImportDecl()) return [ builder.renderThunkDecl( - name: method.name, - parameters: method.parameters, + name: Self.thunkName(type: type, method: method), + parameters: [selfParameter] + method.parameters, returnType: method.returnType ) - .with(\.leadingTrivia, Self.renderDocumentation(documentation: method.documentation)) ] } @@ -360,119 +370,78 @@ public struct ImportTS { for param in constructor.parameters { try builder.lowerParameter(param: param) } - try builder.call(returnType: .jsObject(name)) - builder.assignThis(returnType: .jsObject(name)) + try builder.call(returnType: .jsObject(nil)) + try builder.liftReturnValue(returnType: .jsObject(nil)) topLevelDecls.append(builder.renderImportDecl()) return [ - builder.renderConstructorDecl(parameters: constructor.parameters) + builder.renderThunkDecl( + name: Self.thunkName(type: type), + parameters: constructor.parameters, + returnType: .jsObject(nil) + ) ] } - func renderGetterDecl(property: ImportedPropertySkeleton) throws -> AccessorDeclSyntax { + func renderGetterDecl(getter: ImportedGetterSkeleton) throws -> DeclSyntax { let builder = CallJSEmission( moduleName: moduleName, - abiName: property.getterAbiName(context: type) + abiName: getter.abiName(context: type) ) - try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) - try builder.call(returnType: property.type) - try builder.liftReturnValue(returnType: property.type) + try builder.lowerParameter(param: selfParameter) + try builder.call(returnType: getter.type) + try builder.liftReturnValue(returnType: getter.type) topLevelDecls.append(builder.renderImportDecl()) - return AccessorDeclSyntax( - accessorSpecifier: .keyword(.get), - effectSpecifiers: Self.buildAccessorEffect(throws: true, async: false), - body: CodeBlockSyntax { - builder.body - } + return DeclSyntax( + builder.renderThunkDecl( + name: Self.thunkName(type: type, propertyName: getter.name, operation: "get"), + parameters: [selfParameter], + returnType: getter.type + ) ) } - func renderSetterDecl(property: ImportedPropertySkeleton) throws -> DeclSyntax { + func renderSetterDecl(setter: ImportedSetterSkeleton) throws -> DeclSyntax { let builder = CallJSEmission( moduleName: moduleName, - abiName: property.setterAbiName(context: type) + abiName: setter.abiName(context: type) ) - let newValue = Parameter(label: nil, name: "newValue", type: property.type) - try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name))) + let newValue = Parameter(label: nil, name: "newValue", type: setter.type) + try builder.lowerParameter(param: selfParameter) try builder.lowerParameter(param: newValue) try builder.call(returnType: .void) topLevelDecls.append(builder.renderImportDecl()) + // Use functionName if available (has lowercase first char), otherwise derive from name + let propertyNameForThunk: String + if let functionName = setter.functionName, functionName.hasSuffix("_set") { + // Extract base name from functionName (e.g., "any_set" -> "any") + propertyNameForThunk = String(functionName.dropLast(4)) + } else { + // Lowercase first character of property name for thunk + propertyNameForThunk = setter.name.prefix(1).lowercased() + setter.name.dropFirst() + } return builder.renderThunkDecl( - name: "set\(property.name.capitalizedFirstLetter)", - parameters: [newValue], + name: Self.thunkName(type: type, propertyName: propertyNameForThunk, operation: "set"), + parameters: [selfParameter, newValue], returnType: .void ) } - - func renderPropertyDecl(property: ImportedPropertySkeleton) throws -> [DeclSyntax] { - let accessorDecls: [AccessorDeclSyntax] = [try renderGetterDecl(property: property)] - var decls: [DeclSyntax] = [ - DeclSyntax( - VariableDeclSyntax( - leadingTrivia: Self.renderDocumentation(documentation: property.documentation), - bindingSpecifier: .keyword(.var), - bindingsBuilder: { - PatternBindingListSyntax { - PatternBindingSyntax( - pattern: IdentifierPatternSyntax( - identifier: .identifier(property.name.backtickIfNeeded()) - ), - typeAnnotation: TypeAnnotationSyntax( - type: IdentifierTypeSyntax(name: .identifier(property.type.swiftType)) - ), - accessorBlock: AccessorBlockSyntax( - accessors: .accessors( - AccessorDeclListSyntax(accessorDecls) - ) - ) - ) - } - } - ) - ) - ] - if !property.isReadonly { - decls.append(try renderSetterDecl(property: property)) - } - return decls + if let constructor = type.constructor { + decls.append(contentsOf: try renderConstructorDecl(constructor: constructor)) } - let classDecl = try StructDeclSyntax( - leadingTrivia: Self.renderDocumentation(documentation: type.documentation), - name: .identifier(name), - inheritanceClause: InheritanceClauseSyntax( - inheritedTypesBuilder: { - InheritedTypeSyntax(type: TypeSyntax("_JSBridgedClass")) - } - ), - memberBlockBuilder: { - DeclSyntax( - """ - let jsObject: JSObject - """ - ).with(\.trailingTrivia, .newlines(2)) - - DeclSyntax( - """ - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - """ - ).with(\.trailingTrivia, .newlines(2)) - if let constructor = type.constructor { - try renderConstructorDecl(constructor: constructor).map { $0.with(\.trailingTrivia, .newlines(2)) } - } + for getter in type.getters { + decls.append(try renderGetterDecl(getter: getter)) + } - for property in type.properties { - try renderPropertyDecl(property: property).map { $0.with(\.trailingTrivia, .newlines(2)) } - } + for setter in type.setters { + decls.append(try renderSetterDecl(setter: setter)) + } - for method in type.methods { - try renderMethod(method: method).map { $0.with(\.trailingTrivia, .newlines(2)) } - } - } - ) + for method in type.methods { + decls.append(contentsOf: try renderMethod(method: method)) + } - return [DeclSyntax(classDecl)] + return decls } static func renderDocumentation(documentation: String?) -> Trivia { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 41b323425..d6103f7de 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -8,30 +8,35 @@ import BridgeJSUtilities #endif struct BridgeJSLink { - /// The exported skeletons - var exportedSkeletons: [ExportedSkeleton] = [] - var importedSkeletons: [ImportedModuleSkeleton] = [] + var skeletons: [BridgeJSSkeleton] = [] let sharedMemory: Bool private let namespaceBuilder = NamespaceBuilder() init( - exportedSkeletons: [ExportedSkeleton] = [], - importedSkeletons: [ImportedModuleSkeleton] = [], + skeletons: [BridgeJSSkeleton] = [], sharedMemory: Bool ) { - self.exportedSkeletons = exportedSkeletons - self.importedSkeletons = importedSkeletons + self.skeletons = skeletons self.sharedMemory = sharedMemory } - mutating func addExportedSkeletonFile(data: Data) throws { - let skeleton = try JSONDecoder().decode(ExportedSkeleton.self, from: data) - exportedSkeletons.append(skeleton) - } - - mutating func addImportedSkeletonFile(data: Data) throws { - let skeletons = try JSONDecoder().decode(ImportedModuleSkeleton.self, from: data) - importedSkeletons.append(skeletons) + mutating func addSkeletonFile(data: Data) throws { + do { + let unified = try JSONDecoder().decode(BridgeJSSkeleton.self, from: data) + skeletons.append(unified) + } catch { + struct SkeletonDecodingError: Error, CustomStringConvertible { + let description: String + } + throw SkeletonDecodingError( + description: """ + Failed to decode skeleton file: \(error) + + This file appears to be in an old format. Please regenerate skeleton files using: + bridge-js generate --module-name --target-dir --output-skeleton ... + """ + ) + } } let swiftHeapObjectClassDts = """ @@ -81,7 +86,7 @@ struct BridgeJSLink { var data = LinkData() // Swift heap object class definitions - if exportedSkeletons.contains(where: { $0.classes.count > 0 }) { + if skeletons.contains(where: { $0.exported?.classes.isEmpty == false }) { data.classLines.append( contentsOf: swiftHeapObjectClassJs.split(separator: "\n", omittingEmptySubsequences: false).map { String($0) @@ -95,7 +100,8 @@ struct BridgeJSLink { } // Process exported skeletons - for skeleton in exportedSkeletons { + for unified in skeletons { + guard let skeleton = unified.exported else { continue } // Process classes for klass in skeleton.classes { let (jsType, dtsType, dtsExportEntry) = try renderExportedClass(klass) @@ -162,9 +168,10 @@ struct BridgeJSLink { } // Process imported skeletons - for skeletonSet in importedSkeletons { - let importObjectBuilder = ImportObjectBuilder(moduleName: skeletonSet.moduleName) - for fileSkeleton in skeletonSet.children { + for unified in skeletons { + guard let imported = unified.imported else { continue } + let importObjectBuilder = ImportObjectBuilder(moduleName: unified.moduleName) + for fileSkeleton in imported.children { for function in fileSkeleton.functions { try renderImportedFunction(importObjectBuilder: importObjectBuilder, function: function) } @@ -175,14 +182,16 @@ struct BridgeJSLink { data.importObjectBuilders.append(importObjectBuilder) } - for skeleton in exportedSkeletons { + for unified in skeletons { + guard let skeleton = unified.exported else { continue } + let moduleName = unified.moduleName if !skeleton.protocols.isEmpty { let importObjectBuilder: ImportObjectBuilder - if let existingBuilder = data.importObjectBuilders.first(where: { $0.moduleName == skeleton.moduleName } + if let existingBuilder = data.importObjectBuilders.first(where: { $0.moduleName == moduleName } ) { importObjectBuilder = existingBuilder } else { - importObjectBuilder = ImportObjectBuilder(moduleName: skeleton.moduleName) + importObjectBuilder = ImportObjectBuilder(moduleName: moduleName) data.importObjectBuilders.append(importObjectBuilder) } @@ -297,7 +306,7 @@ struct BridgeJSLink { "bjs = {};", "importObject[\"bjs\"] = bjs;", ]) - if self.importedSkeletons.count > 0 { + if skeletons.contains(where: { $0.imported != nil }) { printer.write(lines: [ "const imports = options.getImports(importsContext);" ]) @@ -576,14 +585,16 @@ struct BridgeJSLink { } printer.write("}") - for skeleton in exportedSkeletons { + for unified in skeletons { + guard let skeleton = unified.exported else { continue } + let moduleName = unified.moduleName var closureSignatures: Set = [] collectClosureSignatures(from: skeleton, into: &closureSignatures) guard !closureSignatures.isEmpty else { continue } for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { - let invokeFuncName = "invoke_js_callback_\(skeleton.moduleName)_\(signature.mangleName)" + let invokeFuncName = "invoke_js_callback_\(moduleName)_\(signature.mangleName)" printer.write( lines: generateInvokeFunction( signature: signature, @@ -591,7 +602,7 @@ struct BridgeJSLink { ) ) - let lowerFuncName = "lower_closure_\(skeleton.moduleName)_\(signature.mangleName)" + let lowerFuncName = "lower_closure_\(moduleName)_\(signature.mangleName)" printer.write( lines: generateLowerClosureFunction( signature: signature, @@ -779,6 +790,8 @@ struct BridgeJSLink { let printer = CodeFragmentPrinter(header: header) printer.nextLine() + let exportedSkeletons = skeletons.compactMap(\.exported) + for skeleton in exportedSkeletons { for proto in skeleton.protocols { printer.write("export interface \(proto.name) {") @@ -922,6 +935,7 @@ struct BridgeJSLink { printer.write(lines: data.topLevelTypeLines) + let exportedSkeletons = skeletons.compactMap(\.exported) let topLevelNamespaceCode = namespaceBuilder.buildTopLevelNamespaceInitialization( exportedSkeletons: exportedSkeletons ) @@ -1028,7 +1042,7 @@ struct BridgeJSLink { private func enumHelperAssignments() -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() - for skeleton in exportedSkeletons { + for skeleton in skeletons.compactMap(\.exported) { for enumDef in skeleton.enums where enumDef.enumType == .associatedValue { printer.write( "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift));" @@ -1044,7 +1058,7 @@ struct BridgeJSLink { private func structHelperAssignments() -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() - for skeleton in exportedSkeletons { + for skeleton in skeletons.compactMap(\.exported) { for structDef in skeleton.structs { printer.write( "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedEnumHelpers));" @@ -1064,13 +1078,15 @@ struct BridgeJSLink { var modulesByName: [String: [ExportedClass]] = [:] // Group classes by their module name - for skeleton in exportedSkeletons { + for unified in skeletons { + guard let skeleton = unified.exported else { continue } if skeleton.classes.isEmpty { continue } + let moduleName = unified.moduleName - if modulesByName[skeleton.moduleName] == nil { - modulesByName[skeleton.moduleName] = [] + if modulesByName[moduleName] == nil { + modulesByName[moduleName] = [] } - modulesByName[skeleton.moduleName]?.append(contentsOf: skeleton.classes) + modulesByName[moduleName]?.append(contentsOf: skeleton.classes) } // Generate wrapper functions for each module @@ -1132,7 +1148,8 @@ struct BridgeJSLink { private func generateImportedTypeDefinitions() -> [String] { let printer = CodeFragmentPrinter() - for skeletonSet in importedSkeletons { + for unified in skeletons { + guard let skeletonSet = unified.imported else { continue } for fileSkeleton in skeletonSet.children { for type in fileSkeleton.types { printer.write("export interface \(type.name) {") @@ -1145,14 +1162,21 @@ struct BridgeJSLink { printer.write(methodSignature) } - // Add properties - for property in type.properties { + // Add properties from getters + var propertyNames = Set() + for getter in type.getters { + propertyNames.insert(getter.name) + let hasSetter = type.setters.contains { $0.name == getter.name } let propertySignature = - property.isReadonly - ? "readonly \(property.name): \(resolveTypeScriptType(property.type));" - : "\(property.name): \(resolveTypeScriptType(property.type));" + hasSetter + ? "\(getter.name): \(resolveTypeScriptType(getter.type));" + : "readonly \(getter.name): \(resolveTypeScriptType(getter.type));" printer.write(propertySignature) } + // Add setters that don't have corresponding getters + for setter in type.setters where !propertyNames.contains(setter.name) { + printer.write("\(setter.name): \(resolveTypeScriptType(setter.type));") + } printer.unindent() printer.write("}") @@ -1279,7 +1303,7 @@ struct BridgeJSLink { /// If the type is an enum, looks up the ExportedEnum and uses its tsFullPath /// Otherwise, uses the default tsType property private func resolveTypeScriptType(_ type: BridgeType) -> String { - return Self.resolveTypeScriptType(type, exportedSkeletons: exportedSkeletons) + return Self.resolveTypeScriptType(type, exportedSkeletons: skeletons.compactMap(\.exported)) } /// Static helper for resolving TypeScript types with full enum paths @@ -2868,34 +2892,34 @@ extension BridgeJSLink { constructor: constructor ) } - for property in type.properties { - let getterAbiName = property.getterAbiName(context: type) - let (js, dts) = try renderImportedProperty( - property: property, + for getter in type.getters { + let getterAbiName = getter.abiName(context: type) + let (js, dts) = try renderImportedGetter( + getter: getter, abiName: getterAbiName, emitCall: { thunkBuilder in - return try thunkBuilder.callPropertyGetter(name: property.name, returnType: property.type) + return try thunkBuilder.callPropertyGetter(name: getter.name, returnType: getter.type) } ) importObjectBuilder.assignToImportObject(name: getterAbiName, function: js) importObjectBuilder.appendDts(dts) + } - if !property.isReadonly { - let setterAbiName = property.setterAbiName(context: type) - let (js, dts) = try renderImportedProperty( - property: property, - abiName: setterAbiName, - emitCall: { thunkBuilder in - try thunkBuilder.liftParameter( - param: Parameter(label: nil, name: "newValue", type: property.type) - ) - thunkBuilder.callPropertySetter(name: property.name, returnType: property.type) - return nil - } - ) - importObjectBuilder.assignToImportObject(name: setterAbiName, function: js) - importObjectBuilder.appendDts(dts) - } + for setter in type.setters { + let setterAbiName = setter.abiName(context: type) + let (js, dts) = try renderImportedSetter( + setter: setter, + abiName: setterAbiName, + emitCall: { thunkBuilder in + try thunkBuilder.liftParameter( + param: Parameter(label: nil, name: "newValue", type: setter.type) + ) + thunkBuilder.callPropertySetter(name: setter.name, returnType: setter.type) + return nil + } + ) + importObjectBuilder.assignToImportObject(name: setterAbiName, function: js) + importObjectBuilder.appendDts(dts) } for method in type.methods { let (js, dts) = try renderImportedMethod(context: type, method: method) @@ -2935,8 +2959,8 @@ extension BridgeJSLink { importObjectBuilder.appendDts(dtsPrinter.lines) } - func renderImportedProperty( - property: ImportedPropertySkeleton, + func renderImportedGetter( + getter: ImportedGetterSkeleton, abiName: String, emitCall: (ImportedThunkBuilder) throws -> String? ) throws -> (js: [String], dts: [String]) { @@ -2946,7 +2970,23 @@ extension BridgeJSLink { let funcLines = thunkBuilder.renderFunction( name: abiName, returnExpr: returnExpr, - returnType: property.type + returnType: getter.type + ) + return (funcLines, []) + } + + func renderImportedSetter( + setter: ImportedSetterSkeleton, + abiName: String, + emitCall: (ImportedThunkBuilder) throws -> String? + ) throws -> (js: [String], dts: [String]) { + let thunkBuilder = ImportedThunkBuilder() + thunkBuilder.liftSelf() + let returnExpr = try emitCall(thunkBuilder) + let funcLines = thunkBuilder.renderFunction( + name: abiName, + returnExpr: returnExpr, + returnType: .void ) return (funcLines, []) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/BridgeJSMacrosPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/BridgeJSMacrosPlugin.swift new file mode 100644 index 000000000..9a45fa0f0 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/BridgeJSMacrosPlugin.swift @@ -0,0 +1,12 @@ +import SwiftCompilerPlugin +import SwiftSyntaxMacros + +@main +struct BridgeJSMacrosPlugin: CompilerPlugin { + var providingMacros: [Macro.Type] = [ + JSFunctionMacro.self, + JSGetterMacro.self, + JSSetterMacro.self, + JSClassMacro.self, + ] +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift new file mode 100644 index 000000000..fc7af6cda --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -0,0 +1,51 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +import SwiftSyntaxMacros +import SwiftDiagnostics + +public enum JSClassMacro {} + +extension JSClassMacro: MemberMacro { + public static func expansion( + of node: AttributeSyntax, + providingMembersOf declaration: some DeclGroupSyntax, + in context: some MacroExpansionContext + ) throws -> [DeclSyntax] { + var members: [DeclSyntax] = [] + + let existingMembers = declaration.memberBlock.members + let hasJSObjectProperty = existingMembers.contains { member in + guard let variable = member.decl.as(VariableDeclSyntax.self) else { return false } + return variable.bindings.contains { binding in + binding.pattern.as(IdentifierPatternSyntax.self)?.identifier.text == "jsObject" + } + } + + if !hasJSObjectProperty { + members.append(DeclSyntax("let jsObject: JSObject")) + } + + let hasUnsafelyWrappingInit = existingMembers.contains { member in + guard let initializer = member.decl.as(InitializerDeclSyntax.self) else { return false } + let parameters = initializer.signature.parameterClause.parameters + guard let firstParam = parameters.first else { return false } + let externalName = firstParam.firstName.text + let internalName = firstParam.secondName?.text + return externalName == "unsafelyWrapping" && internalName == "jsObject" + } + + if !hasUnsafelyWrappingInit { + members.append( + DeclSyntax( + """ + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + """ + ) + ) + } + + return members + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift new file mode 100644 index 000000000..7dfd635f9 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift @@ -0,0 +1,72 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +import SwiftSyntaxMacros +import SwiftDiagnostics + +public enum JSFunctionMacro {} + +extension JSFunctionMacro: BodyMacro { + public static func expansion( + of node: AttributeSyntax, + providingBodyFor declaration: some DeclSyntaxProtocol & WithOptionalCodeBlockSyntax, + in context: some MacroExpansionContext + ) throws -> [CodeBlockItemSyntax] { + if let functionDecl = declaration.as(FunctionDeclSyntax.self) { + let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) + let isStatic = JSMacroHelper.isStatic(functionDecl.modifiers) + let isInstanceMember = enclosingTypeName != nil && !isStatic + + // Strip backticks from function name (e.g., "`prefix`" -> "prefix") + // Backticks are only needed for Swift identifiers, not function names + let name = JSMacroHelper.stripBackticks(functionDecl.name.text) + let glueName = JSMacroHelper.glueName(baseName: name, enclosingTypeName: enclosingTypeName) + + var arguments: [String] = [] + if isInstanceMember { + arguments.append("self.jsObject") + } + arguments.append( + contentsOf: JSMacroHelper.parameterNames(functionDecl.signature.parameterClause.parameters) + ) + + let argsJoined = arguments.joined(separator: ", ") + let call = "\(glueName)(\(argsJoined))" + + let effects = functionDecl.signature.effectSpecifiers + let isAsync = effects?.asyncSpecifier != nil + let isThrows = effects?.throwsClause != nil + let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows) + + let isVoid = JSMacroHelper.isVoidReturn(functionDecl.signature.returnClause?.type) + let line = isVoid ? "\(prefix)\(call)" : "return \(prefix)\(call)" + return [CodeBlockItemSyntax(stringLiteral: line)] + } + + if let initializerDecl = declaration.as(InitializerDeclSyntax.self) { + guard let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) else { + context.diagnose( + Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration) + ) + return [] + } + + let glueName = JSMacroHelper.glueName(baseName: "init", enclosingTypeName: enclosingTypeName) + let parameters = initializerDecl.signature.parameterClause.parameters + let arguments = JSMacroHelper.parameterNames(parameters) + let call = "\(glueName)(\(arguments.joined(separator: ", ")))" + + let effects = initializerDecl.signature.effectSpecifiers + let isAsync = effects?.asyncSpecifier != nil + let isThrows = effects?.throwsClause != nil + let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows) + + return [ + CodeBlockItemSyntax(stringLiteral: "let jsObject = \(prefix)\(call)"), + CodeBlockItemSyntax(stringLiteral: "self.init(unsafelyWrapping: jsObject)"), + ] + } + + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration)) + return [] + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift new file mode 100644 index 000000000..b996facfa --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift @@ -0,0 +1,62 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +import SwiftSyntaxMacros +import SwiftDiagnostics + +public enum JSGetterMacro {} + +extension JSGetterMacro: AccessorMacro { + public static func expansion( + of node: AttributeSyntax, + providingAccessorsOf declaration: some DeclSyntaxProtocol, + in context: some MacroExpansionContext + ) throws -> [AccessorDeclSyntax] { + guard let variableDecl = declaration.as(VariableDeclSyntax.self), + let binding = variableDecl.bindings.first, + let identifier = binding.pattern.as(IdentifierPatternSyntax.self) + else { + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedVariable)) + return [] + } + + let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) + let isStatic = JSMacroHelper.isStatic(variableDecl.modifiers) + let isInstanceMember = enclosingTypeName != nil && !isStatic + + // Strip backticks from property name (e.g., "`prefix`" -> "prefix") + // Backticks are only needed for Swift identifiers, not function names + let propertyName = JSMacroHelper.stripBackticks(identifier.identifier.text) + let getterName = JSMacroHelper.glueName( + baseName: propertyName, + enclosingTypeName: enclosingTypeName, + operation: "get" + ) + + var getterArgs: [String] = [] + if isInstanceMember { + getterArgs.append("self.jsObject") + } + let getterCall: CodeBlockItemSyntax = + "return try \(raw: getterName)(\(raw: getterArgs.joined(separator: ", ")))" + + let throwsClause = ThrowsClauseSyntax( + throwsSpecifier: .keyword(.throws), + leftParen: .leftParenToken(), + type: IdentifierTypeSyntax(name: .identifier("JSException")), + rightParen: .rightParenToken() + ) + + return [ + AccessorDeclSyntax( + accessorSpecifier: .keyword(.get), + effectSpecifiers: AccessorEffectSpecifiersSyntax( + asyncSpecifier: nil, + throwsClause: throwsClause + ), + body: CodeBlockSyntax { + getterCall + } + ) + ] + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift new file mode 100644 index 000000000..b10871f6a --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -0,0 +1,100 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +import SwiftSyntaxMacros +import SwiftDiagnostics + +enum JSMacroMessage: String, DiagnosticMessage { + case unsupportedDeclaration = "@JSFunction can only be applied to functions or initializers." + case unsupportedVariable = "@JSGetter can only be applied to single-variable declarations." + case unsupportedSetterDeclaration = "@JSSetter can only be applied to functions." + case invalidSetterName = + "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo')." + case setterRequiresParameter = "@JSSetter function must have at least one parameter." + + var message: String { rawValue } + var diagnosticID: MessageID { MessageID(domain: "JavaScriptKitMacros", id: rawValue) } + var severity: DiagnosticSeverity { .error } +} + +enum JSMacroHelper { + static func enclosingTypeName(from context: some MacroExpansionContext) -> String? { + for syntax in context.lexicalContext { + if let decl = syntax.as(ClassDeclSyntax.self) { + return decl.name.text + } + if let decl = syntax.as(StructDeclSyntax.self) { + return decl.name.text + } + if let decl = syntax.as(EnumDeclSyntax.self) { + return decl.name.text + } + if let decl = syntax.as(ActorDeclSyntax.self) { + return decl.name.text + } + } + return nil + } + + static func isStatic(_ modifiers: DeclModifierListSyntax?) -> Bool { + guard let modifiers else { return false } + return modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + } + + static func isVoidReturn(_ returnType: TypeSyntax?) -> Bool { + guard let returnType else { return true } + if let identifier = returnType.as(IdentifierTypeSyntax.self), identifier.name.text == "Void" { + return true + } + if let tuple = returnType.as(TupleTypeSyntax.self), tuple.elements.isEmpty { + return true + } + return false + } + + static func glueName(baseName: String, enclosingTypeName: String?) -> String { + if let enclosingTypeName { + return "_$\(enclosingTypeName)_\(baseName)" + } + return "_$\(baseName)" + } + + static func glueName(baseName: String, enclosingTypeName: String?, operation: String) -> String { + if let enclosingTypeName { + return "_$\(enclosingTypeName)_\(baseName)_\(operation)" + } + return "_$\(baseName)_\(operation)" + } + + static func parameterNames(_ parameters: FunctionParameterListSyntax) -> [String] { + parameters.compactMap { param in + let nameToken = param.secondName ?? param.firstName + let nameText = nameToken.text + return nameText == "_" ? nil : nameText + } + } + + static func tryAwaitPrefix(isAsync: Bool, isThrows: Bool) -> String { + switch (isAsync, isThrows) { + case (true, true): + return "try await " + case (true, false): + return "await " + case (false, true): + return "try " + case (false, false): + return "" + } + } + + /// Strips backticks from an identifier name. + /// Swift identifiers with keywords are escaped with backticks (e.g., `` `prefix` ``), + /// but function names should not include backticks. + static func stripBackticks(_ name: String) -> String { + if name.hasPrefix("`") && name.hasSuffix("`") && name.count > 2 { + return String(name.dropFirst().dropLast()) + } + return name + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift new file mode 100644 index 000000000..bb9fd1f21 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift @@ -0,0 +1,71 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +import SwiftSyntaxMacros +import SwiftDiagnostics + +public enum JSSetterMacro {} + +extension JSSetterMacro: BodyMacro { + public static func expansion( + of node: AttributeSyntax, + providingBodyFor declaration: some DeclSyntaxProtocol & WithOptionalCodeBlockSyntax, + in context: some MacroExpansionContext + ) throws -> [CodeBlockItemSyntax] { + guard let functionDecl = declaration.as(FunctionDeclSyntax.self) else { + context.diagnose( + Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedSetterDeclaration) + ) + return [] + } + + let functionName = functionDecl.name.text + + // Extract property name from setter function name (e.g., "setFoo" -> "foo") + // Strip backticks if present (e.g., "set`prefix`" -> "prefix") + let rawFunctionName = JSMacroHelper.stripBackticks(functionName) + guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) + return [] + } + + let propertyName = String(rawFunctionName.dropFirst(3)) + guard !propertyName.isEmpty else { + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) + return [] + } + + // Convert first character to lowercase (e.g., "Foo" -> "foo") + let baseName = propertyName.prefix(1).lowercased() + propertyName.dropFirst() + + let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) + let isStatic = JSMacroHelper.isStatic(functionDecl.modifiers) + let isInstanceMember = enclosingTypeName != nil && !isStatic + + let glueName = JSMacroHelper.glueName( + baseName: baseName, + enclosingTypeName: enclosingTypeName, + operation: "set" + ) + + var arguments: [String] = [] + if isInstanceMember { + arguments.append("self.jsObject") + } + + // Get the parameter name(s) - setters typically have one parameter + let parameters = functionDecl.signature.parameterClause.parameters + guard let firstParam = parameters.first else { + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.setterRequiresParameter)) + return [] + } + + let paramName = firstParam.secondName ?? firstParam.firstName + arguments.append(paramName.text) + + let argsJoined = arguments.joined(separator: ", ") + let call = "\(glueName)(\(argsJoined))" + + // Setters should throw JSException, so always use try + return [CodeBlockItemSyntax(stringLiteral: "try \(call)")] + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index b2dae86c0..e1815fbeb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -548,7 +548,6 @@ public struct ExportedProperty: Codable, Equatable, Sendable { } public struct ExportedSkeleton: Codable { - public let moduleName: String public let functions: [ExportedFunction] public let classes: [ExportedClass] public let enums: [ExportedEnum] @@ -562,7 +561,6 @@ public struct ExportedSkeleton: Codable { public var exposeToGlobal: Bool public init( - moduleName: String, functions: [ExportedFunction], classes: [ExportedClass], enums: [ExportedEnum], @@ -570,7 +568,6 @@ public struct ExportedSkeleton: Codable { protocols: [ExportedProtocol] = [], exposeToGlobal: Bool ) { - self.moduleName = moduleName self.functions = functions self.classes = classes self.enums = enums @@ -588,6 +585,13 @@ public struct ImportedFunctionSkeleton: Codable { public let returnType: BridgeType public let documentation: String? + public init(name: String, parameters: [Parameter], returnType: BridgeType, documentation: String? = nil) { + self.name = name + self.parameters = parameters + self.returnType = returnType + self.documentation = documentation + } + public func abiName(context: ImportedTypeSkeleton?) -> String { return ABINameGenerator.generateImportedABIName( baseName: name, @@ -599,6 +603,10 @@ public struct ImportedFunctionSkeleton: Codable { public struct ImportedConstructorSkeleton: Codable { public let parameters: [Parameter] + public init(parameters: [Parameter]) { + self.parameters = parameters + } + public func abiName(context: ImportedTypeSkeleton) -> String { return ABINameGenerator.generateImportedABIName( baseName: "init", @@ -607,21 +615,68 @@ public struct ImportedConstructorSkeleton: Codable { } } -public struct ImportedPropertySkeleton: Codable { +public struct ImportedGetterSkeleton: Codable { public let name: String - public let isReadonly: Bool public let type: BridgeType public let documentation: String? + /// Name of the getter function if it's a separate function (from @JSGetter) + public let functionName: String? - public func getterAbiName(context: ImportedTypeSkeleton) -> String { + public init( + name: String, + type: BridgeType, + documentation: String? = nil, + functionName: String? = nil + ) { + self.name = name + self.type = type + self.documentation = documentation + self.functionName = functionName + } + + public func abiName(context: ImportedTypeSkeleton) -> String { + if let functionName = functionName { + return ABINameGenerator.generateImportedABIName( + baseName: functionName, + context: context, + operation: nil + ) + } return ABINameGenerator.generateImportedABIName( baseName: name, context: context, operation: "get" ) } +} - public func setterAbiName(context: ImportedTypeSkeleton) -> String { +public struct ImportedSetterSkeleton: Codable { + public let name: String + public let type: BridgeType + public let documentation: String? + /// Name of the setter function if it's a separate function (from @JSSetter) + public let functionName: String? + + public init( + name: String, + type: BridgeType, + documentation: String? = nil, + functionName: String? = nil + ) { + self.name = name + self.type = type + self.documentation = documentation + self.functionName = functionName + } + + public func abiName(context: ImportedTypeSkeleton) -> String { + if let functionName = functionName { + return ABINameGenerator.generateImportedABIName( + baseName: functionName, + context: context, + operation: nil + ) + } return ABINameGenerator.generateImportedABIName( baseName: name, context: context, @@ -634,25 +689,60 @@ public struct ImportedTypeSkeleton: Codable { public let name: String public let constructor: ImportedConstructorSkeleton? public let methods: [ImportedFunctionSkeleton] - public let properties: [ImportedPropertySkeleton] + public let getters: [ImportedGetterSkeleton] + public let setters: [ImportedSetterSkeleton] public let documentation: String? + + public init( + name: String, + constructor: ImportedConstructorSkeleton? = nil, + methods: [ImportedFunctionSkeleton], + getters: [ImportedGetterSkeleton] = [], + setters: [ImportedSetterSkeleton] = [], + documentation: String? = nil + ) { + self.name = name + self.constructor = constructor + self.methods = methods + self.getters = getters + self.setters = setters + self.documentation = documentation + } } public struct ImportedFileSkeleton: Codable { public let functions: [ImportedFunctionSkeleton] public let types: [ImportedTypeSkeleton] + + public init(functions: [ImportedFunctionSkeleton], types: [ImportedTypeSkeleton]) { + self.functions = functions + self.types = types + } } public struct ImportedModuleSkeleton: Codable { - public let moduleName: String public var children: [ImportedFileSkeleton] - public init(moduleName: String, children: [ImportedFileSkeleton]) { - self.moduleName = moduleName + public init(children: [ImportedFileSkeleton]) { self.children = children } } +// MARK: - Unified Skeleton + +/// Unified skeleton containing both exported and imported API definitions +public struct BridgeJSSkeleton: Codable { + public let moduleName: String + public let exported: ExportedSkeleton? + public let imported: ImportedModuleSkeleton? + + public init(moduleName: String, exported: ExportedSkeleton? = nil, imported: ImportedModuleSkeleton? = nil) { + self.moduleName = moduleName + self.exported = exported + self.imported = imported + } +} + // MARK: - BridgeType extension extension BridgeType { diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index d5a58aba9..1f3aadf1c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -9,6 +9,7 @@ @preconcurrency import class Foundation.JSONDecoder @preconcurrency import class Foundation.ProcessInfo import SwiftParser +import SwiftSyntax #if canImport(BridgeJSCore) import BridgeJSCore @@ -16,8 +17,11 @@ import BridgeJSCore #if canImport(BridgeJSSkeleton) import BridgeJSSkeleton #endif -#if canImport(TS2Skeleton) -import TS2Skeleton +#if canImport(TS2Swift) +import TS2Swift +#endif +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities #endif /// BridgeJS Tool @@ -29,10 +33,7 @@ import TS2Skeleton /// 2. Export: Generate JavaScript bindings for Swift declarations /// /// Usage: -/// For importing TypeScript: -/// $ bridge-js import --module-name --output-swift --output-skeleton --project -/// For exporting Swift: -/// $ bridge-js export --output-swift --output-skeleton +/// $ bridge-js generate --module-name --target-dir --output-swift --output-skeleton [--output-import-swift ] [--output-import-skeleton ] [--project ] ... [...] /// /// This tool is intended to be used through the Swift Package Manager plugin system /// and is not typically called directly by end users. @@ -40,11 +41,10 @@ import TS2Skeleton static func help() -> String { return """ - Usage: \(CommandLine.arguments.first ?? "bridge-js-tool") [options] + Usage: \(CommandLine.arguments.first ?? "bridge-js-tool") generate [options] ... - Subcommands: - import Generate binding code to import TypeScript APIs into Swift - export Generate binding code to export Swift APIs to JavaScript + Generate bridge code for both exporting Swift APIs and importing TypeScript APIs. + Input files can be Swift source files (for export) or macro-annotated Swift files (for import). """ } @@ -69,16 +69,16 @@ import TS2Skeleton ) } switch subcommand { - case "import": + case "generate": let parser = ArgumentParser( singleDashOptions: [:], doubleDashOptions: [ "module-name": OptionRule( - help: "The name of the module to import the TypeScript API into", + help: "The name of the module", required: true ), "always-write": OptionRule( - help: "Always write the output files even if no APIs are imported", + help: "Always write the output files even if no APIs are found", required: false ), "verbose": OptionRule( @@ -89,14 +89,13 @@ import TS2Skeleton help: "The SwiftPM package target directory", required: true ), - "output-swift": OptionRule(help: "The output file path for the Swift source code", required: true), - "output-skeleton": OptionRule( - help: "The output file path for the skeleton of the imported TypeScript APIs", + "output-dir": OptionRule( + help: "The output directory for generated code", required: true ), "project": OptionRule( - help: "The path to the TypeScript project configuration file", - required: true + help: "The path to the TypeScript project configuration file (required for .d.ts files)", + required: false ), ] ) @@ -104,140 +103,90 @@ import TS2Skeleton arguments: Array(arguments.dropFirst()) ) let progress = ProgressReporting(verbose: doubleDashOptions["verbose"] == "true") - var importer = ImportTS(progress: progress, moduleName: doubleDashOptions["module-name"]!) + let moduleName = doubleDashOptions["module-name"]! let targetDirectory = URL(fileURLWithPath: doubleDashOptions["target-dir"]!) + let outputDirectory = URL(fileURLWithPath: doubleDashOptions["output-dir"]!) let config = try BridgeJSConfig.load(targetDirectory: targetDirectory) let nodePath: URL = try config.findTool("node", targetDirectory: targetDirectory) - for inputFile in positionalArguments { - if inputFile.hasSuffix(".json") { - let sourceURL = URL(fileURLWithPath: inputFile) - let skeleton = try JSONDecoder().decode( - ImportedFileSkeleton.self, - from: Data(contentsOf: sourceURL) - ) - importer.addSkeleton(skeleton) - } else if inputFile.hasSuffix(".d.ts") { - let tsconfigPath = URL(fileURLWithPath: doubleDashOptions["project"]!) - try importer.addSourceFile(inputFile, tsconfigPath: tsconfigPath.path, nodePath: nodePath) - } - } - let outputSwift = try importer.finalize() - let shouldWrite = doubleDashOptions["always-write"] == "true" || outputSwift != nil - guard shouldWrite else { - progress.print("No imported TypeScript APIs found") - return + let bridgeJsDtsPath = targetDirectory.appending(path: "bridge-js.d.ts") + if FileManager.default.fileExists(atPath: bridgeJsDtsPath.path) { + guard let tsconfigPath = doubleDashOptions["project"] else { + throw BridgeJSToolError("--project option is required when processing .d.ts files") + } + let bridgeJSMacrosPath = outputDirectory.appending(path: "BridgeJS.Macros.swift") + _ = try invokeTS2Swift( + dtsFile: bridgeJsDtsPath.path, + tsconfigPath: tsconfigPath, + nodePath: nodePath, + progress: progress, + outputPath: bridgeJSMacrosPath.path + ) } - let outputSwiftURL = URL(fileURLWithPath: doubleDashOptions["output-swift"]!) - try FileManager.default.createDirectory( - at: outputSwiftURL.deletingLastPathComponent(), - withIntermediateDirectories: true, - attributes: nil - ) - try (outputSwift ?? "").write(to: outputSwiftURL, atomically: true, encoding: .utf8) - - let outputSkeletonsURL = URL(fileURLWithPath: doubleDashOptions["output-skeleton"]!) - try FileManager.default.createDirectory( - at: outputSkeletonsURL.deletingLastPathComponent(), - withIntermediateDirectories: true, - attributes: nil - ) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - try encoder.encode(importer.skeleton).write(to: outputSkeletonsURL) - - progress.print( - """ - Imported TypeScript APIs: - - \(outputSwiftURL.path) - - \(outputSkeletonsURL.path) - """ - ) - case "export": - let parser = ArgumentParser( - singleDashOptions: [:], - doubleDashOptions: [ - "module-name": OptionRule( - help: "The name of the module for external function references", - required: true - ), - "target-dir": OptionRule( - help: "The SwiftPM package target directory", - required: true - ), - "output-skeleton": OptionRule( - help: "The output file path for the skeleton of the exported Swift APIs", - required: true - ), - "output-swift": OptionRule(help: "The output file path for the Swift source code", required: true), - "always-write": OptionRule( - help: "Always write the output files even if no APIs are exported", - required: false - ), - "verbose": OptionRule( - help: "Print verbose output", - required: false - ), - ] - ) - let (positionalArguments, _, doubleDashOptions) = try parser.parse( - arguments: Array(arguments.dropFirst()) - ) - let progress = ProgressReporting(verbose: doubleDashOptions["verbose"] == "true") - let targetDirectory = URL(fileURLWithPath: doubleDashOptions["target-dir"]!) - let config = try BridgeJSConfig.load(targetDirectory: targetDirectory) + let inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) let exporter = ExportSwift( progress: progress, - moduleName: doubleDashOptions["module-name"]!, + moduleName: moduleName, exposeToGlobal: config.exposeToGlobal ) - for inputFile in positionalArguments.sorted() { - let sourceURL = URL(fileURLWithPath: inputFile) - guard sourceURL.pathExtension == "swift" else { continue } - let sourceContent = try String(contentsOf: sourceURL, encoding: .utf8) - let sourceFile = Parser.parse(source: sourceContent) - try exporter.addSourceFile(sourceFile, sourceURL.path) - } + let importSwift = ImportSwiftMacros(progress: progress, moduleName: moduleName) + + for inputFile in inputFiles.sorted() { + let content = try String(contentsOf: URL(fileURLWithPath: inputFile), encoding: .utf8) + if hasBridgeJSSkipComment(content) { + continue + } - // Finalize the export - let output = try exporter.finalize() - let outputSwiftURL = URL(fileURLWithPath: doubleDashOptions["output-swift"]!) - let outputSkeletonURL = URL(fileURLWithPath: doubleDashOptions["output-skeleton"]!) + let sourceFile = Parser.parse(source: content) + try exporter.addSourceFile(sourceFile, inputFile) + importSwift.addSourceFile(sourceFile, inputFile) + } - let shouldWrite = doubleDashOptions["always-write"] == "true" || output != nil - guard shouldWrite else { - progress.print("No exported Swift APIs found") - return + let importResult = try importSwift.finalize() + let exportResult = try exporter.finalize() + let importSkeleton = importResult.outputSkeleton + + // Combine and write unified Swift output + let outputSwiftURL = outputDirectory.appending(path: "BridgeJS.swift") + let combinedSwift = [exportResult?.outputSwift, importResult.outputSwift].compactMap { $0 } + let outputSwift = combineGeneratedSwift(combinedSwift) + let shouldWrite = doubleDashOptions["always-write"] == "true" || !outputSwift.isEmpty + if shouldWrite { + try FileManager.default.createDirectory( + at: outputSwiftURL.deletingLastPathComponent(), + withIntermediateDirectories: true, + attributes: nil + ) + try outputSwift.write(to: outputSwiftURL, atomically: true, encoding: .utf8) } - // Create the output directory if it doesn't exist - try FileManager.default.createDirectory( - at: outputSwiftURL.deletingLastPathComponent(), - withIntermediateDirectories: true, - attributes: nil + // Write unified skeleton + let outputSkeletonURL = outputDirectory.appending(path: "JavaScript/BridgeJS.json") + let unifiedSkeleton = BridgeJSSkeleton( + moduleName: moduleName, + exported: exportResult?.outputSkeleton, + imported: importSkeleton ) try FileManager.default.createDirectory( at: outputSkeletonURL.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: nil ) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let skeletonData = try encoder.encode(unifiedSkeleton) + try skeletonData.write(to: outputSkeletonURL) - // Write the output Swift file - try (output?.outputSwift ?? "").write(to: outputSwiftURL, atomically: true, encoding: .utf8) - - if let outputSkeleton = output?.outputSkeleton { - // Write the output skeleton file - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(outputSkeleton) - try outputSkeletonData.write(to: outputSkeletonURL) + if exportResult != nil || importResult.outputSwift != nil { + progress.print("Generated BridgeJS code") } - progress.print( + case "export", "import": + throw BridgeJSToolError( """ - Exported Swift APIs: - - \(outputSwiftURL.path) - - \(outputSkeletonURL.path) + Error: Subcommands 'export' and 'import' have been unified into 'generate'. + + \(BridgeJSTool.help()) """ ) default: @@ -264,6 +213,52 @@ private func printStderr(_ message: String) { fputs(message + "\n", stderr) } +private func hasBridgeJSSkipComment(_ content: String) -> Bool { + BridgeJSGeneratedFile.hasSkipComment(content) +} + +private func combineGeneratedSwift(_ pieces: [String]) -> String { + let trimmedPieces = pieces + .map { $0.trimmingCharacters(in: .newlines) } + .filter { !$0.isEmpty } + guard !trimmedPieces.isEmpty else { return "" } + + return ([BridgeJSGeneratedFile.swiftPreamble] + trimmedPieces).joined(separator: "\n\n") +} + +private func recursivelyCollectSwiftFiles(from directory: URL) -> [URL] { + var swiftFiles: [URL] = [] + let fileManager = FileManager.default + + guard + let enumerator = fileManager.enumerator( + at: directory, + includingPropertiesForKeys: [.isRegularFileKey, .isDirectoryKey], + options: [.skipsHiddenFiles] + ) + else { + return [] + } + + for case let fileURL as URL in enumerator { + if fileURL.pathExtension == "swift" { + let resourceValues = try? fileURL.resourceValues(forKeys: [.isRegularFileKey]) + if resourceValues?.isRegularFile == true { + swiftFiles.append(fileURL) + } + } + } + + return swiftFiles.sorted { $0.path < $1.path } +} + +private func inputSwiftFiles(targetDirectory: URL, positionalArguments: [String]) -> [String] { + if positionalArguments.isEmpty { + return recursivelyCollectSwiftFiles(from: targetDirectory).map(\.path) + } + return positionalArguments +} + // MARK: - Minimal Argument Parsing struct OptionRule { diff --git a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift index f091e4a3f..1117575ab 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift @@ -1,6 +1,29 @@ +import Foundation + extension String { public var capitalizedFirstLetter: String { guard !isEmpty else { return self } return prefix(1).uppercased() + dropFirst() } } + +public enum BridgeJSGeneratedFile { + public static let skipLine = "// bridge-js: skip" + + public static func hasSkipComment(_ content: String) -> Bool { + content.starts(with: skipLine + "\n") + } + + public static var swiftPreamble: String { + """ + \(skipLine) + // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, + // DO NOT EDIT. + // + // To update this file, just rebuild your project or run + // `swift package bridge-js`. + + @_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit + """.trimmingCharacters(in: .newlines) + } +} diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/README.md b/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/README.md deleted file mode 100644 index de6806350..000000000 --- a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ts2skeleton - -This script analyzes the TypeScript type definitions and produces a structured JSON output with skeleton information that can be used to generate Swift bindings. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/README.md b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/README.md new file mode 100644 index 000000000..b2dbe6a6a --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/README.md @@ -0,0 +1,3 @@ +# ts2swift + +This script analyzes the TypeScript type definitions and produces macro-annotated Swift declarations that can be fed into BridgeJS for glue generation. diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/bin/ts2skeleton.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/bin/ts2swift.js old mode 100755 new mode 100644 similarity index 53% rename from Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/bin/ts2skeleton.js rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/bin/ts2swift.js index ba926a889..cc94fce3c --- a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/bin/ts2skeleton.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/bin/ts2swift.js @@ -2,11 +2,10 @@ // @ts-check /** - * Main entry point for the ts2skeleton tool + * Main entry point for the ts2swift tool * - * This script analyzes the TypeScript type definitions and produces a structured - * JSON output with skeleton information that can be used to generate Swift - * bindings. + * This script analyzes the TypeScript type definitions and produces macro-annotated + * Swift declarations that can be used to generate Swift bindings. */ import { main } from "../src/cli.js" diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/package.json b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json similarity index 69% rename from Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/package.json rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json index 48fb77cfc..d6b34558d 100644 --- a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/package.json +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json @@ -4,6 +4,6 @@ "typescript": "5.8.2" }, "bin": { - "ts2skeleton": "./bin/ts2skeleton.js" + "ts2swift": "./bin/ts2swift.js" } } diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js similarity index 90% rename from Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/cli.js rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 41f6e4198..28f37e0ec 100644 --- a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -73,7 +73,7 @@ class DiagnosticEngine { } function printUsage() { - console.error('Usage: ts2skeleton -p [-o output.json]'); + console.error('Usage: ts2swift -p [-o output.swift]'); } /** @@ -139,13 +139,14 @@ export function main(args) { } const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine); - const results = processor.processTypeDeclarations(program, filePath); + const { content: swiftOutput, hasAny } = processor.processTypeDeclarations(program, filePath); - // Write results to file or stdout - const jsonOutput = JSON.stringify(results, null, 2); if (options.values.output) { - fs.writeFileSync(options.values.output, jsonOutput); + if (hasAny) { + fs.mkdirSync(path.dirname(options.values.output), { recursive: true }); + fs.writeFileSync(options.values.output, swiftOutput); + } } else { - process.stdout.write(jsonOutput, "utf-8"); + process.stdout.write(swiftOutput, "utf-8"); } } diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/index.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts similarity index 100% rename from Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/index.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js similarity index 51% rename from Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index cdcff719d..a7855797b 100644 --- a/Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -5,14 +5,10 @@ // @ts-check import ts from 'typescript'; +import path from 'path'; -/** @typedef {import('./index').ImportSkeleton} ImportSkeleton */ -/** @typedef {import('./index').ImportFunctionSkeleton} ImportFunctionSkeleton */ -/** @typedef {import('./index').ImportTypeSkeleton} ImportTypeSkeleton */ -/** @typedef {import('./index').ImportPropertySkeleton} ImportPropertySkeleton */ -/** @typedef {import('./index').ImportConstructorSkeleton} ImportConstructorSkeleton */ -/** @typedef {import('./index').Parameter} Parameter */ -/** @typedef {import('./index').BridgeType} BridgeType */ +/** @typedef {import('./index.d.ts').Parameter} Parameter */ +/** @typedef {import('./index.d.ts').BridgeType} BridgeType */ /** * @typedef {{ @@ -57,21 +53,33 @@ export class TypeProcessor { this.processedTypes = new Map(); /** @type {Map} Seen position by type */ this.seenTypes = new Map(); - /** @type {ImportFunctionSkeleton[]} */ - this.functions = []; - /** @type {ImportTypeSkeleton[]} */ - this.types = []; + /** @type {string[]} Collected Swift code lines */ + this.swiftLines = []; } /** - * Process type declarations from a TypeScript program + * Process type declarations from a TypeScript program and render Swift code * @param {ts.Program} program - TypeScript program * @param {string} inputFilePath - Path to the input file - * @returns {ImportSkeleton} Processed type declarations + * @returns {{ content: string, hasAny: boolean }} Rendered Swift code */ processTypeDeclarations(program, inputFilePath) { - const sourceFiles = program.getSourceFiles().filter( - sf => !sf.isDeclarationFile || sf.fileName === inputFilePath + const normalizedInput = path.resolve(inputFilePath); + const sourceFiles = program.getSourceFiles().filter(sf => { + if (!sf.isDeclarationFile) return true; + return path.resolve(sf.fileName) === normalizedInput; + }); + + // Add prelude + this.swiftLines.push( + "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,", + "// DO NOT EDIT.", + "//", + "// To update this file, just rebuild your project or run", + "// `swift package bridge-js`.", + "", + "import JavaScriptKit", + "" ); for (const sourceFile of sourceFiles) { @@ -88,10 +96,7 @@ export class TypeProcessor { const typeString = this.checker.typeToString(type); const members = type.getProperties(); if (members) { - const type = this.visitStructuredType(typeString, members); - this.types.push(type); - } else { - this.types.push(this.createUnknownType(typeString)); + this.visitStructuredType(typeString, members); } } }); @@ -100,23 +105,11 @@ export class TypeProcessor { } } - return { functions: this.functions, types: this.types }; + const content = this.swiftLines.join("\n").trimEnd() + "\n"; + const hasAny = this.swiftLines.length > 9; // More than just the prelude + return { content, hasAny }; } - /** - * Create an unknown type - * @param {string} typeString - Type string - * @returns {ImportTypeSkeleton} Unknown type - */ - createUnknownType(typeString) { - return { - name: typeString, - documentation: undefined, - properties: [], - methods: [], - constructor: undefined, - }; - } /** * Visit a node and process it @@ -124,50 +117,34 @@ export class TypeProcessor { */ visitNode(node) { if (ts.isFunctionDeclaration(node)) { - const func = this.visitFunctionLikeDecl(node); - if (func && node.name) { - this.functions.push({ ...func, name: node.name.getText() }); - } + this.visitFunctionDeclaration(node); } else if (ts.isClassDeclaration(node)) { - const cls = this.visitClassDecl(node); - if (cls) this.types.push(cls); + this.visitClassDecl(node); } } /** - * Process a function declaration into ImportFunctionSkeleton format - * @param {ts.SignatureDeclaration} node - The function node - * @returns {ImportFunctionSkeleton | null} Processed function + * Visit a function declaration and render Swift code + * @param {ts.FunctionDeclaration} node - The function node * @private */ - visitFunctionLikeDecl(node) { - if (!node.name) return null; + visitFunctionDeclaration(node) { + if (!node.name) return; const name = node.name.getText(); if (!isValidSwiftDeclName(name)) { - return null; + return; } const signature = this.checker.getSignatureFromDeclaration(node); - if (!signature) return null; - - /** @type {Parameter[]} */ - const parameters = []; - for (const p of signature.getParameters()) { - const bridgeType = this.visitSignatureParameter(p, node); - parameters.push(bridgeType); - } - - const returnType = signature.getReturnType(); - const bridgeReturnType = this.visitType(returnType, node); - const documentation = this.getFullJSDocText(node); - - return { - name, - parameters, - returnType: bridgeReturnType, - documentation, - effects: { isAsync: false }, - }; + if (!signature) return; + + const params = this.renderParameters(signature.getParameters(), node); + const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); + const effects = this.renderEffects({ isAsync: false }); + const swiftName = this.renderIdentifier(name); + + this.swiftLines.push(`@JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); + this.swiftLines.push(""); } /** @@ -188,25 +165,21 @@ export class TypeProcessor { } /** + * Render constructor parameters * @param {ts.ConstructorDeclaration} node - * @returns {ImportConstructorSkeleton | null} + * @returns {string} Rendered parameters + * @private */ - visitConstructorDecl(node) { + renderConstructorParameters(node) { const signature = this.checker.getSignatureFromDeclaration(node); - if (!signature) return null; - - const parameters = []; - for (const p of signature.getParameters()) { - const bridgeType = this.visitSignatureParameter(p, node); - parameters.push(bridgeType); - } + if (!signature) return ""; - return { parameters }; + return this.renderParameters(signature.getParameters(), node); } /** * @param {ts.PropertyDeclaration | ts.PropertySignature} node - * @returns {ImportPropertySkeleton | null} + * @returns {{ name: string, type: BridgeType, isReadonly: boolean, documentation: string | undefined } | null} */ visitPropertyDecl(node) { if (!node.name) return null; @@ -235,39 +208,29 @@ export class TypeProcessor { } /** + * Visit a class declaration and render Swift code * @param {ts.ClassDeclaration} node - * @returns {ImportTypeSkeleton | null} + * @private */ visitClassDecl(node) { - if (!node.name) return null; + if (!node.name) return; - const name = node.name.text; - const properties = []; - const methods = []; - /** @type {ImportConstructorSkeleton | undefined} */ - let constructor = undefined; + const className = this.renderIdentifier(node.name.text); + this.swiftLines.push(`@JSClass struct ${className}: _JSBridgedClass {`); + // Process members in declaration order for (const member of node.members) { if (ts.isPropertyDeclaration(member)) { - const property = this.visitPropertyDecl(member); - if (property) properties.push(property); + this.renderProperty(member); } else if (ts.isMethodDeclaration(member)) { - const decl = this.visitFunctionLikeDecl(member); - if (decl) methods.push(decl); + this.renderMethod(member); } else if (ts.isConstructorDeclaration(member)) { - const decl = this.visitConstructorDecl(member); - if (decl) constructor = decl; + this.renderConstructor(member); } } - const documentation = this.getFullJSDocText(node); - return { - name, - constructor, - properties, - methods, - documentation, - }; + this.swiftLines.push("}"); + this.swiftLines.push(""); } /** @@ -301,47 +264,51 @@ export class TypeProcessor { } /** + * Visit a structured type (interface) and render Swift code * @param {string} name * @param {ts.Symbol[]} members - * @returns {ImportTypeSkeleton} + * @private */ visitStructuredType(name, members) { - /** @type {ImportPropertySkeleton[]} */ - const properties = []; - /** @type {ImportFunctionSkeleton[]} */ - const methods = []; - /** @type {ImportConstructorSkeleton | undefined} */ - let constructor = undefined; + const typeName = this.renderIdentifier(name); + this.swiftLines.push(`@JSClass struct ${typeName}: _JSBridgedClass {`); + + // Collect all declarations with their positions to preserve order + /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */ + const allDecls = []; + for (const symbol of members) { + for (const decl of symbol.getDeclarations() ?? []) { + const sourceFile = decl.getSourceFile(); + const pos = sourceFile ? decl.getStart() : 0; + allDecls.push({ decl, symbol, position: pos }); + } + } + + // Sort by position to preserve declaration order + allDecls.sort((a, b) => a.position - b.position); + + // Process declarations in order + for (const { decl, symbol } of allDecls) { if (symbol.flags & ts.SymbolFlags.Property) { - for (const decl of symbol.getDeclarations() ?? []) { - if (ts.isPropertyDeclaration(decl) || ts.isPropertySignature(decl)) { - const property = this.visitPropertyDecl(decl); - if (property) properties.push(property); - } else if (ts.isMethodSignature(decl)) { - const method = this.visitFunctionLikeDecl(decl); - if (method) methods.push(method); - } + if (ts.isPropertyDeclaration(decl) || ts.isPropertySignature(decl)) { + this.renderProperty(decl); + } else if (ts.isMethodSignature(decl)) { + this.renderMethodSignature(decl); } } else if (symbol.flags & ts.SymbolFlags.Method) { - for (const decl of symbol.getDeclarations() ?? []) { - if (!ts.isMethodSignature(decl)) { - continue; - } - const method = this.visitFunctionLikeDecl(decl); - if (method) methods.push(method); + if (ts.isMethodSignature(decl)) { + this.renderMethodSignature(decl); } } else if (symbol.flags & ts.SymbolFlags.Constructor) { - for (const decl of symbol.getDeclarations() ?? []) { - if (!ts.isConstructorDeclaration(decl)) { - continue; - } - const ctor = this.visitConstructorDecl(decl); - if (ctor) constructor = ctor; + if (ts.isConstructorDeclaration(decl)) { + this.renderConstructor(decl); } } } - return { name, properties, methods, constructor, documentation: undefined }; + + this.swiftLines.push("}"); + this.swiftLines.push(""); } /** @@ -431,6 +398,160 @@ export class TypeProcessor { } return undefined; } + + /** + * Render a property declaration + * @param {ts.PropertyDeclaration | ts.PropertySignature} node + * @private + */ + renderProperty(node) { + const property = this.visitPropertyDecl(node); + if (!property) return; + + const type = this.renderBridgeType(property.type, node); + const name = this.renderIdentifier(property.name); + + // Always render getter + this.swiftLines.push(` @JSGetter var ${name}: ${type}`); + + // Render setter if not readonly + if (!property.isReadonly) { + const capitalizedName = property.name.charAt(0).toUpperCase() + property.name.slice(1); + const needsJSNameField = property.name.charAt(0) != capitalizedName.charAt(0).toLowerCase(); + const setterName = `set${capitalizedName}`; + const annotation = needsJSNameField ? `@JSSetter(jsName: "${property.name}")` : "@JSSetter"; + this.swiftLines.push(` ${annotation} func ${this.renderIdentifier(setterName)}(_ value: ${type}) ${this.renderEffects({ isAsync: false })}`); + } + } + + /** + * Render a method declaration + * @param {ts.MethodDeclaration | ts.MethodSignature} node + * @private + */ + renderMethod(node) { + if (!node.name) return; + const name = node.name.getText(); + if (!isValidSwiftDeclName(name)) return; + + const signature = this.checker.getSignatureFromDeclaration(node); + if (!signature) return; + + const params = this.renderParameters(signature.getParameters(), node); + const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); + const effects = this.renderEffects({ isAsync: false }); + const swiftName = this.renderIdentifier(name); + + this.swiftLines.push(` @JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); + } + + /** + * Render a method signature (from interface) + * @param {ts.MethodSignature} node + * @private + */ + renderMethodSignature(node) { + this.renderMethod(node); + } + + /** + * Render a constructor declaration + * @param {ts.ConstructorDeclaration} node + * @private + */ + renderConstructor(node) { + const params = this.renderConstructorParameters(node); + const effects = this.renderEffects({ isAsync: false }); + this.swiftLines.push(` @JSFunction init(${params}) ${effects}`); + } + + /** + * Render function parameters + * @param {ts.Symbol[]} parameters + * @param {ts.Node} node + * @returns {string} + * @private + */ + renderParameters(parameters, node) { + const params = []; + for (const p of parameters) { + const bridgeType = this.visitSignatureParameter(p, node); + const paramName = this.renderIdentifier(p.name); + const type = this.renderBridgeType(bridgeType.type, node); + params.push(`_ ${paramName}: ${type}`); + } + return params.join(", "); + } + + /** + * Render bridge type to Swift type + * @param {BridgeType} bridgeType + * @param {ts.Node} node + * @returns {string} + * @private + */ + renderBridgeType(bridgeType, node) { + if ("int" in bridgeType) return "Int"; + if ("float" in bridgeType) return "Float"; + if ("double" in bridgeType) return "Double"; + if ("string" in bridgeType) return "String"; + if ("bool" in bridgeType) return "Bool"; + if ("void" in bridgeType) return "Void"; + if ("jsObject" in bridgeType) { + const name = "_0" in bridgeType.jsObject ? bridgeType.jsObject._0 : undefined; + return name ? this.renderIdentifier(name) : "JSObject"; + } + return "JSObject"; + } + + /** + * Render effects (async/throws) + * @param {{ isAsync: boolean }} effects + * @returns {string} + * @private + */ + renderEffects(effects) { + const parts = []; + if (effects?.isAsync) { + parts.push("async"); + } + parts.push("throws (JSException)"); + return parts.join(" "); + } + + /** + * Render identifier with backticks if needed + * @param {string} name + * @returns {string} + * @private + */ + renderIdentifier(name) { + if (!name) return name; + if (!isValidSwiftDeclName(name) || isSwiftKeyword(name)) { + return `\`${name}\``; + } + return name; + } +} + + +const SWIFT_KEYWORDS = new Set([ + "associatedtype", "class", "deinit", "enum", "extension", "fileprivate", + "func", "import", "init", "inout", "internal", "let", "open", "operator", + "private", "protocol", "public", "static", "struct", "subscript", "typealias", + "var", "break", "case", "continue", "default", "defer", "do", "else", + "fallthrough", "for", "guard", "if", "in", "repeat", "return", "switch", + "where", "while", "as", "Any", "catch", "false", "is", "nil", "rethrows", + "super", "self", "Self", "throw", "throws", "true", "try", + "prefix", "postfix", "infix" // Contextual keywords for operator declarations +]); + +/** + * @param {string} name + * @returns {boolean} + */ +function isSwiftKeyword(name) { + return SWIFT_KEYWORDS.has(name); } /** diff --git a/Plugins/BridgeJS/Sources/TS2Skeleton/TS2Skeleton.swift b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift similarity index 65% rename from Plugins/BridgeJS/Sources/TS2Skeleton/TS2Skeleton.swift rename to Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift index c7725faf8..0a69eb702 100644 --- a/Plugins/BridgeJS/Sources/TS2Skeleton/TS2Skeleton.swift +++ b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift @@ -1,4 +1,3 @@ -@preconcurrency import class Foundation.JSONDecoder @preconcurrency import class Foundation.Process @preconcurrency import class Foundation.Pipe @preconcurrency import class Foundation.ProcessInfo @@ -11,6 +10,8 @@ @preconcurrency import var Foundation.SIGTERM import protocol Dispatch.DispatchSourceSignal import class Dispatch.DispatchSource +import SwiftParser +import SwiftSyntax #if canImport(BridgeJSCore) import BridgeJSCore @@ -76,48 +77,57 @@ extension BridgeJSConfig { } } -extension ImportTS { - /// Processes a TypeScript definition file and extracts its API information - public mutating func addSourceFile( - _ sourceFile: String, - tsconfigPath: String, - nodePath: URL - ) throws { - let ts2skeletonPath = URL(fileURLWithPath: #filePath) - .deletingLastPathComponent() - .appendingPathComponent("JavaScript") - .appendingPathComponent("bin") - .appendingPathComponent("ts2skeleton.js") - let arguments = [ts2skeletonPath.path, sourceFile, "--project", tsconfigPath] +/// Invokes ts2swift to convert TypeScript definitions to macro-annotated Swift +/// - Parameters: +/// - dtsFile: Path to the TypeScript definition file +/// - tsconfigPath: Path to the TypeScript project configuration file +/// - nodePath: Path to the node executable +/// - progress: Progress reporting instance +/// - outputPath: Optional path to write the output file. If nil, output is collected from stdout (for testing) +/// - Returns: The generated Swift source code (always collected from stdout for return value) +public func invokeTS2Swift( + dtsFile: String, + tsconfigPath: String, + nodePath: URL, + progress: ProgressReporting, + outputPath: String? = nil +) throws -> String { + let ts2swiftPath = URL(fileURLWithPath: #filePath) + .deletingLastPathComponent() + .appendingPathComponent("JavaScript") + .appendingPathComponent("bin") + .appendingPathComponent("ts2swift.js") + var arguments = [ts2swiftPath.path, dtsFile, "--project", tsconfigPath] + if let outputPath = outputPath { + arguments.append(contentsOf: ["--output", outputPath]) + } - progress.print("Running ts2skeleton...") - progress.print(" \(([nodePath.path] + arguments).joined(separator: " "))") + progress.print("Running ts2swift...") + progress.print(" \(([nodePath.path] + arguments).joined(separator: " "))") - let process = Process() - let stdoutPipe = Pipe() - nonisolated(unsafe) var stdoutData = Data() + let process = Process() + let stdoutPipe = Pipe() + nonisolated(unsafe) var stdoutData = Data() - process.executableURL = nodePath - process.arguments = arguments - process.standardOutput = stdoutPipe + process.executableURL = nodePath + process.arguments = arguments + process.standardOutput = stdoutPipe - stdoutPipe.fileHandleForReading.readabilityHandler = { handle in - let data = handle.availableData - if data.count > 0 { - stdoutData.append(data) - } - } - try process.forwardTerminationSignals { - try process.run() - process.waitUntilExit() + stdoutPipe.fileHandleForReading.readabilityHandler = { handle in + let data = handle.availableData + if data.count > 0 { + stdoutData.append(data) } + } + try process.forwardTerminationSignals { + try process.run() + process.waitUntilExit() + } - if process.terminationStatus != 0 { - throw BridgeJSCoreError("ts2skeleton returned \(process.terminationStatus)") - } - let skeleton = try JSONDecoder().decode(ImportedFileSkeleton.self, from: stdoutData) - self.addSkeleton(skeleton) + if process.terminationStatus != 0 { + throw BridgeJSCoreError("ts2swift returned \(process.terminationStatus)") } + return String(decoding: stdoutData, as: UTF8.self) } extension Foundation.Process { diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift new file mode 100644 index 000000000..5997d3052 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -0,0 +1,289 @@ +import SwiftDiagnostics +import SwiftSyntax +import SwiftSyntaxMacros +import SwiftSyntaxMacrosTestSupport +import Testing +import BridgeJSMacros + +@Suite struct JSClassMacroTests { + private let indentationWidth: Trivia = .spaces(4) + + @Test func emptyStruct() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithExistingJSObject() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + let jsObject: JSObject + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithExistingInit() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithBothExisting() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithMembers() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + var name: String + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + var name: String + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func _class() { + assertMacroExpansion( + """ + @JSClass + class MyClass { + } + """, + expandedSource: """ + class MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func _enum() { + assertMacroExpansion( + """ + @JSClass + enum MyEnum { + } + """, + expandedSource: """ + enum MyEnum { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func _actor() { + assertMacroExpansion( + """ + @JSClass + actor MyActor { + } + """, + expandedSource: """ + actor MyActor { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithDifferentJSObjectName() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + var otherProperty: String + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + var otherProperty: String + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithDifferentInit() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + init(name: String) { + } + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + init(name: String) { + } + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithMultipleMembers() { + assertMacroExpansion( + """ + @JSClass + struct MyClass { + var name: String + var age: Int + } + """, + expandedSource: """ + struct MyClass { + let jsObject: JSObject + + var name: String + var age: Int + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func structWithComment() { + assertMacroExpansion( + """ + /// Documentation comment + @JSClass + struct MyClass { + } + """, + expandedSource: """ + /// Documentation comment + struct MyClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + """, + macros: ["JSClass": JSClassMacro.self], + indentationWidth: indentationWidth + ) + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift new file mode 100644 index 000000000..8cfdd66e0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift @@ -0,0 +1,377 @@ +import SwiftDiagnostics +import SwiftSyntax +import SwiftSyntaxMacros +import SwiftSyntaxMacrosTestSupport +import Testing +import BridgeJSMacros + +@Suite struct JSFunctionMacroTests { + private let indentationWidth: Trivia = .spaces(4) + + @Test func topLevelFunction() { + assertMacroExpansion( + """ + @JSFunction + func greet(name: String) -> String + """, + expandedSource: """ + func greet(name: String) -> String { + return _$greet(name) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionVoidReturn() { + assertMacroExpansion( + """ + @JSFunction + func log(message: String) + """, + expandedSource: """ + func log(message: String) { + _$log(message) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionWithExplicitVoidReturn() { + assertMacroExpansion( + """ + @JSFunction + func log(message: String) -> Void + """, + expandedSource: """ + func log(message: String) -> Void { + _$log(message) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionWithEmptyTupleReturn() { + assertMacroExpansion( + """ + @JSFunction + func log(message: String) -> () + """, + expandedSource: """ + func log(message: String) -> () { + _$log(message) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionThrows() { + assertMacroExpansion( + """ + @JSFunction + func parse(json: String) throws -> [String: Any] + """, + expandedSource: """ + func parse(json: String) throws -> [String: Any] { + return try _$parse(json) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionAsync() { + assertMacroExpansion( + """ + @JSFunction + func fetch(url: String) async -> String + """, + expandedSource: """ + func fetch(url: String) async -> String { + return await _$fetch(url) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionAsyncThrows() { + assertMacroExpansion( + """ + @JSFunction + func fetch(url: String) async throws -> String + """, + expandedSource: """ + func fetch(url: String) async throws -> String { + return try await _$fetch(url) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionWithUnderscoreParameter() { + assertMacroExpansion( + """ + @JSFunction + func process(_ value: Int) -> Int + """, + expandedSource: """ + func process(_ value: Int) -> Int { + return _$process(value) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelFunctionWithMultipleParameters() { + assertMacroExpansion( + """ + @JSFunction + func add(a: Int, b: Int) -> Int + """, + expandedSource: """ + func add(a: Int, b: Int) -> Int { + return _$add(a, b) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func instanceMethod() { + assertMacroExpansion( + """ + struct MyClass { + @JSFunction + func getName() -> String + } + """, + expandedSource: """ + struct MyClass { + func getName() -> String { + return _$MyClass_getName(self.jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func staticMethod() { + assertMacroExpansion( + """ + struct MyClass { + @JSFunction + static func create() -> MyClass + } + """, + expandedSource: """ + struct MyClass { + static func create() -> MyClass { + return _$create() + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func classMethod() { + assertMacroExpansion( + """ + class MyClass { + @JSFunction + class func create() -> MyClass + } + """, + expandedSource: """ + class MyClass { + class func create() -> MyClass { + return _$create() + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func initializer() { + assertMacroExpansion( + """ + struct MyClass { + @JSFunction + init(name: String) + } + """, + expandedSource: """ + struct MyClass { + init(name: String) { + let jsObject = _$MyClass_init(name) + self.init(unsafelyWrapping: jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func initializerThrows() { + assertMacroExpansion( + """ + struct MyClass { + @JSFunction + init(name: String) throws + } + """, + expandedSource: """ + struct MyClass { + init(name: String) throws { + let jsObject = try _$MyClass_init(name) + self.init(unsafelyWrapping: jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func initializerAsyncThrows() { + assertMacroExpansion( + """ + struct MyClass { + @JSFunction + init(name: String) async throws + } + """, + expandedSource: """ + struct MyClass { + init(name: String) async throws { + let jsObject = try await _$MyClass_init(name) + self.init(unsafelyWrapping: jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func initializerWithoutEnclosingType() { + assertMacroExpansion( + """ + @JSFunction + init() + """, + expandedSource: """ + init() + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSFunction can only be applied to functions or initializers.", + line: 1, + column: 1 + ) + ], + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func unsupportedDeclaration() { + assertMacroExpansion( + """ + @JSFunction + var property: String + """, + expandedSource: """ + var property: String + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSFunction can only be applied to functions or initializers.", + line: 1, + column: 1 + ) + ], + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func enumInstanceMethod() { + assertMacroExpansion( + """ + enum MyEnum { + @JSFunction + func getValue() -> Int + } + """, + expandedSource: """ + enum MyEnum { + func getValue() -> Int { + return _$MyEnum_getValue(self.jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func actorInstanceMethod() { + assertMacroExpansion( + """ + actor MyActor { + @JSFunction + func getValue() -> Int + } + """, + expandedSource: """ + actor MyActor { + func getValue() -> Int { + return _$MyActor_getValue(self.jsObject) + } + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func functionWithExistingBody() { + assertMacroExpansion( + """ + @JSFunction + func greet(name: String) -> String { + return "Hello, \\(name)" + } + """, + expandedSource: """ + func greet(name: String) -> String { + return _$greet(name) + } + """, + macros: ["JSFunction": JSFunctionMacro.self], + indentationWidth: indentationWidth + ) + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift new file mode 100644 index 000000000..8c7f3c119 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift @@ -0,0 +1,299 @@ +import SwiftDiagnostics +import SwiftSyntax +import SwiftSyntaxMacros +import SwiftSyntaxMacrosTestSupport +import Testing +import BridgeJSMacros + +@Suite struct JSGetterMacroTests { + private let indentationWidth: Trivia = .spaces(4) + + @Test func topLevelVariable() { + assertMacroExpansion( + """ + @JSGetter + var count: Int + """, + expandedSource: """ + var count: Int { + get throws(JSException) { + return try _$count_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelLet() { + assertMacroExpansion( + """ + @JSGetter + let constant: String + """, + expandedSource: """ + let constant: String { + get throws(JSException) { + return try _$constant_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func instanceProperty() { + assertMacroExpansion( + """ + struct MyClass { + @JSGetter + var name: String + } + """, + expandedSource: """ + struct MyClass { + var name: String { + get throws(JSException) { + return try _$MyClass_name_get(self.jsObject) + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func instanceLetProperty() { + assertMacroExpansion( + """ + struct MyClass { + @JSGetter + let id: Int + } + """, + expandedSource: """ + struct MyClass { + let id: Int { + get throws(JSException) { + return try _$MyClass_id_get(self.jsObject) + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func staticProperty() { + assertMacroExpansion( + """ + struct MyClass { + @JSGetter + static var version: String + } + """, + expandedSource: """ + struct MyClass { + static var version: String { + get throws(JSException) { + return try _$version_get() + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func classProperty() { + assertMacroExpansion( + """ + class MyClass { + @JSGetter + class var version: String + } + """, + expandedSource: """ + class MyClass { + class var version: String { + get throws(JSException) { + return try _$version_get() + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func enumProperty() { + assertMacroExpansion( + """ + enum MyEnum { + @JSGetter + var value: Int + } + """, + expandedSource: """ + enum MyEnum { + var value: Int { + get throws(JSException) { + return try _$MyEnum_value_get(self.jsObject) + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func actorProperty() { + assertMacroExpansion( + """ + actor MyActor { + @JSGetter + var state: String + } + """, + expandedSource: """ + actor MyActor { + var state: String { + get throws(JSException) { + return try _$MyActor_state_get(self.jsObject) + } + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func variableWithExistingAccessor() { + assertMacroExpansion( + """ + @JSGetter + var count: Int { + return 0 + } + """, + expandedSource: """ + var count: Int { + get { + return 0 + } + get throws(JSException) { + return try _$count_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func variableWithInitializer() { + assertMacroExpansion( + """ + @JSGetter + var count: Int = 0 + """, + expandedSource: """ + var count: Int { + get throws(JSException) { + return try _$count_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func multipleBindings() { + assertMacroExpansion( + """ + @JSGetter + var x: Int, y: Int + """, + expandedSource: """ + var x: Int, y: Int + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSGetter can only be applied to single-variable declarations.", + line: 1, + column: 1, + severity: .error + ) + ], + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func unsupportedDeclaration() { + assertMacroExpansion( + """ + @JSGetter + func test() {} + """, + expandedSource: """ + func test() {} + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSGetter can only be applied to single-variable declarations.", + line: 1, + column: 1, + severity: .error + ) + ], + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func variableWithTrailingComment() { + assertMacroExpansion( + """ + @JSGetter + var count: Int // comment + """, + expandedSource: """ + var count: Int { // comment + get throws(JSException) { + return try _$count_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func variableWithUnderscoreName() { + assertMacroExpansion( + """ + @JSGetter + var _internal: String + """, + expandedSource: """ + var _internal: String { + get throws(JSException) { + return try _$internal_get() + } + } + """, + macros: ["JSGetter": JSGetterMacro.self], + indentationWidth: indentationWidth + ) + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift new file mode 100644 index 000000000..83289e092 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift @@ -0,0 +1,278 @@ +import SwiftDiagnostics +import SwiftSyntax +import SwiftSyntaxMacros +import SwiftSyntaxMacrosTestSupport +import Testing +import BridgeJSMacros + +@Suite struct JSSetterMacroTests { + private let indentationWidth: Trivia = .spaces(4) + + @Test func topLevelSetter() { + assertMacroExpansion( + """ + @JSSetter + func setFoo(_ value: Foo) throws(JSException) + """, + expandedSource: """ + func setFoo(_ value: Foo) throws(JSException) { + try _$foo_set(value) + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func topLevelSetterWithNamedParameter() { + assertMacroExpansion( + """ + @JSSetter + func setCount(count: Int) throws(JSException) + """, + expandedSource: """ + func setCount(count: Int) throws(JSException) { + try _$count_set(count) + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func instanceSetter() { + assertMacroExpansion( + """ + struct MyClass { + @JSSetter + func setName(_ name: String) throws(JSException) + } + """, + expandedSource: """ + struct MyClass { + func setName(_ name: String) throws(JSException) { + try _$MyClass_name_set(self.jsObject, name) + } + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func staticSetter() { + assertMacroExpansion( + """ + struct MyClass { + @JSSetter + static func setVersion(_ version: String) throws(JSException) + } + """, + expandedSource: """ + struct MyClass { + static func setVersion(_ version: String) throws(JSException) { + try _$version_set(version) + } + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func classSetter() { + assertMacroExpansion( + """ + class MyClass { + @JSSetter + class func setConfig(_ config: Config) throws(JSException) + } + """, + expandedSource: """ + class MyClass { + class func setConfig(_ config: Config) throws(JSException) { + try _$config_set(config) + } + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func enumSetter() { + assertMacroExpansion( + """ + enum MyEnum { + @JSSetter + func setValue(_ value: Int) throws(JSException) + } + """, + expandedSource: """ + enum MyEnum { + func setValue(_ value: Int) throws(JSException) { + try _$MyEnum_value_set(self.jsObject, value) + } + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func actorSetter() { + assertMacroExpansion( + """ + actor MyActor { + @JSSetter + func setState(_ state: String) throws(JSException) + } + """, + expandedSource: """ + actor MyActor { + func setState(_ state: String) throws(JSException) { + try _$MyActor_state_set(self.jsObject, state) + } + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func setterWithExistingBody() { + assertMacroExpansion( + """ + @JSSetter + func setFoo(_ value: Foo) throws(JSException) { + print("Setting foo") + } + """, + expandedSource: """ + func setFoo(_ value: Foo) throws(JSException) { + try _$foo_set(value) + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func invalidSetterName() { + assertMacroExpansion( + """ + @JSSetter + func updateFoo(_ value: Foo) throws(JSException) + """, + expandedSource: """ + func updateFoo(_ value: Foo) throws(JSException) + """, + diagnostics: [ + DiagnosticSpec( + message: + "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo').", + line: 1, + column: 1 + ) + ], + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func setterNameTooShort() { + assertMacroExpansion( + """ + @JSSetter + func set(_ value: Foo) throws(JSException) + """, + expandedSource: """ + func set(_ value: Foo) throws(JSException) + """, + diagnostics: [ + DiagnosticSpec( + message: + "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo').", + line: 1, + column: 1 + ) + ], + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func setterWithoutParameter() { + assertMacroExpansion( + """ + @JSSetter + func setFoo() throws(JSException) + """, + expandedSource: """ + func setFoo() throws(JSException) + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSSetter function must have at least one parameter.", + line: 1, + column: 1 + ) + ], + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func unsupportedDeclaration() { + assertMacroExpansion( + """ + @JSSetter + var property: String + """, + expandedSource: """ + var property: String + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSSetter can only be applied to functions.", + line: 1, + column: 1 + ) + ], + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func setterWithMultipleWords() { + assertMacroExpansion( + """ + @JSSetter + func setConnectionTimeout(_ timeout: Int) throws(JSException) + """, + expandedSource: """ + func setConnectionTimeout(_ timeout: Int) throws(JSException) { + try _$connectionTimeout_set(timeout) + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } + + @Test func setterWithSingleLetterProperty() { + assertMacroExpansion( + """ + @JSSetter + func setX(_ x: Int) throws(JSException) + """, + expandedSource: """ + func setX(_ x: Int) throws(JSException) { + try _$x_set(x) + } + """, + macros: ["JSSetter": JSSetterMacro.self], + indentationWidth: indentationWidth + ) + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index c81a224f8..89f346d2a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -4,7 +4,8 @@ import SwiftParser import Testing @testable import BridgeJSLink @testable import BridgeJSCore -@testable import TS2Skeleton +@testable import TS2Swift +@testable import BridgeJSSkeleton @Suite struct BridgeJSLinkTests { private func snapshot( @@ -52,26 +53,51 @@ import Testing let name = url.deletingPathExtension().lastPathComponent let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) - let bridgeJSLink: BridgeJSLink = BridgeJSLink(exportedSkeletons: [outputSkeleton], sharedMemory: false) + let bridgeJSLink: BridgeJSLink = BridgeJSLink( + skeletons: [ + BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton), + ], + sharedMemory: false + ) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Export") } @Test(arguments: collectInputs(extension: ".d.ts")) func snapshotImport(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().deletingPathExtension().lastPathComponent let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json") - var importTS = ImportTS(progress: .silent, moduleName: "TestModule") let nodePath = try #require(which("node")) - try importTS.addSourceFile(url.path, tsconfigPath: tsconfigPath.path, nodePath: nodePath) - let name = url.deletingPathExtension().deletingPathExtension().lastPathComponent + let swiftSource = try invokeTS2Swift( + dtsFile: url.path, + tsconfigPath: tsconfigPath.path, + nodePath: nodePath, + progress: .silent + ) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(importTS.skeleton) + let sourceFile = Parser.parse(source: swiftSource) + let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "TestModule") + importSwift.addSourceFile(sourceFile, "\(name).Macros.swift") + let importResult = try importSwift.finalize() + + var importTS = ImportTS(progress: .silent, moduleName: "TestModule") + for child in importResult.outputSkeleton.children { + importTS.addSkeleton(child) + } + let importSkeleton = importTS.skeleton var bridgeJSLink = BridgeJSLink(sharedMemory: false) - try bridgeJSLink.addImportedSkeletonFile(data: outputSkeletonData) + // Create unified skeleton for test + let unifiedSkeleton = BridgeJSSkeleton( + moduleName: "TestModule", + exported: nil, + imported: importSkeleton + ) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let unifiedData = try encoder.encode(unifiedSkeleton) + try bridgeJSLink.addSkeletonFile(data: unifiedData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") } @@ -88,7 +114,12 @@ import Testing try swiftAPI.addSourceFile(sourceFile, inputFile) let name = url.deletingPathExtension().lastPathComponent let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) - let bridgeJSLink: BridgeJSLink = BridgeJSLink(exportedSkeletons: [outputSkeleton], sharedMemory: false) + let bridgeJSLink: BridgeJSLink = BridgeJSLink( + skeletons: [ + BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton), + ], + sharedMemory: false + ) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global.Export") } @@ -107,7 +138,10 @@ import Testing let (_, privateSkeleton) = try #require(try privateAPI.finalize()) let bridgeJSLink = BridgeJSLink( - exportedSkeletons: [globalSkeleton, privateSkeleton], + skeletons: [ + BridgeJSSkeleton(moduleName: "GlobalModule", exported: globalSkeleton), + BridgeJSSkeleton(moduleName: "PrivateModule", exported: privateSkeleton), + ], sharedMemory: false ) try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules.Export") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift index ef642ed3a..f56fbfb6d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift @@ -1,7 +1,8 @@ import Testing import Foundation +import SwiftParser @testable import BridgeJSCore -@testable import TS2Skeleton +@testable import TS2Swift @Suite struct ImportTSTests { static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( @@ -16,13 +17,37 @@ import Foundation @Test(arguments: collectInputs()) func snapshot(input: String) throws { - var api = ImportTS(progress: .silent, moduleName: "Check") let url = Self.inputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().deletingPathExtension().deletingPathExtension().lastPathComponent let nodePath = try #require(which("node")) let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json") - try api.addSourceFile(url.path, tsconfigPath: tsconfigPath.path, nodePath: nodePath) + + // Use the new workflow: invokeTS2Swift -> ImportSwiftMacros -> ImportTS + let swiftSource = try invokeTS2Swift( + dtsFile: url.path, + tsconfigPath: tsconfigPath.path, + nodePath: nodePath, + progress: .silent + ) + try assertSnapshot( + name: name + ".Macros", + filePath: #filePath, + function: #function, + input: swiftSource.data(using: .utf8)!, + fileExtension: "swift" + ) + + let sourceFile = Parser.parse(source: swiftSource) + let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "Check") + importSwift.addSourceFile(sourceFile, "\(name).Macros.swift") + let importResult = try importSwift.finalize() + + var api = ImportTS(progress: .silent, moduleName: "Check") + for child in importResult.outputSkeleton.children { + api.addSkeleton(child) + } + let outputSwift = try #require(try api.finalize()) - let name = url.deletingPathExtension().deletingPathExtension().deletingPathExtension().lastPathComponent try assertSnapshot( name: name, filePath: #filePath, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/WhichTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/WhichTests.swift index 958d4d645..f82b3dfec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/WhichTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/WhichTests.swift @@ -1,6 +1,6 @@ import Testing import Foundation -@testable import TS2Skeleton +@testable import TS2Swift @testable import BridgeJSCore @Suite struct WhichTests { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index a71c8dd71..60435e569 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -237,43 +237,43 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WeirdNaming_normalProperty_set"] = function bjs_WeirdNaming_normalProperty_set(self, newValue) { + TestModule["bjs_WeirdNaming_for_get"] = function bjs_WeirdNaming_for_get(self) { try { - const newValueObject = swift.memory.getObject(newValue); - swift.memory.release(newValue); - swift.memory.getObject(self).normalProperty = newValueObject; + let ret = swift.memory.getObject(self).for; + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_for_get"] = function bjs_WeirdNaming_for_get(self) { + TestModule["bjs_WeirdNaming_Any_get"] = function bjs_WeirdNaming_Any_get(self) { try { - let ret = swift.memory.getObject(self).for; + let ret = swift.memory.getObject(self).Any; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_for_set"] = function bjs_WeirdNaming_for_set(self, newValue) { + TestModule["bjs_WeirdNaming_normalProperty_set"] = function bjs_WeirdNaming_normalProperty_set(self, newValue) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self).for = newValueObject; + swift.memory.getObject(self).normalProperty = newValueObject; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_Any_get"] = function bjs_WeirdNaming_Any_get(self) { + TestModule["bjs_WeirdNaming_for_set"] = function bjs_WeirdNaming_for_set(self, newValue) { try { - let ret = swift.memory.getObject(self).Any; - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; + const newValueObject = swift.memory.getObject(newValue); + swift.memory.release(newValue); + swift.memory.getObject(self).for = newValueObject; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_Any_set"] = function bjs_WeirdNaming_Any_set(self, newValue) { + TestModule["bjs_WeirdNaming_any_set"] = function bjs_WeirdNaming_any_set(self, newValue) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 86edf39ab..40a3f4e3f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -244,7 +244,6 @@ export async function createInstantiator(options, swift) { swift.memory.getObject(self).connectionTimeout = newValue; } catch (error) { setException(error); - return 0 } } TestModule["bjs_DatabaseConnection_connect"] = function bjs_DatabaseConnection_connect(self, url) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 0e2041822..6c44fd008 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -211,22 +211,22 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_Greeter_name_set"] = function bjs_Greeter_name_set(self, newValue) { + TestModule["bjs_Greeter_age_get"] = function bjs_Greeter_age_get(self) { try { - const newValueObject = swift.memory.getObject(newValue); - swift.memory.release(newValue); - swift.memory.getObject(self).name = newValueObject; + let ret = swift.memory.getObject(self).age; + return ret; } catch (error) { setException(error); + return 0 } } - TestModule["bjs_Greeter_age_get"] = function bjs_Greeter_age_get(self) { + TestModule["bjs_Greeter_name_set"] = function bjs_Greeter_name_set(self, newValue) { try { - let ret = swift.memory.getObject(self).age; - return ret; + const newValueObject = swift.memory.getObject(newValue); + swift.memory.release(newValue); + swift.memory.getObject(self).name = newValueObject; } catch (error) { setException(error); - return 0 } } TestModule["bjs_Greeter_greet"] = function bjs_Greeter_greet(self) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json index 4bb845587..77c5b3678 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json @@ -175,7 +175,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift index 08e384350..4c97553de 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_asyncReturnVoid") @_cdecl("bjs_asyncReturnVoid") public func _bjs_asyncReturnVoid() -> Int32 { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json index faff44843..97def2060 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json @@ -140,7 +140,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift index eef86b6d7..05437f540 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_standaloneFunction") @_cdecl("bjs_standaloneFunction") public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json index a0caf3bc9..acfa4c9ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json @@ -140,7 +140,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift index 729520362..fa8e80cd8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_standaloneFunction") @_cdecl("bjs_standaloneFunction") public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json index aa4242cd7..de5fb19b0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json @@ -52,7 +52,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift index 7504b289c..8d697f8ba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_ClassA_linkedB_get") @_cdecl("bjs_ClassA_linkedB_get") public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json index e6acc7f35..53a5f858c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json @@ -52,7 +52,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift index 04130f749..0a0396075 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_ClassB_init") @_cdecl("bjs_ClassB_init") public func _bjs_ClassB_init() -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index 7e614a324..1a013eed0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -730,7 +730,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index f624dc33c..d5e5bdc48 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Status: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json index f7e57aabd..ab7fbfd9d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json @@ -835,7 +835,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index 1a1bc9baf..13239108f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json index 1f4d55046..ca6fabceb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json @@ -311,7 +311,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift index a513a22ab..06c3e1cd8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json index 98ded1fe8..42a084c44 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json @@ -406,7 +406,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift index 66f8e22a6..9683b5307 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Networking.API.Method: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 24afb4eb2..23bb06429 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -406,7 +406,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index 66f8e22a6..9683b5307 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Networking.API.Method: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json index b7ea9cd17..078772ff2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json @@ -1489,7 +1489,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift index 5d88fce46..12fdeba04 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Theme: _BridgedSwiftEnumNoPayload { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json index 995c3efcf..5409a400e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json @@ -67,7 +67,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift index 3e38fee4b..981e01be4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_GlobalAPI_globalFunction") @_cdecl("bjs_GlobalAPI_globalFunction") public func _bjs_GlobalAPI_globalFunction() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json index c986a903f..bc58d985e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json @@ -67,7 +67,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift index 76a1a6c2a..1e9eae2bf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_PrivateAPI_privateFunction") @_cdecl("bjs_PrivateAPI_privateFunction") public func _bjs_PrivateAPI_privateFunction() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json index a0b1efea2..eb11e983f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json @@ -173,7 +173,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift index 19fe8ea9f..cb19c6854 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_plainFunction") @_cdecl("bjs_plainFunction") public func _bjs_plainFunction() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json index 2420d592e..914b7b894 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json @@ -173,7 +173,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift index 19fe8ea9f..cb19c6854 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_plainFunction") @_cdecl("bjs_plainFunction") public func _bjs_plainFunction() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json index 64aaa295e..b3a4fc2c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json @@ -690,7 +690,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift index f2f19f9af..88195f37d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_roundTripOptionalClass") @_cdecl("bjs_roundTripOptionalClass") public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json index d9edf11c3..ab2539abf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json @@ -60,7 +60,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift index 4f906704f..bb3ea0fd8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_check") @_cdecl("bjs_check") public func _bjs_check(_ a: Int32, _ b: Float32, _ c: Float64, _ d: Int32) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json index 79ce75dac..e63b4a242 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json @@ -76,7 +76,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift index 63e5f03c3..62b5826d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_checkInt") @_cdecl("bjs_checkInt") public func _bjs_checkInt() -> Int32 { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json index aa5fcc86b..43d05d9fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json @@ -351,7 +351,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift index 96bde51e6..b5b3c8d9e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_createPropertyHolder") @_cdecl("bjs_createPropertyHolder") public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index c3107394e..b79a59d19 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -396,7 +396,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ { "methods" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 318b908b5..735c225f1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { let jsObject: JSObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json index 4e8d80d59..3b6937c30 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json @@ -327,7 +327,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 8ea228dc5..8a5b56065 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Calculator: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index ab399f102..652465dff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -327,7 +327,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 8ea228dc5..8a5b56065 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension Calculator: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json index 472406ba9..4ec19f83c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json @@ -330,7 +330,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift index 91577ebfc..6510fd89f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension PropertyEnum: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index 6ef937981..0e8b2de22 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -330,7 +330,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift index 91577ebfc..6510fd89f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension PropertyEnum: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json index b70151233..9116fd482 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json @@ -58,7 +58,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift index 6e32c00d3..d980f5bc6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_checkString") @_cdecl("bjs_checkString") public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json index 39ec8b7a3..01f9ca4b7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json @@ -25,7 +25,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift index 0475def5b..1c260ec55 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_checkString") @_cdecl("bjs_checkString") public func _bjs_checkString() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json index df4975e11..b8f908c2d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json @@ -133,7 +133,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift index 652792106..216dfc684 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_takeGreeter") @_cdecl("bjs_takeGreeter") public func _bjs_takeGreeter(_ greeter: UnsafeMutableRawPointer) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json index 20015ba25..27627407b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json @@ -1066,7 +1066,6 @@ "functions" : [ ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index 2e57a8a56..7d0ae15da 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json index 498231bf0..c6e430edf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json @@ -86,7 +86,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index f35fc3b02..a09d312d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json index ef42dc6cf..ad47cbf0b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json @@ -25,7 +25,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift index 8b865b7d7..37f6d9c96 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_throwsSomething") @_cdecl("bjs_throwsSomething") public func _bjs_throwsSomething() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json index c80650aff..b6b9c7bcb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json @@ -25,7 +25,6 @@ } } ], - "moduleName" : "TestModule", "protocols" : [ ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift index 15e91a0b8..d5bc03b15 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - @_expose(wasm, "bjs_check") @_cdecl("bjs_check") public func _bjs_check() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift new file mode 100644 index 000000000..e5b2742ae --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift @@ -0,0 +1,13 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void + +@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws (JSException) -> Void + +@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift index 56425b208..4e2cec8dc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkArray") fileprivate func bjs_checkArray(_ a: Int32) -> Void @@ -15,7 +7,7 @@ fileprivate func bjs_checkArray(_ a: Int32) -> Void { } #endif -func checkArray(_ a: JSObject) throws(JSException) -> Void { +func _$checkArray(_ a: JSObject) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() bjs_checkArray(aValue) if let error = _swift_js_take_exception() { @@ -32,7 +24,7 @@ fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { } #endif -func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { +func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() let bValue = b.bridgeJSLowerParameter() bjs_checkArrayWithLength(aValue, bValue) @@ -50,7 +42,7 @@ fileprivate func bjs_checkArray(_ a: Int32) -> Void { } #endif -func checkArray(_ a: JSObject) throws(JSException) -> Void { +func _$checkArray(_ a: JSObject) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() bjs_checkArray(aValue) if let error = _swift_js_take_exception() { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift new file mode 100644 index 000000000..1f16ba9f1 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift @@ -0,0 +1,21 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripInt(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripString(_ v: String) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripBool(_ v: Bool) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripFloat(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripDouble(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws (JSException) -> JSPromise diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift index 41a89ad2f..1cc954b0d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_asyncReturnVoid") fileprivate func bjs_asyncReturnVoid() -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_asyncReturnVoid() -> Int32 { } #endif -func asyncReturnVoid() throws(JSException) -> JSPromise { +func _$asyncReturnVoid() throws(JSException) -> JSPromise { let ret = bjs_asyncReturnVoid() if let error = _swift_js_take_exception() { throw error @@ -32,7 +24,7 @@ fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { } #endif -func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { +func _$asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripInt(vValue) if let error = _swift_js_take_exception() { @@ -50,7 +42,7 @@ fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { } #endif -func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { +func _$asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripString(vValue) if let error = _swift_js_take_exception() { @@ -68,7 +60,7 @@ fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { } #endif -func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { +func _$asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripBool(vValue) if let error = _swift_js_take_exception() { @@ -86,7 +78,7 @@ fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { } #endif -func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { +func _$asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripFloat(vValue) if let error = _swift_js_take_exception() { @@ -104,7 +96,7 @@ fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { } #endif -func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { +func _$asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripDouble(vValue) if let error = _swift_js_take_exception() { @@ -122,7 +114,7 @@ fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { } #endif -func asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise { +func _$asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise { let vValue = v.bridgeJSLowerParameter() let ret = bjs_asyncRoundTripJSObject(vValue) if let error = _swift_js_take_exception() { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift new file mode 100644 index 000000000..435d5011c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift @@ -0,0 +1,14 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func returnAnimatable() throws (JSException) -> Animatable + +@JSClass struct Animatable: _JSBridgedClass { + @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject + @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift index 122771716..fd16bd0d8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_returnAnimatable") fileprivate func bjs_returnAnimatable() -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_returnAnimatable() -> Int32 { } #endif -func returnAnimatable() throws(JSException) -> Animatable { +func _$returnAnimatable() throws(JSException) -> Animatable { let ret = bjs_returnAnimatable() if let error = _swift_js_take_exception() { throw error @@ -41,32 +33,23 @@ fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) - } #endif -struct Animatable: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let keyframesValue = keyframes.bridgeJSLowerParameter() - let optionsValue = options.bridgeJSLowerParameter() - let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) +func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let keyframesValue = keyframes.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue) + if let error = _swift_js_take_exception() { + throw error } + return JSObject.bridgeJSLiftReturn(ret) +} - func getAnimations(_ options: JSObject) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let optionsValue = options.bridgeJSLowerParameter() - let ret = bjs_Animatable_getAnimations(selfValue, optionsValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) +func _$Animatable_getAnimations(_ self: JSObject, _ options: JSObject) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_getAnimations(selfValue, optionsValue) + if let error = _swift_js_take_exception() { + throw error } - + return JSObject.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift new file mode 100644 index 000000000..8bd4798df --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -0,0 +1,26 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike + +@JSClass struct ArrayBufferLike: _JSBridgedClass { + @JSGetter var byteLength: Double + @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike +} + +@JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming + +@JSClass struct WeirdNaming: _JSBridgedClass { + @JSGetter var normalProperty: String + @JSSetter func setNormalProperty(_ value: String) throws (JSException) + @JSGetter var `for`: String + @JSSetter func setFor(_ value: String) throws (JSException) + @JSGetter var `Any`: String + @JSSetter(jsName: "Any") func setAny(_ value: String) throws (JSException) + @JSFunction func `as`() throws (JSException) -> Void +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index c78682994..ba9e925e0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createArrayBuffer") fileprivate func bjs_createArrayBuffer() -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_createArrayBuffer() -> Int32 { } #endif -func createArrayBuffer() throws(JSException) -> ArrayBufferLike { +func _$createArrayBuffer() throws(JSException) -> ArrayBufferLike { let ret = bjs_createArrayBuffer() if let error = _swift_js_take_exception() { throw error @@ -32,7 +24,7 @@ fileprivate func bjs_createWeirdObject() -> Int32 { } #endif -func createWeirdObject() throws(JSException) -> WeirdNaming { +func _$createWeirdObject() throws(JSException) -> WeirdNaming { let ret = bjs_createWeirdObject() if let error = _swift_js_take_exception() { throw error @@ -58,35 +50,24 @@ fileprivate func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ en } #endif -struct ArrayBufferLike: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var byteLength: Double { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_ArrayBufferLike_byteLength_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) - } +func _$ArrayBufferLike_byteLength_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_ArrayBufferLike_byteLength_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return Double.bridgeJSLiftReturn(ret) +} - func slice(_ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike { - let selfValue = self.bridgeJSLowerParameter() - let beginValue = begin.bridgeJSLowerParameter() - let endValue = end.bridgeJSLowerParameter() - let ret = bjs_ArrayBufferLike_slice(selfValue, beginValue, endValue) - if let error = _swift_js_take_exception() { - throw error - } - return ArrayBufferLike.bridgeJSLiftReturn(ret) +func _$ArrayBufferLike_slice(_ self: JSObject, _ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike { + let selfValue = self.bridgeJSLowerParameter() + let beginValue = begin.bridgeJSLowerParameter() + let endValue = end.bridgeJSLowerParameter() + let ret = bjs_ArrayBufferLike_slice(selfValue, beginValue, endValue) + if let error = _swift_js_take_exception() { + throw error } - + return ArrayBufferLike.bridgeJSLiftReturn(ret) } #if arch(wasm32) @@ -99,46 +80,46 @@ fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") -fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") +fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") -fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") +fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") -fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") +fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") -fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") +fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_set") -fileprivate func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_any_set") +fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_Any_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -152,79 +133,64 @@ fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { } #endif -struct WeirdNaming: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var normalProperty: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_WeirdNaming_normalProperty_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$WeirdNaming_normalProperty_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_normalProperty_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func setNormalProperty(_ newValue: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_WeirdNaming_normalProperty_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$WeirdNaming_for_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_for_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - var `for`: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_WeirdNaming_for_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$WeirdNaming_Any_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_Any_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func setFor(_ newValue: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_WeirdNaming_for_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$WeirdNaming_normalProperty_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_normalProperty_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error } +} - var `Any`: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_WeirdNaming_Any_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_for_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error } +} - func setAny(_ newValue: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_WeirdNaming_Any_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$WeirdNaming_any_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_any_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error } +} - func `as`() throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_as(selfValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$WeirdNaming_as(_ self: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + bjs_WeirdNaming_as(selfValue) + if let error = _swift_js_take_exception() { + throw error } - } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift new file mode 100644 index 000000000..0d5635c35 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift @@ -0,0 +1,33 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection + +@JSClass struct DatabaseConnection: _JSBridgedClass { + @JSFunction func connect(_ url: String) throws (JSException) -> Void + @JSFunction func execute(_ query: String) throws (JSException) -> JSObject + @JSGetter var isConnected: Bool + @JSGetter var connectionTimeout: Double + @JSSetter func setConnectionTimeout(_ value: Double) throws (JSException) +} + +@JSFunction func createLogger(_ level: String) throws (JSException) -> Logger + +@JSClass struct Logger: _JSBridgedClass { + @JSFunction func log(_ message: String) throws (JSException) -> Void + @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void + @JSGetter var level: String +} + +@JSFunction func getConfigManager() throws (JSException) -> ConfigManager + +@JSClass struct ConfigManager: _JSBridgedClass { + @JSFunction func get(_ key: String) throws (JSException) -> JSObject + @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void + @JSGetter var configPath: String +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift index 1f8a14800..1c1418af8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createDatabaseConnection") fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { } #endif -func createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection { +func _$createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection { let configValue = config.bridgeJSLowerParameter() let ret = bjs_createDatabaseConnection(configValue) if let error = _swift_js_take_exception() { @@ -33,7 +25,7 @@ fileprivate func bjs_createLogger(_ level: Int32) -> Int32 { } #endif -func createLogger(_ level: String) throws(JSException) -> Logger { +func _$createLogger(_ level: String) throws(JSException) -> Logger { let levelValue = level.bridgeJSLowerParameter() let ret = bjs_createLogger(levelValue) if let error = _swift_js_take_exception() { @@ -51,7 +43,7 @@ fileprivate func bjs_getConfigManager() -> Int32 { } #endif -func getConfigManager() throws(JSException) -> ConfigManager { +func _$getConfigManager() throws(JSException) -> ConfigManager { let ret = bjs_getConfigManager() if let error = _swift_js_take_exception() { throw error @@ -104,63 +96,50 @@ fileprivate func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) - } #endif -struct DatabaseConnection: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var isConnected: Bool { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_isConnected_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) - } +func _$DatabaseConnection_isConnected_get(_ self: JSObject) throws(JSException) -> Bool { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_isConnected_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return Bool.bridgeJSLiftReturn(ret) +} - var connectionTimeout: Double { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_connectionTimeout_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) - } +func _$DatabaseConnection_connectionTimeout_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_connectionTimeout_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return Double.bridgeJSLiftReturn(ret) +} - func setConnectionTimeout(_ newValue: Double) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_DatabaseConnection_connectionTimeout_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$DatabaseConnection_connectionTimeout_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_DatabaseConnection_connectionTimeout_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error } +} - func connect(_ url: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let urlValue = url.bridgeJSLowerParameter() - bjs_DatabaseConnection_connect(selfValue, urlValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$DatabaseConnection_connect(_ self: JSObject, _ url: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let urlValue = url.bridgeJSLowerParameter() + bjs_DatabaseConnection_connect(selfValue, urlValue) + if let error = _swift_js_take_exception() { + throw error } +} - func execute(_ query: String) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let queryValue = query.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_execute(selfValue, queryValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) +func _$DatabaseConnection_execute(_ self: JSObject, _ query: String) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let queryValue = query.bridgeJSLowerParameter() + let ret = bjs_DatabaseConnection_execute(selfValue, queryValue) + if let error = _swift_js_take_exception() { + throw error } - + return JSObject.bridgeJSLiftReturn(ret) } #if arch(wasm32) @@ -190,43 +169,32 @@ fileprivate func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int3 } #endif -struct Logger: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var level: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_Logger_level_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$Logger_level_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Logger_level_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func log(_ message: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let messageValue = message.bridgeJSLowerParameter() - bjs_Logger_log(selfValue, messageValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$Logger_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + bjs_Logger_log(selfValue, messageValue) + if let error = _swift_js_take_exception() { + throw error } +} - func error(_ message: String, _ error: JSObject) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let messageValue = message.bridgeJSLowerParameter() - let errorValue = error.bridgeJSLowerParameter() - bjs_Logger_error(selfValue, messageValue, errorValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$Logger_error(_ self: JSObject, _ message: String, _ error: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + let errorValue = error.bridgeJSLowerParameter() + bjs_Logger_error(selfValue, messageValue, errorValue) + if let error = _swift_js_take_exception() { + throw error } - } #if arch(wasm32) @@ -256,42 +224,31 @@ fileprivate func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int } #endif -struct ConfigManager: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var configPath: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_ConfigManager_configPath_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$ConfigManager_configPath_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_ConfigManager_configPath_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func get(_ key: String) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let keyValue = key.bridgeJSLowerParameter() - let ret = bjs_ConfigManager_get(selfValue, keyValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) +func _$ConfigManager_get(_ self: JSObject, _ key: String) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let keyValue = key.bridgeJSLowerParameter() + let ret = bjs_ConfigManager_get(selfValue, keyValue) + if let error = _swift_js_take_exception() { + throw error } + return JSObject.bridgeJSLiftReturn(ret) +} - func set(_ key: String, _ value: JSObject) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let keyValue = key.bridgeJSLowerParameter() - let valueValue = value.bridgeJSLowerParameter() - bjs_ConfigManager_set(selfValue, keyValue, valueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$ConfigManager_set(_ self: JSObject, _ key: String, _ value: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let keyValue = key.bridgeJSLowerParameter() + let valueValue = value.bridgeJSLowerParameter() + bjs_ConfigManager_set(selfValue, keyValue, valueValue) + if let error = _swift_js_take_exception() { + throw error } - } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift new file mode 100644 index 000000000..6ede7fabc --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift @@ -0,0 +1,9 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift index 90088799d..6d59ca52f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_check") fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void @@ -15,7 +7,7 @@ fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { } #endif -func check(_ a: Double, _ b: Bool) throws(JSException) -> Void { +func _$check(_ a: Double, _ b: Bool) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() let bValue = b.bridgeJSLowerParameter() bjs_check(aValue, bValue) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift new file mode 100644 index 000000000..198c44c91 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift @@ -0,0 +1,11 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func checkNumber() throws (JSException) -> Double + +@JSFunction func checkBoolean() throws (JSException) -> Bool diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift index 6424329b5..17f536ba5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkNumber") fileprivate func bjs_checkNumber() -> Float64 @@ -15,7 +7,7 @@ fileprivate func bjs_checkNumber() -> Float64 { } #endif -func checkNumber() throws(JSException) -> Double { +func _$checkNumber() throws(JSException) -> Double { let ret = bjs_checkNumber() if let error = _swift_js_take_exception() { throw error @@ -32,7 +24,7 @@ fileprivate func bjs_checkBoolean() -> Int32 { } #endif -func checkBoolean() throws(JSException) -> Bool { +func _$checkBoolean() throws(JSException) -> Bool { let ret = bjs_checkBoolean() if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift new file mode 100644 index 000000000..46643d1ee --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift @@ -0,0 +1,11 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func checkString(_ a: String) throws (JSException) -> Void + +@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift index 35502a7cd..694c44e06 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkString") fileprivate func bjs_checkString(_ a: Int32) -> Void @@ -15,7 +7,7 @@ fileprivate func bjs_checkString(_ a: Int32) -> Void { } #endif -func checkString(_ a: String) throws(JSException) -> Void { +func _$checkString(_ a: String) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() bjs_checkString(aValue) if let error = _swift_js_take_exception() { @@ -32,7 +24,7 @@ fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { } #endif -func checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { +func _$checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() let bValue = b.bridgeJSLowerParameter() bjs_checkStringWithLength(aValue, bValue) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift new file mode 100644 index 000000000..0d2b146cb --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift @@ -0,0 +1,9 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func checkString() throws (JSException) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift index 638eedb05..bde90ea74 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkString") fileprivate func bjs_checkString() -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_checkString() -> Int32 { } #endif -func checkString() throws(JSException) -> String { +func _$checkString() throws(JSException) -> String { let ret = bjs_checkString() if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift new file mode 100644 index 000000000..7149a24a3 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift @@ -0,0 +1,22 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor + +@JSClass struct TypeScriptProcessor: _JSBridgedClass { + @JSFunction func convert(_ ts: String) throws (JSException) -> String + @JSFunction func validate(_ ts: String) throws (JSException) -> Bool + @JSGetter var version: String +} + +@JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator + +@JSClass struct CodeGenerator: _JSBridgedClass { + @JSFunction func generate(_ input: JSObject) throws (JSException) -> String + @JSGetter var outputFormat: String +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift index 26d37a909..54d3b9156 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_createTS2Skeleton") fileprivate func bjs_createTS2Skeleton() -> Int32 @@ -15,7 +7,7 @@ fileprivate func bjs_createTS2Skeleton() -> Int32 { } #endif -func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { +func _$createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { let ret = bjs_createTS2Skeleton() if let error = _swift_js_take_exception() { throw error @@ -32,7 +24,7 @@ fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 { } #endif -func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator { +func _$createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator { let formatValue = format.bridgeJSLowerParameter() let ret = bjs_createCodeGenerator(formatValue) if let error = _swift_js_take_exception() { @@ -68,44 +60,33 @@ fileprivate func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> } #endif -struct TypeScriptProcessor: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var version: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_version_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$TypeScriptProcessor_version_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_version_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func convert(_ ts: String) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let tsValue = ts.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_convert(selfValue, tsValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) +func _$TypeScriptProcessor_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_convert(selfValue, tsValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func validate(_ ts: String) throws(JSException) -> Bool { - let selfValue = self.bridgeJSLowerParameter() - let tsValue = ts.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_validate(selfValue, tsValue) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) +func _$TypeScriptProcessor_validate(_ self: JSObject, _ ts: String) throws(JSException) -> Bool { + let selfValue = self.bridgeJSLowerParameter() + let tsValue = ts.bridgeJSLowerParameter() + let ret = bjs_TypeScriptProcessor_validate(selfValue, tsValue) + if let error = _swift_js_take_exception() { + throw error } - + return Bool.bridgeJSLiftReturn(ret) } #if arch(wasm32) @@ -126,32 +107,21 @@ fileprivate func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> In } #endif -struct CodeGenerator: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - var outputFormat: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_CodeGenerator_outputFormat_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$CodeGenerator_outputFormat_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_CodeGenerator_outputFormat_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func generate(_ input: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let inputValue = input.bridgeJSLowerParameter() - let ret = bjs_CodeGenerator_generate(selfValue, inputValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) +func _$CodeGenerator_generate(_ self: JSObject, _ input: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let inputValue = input.bridgeJSLowerParameter() + let ret = bjs_CodeGenerator_generate(selfValue, inputValue) + if let error = _swift_js_take_exception() { + throw error } - + return String.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift new file mode 100644 index 000000000..5724d9d47 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift @@ -0,0 +1,9 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift index afd99723e..0b5d0c40d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_checkSimple") fileprivate func bjs_checkSimple(_ a: Float64) -> Void @@ -15,7 +7,7 @@ fileprivate func bjs_checkSimple(_ a: Float64) -> Void { } #endif -func checkSimple(_ a: Double) throws(JSException) -> Void { +func _$checkSimple(_ a: Double) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() bjs_checkSimple(aValue) if let error = _swift_js_take_exception() { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift new file mode 100644 index 000000000..9f33c11e1 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift @@ -0,0 +1,16 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSClass struct Greeter: _JSBridgedClass { + @JSGetter var name: String + @JSSetter func setName(_ value: String) throws (JSException) + @JSGetter var age: Double + @JSFunction init(_ name: String) throws (JSException) + @JSFunction func greet() throws (JSException) -> String + @JSFunction func changeName(_ name: String) throws (JSException) -> Void +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift index 6d1bdca34..67c778975 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_Greeter_init") fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 @@ -25,19 +17,19 @@ fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") -fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +@_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") +fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 #else -fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") -fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 +@_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") +fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { +fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -60,69 +52,56 @@ fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { } #endif -struct Greeter: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - init(_ name: String) throws(JSException) { - let nameValue = name.bridgeJSLowerParameter() - let ret = bjs_Greeter_init(nameValue) - if let error = _swift_js_take_exception() { - throw error - } - self.jsObject = JSObject(id: UInt32(bitPattern: ret)) +func _$Greeter_init(_ name: String) throws(JSException) -> JSObject { + let nameValue = name.bridgeJSLowerParameter() + let ret = bjs_Greeter_init(nameValue) + if let error = _swift_js_take_exception() { + throw error } + return JSObject.bridgeJSLiftReturn(ret) +} - var name: String { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_Greeter_name_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } +func _$Greeter_name_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_name_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func setName(_ newValue: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_Greeter_name_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$Greeter_age_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_age_get(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return Double.bridgeJSLiftReturn(ret) +} - var age: Double { - get throws(JSException) { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_Greeter_age_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) - } +func _$Greeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_Greeter_name_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error } +} - func greet() throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_Greeter_greet(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) +func _$Greeter_greet(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Greeter_greet(selfValue) + if let error = _swift_js_take_exception() { + throw error } + return String.bridgeJSLiftReturn(ret) +} - func changeName(_ name: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let nameValue = name.bridgeJSLowerParameter() - bjs_Greeter_changeName(selfValue, nameValue) - if let error = _swift_js_take_exception() { - throw error - } +func _$Greeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let nameValue = name.bridgeJSLowerParameter() + bjs_Greeter_changeName(selfValue, nameValue) + if let error = _swift_js_take_exception() { + throw error } - } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift new file mode 100644 index 000000000..1fe58af34 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift @@ -0,0 +1,9 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func check() throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift index 511678471..2a2622ce0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift @@ -1,11 +1,3 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_check") fileprivate func bjs_check() -> Void @@ -15,7 +7,7 @@ fileprivate func bjs_check() -> Void { } #endif -func check() throws(JSException) -> Void { +func _$check() throws(JSException) -> Void { bjs_check() if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index ec9840439..ea99f0b09 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -602,19 +602,21 @@ struct PackagingPlanner { let bridgeDts = outputDir.appending(path: "bridge-js.d.ts") packageInputs.append( make.addTask(inputFiles: exportedSkeletons + importedSkeletons, output: bridgeJs) { _, scope in - let link = try BridgeJSLink( - exportedSkeletons: exportedSkeletons.map { - let decoder = JSONDecoder() - let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: $0).path)) - return try decoder.decode(ExportedSkeleton.self, from: data) - }, - importedSkeletons: importedSkeletons.map { - let decoder = JSONDecoder() - let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: $0).path)) - return try decoder.decode(ImportedModuleSkeleton.self, from: data) - }, + var link = BridgeJSLink( + exportedSkeletons: [], + importedSkeletons: [], sharedMemory: Self.isSharedMemoryEnabled(triple: triple) ) + + // Decode unified skeleton format + // Unified skeleton files can contain both exported and imported parts + // Deduplicate file paths since we may have the same file in both lists + let allSkeletonPaths = Set(exportedSkeletons + importedSkeletons) + for skeletonPath in allSkeletonPaths { + let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: skeletonPath).path)) + try link.addSkeletonFile(data: data) + } + let (outputJs, outputDts) = try link.link() try system.writeFile(atPath: scope.resolve(path: bridgeJs).path, content: Data(outputJs.utf8)) try system.writeFile(atPath: scope.resolve(path: bridgeDts).path, content: Data(outputDts.utf8)) diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 709dc8f3a..32271f243 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -166,7 +166,7 @@ struct PackageToJSPlugin: CommandPlugin { } } - static let JAVASCRIPTKIT_PRODUCT_ID: Product.ID = "JavaScriptKit" + static let JAVASCRIPTEVENTLOOP_PRODUCT_ID: Product.ID = "JavaScriptEventLoop" func performBuildCommand(context: PluginContext, arguments: [String]) throws { if arguments.contains(where: { ["-h", "--help"].contains($0) }) { @@ -396,7 +396,11 @@ struct PackageToJSPlugin: CommandPlugin { guard let selfPackage = findPackageInDependencies( package: package, - including: Self.JAVASCRIPTKIT_PRODUCT_ID + // NOTE: We use JavaScriptEventLoop product to find the JavaScriptKit package + // instead of JavaScriptKit product because SwiftPM in 6.0 does not returns + // product information for JavaScriptKit product for some reason (very likely + // a bug in SwiftPM). + including: Self.JAVASCRIPTEVENTLOOP_PRODUCT_ID ) else { throw PackageToJSError("Failed to find JavaScriptKit in dependencies!?") @@ -702,10 +706,8 @@ class SkeletonCollector { private var visitedProducts: Set = [] private var visitedTargets: Set = [] - var exportedSkeletons: [URL] = [] - var importedSkeletons: [URL] = [] - let exportedSkeletonFile = "BridgeJS.ExportSwift.json" - let importedSkeletonFile = "BridgeJS.ImportTS.json" + var skeletons: [URL] = [] + let skeletonFile = "BridgeJS.json" let context: PluginContext init(context: PluginContext) { @@ -717,7 +719,9 @@ class SkeletonCollector { return ([], []) } visit(product: product, package: context.package) - return (exportedSkeletons, importedSkeletons) + // Unified skeleton files contain both exported and imported parts + // Return the same list for both since BridgeJSLink.addSkeletonFile handles the unified format + return (skeletons, skeletons) } func collectFromTests() -> (exportedSkeletons: [URL], importedSkeletons: [URL]) { @@ -728,7 +732,9 @@ class SkeletonCollector { for test in tests { visit(target: test, package: context.package) } - return (exportedSkeletons, importedSkeletons) + // Unified skeleton files contain both exported and imported parts + // Return the same list for both since BridgeJSLink.addSkeletonFile handles the unified format + return (skeletons, skeletons) } private func visit(product: Product, package: Package) { @@ -742,6 +748,11 @@ class SkeletonCollector { private func visit(target: Target, package: Package) { if visitedTargets.contains(target.id) { return } visitedTargets.insert(target.id) + if let sourceModuleTarget = target as? SourceModuleTarget { + if sourceModuleTarget.kind == .macro { + return + } + } if let target = target as? SwiftSourceModuleTarget { let directories = [ target.directoryURL.appending(path: "Generated/JavaScript"), @@ -751,13 +762,9 @@ class SkeletonCollector { .appending(path: "outputs/\(package.id)/\(target.name)/destination/BridgeJS"), ] for directory in directories { - let exportedSkeletonURL = directory.appending(path: exportedSkeletonFile) - let importedSkeletonURL = directory.appending(path: importedSkeletonFile) - if FileManager.default.fileExists(atPath: exportedSkeletonURL.path) { - exportedSkeletons.append(exportedSkeletonURL) - } - if FileManager.default.fileExists(atPath: importedSkeletonURL.path) { - importedSkeletons.append(importedSkeletonURL) + let skeletonURL = directory.appending(path: skeletonFile) + if FileManager.default.fileExists(atPath: skeletonURL.path) { + skeletons.append(skeletonURL) } } } diff --git a/Sources/BridgeJSMacros b/Sources/BridgeJSMacros new file mode 120000 index 000000000..2d3d8a4ab --- /dev/null +++ b/Sources/BridgeJSMacros @@ -0,0 +1 @@ +../Plugins/BridgeJS/Sources/BridgeJSMacros \ No newline at end of file diff --git a/Sources/BridgeJSTool/TS2Skeleton b/Sources/BridgeJSTool/TS2Skeleton deleted file mode 120000 index c41c12804..000000000 --- a/Sources/BridgeJSTool/TS2Skeleton +++ /dev/null @@ -1 +0,0 @@ -../../Plugins/BridgeJS/Sources/TS2Skeleton \ No newline at end of file diff --git a/Sources/BridgeJSTool/TS2Swift b/Sources/BridgeJSTool/TS2Swift new file mode 120000 index 000000000..6d9b4332e --- /dev/null +++ b/Sources/BridgeJSTool/TS2Swift @@ -0,0 +1 @@ +../../Plugins/BridgeJS/Sources/TS2Swift \ No newline at end of file diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md index e3f52885c..ee6ac3047 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md @@ -111,9 +111,8 @@ This command will: For example, with a target named "MyApp", it will create: ``` -Sources/MyApp/Generated/ExportSwift.swift # Generated code for Swift exports -Sources/MyApp/Generated/ImportTS.swift # Generated code for TypeScript imports -Sources/MyApp/Generated/JavaScript/ # Generated JSON skeletons +Sources/MyApp/Generated/BridgeJS.swift # Generated code for both exports and imports +Sources/MyApp/Generated/JavaScript/BridgeJS.json # Unified skeleton JSON ``` ### Step 6: Add Generated Files to Version Control diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index b8a44a08c..9e11db3b4 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -107,3 +107,81 @@ public enum JSEnumStyle: String { /// - Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. @attached(peer) public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Builtin.ExternalMacro + +/// A macro that generates a Swift getter that reads a value from JavaScript. +/// +/// This macro is used by BridgeJS-generated Swift declarations. +/// +/// Example: +/// +/// ```swift +/// @_spi(Experimental) import JavaScriptKit +/// +/// @JSGetter var count: Int +/// +/// struct Greeter { +/// @JSGetter var name: String +/// } +/// ``` +@attached(accessor) +@_spi(Experimental) +public macro JSGetter() = + #externalMacro(module: "BridgeJSMacros", type: "JSGetterMacro") + +/// A macro that generates a Swift function body that writes a value to JavaScript. +/// +/// This macro is used by BridgeJS-generated Swift declarations. +/// +/// - Parameter jsName: An optional string that specifies the name of the JavaScript property to write to. +/// If not provided, automatically derived from the Swift property name. (e.g. "setName" -> "name") +/// +/// Example: +/// +/// ```swift +/// @_spi(Experimental) import JavaScriptKit +/// +/// @JSSetter func setName(_ value: String) throws (JSException) +/// ``` +@attached(body) +@_spi(Experimental) +public macro JSSetter(jsName: String? = nil) = + #externalMacro(module: "BridgeJSMacros", type: "JSSetterMacro") + +/// A macro that generates a Swift function body that calls a JavaScript function. +/// +/// This macro is used by BridgeJS-generated Swift declarations. +/// +/// Example: +/// +/// ```swift +/// @_spi(Experimental) import JavaScriptKit +/// +/// @JSFunction func greet() throws (JSException) -> String +/// @JSFunction init(_ name: String) throws (JSException) +/// ``` +@attached(body) +@_spi(Experimental) +public macro JSFunction() = + #externalMacro(module: "BridgeJSMacros", type: "JSFunctionMacro") + +/// A macro that adds bridging members for a Swift type that represents a JavaScript class. +/// +/// This macro is used by BridgeJS-generated Swift declarations. +/// +/// Example: +/// +/// ```swift +/// @_spi(Experimental) import JavaScriptKit +/// +/// @JSClass +/// struct JsGreeter: _JSBridgedClass { +/// @JSGetter var name: String +/// @JSSetter func setName(_ value: String) throws (JSException) +/// @JSFunction init(_ name: String) throws (JSException) +/// @JSFunction func greet() throws (JSException) -> String +/// } +/// ``` +@attached(member, names: arbitrary) +@_spi(Experimental) +public macro JSClass() = + #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro") diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift similarity index 99% rename from Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift rename to Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift index 09cd79ecc..3a41f337e 100644 --- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift @@ -1,10 +1,11 @@ +// bridge-js: skip // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. // // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit extension GlobalNetworking.API.CallMethod: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json deleted file mode 100644 index 955b78f69..000000000 --- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ /dev/null @@ -1,540 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_TestHTTPServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestHTTPServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "GlobalNetworking", - "API" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "GlobalNetworking.API.CallMethod" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "TestHTTPServer", - "namespace" : [ - "GlobalNetworking", - "API" - ], - "properties" : [ - - ], - "swiftCallName" : "GlobalNetworking.API.TestHTTPServer" - }, - { - "constructor" : { - "abiName" : "bjs_TestInternalServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestInternalServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "GlobalNetworking", - "APIV2", - "Internal" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Internal.SupportedServerMethod" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "TestInternalServer", - "namespace" : [ - "GlobalNetworking", - "APIV2", - "Internal" - ], - "properties" : [ - - ], - "swiftCallName" : "Internal.TestInternalServer" - }, - { - "constructor" : { - "abiName" : "bjs_PublicConverter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_PublicConverter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "namespace" : [ - "GlobalUtils" - ], - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "PublicConverter", - "namespace" : [ - "GlobalUtils" - ], - "properties" : [ - - ], - "swiftCallName" : "GlobalUtils.PublicConverter" - } - ], - "enums" : [ - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GlobalNetworking", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalNetworking", - "tsFullPath" : "GlobalNetworking" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "API", - "namespace" : [ - "GlobalNetworking" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalNetworking.API", - "tsFullPath" : "GlobalNetworking.API" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - }, - { - "associatedValues" : [ - - ], - "name" : "put" - }, - { - "associatedValues" : [ - - ], - "name" : "delete" - } - ], - "emitStyle" : "const", - "name" : "CallMethod", - "namespace" : [ - "GlobalNetworking", - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalNetworking.API.CallMethod", - "tsFullPath" : "GlobalNetworking.API.CallMethod" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GlobalConfiguration", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalConfiguration", - "tsFullPath" : "GlobalConfiguration" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "debug", - "rawValue" : "debug" - }, - { - "associatedValues" : [ - - ], - "name" : "info", - "rawValue" : "info" - }, - { - "associatedValues" : [ - - ], - "name" : "warning", - "rawValue" : "warning" - }, - { - "associatedValues" : [ - - ], - "name" : "error", - "rawValue" : "error" - } - ], - "emitStyle" : "const", - "name" : "PublicLogLevel", - "namespace" : [ - "GlobalConfiguration" - ], - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalConfiguration.PublicLogLevel", - "tsFullPath" : "GlobalConfiguration.PublicLogLevel" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "http", - "rawValue" : "80" - }, - { - "associatedValues" : [ - - ], - "name" : "https", - "rawValue" : "443" - }, - { - "associatedValues" : [ - - ], - "name" : "development", - "rawValue" : "3000" - } - ], - "emitStyle" : "const", - "name" : "AvailablePort", - "namespace" : [ - "GlobalConfiguration" - ], - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalConfiguration.AvailablePort", - "tsFullPath" : "GlobalConfiguration.AvailablePort" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Internal", - "namespace" : [ - "GlobalNetworking", - "APIV2" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal", - "tsFullPath" : "GlobalNetworking.APIV2.Internal" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - } - ], - "emitStyle" : "const", - "name" : "SupportedServerMethod", - "namespace" : [ - "GlobalNetworking", - "APIV2", - "Internal" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal.SupportedServerMethod", - "tsFullPath" : "GlobalNetworking.APIV2.Internal.SupportedServerMethod" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GlobalStaticPropertyNamespace", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "namespaceProperty", - "namespace" : [ - "GlobalStaticPropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "namespaceConstant", - "namespace" : [ - "GlobalStaticPropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "GlobalStaticPropertyNamespace", - "tsFullPath" : "GlobalStaticPropertyNamespace" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "NestedProperties", - "namespace" : [ - "GlobalStaticPropertyNamespace" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedProperty", - "namespace" : [ - "GlobalStaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "nestedConstant", - "namespace" : [ - "GlobalStaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedDouble", - "namespace" : [ - "GlobalStaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "GlobalStaticPropertyNamespace.NestedProperties", - "tsFullPath" : "GlobalStaticPropertyNamespace.NestedProperties" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GlobalUtils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GlobalUtils", - "tsFullPath" : "GlobalUtils" - } - ], - "exposeToGlobal" : true, - "functions" : [ - - ], - "moduleName" : "BridgeJSGlobalTests", - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json new file mode 100644 index 000000000..3e7f4a6dd --- /dev/null +++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json @@ -0,0 +1,554 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_TestHTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestHTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "GlobalNetworking.API.CallMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestHTTPServer", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API.TestHTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestInternalServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestInternalServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedServerMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestInternalServer", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestInternalServer" + }, + { + "constructor" : { + "abiName" : "bjs_PublicConverter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_PublicConverter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "GlobalUtils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PublicConverter", + "namespace" : [ + "GlobalUtils" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalUtils.PublicConverter" + } + ], + "enums" : [ + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalNetworking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking", + "tsFullPath" : "GlobalNetworking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "GlobalNetworking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API", + "tsFullPath" : "GlobalNetworking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "CallMethod", + "namespace" : [ + "GlobalNetworking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalNetworking.API.CallMethod", + "tsFullPath" : "GlobalNetworking.API.CallMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalConfiguration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration", + "tsFullPath" : "GlobalConfiguration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "PublicLogLevel", + "namespace" : [ + "GlobalConfiguration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration.PublicLogLevel", + "tsFullPath" : "GlobalConfiguration.PublicLogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "AvailablePort", + "namespace" : [ + "GlobalConfiguration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalConfiguration.AvailablePort", + "tsFullPath" : "GlobalConfiguration.AvailablePort" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "GlobalNetworking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "GlobalNetworking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedServerMethod", + "namespace" : [ + "GlobalNetworking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedServerMethod", + "tsFullPath" : "GlobalNetworking.APIV2.Internal.SupportedServerMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalStaticPropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "GlobalStaticPropertyNamespace", + "tsFullPath" : "GlobalStaticPropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "NestedProperties", + "namespace" : [ + "GlobalStaticPropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "GlobalStaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "GlobalStaticPropertyNamespace.NestedProperties", + "tsFullPath" : "GlobalStaticPropertyNamespace.NestedProperties" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GlobalUtils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GlobalUtils", + "tsFullPath" : "GlobalUtils" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "BridgeJSGlobalTests" +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift deleted file mode 100644 index e75febb86..000000000 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift +++ /dev/null @@ -1,271 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(BridgeJS) import JavaScriptKit - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") -fileprivate func bjs_jsRoundTripVoid() -> Void -#else -fileprivate func bjs_jsRoundTripVoid() -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func jsRoundTripVoid() throws(JSException) -> Void { - bjs_jsRoundTripVoid() - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 -#else -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { - let ret = bjs_jsRoundTripNumber(v.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") -fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 -#else -fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { - let ret = bjs_jsRoundTripBool(v.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") -fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 -#else -fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsRoundTripString(_ v: String) throws(JSException) -> String { - let ret = bjs_jsRoundTripString(v.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") -fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void -#else -fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { - bjs_jsThrowOrVoid(shouldThrow.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") -fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 -#else -fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { - let ret = bjs_jsThrowOrNumber(shouldThrow.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") -fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 -#else -fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { - let ret = bjs_jsThrowOrBool(shouldThrow.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") -fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 -#else -fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { - let ret = bjs_jsThrowOrString(shouldThrow.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") -fileprivate func bjs_runAsyncWorks() -> Int32 -#else -fileprivate func bjs_runAsyncWorks() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func runAsyncWorks() throws(JSException) -> JSPromise { - let ret = bjs_runAsyncWorks() - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") -fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") -fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") -fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void -#else -fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") -fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") -fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void -#else -fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -struct JsGreeter: _JSBridgedClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - - init(_ name: String, _ prefix: String) throws(JSException) { - let ret = bjs_JsGreeter_init(name.bridgeJSLowerParameter(), prefix.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - self.jsObject = JSObject(id: UInt32(bitPattern: ret)) - } - - var name: String { - get throws(JSException) { - let ret = bjs_JsGreeter_name_get(self.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } - } - - func setName(_ newValue: String) throws(JSException) -> Void { - bjs_JsGreeter_name_set(self.bridgeJSLowerParameter(), newValue.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - } - - var prefix: String { - get throws(JSException) { - let ret = bjs_JsGreeter_prefix_get(self.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } - } - - func greet() throws(JSException) -> String { - let ret = bjs_JsGreeter_greet(self.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) - } - - func changeName(_ name: String) throws(JSException) -> Void { - bjs_JsGreeter_changeName(self.bridgeJSLowerParameter(), name.bridgeJSLowerParameter()) - if let error = _swift_js_take_exception() { - throw error - } - } - -} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift new file mode 100644 index 000000000..1f06bd2a9 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -0,0 +1,34 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +import JavaScriptKit + +@JSFunction func jsRoundTripVoid() throws (JSException) -> Void + +@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double + +@JSFunction func jsRoundTripBool(_ v: Bool) throws (JSException) -> Bool + +@JSFunction func jsRoundTripString(_ v: String) throws (JSException) -> String + +@JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws (JSException) -> Void + +@JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws (JSException) -> Double + +@JSFunction func jsThrowOrBool(_ shouldThrow: Bool) throws (JSException) -> Bool + +@JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws (JSException) -> String + +@JSClass struct JsGreeter: _JSBridgedClass { + @JSGetter var name: String + @JSSetter func setName(_ value: String) throws (JSException) + @JSGetter var `prefix`: String + @JSFunction init(_ name: String, _ `prefix`: String) throws (JSException) + @JSFunction func greet() throws (JSException) -> String + @JSFunction func changeName(_ name: String) throws (JSException) -> Void +} + +@JSFunction func runAsyncWorks() throws (JSException) -> JSPromise diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift similarity index 96% rename from Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift rename to Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 0a95e88f9..e4b4bf08b 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ExportSwift.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1,10 +1,11 @@ +// bridge-js: skip // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. // // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") @@ -6163,4 +6164,271 @@ fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int3 fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") +fileprivate func bjs_jsRoundTripVoid() -> Void +#else +fileprivate func bjs_jsRoundTripVoid() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripVoid() throws(JSException) -> Void { + bjs_jsRoundTripVoid() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 +#else +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripNumber(vValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") +fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 +#else +fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripBool(vValue) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") +fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 +#else +fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripString(_ v: String) throws(JSException) -> String { + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripString(vValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") +fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void +#else +fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { + let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() + bjs_jsThrowOrVoid(shouldThrowValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") +fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 +#else +fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { + let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() + let ret = bjs_jsThrowOrNumber(shouldThrowValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") +fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 +#else +fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { + let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() + let ret = bjs_jsThrowOrBool(shouldThrowValue) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") +fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 +#else +fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { + let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() + let ret = bjs_jsThrowOrString(shouldThrowValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") +fileprivate func bjs_runAsyncWorks() -> Int32 +#else +fileprivate func bjs_runAsyncWorks() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$runAsyncWorks() throws(JSException) -> JSPromise { + let ret = bjs_runAsyncWorks() + if let error = _swift_js_take_exception() { + throw error + } + return JSPromise.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") +fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") +fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") +fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") +fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") +fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void +#else +fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$JsGreeter_init(_ name: String, _ prefix: String) throws(JSException) -> JSObject { + let nameValue = name.bridgeJSLowerParameter() + let prefixValue = prefix.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_init(nameValue, prefixValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$JsGreeter_name_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_name_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$JsGreeter_prefix_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_prefix_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$JsGreeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_JsGreeter_name_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_greet(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let nameValue = name.bridgeJSLowerParameter() + bjs_JsGreeter_changeName(selfValue, nameValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json deleted file mode 100644 index 872af0251..000000000 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ExportSwift.json +++ /dev/null @@ -1,8923 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "explicitAccessControl" : "public", - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_Greeter_changeName", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "changeName", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_Greeter_greetWith", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greetWith", - "parameters" : [ - { - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "label" : "customGreeting", - "name" : "customGreeting", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_Greeter_makeFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeFormatter", - "parameters" : [ - { - "label" : "suffix", - "name" : "suffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_Greeter_static_makeCreator", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "makeCreator", - "parameters" : [ - { - "label" : "defaultName", - "name" : "defaultName", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_7GreeterC", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - }, - "staticContext" : { - "className" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_Greeter_makeCustomGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeCustomGreeter", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "name" : "Greeter", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "prefix", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "Greeter" - }, - { - "methods" : [ - { - "abiName" : "bjs_Calculator_square", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "square", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_Calculator_add", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - } - ], - "name" : "Calculator", - "properties" : [ - - ], - "swiftCallName" : "Calculator" - }, - { - "explicitAccessControl" : "internal", - "methods" : [ - - ], - "name" : "InternalGreeter", - "properties" : [ - - ], - "swiftCallName" : "InternalGreeter" - }, - { - "explicitAccessControl" : "public", - "methods" : [ - - ], - "name" : "PublicGreeter", - "properties" : [ - - ], - "swiftCallName" : "PublicGreeter" - }, - { - "explicitAccessControl" : "package", - "methods" : [ - - ], - "name" : "PackageGreeter", - "properties" : [ - - ], - "swiftCallName" : "PackageGreeter" - }, - { - "constructor" : { - "abiName" : "bjs_Converter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_Converter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "namespace" : [ - "Utils" - ], - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Converter", - "namespace" : [ - "Utils" - ], - "properties" : [ - - ], - "swiftCallName" : "Utils.Converter" - }, - { - "constructor" : { - "abiName" : "bjs_HTTPServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_HTTPServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "API" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "HTTPServer", - "namespace" : [ - "Networking", - "API" - ], - "properties" : [ - - ], - "swiftCallName" : "Networking.API.HTTPServer" - }, - { - "constructor" : { - "abiName" : "bjs_TestServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Internal.SupportedMethod" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "TestServer", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "properties" : [ - - ], - "swiftCallName" : "Internal.TestServer" - }, - { - "constructor" : { - "abiName" : "bjs_OptionalPropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "optionalName", - "name" : "optionalName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "OptionalPropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalAge", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalGreeter", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "swiftCallName" : "OptionalPropertyHolder" - }, - { - "constructor" : { - "abiName" : "bjs_SimplePropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "SimplePropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "SimplePropertyHolder" - }, - { - "constructor" : { - "abiName" : "bjs_PropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "intValue", - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "label" : "floatValue", - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "label" : "doubleValue", - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "label" : "boolValue", - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "stringValue", - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "label" : "jsObject", - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - }, - { - "label" : "sibling", - "name" : "sibling", - "type" : { - "swiftHeapObject" : { - "_0" : "SimplePropertyHolder" - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_PropertyHolder_getAllValues", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getAllValues", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "PropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyInt", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyFloat", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyDouble", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyBool", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyString", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "sibling", - "type" : { - "swiftHeapObject" : { - "_0" : "SimplePropertyHolder" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "lazyValue", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "computedReadonly", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "computedReadWrite", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "observedProperty", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "PropertyHolder" - }, - { - "methods" : [ - { - "abiName" : "bjs_MathUtils_static_add", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - }, - { - "abiName" : "bjs_MathUtils_static_substract", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "substract", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - } - ], - "name" : "MathUtils", - "properties" : [ - - ], - "swiftCallName" : "MathUtils" - }, - { - "constructor" : { - "abiName" : "bjs_ConstructorDefaults_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Default" - } - }, - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "int" : { - "_0" : 42 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "enabled", - "name" : "enabled", - "type" : { - "bool" : { - - } - } - }, - { - "defaultValue" : { - "enumCase" : { - "_0" : "Status", - "_1" : "success" - } - }, - "label" : "status", - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "tag", - "name" : "tag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_ConstructorDefaults_describe", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "describe", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "ConstructorDefaults", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "enabled", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "tag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "ConstructorDefaults" - }, - { - "constructor" : { - "abiName" : "bjs_StaticPropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "StaticPropertyHolder", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : true, - "name" : "staticConstant", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticVariable", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticString", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticBool", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticFloat", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticDouble", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedProperty", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "readOnlyComputed", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "optionalString", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "optionalInt", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "jsObjectProperty", - "staticContext" : { - "className" : { - "_0" : "StaticPropertyHolder" - } - }, - "type" : { - "jsObject" : { - - } - } - } - ], - "swiftCallName" : "StaticPropertyHolder" - }, - { - "constructor" : { - "abiName" : "bjs_DataProcessorManager_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "processor", - "name" : "processor", - "type" : { - "swiftProtocol" : { - "_0" : "DataProcessor" - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_DataProcessorManager_incrementByAmount", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "incrementByAmount", - "parameters" : [ - { - "label" : "_", - "name" : "amount", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorLabel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorLabel", - "parameters" : [ - { - "label" : "_", - "name" : "prefix", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "suffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_isProcessorEven", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "isProcessorEven", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorLabel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorLabel", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getCurrentValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getCurrentValue", - "parameters" : [ - - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_incrementBoth", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "incrementBoth", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getBackupValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getBackupValue", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_hasBackup", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "hasBackup", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorOptionalTag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorOptionalTag", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorOptionalTag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorOptionalTag", - "parameters" : [ - { - "label" : "_", - "name" : "tag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorOptionalCount", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorOptionalCount", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorOptionalCount", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorOptionalCount", - "parameters" : [ - { - "label" : "_", - "name" : "count", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorDirection", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorDirection", - "parameters" : [ - { - "label" : "_", - "name" : "direction", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorTheme", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorHttpStatus", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "status", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_getProcessorAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getProcessorAPIResult", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessorManager_setProcessorAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setProcessorAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "apiResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "DataProcessorManager", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "processor", - "type" : { - "swiftProtocol" : { - "_0" : "DataProcessor" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "backupProcessor", - "type" : { - "optional" : { - "_0" : { - "swiftProtocol" : { - "_0" : "DataProcessor" - } - } - } - } - } - ], - "swiftCallName" : "DataProcessorManager" - }, - { - "constructor" : { - "abiName" : "bjs_SwiftDataProcessor_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_SwiftDataProcessor_increment", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "increment", - "parameters" : [ - { - "label" : "by", - "name" : "amount", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_getValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getValue", - "parameters" : [ - - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_setLabelElements", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setLabelElements", - "parameters" : [ - { - "label" : "_", - "name" : "labelPrefix", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "labelSuffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_getLabel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getLabel", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_isEven", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "isEven", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_processGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processGreeter", - "parameters" : [ - { - "label" : "_", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_createGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createGreeter", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_processOptionalGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalGreeter", - "parameters" : [ - { - "label" : "_", - "name" : "greeter", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_createOptionalGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createOptionalGreeter", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_handleAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "handleAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_SwiftDataProcessor_getAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getAPIResult", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "name" : "SwiftDataProcessor", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalTag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "direction", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalTheme", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "httpStatus", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "apiResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "helper", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalHelper", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "swiftCallName" : "SwiftDataProcessor" - }, - { - "constructor" : { - "abiName" : "bjs_TextProcessor_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "transform", - "name" : "transform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_TextProcessor_process", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "process", - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processWithCustom", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processWithCustom", - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { - - } - } - }, - { - "label" : "customTransform", - "name" : "customTransform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSiSSSd_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - }, - { - "string" : { - - } - }, - { - "double" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_getTransform", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTransform", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalString", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalInt", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSqSi_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalGreeter", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeOptionalStringFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeOptionalStringFormatter", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeOptionalGreeterCreator", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeOptionalGreeterCreator", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsy_Sq7GreeterC", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_processDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests9DirectionO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "caseEnum" : { - "_0" : "Direction" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests5ThemeO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeDirectionChecker", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeDirectionChecker", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests9DirectionO_Sb", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "caseEnum" : { - "_0" : "Direction" - } - } - ], - "returnType" : { - "bool" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeThemeValidator", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeThemeValidator", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests5ThemeO_Sb", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - ], - "returnType" : { - "bool" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeStatusCodeExtractor", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeStatusCodeExtractor", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeAPIResultHandler", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultHandler", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq5ThemeO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_processOptionalAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq9APIResultO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TextProcessor_makeOptionalDirectionFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeOptionalDirectionFormatter", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "name" : "TextProcessor", - "properties" : [ - - ], - "swiftCallName" : "TextProcessor" - }, - { - "constructor" : { - "abiName" : "bjs_Container_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "location", - "name" : "location", - "type" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - }, - { - "label" : "config", - "name" : "config", - "type" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "Container", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "location", - "type" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "config", - "type" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - } - ], - "swiftCallName" : "Container" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "loading" - }, - { - "associatedValues" : [ - - ], - "name" : "success" - }, - { - "associatedValues" : [ - - ], - "name" : "error" - } - ], - "emitStyle" : "const", - "name" : "Status", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Status", - "tsFullPath" : "Status" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, - { - "associatedValues" : [ - - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ - - ], - "name" : "auto", - "rawValue" : "auto" - } - ], - "emitStyle" : "const", - "name" : "Theme", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Theme", - "tsFullPath" : "Theme" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "ok", - "rawValue" : "200" - }, - { - "associatedValues" : [ - - ], - "name" : "notFound", - "rawValue" : "404" - }, - { - "associatedValues" : [ - - ], - "name" : "serverError", - "rawValue" : "500" - }, - { - "associatedValues" : [ - - ], - "name" : "unknown", - "rawValue" : "-1" - } - ], - "emitStyle" : "const", - "name" : "HttpStatus", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "HttpStatus", - "tsFullPath" : "HttpStatus" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "tsEnum", - "name" : "TSDirection", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TSDirection", - "tsFullPath" : "TSDirection" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, - { - "associatedValues" : [ - - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ - - ], - "name" : "auto", - "rawValue" : "auto" - } - ], - "emitStyle" : "tsEnum", - "name" : "TSTheme", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TSTheme", - "tsFullPath" : "TSTheme" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils", - "tsFullPath" : "Utils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Networking", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking", - "tsFullPath" : "Networking" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "API", - "namespace" : [ - "Networking" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API", - "tsFullPath" : "Networking.API" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - }, - { - "associatedValues" : [ - - ], - "name" : "put" - }, - { - "associatedValues" : [ - - ], - "name" : "delete" - } - ], - "emitStyle" : "const", - "name" : "Method", - "namespace" : [ - "Networking", - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API.Method", - "tsFullPath" : "Networking.API.Method" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Configuration", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration", - "tsFullPath" : "Configuration" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "debug", - "rawValue" : "debug" - }, - { - "associatedValues" : [ - - ], - "name" : "info", - "rawValue" : "info" - }, - { - "associatedValues" : [ - - ], - "name" : "warning", - "rawValue" : "warning" - }, - { - "associatedValues" : [ - - ], - "name" : "error", - "rawValue" : "error" - } - ], - "emitStyle" : "const", - "name" : "LogLevel", - "namespace" : [ - "Configuration" - ], - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.LogLevel", - "tsFullPath" : "Configuration.LogLevel" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "http", - "rawValue" : "80" - }, - { - "associatedValues" : [ - - ], - "name" : "https", - "rawValue" : "443" - }, - { - "associatedValues" : [ - - ], - "name" : "development", - "rawValue" : "3000" - } - ], - "emitStyle" : "const", - "name" : "Port", - "namespace" : [ - "Configuration" - ], - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.Port", - "tsFullPath" : "Configuration.Port" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Internal", - "namespace" : [ - "Networking", - "APIV2" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal", - "tsFullPath" : "Networking.APIV2.Internal" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - } - ], - "emitStyle" : "const", - "name" : "SupportedMethod", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal.SupportedMethod", - "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - } - ], - "name" : "flag" - }, - { - "associatedValues" : [ - { - "type" : { - "float" : { - - } - } - } - ], - "name" : "rate" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "precise" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "error" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "location" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "status" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "coordinates" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "comprehensive" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "ComplexResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "ComplexResult", - "tsFullPath" : "ComplexResult" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utilities", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utilities", - "tsFullPath" : "Utilities" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "status" - } - ], - "emitStyle" : "const", - "name" : "Result", - "namespace" : [ - "Utilities" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utilities.Result", - "tsFullPath" : "Utilities.Result" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "API", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "API", - "tsFullPath" : "API" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - } - ], - "emitStyle" : "const", - "name" : "NetworkingResult", - "namespace" : [ - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "API.NetworkingResult", - "tsFullPath" : "API.NetworkingResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "name" : "status" - } - ], - "emitStyle" : "const", - "name" : "APIOptionalResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIOptionalResult", - "tsFullPath" : "APIOptionalResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "scientific" - }, - { - "associatedValues" : [ - - ], - "name" : "basic" - } - ], - "emitStyle" : "const", - "name" : "StaticCalculator", - "staticMethods" : [ - { - "abiName" : "bjs_StaticCalculator_static_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "enumName" : { - "_0" : "StaticCalculator" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "StaticCalculator", - "tsFullPath" : "StaticCalculator" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "StaticUtils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "StaticUtils", - "tsFullPath" : "StaticUtils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Nested", - "namespace" : [ - "StaticUtils" - ], - "staticMethods" : [ - { - "abiName" : "bjs_StaticUtils_Nested_static_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "roundtrip", - "namespace" : [ - "StaticUtils", - "Nested" - ], - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "StaticUtils.Nested", - "tsFullPath" : "StaticUtils.Nested" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "option1" - }, - { - "associatedValues" : [ - - ], - "name" : "option2" - } - ], - "emitStyle" : "const", - "name" : "StaticPropertyEnum", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "enumProperty", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "enumConstant", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "enumBool", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "enumVariable", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "computedReadonly", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedReadWrite", - "staticContext" : { - "enumName" : { - "_0" : "StaticPropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "StaticPropertyEnum", - "tsFullPath" : "StaticPropertyEnum" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "StaticPropertyNamespace", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "namespaceProperty", - "namespace" : [ - "StaticPropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "namespaceConstant", - "namespace" : [ - "StaticPropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "StaticPropertyNamespace", - "tsFullPath" : "StaticPropertyNamespace" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "NestedProperties", - "namespace" : [ - "StaticPropertyNamespace" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedProperty", - "namespace" : [ - "StaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "nestedConstant", - "namespace" : [ - "StaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedDouble", - "namespace" : [ - "StaticPropertyNamespace", - "NestedProperties" - ], - "staticContext" : { - "namespaceEnum" : { - - } - }, - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "StaticPropertyNamespace.NestedProperties", - "tsFullPath" : "StaticPropertyNamespace.NestedProperties" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_roundTripVoid", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripVoid", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_roundTripInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripInt", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_roundTripFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripFloat", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "float" : { - - } - } - } - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_roundTripDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripDouble", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_roundTripBool", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripBool", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_roundTripString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripString", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_roundTripSwiftHeapObject", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripSwiftHeapObject", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_roundTripJSObject", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripJSObject", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_throwsSwiftError", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsSwiftError", - "parameters" : [ - { - "label" : "shouldThrow", - "name" : "shouldThrow", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithIntResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithIntResult", - "parameters" : [ - - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithStringResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithStringResult", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithBoolResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithBoolResult", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithFloatResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithFloatResult", - "parameters" : [ - - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithDoubleResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithDoubleResult", - "parameters" : [ - - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_throwsWithSwiftHeapObjectResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithSwiftHeapObjectResult", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_throwsWithJSObjectResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsWithJSObjectResult", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripVoid", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripVoid", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripInt", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripInt", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripFloat", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripFloat", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "float" : { - - } - } - } - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripDouble", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripDouble", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripBool", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripBool", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripString", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripString", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripSwiftHeapObject", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripSwiftHeapObject", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_asyncRoundTripJSObject", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripJSObject", - "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_takeGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeGreeter", - "parameters" : [ - { - "label" : "g", - "name" : "g", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_createCalculator", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createCalculator", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Calculator" - } - } - }, - { - "abiName" : "bjs_useCalculator", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "useCalculator", - "parameters" : [ - { - "label" : "calc", - "name" : "calc", - "type" : { - "swiftHeapObject" : { - "_0" : "Calculator" - } - } - }, - { - "label" : "x", - "name" : "x", - "type" : { - "int" : { - - } - } - }, - { - "label" : "y", - "name" : "y", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_testGreeterToJSValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testGreeterToJSValue", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_testCalculatorToJSValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testCalculatorToJSValue", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_testSwiftClassAsJSValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testSwiftClassAsJSValue", - "parameters" : [ - { - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "jsObject" : { - - } - } - }, - { - "abiName" : "bjs_setDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setDirection", - "parameters" : [ - { - "label" : "_", - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Direction" - } - } - }, - { - "abiName" : "bjs_getDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getDirection", - "parameters" : [ - - ], - "returnType" : { - "caseEnum" : { - "_0" : "Direction" - } - } - }, - { - "abiName" : "bjs_processDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirection", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "abiName" : "bjs_setTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_getTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTheme", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_setHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "status", - "type" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_getHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getHttpStatus", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_processTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_setTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTSDirection", - "parameters" : [ - { - "label" : "_", - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - }, - { - "abiName" : "bjs_getTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTSDirection", - "parameters" : [ - - ], - "returnType" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - }, - { - "abiName" : "bjs_setTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTSTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_getTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTSTheme", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_roundtripNetworkingAPIMethod", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripNetworkingAPIMethod", - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - }, - { - "abiName" : "bjs_roundtripConfigurationLogLevel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripConfigurationLogLevel", - "parameters" : [ - { - "label" : "_", - "name" : "level", - "type" : { - "rawValueEnum" : { - "_0" : "Configuration.LogLevel", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Configuration.LogLevel", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_roundtripConfigurationPort", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripConfigurationPort", - "parameters" : [ - { - "label" : "_", - "name" : "port", - "type" : { - "rawValueEnum" : { - "_0" : "Configuration.Port", - "_1" : "Int" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Configuration.Port", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_processConfigurationLogLevel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processConfigurationLogLevel", - "parameters" : [ - { - "label" : "_", - "name" : "level", - "type" : { - "rawValueEnum" : { - "_0" : "Configuration.LogLevel", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Configuration.Port", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_roundtripInternalSupportedMethod", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripInternalSupportedMethod", - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Internal.SupportedMethod" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Internal.SupportedMethod" - } - } - }, - { - "abiName" : "bjs_roundtripAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripAPIResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultSuccess", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultFailure", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultFailure", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultInfo", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultInfo", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultFlag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultFlag", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultRate", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultRate", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "float" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_makeAPIResultPrecise", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultPrecise", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_roundtripComplexResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripComplexResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultSuccess", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultError", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultError", - "parameters" : [ - { - "label" : "_", - "name" : "message", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "code", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultLocation", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultLocation", - "parameters" : [ - { - "label" : "_", - "name" : "lat", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "lng", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultStatus", - "parameters" : [ - { - "label" : "_", - "name" : "active", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "_", - "name" : "code", - "type" : { - "int" : { - - } - } - }, - { - "label" : "_", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultCoordinates", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultCoordinates", - "parameters" : [ - { - "label" : "_", - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "y", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "z", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultComprehensive", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultComprehensive", - "parameters" : [ - { - "label" : "_", - "name" : "flag1", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "_", - "name" : "flag2", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "_", - "name" : "count1", - "type" : { - "int" : { - - } - } - }, - { - "label" : "_", - "name" : "count2", - "type" : { - "int" : { - - } - } - }, - { - "label" : "_", - "name" : "value1", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "value2", - "type" : { - "double" : { - - } - } - }, - { - "label" : "_", - "name" : "text1", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "text2", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "text3", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeComplexResultInfo", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeComplexResultInfo", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_makeUtilitiesResultSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeUtilitiesResultSuccess", - "parameters" : [ - { - "label" : "_", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - }, - { - "abiName" : "bjs_makeUtilitiesResultFailure", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeUtilitiesResultFailure", - "parameters" : [ - { - "label" : "_", - "name" : "error", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "code", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - }, - { - "abiName" : "bjs_makeUtilitiesResultStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeUtilitiesResultStatus", - "parameters" : [ - { - "label" : "_", - "name" : "active", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "_", - "name" : "code", - "type" : { - "int" : { - - } - } - }, - { - "label" : "_", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - }, - { - "abiName" : "bjs_makeAPINetworkingResultSuccess", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPINetworkingResultSuccess", - "parameters" : [ - { - "label" : "_", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "API.NetworkingResult" - } - } - }, - { - "abiName" : "bjs_makeAPINetworkingResultFailure", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPINetworkingResultFailure", - "parameters" : [ - { - "label" : "_", - "name" : "error", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "code", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "API.NetworkingResult" - } - } - }, - { - "abiName" : "bjs_roundtripUtilitiesResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripUtilitiesResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - }, - { - "abiName" : "bjs_roundtripAPINetworkingResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripAPINetworkingResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "API.NetworkingResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "API.NetworkingResult" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalString", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalInt", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalBool", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalBool", - "parameters" : [ - { - "label" : "flag", - "name" : "flag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalFloat", - "parameters" : [ - { - "label" : "number", - "name" : "number", - "type" : { - "optional" : { - "_0" : { - "float" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "float" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalDouble", - "parameters" : [ - { - "label" : "precision", - "name" : "precision", - "type" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalMixSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalMixSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalSwiftSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalSwiftSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalWithSpaces", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalWithSpaces", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTypeAlias", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTypeAlias", - "parameters" : [ - { - "label" : "age", - "name" : "age", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalStatus", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTheme", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalHttpStatus", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTSDirection", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTSTheme", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalNetworkingAPIMethod", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalNetworkingAPIMethod", - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalAPIResult", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "abiName" : "bjs_compareAPIResults", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "compareAPIResults", - "parameters" : [ - { - "label" : "_", - "name" : "r1", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "label" : "_", - "name" : "r2", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_roundTripOptionalComplexResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalComplexResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalClass", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalAPIOptionalResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalAPIOptionalResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - }, - { - "abiName" : "bjs_createPropertyHolder", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createPropertyHolder", - "parameters" : [ - { - "label" : "intValue", - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "label" : "floatValue", - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "label" : "doubleValue", - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "label" : "boolValue", - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "stringValue", - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "label" : "jsObject", - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" - } - } - }, - { - "abiName" : "bjs_testPropertyHolder", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testPropertyHolder", - "parameters" : [ - { - "label" : "holder", - "name" : "holder", - "type" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_resetObserverCounts", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "resetObserverCounts", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getObserverStats", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getObserverStats", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testStringDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testStringDefault", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Hello World" - } - }, - "label" : "message", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testIntDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testIntDefault", - "parameters" : [ - { - "defaultValue" : { - "int" : { - "_0" : 42 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_testBoolDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testBoolDefault", - "parameters" : [ - { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "flag", - "name" : "flag", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_testOptionalDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalDefault", - "parameters" : [ - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testMultipleDefaults", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testMultipleDefaults", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Default Title" - } - }, - "label" : "title", - "name" : "title", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "int" : { - "_0" : -10 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : false - } - }, - "label" : "enabled", - "name" : "enabled", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testSimpleEnumDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testSimpleEnumDefault", - "parameters" : [ - { - "defaultValue" : { - "enumCase" : { - "_0" : "Status", - "_1" : "success" - } - }, - "label" : "status", - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "abiName" : "bjs_testDirectionDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testDirectionDefault", - "parameters" : [ - { - "defaultValue" : { - "enumCase" : { - "_0" : "Direction", - "_1" : "north" - } - }, - "label" : "direction", - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Direction" - } - } - }, - { - "abiName" : "bjs_testRawStringEnumDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testRawStringEnumDefault", - "parameters" : [ - { - "defaultValue" : { - "enumCase" : { - "_0" : "Theme", - "_1" : "light" - } - }, - "label" : "theme", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_testComplexInit", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testComplexInit", - "parameters" : [ - { - "defaultValue" : { - "objectWithArguments" : { - "_0" : "Greeter", - "_1" : [ - { - "string" : { - "_0" : "DefaultGreeter" - } - } - ] - } - }, - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testEmptyInit", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testEmptyInit", - "parameters" : [ - { - "defaultValue" : { - "object" : { - "_0" : "StaticPropertyHolder" - } - }, - "label" : "_", - "name" : "object", - "type" : { - "swiftHeapObject" : { - "_0" : "StaticPropertyHolder" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "StaticPropertyHolder" - } - } - }, - { - "abiName" : "bjs_formatName", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "formatName", - "parameters" : [ - { - "label" : "_", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "label" : "transform", - "name" : "transform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_makeFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeFormatter", - "parameters" : [ - { - "label" : "prefix", - "name" : "prefix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_makeAdder", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAdder", - "parameters" : [ - { - "label" : "base", - "name" : "base", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_testStructDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testStructDefault", - "parameters" : [ - { - "defaultValue" : { - "structLiteral" : { - "_0" : "DataPoint", - "_1" : [ - { - "name" : "x", - "value" : { - "float" : { - "_0" : 1 - } - } - }, - { - "name" : "y", - "value" : { - "float" : { - "_0" : 2 - } - } - }, - { - "name" : "label", - "value" : { - "string" : { - "_0" : "default" - } - } - }, - { - "name" : "optCount", - "value" : { - "null" : { - - } - } - }, - { - "name" : "optFlag", - "value" : { - "null" : { - - } - } - } - ] - } - }, - "label" : "point", - "name" : "point", - "type" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_roundTripDataPoint", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripDataPoint", - "parameters" : [ - { - "label" : "_", - "name" : "data", - "type" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - }, - { - "abiName" : "bjs_roundTripContact", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripContact", - "parameters" : [ - { - "label" : "_", - "name" : "contact", - "type" : { - "swiftStruct" : { - "_0" : "Contact" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Contact" - } - } - }, - { - "abiName" : "bjs_roundTripConfig", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripConfig", - "parameters" : [ - { - "label" : "_", - "name" : "config", - "type" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Config" - } - } - }, - { - "abiName" : "bjs_roundTripSessionData", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripSessionData", - "parameters" : [ - { - "label" : "_", - "name" : "session", - "type" : { - "swiftStruct" : { - "_0" : "SessionData" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "SessionData" - } - } - }, - { - "abiName" : "bjs_roundTripValidationReport", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripValidationReport", - "parameters" : [ - { - "label" : "_", - "name" : "report", - "type" : { - "swiftStruct" : { - "_0" : "ValidationReport" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "ValidationReport" - } - } - }, - { - "abiName" : "bjs_updateValidationReport", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "updateValidationReport", - "parameters" : [ - { - "label" : "_", - "name" : "newResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "label" : "_", - "name" : "report", - "type" : { - "swiftStruct" : { - "_0" : "ValidationReport" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "ValidationReport" - } - } - }, - { - "abiName" : "bjs_testContainerWithStruct", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testContainerWithStruct", - "parameters" : [ - { - "label" : "_", - "name" : "point", - "type" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Container" - } - } - } - ], - "moduleName" : "BridgeJSRuntimeTests", - "protocols" : [ - { - "methods" : [ - { - "abiName" : "bjs_DataProcessor_increment", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "increment", - "parameters" : [ - { - "label" : "by", - "name" : "amount", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_getValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getValue", - "parameters" : [ - - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_setLabelElements", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setLabelElements", - "parameters" : [ - { - "label" : "_", - "name" : "labelPrefix", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "labelSuffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_getLabel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getLabel", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_isEven", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "isEven", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_processGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processGreeter", - "parameters" : [ - { - "label" : "_", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_createGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createGreeter", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "abiName" : "bjs_DataProcessor_processOptionalGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalGreeter", - "parameters" : [ - { - "label" : "_", - "name" : "greeter", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_createOptionalGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createOptionalGreeter", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - }, - { - "abiName" : "bjs_DataProcessor_handleAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "handleAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_DataProcessor_getAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getAPIResult", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "name" : "DataProcessor", - "properties" : [ - { - "isReadonly" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "name" : "optionalTag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "optionalCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "direction", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "optionalTheme", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "httpStatus", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "apiResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "helper", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "isReadonly" : false, - "name" : "optionalHelper", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ] - } - ], - "structs" : [ - { - "constructor" : { - "abiName" : "bjs_DataPoint_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "x", - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "label" : "y", - "name" : "y", - "type" : { - "double" : { - - } - } - }, - { - "label" : "label", - "name" : "label", - "type" : { - "string" : { - - } - } - }, - { - "label" : "optCount", - "name" : "optCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "label" : "optFlag", - "name" : "optFlag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "DataPoint", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "y", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "label", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optFlag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "swiftCallName" : "DataPoint" - }, - { - "methods" : [ - - ], - "name" : "Address", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "street", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "city", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "zipCode", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "swiftCallName" : "Address" - }, - { - "methods" : [ - - ], - "name" : "Contact", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "age", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "address", - "type" : { - "swiftStruct" : { - "_0" : "Address" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "email", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "secondaryAddress", - "type" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Address" - } - } - } - } - } - ], - "swiftCallName" : "Contact" - }, - { - "methods" : [ - - ], - "name" : "Config", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "theme", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "direction", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - ], - "swiftCallName" : "Config" - }, - { - "methods" : [ - - ], - "name" : "SessionData", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "id", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "owner", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "swiftCallName" : "SessionData" - }, - { - "methods" : [ - - ], - "name" : "ValidationReport", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "id", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "status", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "outcome", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "swiftCallName" : "ValidationReport" - }, - { - "constructor" : { - "abiName" : "bjs_MathOperations_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "defaultValue" : { - "double" : { - "_0" : 0 - } - }, - "label" : "baseValue", - "name" : "baseValue", - "type" : { - "double" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_MathOperations_add", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "defaultValue" : { - "double" : { - "_0" : 10 - } - }, - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_MathOperations_multiply", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "multiply", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_MathOperations_static_subtract", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "subtract", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - }, - "staticContext" : { - "structName" : { - "_0" : "MathOperations" - } - } - } - ], - "name" : "MathOperations", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "baseValue", - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "MathOperations" - }, - { - "methods" : [ - - ], - "name" : "ConfigStruct", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "value", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "defaultConfig", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "maxRetries", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "timeout", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "computedSetting", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "ConfigStruct" - } - ] -} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json deleted file mode 100644 index 82515fecb..000000000 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.ImportTS.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "children" : [ - { - "functions" : [ - { - "name" : "jsRoundTripVoid", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "name" : "jsRoundTripNumber", - "parameters" : [ - { - "name" : "v", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "name" : "jsRoundTripBool", - "parameters" : [ - { - "name" : "v", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "name" : "jsRoundTripString", - "parameters" : [ - { - "name" : "v", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "name" : "jsThrowOrVoid", - "parameters" : [ - { - "name" : "shouldThrow", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "name" : "jsThrowOrNumber", - "parameters" : [ - { - "name" : "shouldThrow", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "name" : "jsThrowOrBool", - "parameters" : [ - { - "name" : "shouldThrow", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "name" : "jsThrowOrString", - "parameters" : [ - { - "name" : "shouldThrow", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "name" : "runAsyncWorks", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "JSPromise" - } - } - } - ], - "types" : [ - { - "constructor" : { - "parameters" : [ - { - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "name" : "prefix", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - { - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "name" : "changeName", - "parameters" : [ - { - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "JsGreeter", - "properties" : [ - { - "isReadonly" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "name" : "prefix", - "type" : { - "string" : { - - } - } - } - ] - } - ] - } - ], - "moduleName" : "BridgeJSRuntimeTests" -} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json new file mode 100644 index 000000000..727508f3c --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -0,0 +1,9182 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "explicitAccessControl" : "public", + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_changeName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "changeName", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_greetWith", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greetWith", + "parameters" : [ + { + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "label" : "customGreeting", + "name" : "customGreeting", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "suffix", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_Greeter_static_makeCreator", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "makeCreator", + "parameters" : [ + { + "label" : "defaultName", + "name" : "defaultName", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + "staticContext" : { + "className" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_Greeter_makeCustomGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeCustomGreeter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "Greeter" + }, + { + "methods" : [ + { + "abiName" : "bjs_Calculator_square", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "square", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_Calculator_add", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + } + ], + "name" : "Calculator", + "properties" : [ + + ], + "swiftCallName" : "Calculator" + }, + { + "explicitAccessControl" : "internal", + "methods" : [ + + ], + "name" : "InternalGreeter", + "properties" : [ + + ], + "swiftCallName" : "InternalGreeter" + }, + { + "explicitAccessControl" : "public", + "methods" : [ + + ], + "name" : "PublicGreeter", + "properties" : [ + + ], + "swiftCallName" : "PublicGreeter" + }, + { + "explicitAccessControl" : "package", + "methods" : [ + + ], + "name" : "PackageGreeter", + "properties" : [ + + ], + "swiftCallName" : "PackageGreeter" + }, + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "Utils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils" + ], + "properties" : [ + + ], + "swiftCallName" : "Utils.Converter" + }, + { + "constructor" : { + "abiName" : "bjs_HTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_HTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "HTTPServer", + "namespace" : [ + "Networking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "Networking.API.HTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestServer", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestServer" + }, + { + "constructor" : { + "abiName" : "bjs_OptionalPropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "optionalName", + "name" : "optionalName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "OptionalPropertyHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalAge", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalGreeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "OptionalPropertyHolder" + }, + { + "constructor" : { + "abiName" : "bjs_SimplePropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "SimplePropertyHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "SimplePropertyHolder" + }, + { + "constructor" : { + "abiName" : "bjs_PropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "intValue", + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "label" : "floatValue", + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "label" : "doubleValue", + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "label" : "boolValue", + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "stringValue", + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "label" : "jsObject", + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + }, + { + "label" : "sibling", + "name" : "sibling", + "type" : { + "swiftHeapObject" : { + "_0" : "SimplePropertyHolder" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_PropertyHolder_getAllValues", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAllValues", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PropertyHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyInt", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyFloat", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyDouble", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyBool", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyString", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "sibling", + "type" : { + "swiftHeapObject" : { + "_0" : "SimplePropertyHolder" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "lazyValue", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "computedReadonly", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "computedReadWrite", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "observedProperty", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "PropertyHolder" + }, + { + "methods" : [ + { + "abiName" : "bjs_MathUtils_static_add", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_static_substract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "substract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + } + ], + "name" : "MathUtils", + "properties" : [ + + ], + "swiftCallName" : "MathUtils" + }, + { + "constructor" : { + "abiName" : "bjs_ConstructorDefaults_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Default" + } + }, + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "int" : { + "_0" : 42 + } + }, + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + }, + { + "defaultValue" : { + "enumCase" : { + "_0" : "Status", + "_1" : "success" + } + }, + "label" : "status", + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "tag", + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_ConstructorDefaults_describe", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describe", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "ConstructorDefaults", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "enabled", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "ConstructorDefaults" + }, + { + "constructor" : { + "abiName" : "bjs_StaticPropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "StaticPropertyHolder", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "staticConstant", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticVariable", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticString", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticBool", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticFloat", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticDouble", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedProperty", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "readOnlyComputed", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "optionalString", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "optionalInt", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "jsObjectProperty", + "staticContext" : { + "className" : { + "_0" : "StaticPropertyHolder" + } + }, + "type" : { + "jsObject" : { + + } + } + } + ], + "swiftCallName" : "StaticPropertyHolder" + }, + { + "constructor" : { + "abiName" : "bjs_DataProcessorManager_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "processor", + "name" : "processor", + "type" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_DataProcessorManager_incrementByAmount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "incrementByAmount", + "parameters" : [ + { + "label" : "_", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorLabel", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_isProcessorEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isProcessorEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getCurrentValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getCurrentValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_incrementBoth", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "incrementBoth", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getBackupValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getBackupValue", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_hasBackup", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "hasBackup", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorOptionalTag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorOptionalTag", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorOptionalTag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorOptionalTag", + "parameters" : [ + { + "label" : "_", + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorOptionalCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorOptionalCount", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorOptionalCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorOptionalCount", + "parameters" : [ + { + "label" : "_", + "name" : "count", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorDirection", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorTheme", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorHttpStatus", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_getProcessorAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getProcessorAPIResult", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_setProcessorAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setProcessorAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "DataProcessorManager", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "processor", + "type" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "backupProcessor", + "type" : { + "optional" : { + "_0" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + } + } + } + ], + "swiftCallName" : "DataProcessorManager" + }, + { + "constructor" : { + "abiName" : "bjs_SwiftDataProcessor_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_SwiftDataProcessor_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + { + "label" : "by", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_getValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_setLabelElements", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setLabelElements", + "parameters" : [ + { + "label" : "_", + "name" : "labelPrefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "labelSuffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_getLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_isEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_processGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_createGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createGreeter", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_createOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalGreeter", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_handleAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_getAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAPIResult", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "name" : "SwiftDataProcessor", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalTag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalTheme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "httpStatus", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalHelper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "SwiftDataProcessor" + }, + { + "constructor" : { + "abiName" : "bjs_TextProcessor_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_TextProcessor_process", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "process", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processWithCustom", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processWithCustom", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSiSSSd_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + }, + { + "string" : { + + } + }, + { + "double" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_getTransform", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTransform", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalString", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalInt", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSqSi_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeOptionalStringFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalStringFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSqSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeOptionalGreeterCreator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalGreeterCreator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_Sq7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests5ThemeO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeDirectionChecker", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDirectionChecker", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests9DirectionO_Sb", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeThemeValidator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeThemeValidator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests5ThemeO_Sb", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeStatusCodeExtractor", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStatusCodeExtractor", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests10HttpStatusO_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeAPIResultHandler", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultHandler", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq5ThemeO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_processOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq9APIResultO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TextProcessor_makeOptionalDirectionFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalDirectionFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq9DirectionO_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "name" : "TextProcessor", + "properties" : [ + + ], + "swiftCallName" : "TextProcessor" + }, + { + "constructor" : { + "abiName" : "bjs_Container_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "location", + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "label" : "config", + "name" : "config", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "Container", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "config", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "swiftCallName" : "Container" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "loading" + }, + { + "associatedValues" : [ + + ], + "name" : "success" + }, + { + "associatedValues" : [ + + ], + "name" : "error" + } + ], + "emitStyle" : "const", + "name" : "Status", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Status", + "tsFullPath" : "Status" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "const", + "name" : "Theme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + }, + { + "associatedValues" : [ + + ], + "name" : "unknown", + "rawValue" : "-1" + } + ], + "emitStyle" : "const", + "name" : "HttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "tsEnum", + "name" : "TSDirection", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TSDirection", + "tsFullPath" : "TSDirection" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "tsEnum", + "name" : "TSTheme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TSTheme", + "tsFullPath" : "TSTheme" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Networking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "Networking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "Method", + "namespace" : [ + "Networking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Configuration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "LogLevel", + "namespace" : [ + "Configuration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "Port", + "namespace" : [ + "Configuration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "Networking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedMethod", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ + { + "type" : { + "float" : { + + } + } + } + ], + "name" : "rate" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "error" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "location" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "status" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "coordinates" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "comprehensive" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "ComplexResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utilities", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utilities", + "tsFullPath" : "Utilities" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "status" + } + ], + "emitStyle" : "const", + "name" : "Result", + "namespace" : [ + "Utilities" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utilities.Result", + "tsFullPath" : "Utilities.Result" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "API", + "tsFullPath" : "API" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "NetworkingResult", + "namespace" : [ + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "API.NetworkingResult", + "tsFullPath" : "API.NetworkingResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "name" : "status" + } + ], + "emitStyle" : "const", + "name" : "APIOptionalResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIOptionalResult", + "tsFullPath" : "APIOptionalResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "scientific" + }, + { + "associatedValues" : [ + + ], + "name" : "basic" + } + ], + "emitStyle" : "const", + "name" : "StaticCalculator", + "staticMethods" : [ + { + "abiName" : "bjs_StaticCalculator_static_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "enumName" : { + "_0" : "StaticCalculator" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "StaticCalculator", + "tsFullPath" : "StaticCalculator" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "StaticUtils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "StaticUtils", + "tsFullPath" : "StaticUtils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Nested", + "namespace" : [ + "StaticUtils" + ], + "staticMethods" : [ + { + "abiName" : "bjs_StaticUtils_Nested_static_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundtrip", + "namespace" : [ + "StaticUtils", + "Nested" + ], + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "StaticUtils.Nested", + "tsFullPath" : "StaticUtils.Nested" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "option1" + }, + { + "associatedValues" : [ + + ], + "name" : "option2" + } + ], + "emitStyle" : "const", + "name" : "StaticPropertyEnum", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumProperty", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "enumConstant", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumBool", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumVariable", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "computedReadonly", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedReadWrite", + "staticContext" : { + "enumName" : { + "_0" : "StaticPropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "StaticPropertyEnum", + "tsFullPath" : "StaticPropertyEnum" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "StaticPropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "StaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "StaticPropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "StaticPropertyNamespace", + "tsFullPath" : "StaticPropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "NestedProperties", + "namespace" : [ + "StaticPropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "StaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "StaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "StaticPropertyNamespace", + "NestedProperties" + ], + "staticContext" : { + "namespaceEnum" : { + + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "StaticPropertyNamespace.NestedProperties", + "tsFullPath" : "StaticPropertyNamespace.NestedProperties" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundTripVoid", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripVoid", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_roundTripInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripInt", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_roundTripFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripFloat", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_roundTripDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDouble", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_roundTripBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripBool", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_roundTripString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripString", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_roundTripSwiftHeapObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSwiftHeapObject", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_roundTripJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSObject", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_throwsSwiftError", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsSwiftError", + "parameters" : [ + { + "label" : "shouldThrow", + "name" : "shouldThrow", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithIntResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithIntResult", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithStringResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithStringResult", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithBoolResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithBoolResult", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithFloatResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithFloatResult", + "parameters" : [ + + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithDoubleResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithDoubleResult", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_throwsWithSwiftHeapObjectResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithSwiftHeapObjectResult", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_throwsWithJSObjectResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsWithJSObjectResult", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripVoid", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripVoid", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripInt", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripInt", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripFloat", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripFloat", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripDouble", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripDouble", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripBool", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripBool", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripString", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripString", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripSwiftHeapObject", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripSwiftHeapObject", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_asyncRoundTripJSObject", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripJSObject", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_takeGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeGreeter", + "parameters" : [ + { + "label" : "g", + "name" : "g", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_createCalculator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createCalculator", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Calculator" + } + } + }, + { + "abiName" : "bjs_useCalculator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "useCalculator", + "parameters" : [ + { + "label" : "calc", + "name" : "calc", + "type" : { + "swiftHeapObject" : { + "_0" : "Calculator" + } + } + }, + { + "label" : "x", + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_testGreeterToJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testGreeterToJSValue", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_testCalculatorToJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testCalculatorToJSValue", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_testSwiftClassAsJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testSwiftClassAsJSValue", + "parameters" : [ + { + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_setDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "abiName" : "bjs_getDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getDirection", + "parameters" : [ + + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "abiName" : "bjs_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "abiName" : "bjs_setTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_getTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTheme", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_setHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_getHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getHttpStatus", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_setTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTSDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + }, + { + "abiName" : "bjs_getTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTSDirection", + "parameters" : [ + + ], + "returnType" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + }, + { + "abiName" : "bjs_setTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTSTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_getTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTSTheme", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_roundtripNetworkingAPIMethod", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripNetworkingAPIMethod", + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + }, + { + "abiName" : "bjs_roundtripConfigurationLogLevel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripConfigurationLogLevel", + "parameters" : [ + { + "label" : "_", + "name" : "level", + "type" : { + "rawValueEnum" : { + "_0" : "Configuration.LogLevel", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Configuration.LogLevel", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_roundtripConfigurationPort", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripConfigurationPort", + "parameters" : [ + { + "label" : "_", + "name" : "port", + "type" : { + "rawValueEnum" : { + "_0" : "Configuration.Port", + "_1" : "Int" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Configuration.Port", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_processConfigurationLogLevel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processConfigurationLogLevel", + "parameters" : [ + { + "label" : "_", + "name" : "level", + "type" : { + "rawValueEnum" : { + "_0" : "Configuration.LogLevel", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Configuration.Port", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_roundtripInternalSupportedMethod", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripInternalSupportedMethod", + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + }, + { + "abiName" : "bjs_roundtripAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAPIResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultSuccess", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultFailure", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultFailure", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultInfo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultInfo", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultFlag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultFlag", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultRate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultRate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_makeAPIResultPrecise", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultPrecise", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_roundtripComplexResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripComplexResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultSuccess", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultError", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultError", + "parameters" : [ + { + "label" : "_", + "name" : "message", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "code", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultLocation", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultLocation", + "parameters" : [ + { + "label" : "_", + "name" : "lat", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "lng", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultStatus", + "parameters" : [ + { + "label" : "_", + "name" : "active", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "_", + "name" : "code", + "type" : { + "int" : { + + } + } + }, + { + "label" : "_", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultCoordinates", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultCoordinates", + "parameters" : [ + { + "label" : "_", + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "z", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultComprehensive", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultComprehensive", + "parameters" : [ + { + "label" : "_", + "name" : "flag1", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "_", + "name" : "flag2", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "_", + "name" : "count1", + "type" : { + "int" : { + + } + } + }, + { + "label" : "_", + "name" : "count2", + "type" : { + "int" : { + + } + } + }, + { + "label" : "_", + "name" : "value1", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "value2", + "type" : { + "double" : { + + } + } + }, + { + "label" : "_", + "name" : "text1", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "text2", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "text3", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeComplexResultInfo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeComplexResultInfo", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_makeUtilitiesResultSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeUtilitiesResultSuccess", + "parameters" : [ + { + "label" : "_", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + }, + { + "abiName" : "bjs_makeUtilitiesResultFailure", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeUtilitiesResultFailure", + "parameters" : [ + { + "label" : "_", + "name" : "error", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "code", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + }, + { + "abiName" : "bjs_makeUtilitiesResultStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeUtilitiesResultStatus", + "parameters" : [ + { + "label" : "_", + "name" : "active", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "_", + "name" : "code", + "type" : { + "int" : { + + } + } + }, + { + "label" : "_", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + }, + { + "abiName" : "bjs_makeAPINetworkingResultSuccess", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPINetworkingResultSuccess", + "parameters" : [ + { + "label" : "_", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "API.NetworkingResult" + } + } + }, + { + "abiName" : "bjs_makeAPINetworkingResultFailure", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPINetworkingResultFailure", + "parameters" : [ + { + "label" : "_", + "name" : "error", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "code", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "API.NetworkingResult" + } + } + }, + { + "abiName" : "bjs_roundtripUtilitiesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripUtilitiesResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + }, + { + "abiName" : "bjs_roundtripAPINetworkingResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAPINetworkingResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "API.NetworkingResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "API.NetworkingResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalString", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalInt", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalBool", + "parameters" : [ + { + "label" : "flag", + "name" : "flag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalFloat", + "parameters" : [ + { + "label" : "number", + "name" : "number", + "type" : { + "optional" : { + "_0" : { + "float" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "float" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalDouble", + "parameters" : [ + { + "label" : "precision", + "name" : "precision", + "type" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalMixSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalMixSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalSwiftSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalSwiftSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalWithSpaces", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalWithSpaces", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTypeAlias", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTypeAlias", + "parameters" : [ + { + "label" : "age", + "name" : "age", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalStatus", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTheme", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalHttpStatus", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTSDirection", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTSTheme", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalNetworkingAPIMethod", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalNetworkingAPIMethod", + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAPIResult", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "abiName" : "bjs_compareAPIResults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "compareAPIResults", + "parameters" : [ + { + "label" : "_", + "name" : "r1", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "label" : "_", + "name" : "r2", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_roundTripOptionalComplexResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalComplexResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalClass", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAPIOptionalResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAPIOptionalResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + }, + { + "abiName" : "bjs_createPropertyHolder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createPropertyHolder", + "parameters" : [ + { + "label" : "intValue", + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "label" : "floatValue", + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "label" : "doubleValue", + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "label" : "boolValue", + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "stringValue", + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "label" : "jsObject", + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "PropertyHolder" + } + } + }, + { + "abiName" : "bjs_testPropertyHolder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testPropertyHolder", + "parameters" : [ + { + "label" : "holder", + "name" : "holder", + "type" : { + "swiftHeapObject" : { + "_0" : "PropertyHolder" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_resetObserverCounts", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "resetObserverCounts", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getObserverStats", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getObserverStats", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testStringDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStringDefault", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Hello World" + } + }, + "label" : "message", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testIntDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testIntDefault", + "parameters" : [ + { + "defaultValue" : { + "int" : { + "_0" : 42 + } + }, + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_testBoolDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testBoolDefault", + "parameters" : [ + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "flag", + "name" : "flag", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_testOptionalDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testMultipleDefaults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testMultipleDefaults", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Default Title" + } + }, + "label" : "title", + "name" : "title", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "int" : { + "_0" : -10 + } + }, + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : false + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testSimpleEnumDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testSimpleEnumDefault", + "parameters" : [ + { + "defaultValue" : { + "enumCase" : { + "_0" : "Status", + "_1" : "success" + } + }, + "label" : "status", + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "abiName" : "bjs_testDirectionDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testDirectionDefault", + "parameters" : [ + { + "defaultValue" : { + "enumCase" : { + "_0" : "Direction", + "_1" : "north" + } + }, + "label" : "direction", + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "abiName" : "bjs_testRawStringEnumDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testRawStringEnumDefault", + "parameters" : [ + { + "defaultValue" : { + "enumCase" : { + "_0" : "Theme", + "_1" : "light" + } + }, + "label" : "theme", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_testComplexInit", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testComplexInit", + "parameters" : [ + { + "defaultValue" : { + "objectWithArguments" : { + "_0" : "Greeter", + "_1" : [ + { + "string" : { + "_0" : "DefaultGreeter" + } + } + ] + } + }, + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testEmptyInit", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testEmptyInit", + "parameters" : [ + { + "defaultValue" : { + "object" : { + "_0" : "StaticPropertyHolder" + } + }, + "label" : "_", + "name" : "object", + "type" : { + "swiftHeapObject" : { + "_0" : "StaticPropertyHolder" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "StaticPropertyHolder" + } + } + }, + { + "abiName" : "bjs_formatName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "formatName", + "parameters" : [ + { + "label" : "_", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "prefix", + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_makeAdder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAdder", + "parameters" : [ + { + "label" : "base", + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_testStructDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStructDefault", + "parameters" : [ + { + "defaultValue" : { + "structLiteral" : { + "_0" : "DataPoint", + "_1" : [ + { + "name" : "x", + "value" : { + "float" : { + "_0" : 1 + } + } + }, + { + "name" : "y", + "value" : { + "float" : { + "_0" : 2 + } + } + }, + { + "name" : "label", + "value" : { + "string" : { + "_0" : "default" + } + } + }, + { + "name" : "optCount", + "value" : { + "null" : { + + } + } + }, + { + "name" : "optFlag", + "value" : { + "null" : { + + } + } + } + ] + } + }, + "label" : "point", + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_roundTripDataPoint", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDataPoint", + "parameters" : [ + { + "label" : "_", + "name" : "data", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "abiName" : "bjs_roundTripContact", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripContact", + "parameters" : [ + { + "label" : "_", + "name" : "contact", + "type" : { + "swiftStruct" : { + "_0" : "Contact" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Contact" + } + } + }, + { + "abiName" : "bjs_roundTripConfig", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripConfig", + "parameters" : [ + { + "label" : "_", + "name" : "config", + "type" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Config" + } + } + }, + { + "abiName" : "bjs_roundTripSessionData", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSessionData", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "swiftStruct" : { + "_0" : "SessionData" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "SessionData" + } + } + }, + { + "abiName" : "bjs_roundTripValidationReport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripValidationReport", + "parameters" : [ + { + "label" : "_", + "name" : "report", + "type" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + }, + { + "abiName" : "bjs_updateValidationReport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateValidationReport", + "parameters" : [ + { + "label" : "_", + "name" : "newResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "label" : "_", + "name" : "report", + "type" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ValidationReport" + } + } + }, + { + "abiName" : "bjs_testContainerWithStruct", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testContainerWithStruct", + "parameters" : [ + { + "label" : "_", + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Container" + } + } + } + ], + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_DataProcessor_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + { + "label" : "by", + "name" : "amount", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_getValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getValue", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_setLabelElements", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setLabelElements", + "parameters" : [ + { + "label" : "_", + "name" : "labelPrefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "labelSuffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_getLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getLabel", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_isEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_processGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_createGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createGreeter", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_DataProcessor_processOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "greeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_createOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalGreeter", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_DataProcessor_handleAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_getAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAPIResult", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "name" : "DataProcessor", + "properties" : [ + { + "isReadonly" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "name" : "optionalTag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "optionalCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "optionalTheme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "httpStatus", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "apiResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "name" : "optionalHelper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ] + } + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_DataPoint_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "label" : "label", + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "label" : "optCount", + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "label" : "optFlag", + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "DataPoint", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "swiftCallName" : "DataPoint" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Contact", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "secondaryAddress", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + } + } + ], + "swiftCallName" : "Contact" + }, + { + "methods" : [ + + ], + "name" : "Config", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "theme", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "direction", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + ], + "swiftCallName" : "Config" + }, + { + "methods" : [ + + ], + "name" : "SessionData", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "owner", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "SessionData" + }, + { + "methods" : [ + + ], + "name" : "ValidationReport", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "status", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "outcome", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "swiftCallName" : "ValidationReport" + }, + { + "constructor" : { + "abiName" : "bjs_MathOperations_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "defaultValue" : { + "double" : { + "_0" : 0 + } + }, + "label" : "baseValue", + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathOperations_add", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "defaultValue" : { + "double" : { + "_0" : 10 + } + }, + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "MathOperations" + } + } + } + ], + "name" : "MathOperations", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "MathOperations" + }, + { + "methods" : [ + + ], + "name" : "ConfigStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "defaultConfig", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "maxRetries", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "timeout", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "computedSetting", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "ConfigStruct" + } + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + + ] + }, + { + "functions" : [ + { + "name" : "jsRoundTripVoid", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsRoundTripNumber", + "parameters" : [ + { + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "jsRoundTripBool", + "parameters" : [ + { + "name" : "v", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "name" : "jsRoundTripString", + "parameters" : [ + { + "name" : "v", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "jsThrowOrVoid", + "parameters" : [ + { + "name" : "shouldThrow", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsThrowOrNumber", + "parameters" : [ + { + "name" : "shouldThrow", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "jsThrowOrBool", + "parameters" : [ + { + "name" : "shouldThrow", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "name" : "jsThrowOrString", + "parameters" : [ + { + "name" : "shouldThrow", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "runAsyncWorks", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "JSPromise" + } + } + } + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ] + }, + "getters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "methods" : [ + { + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "changeName", + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "JsGreeter", + "setters" : [ + { + "functionName" : "name_set", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + } + ] + }, + { + "functions" : [ + + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "BridgeJSRuntimeTests" +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index e69de29bb..86a72ca05 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -0,0 +1,18 @@ +export function jsRoundTripVoid(): void +export function jsRoundTripNumber(v: number): number +export function jsRoundTripBool(v: boolean): boolean +export function jsRoundTripString(v: string): string +export function jsThrowOrVoid(shouldThrow: boolean): void +export function jsThrowOrNumber(shouldThrow: boolean): number +export function jsThrowOrBool(shouldThrow: boolean): boolean +export function jsThrowOrString(shouldThrow: boolean): string + +export class JsGreeter { + name: string; + readonly prefix: string; + constructor(name: string, prefix: string); + greet(): string; + changeName(name: string): void; +} + +export function runAsyncWorks(): Promise; \ No newline at end of file diff --git a/Utilities/bridge-js-generate.sh b/Utilities/bridge-js-generate.sh index b79befa2b..22182d24b 100755 --- a/Utilities/bridge-js-generate.sh +++ b/Utilities/bridge-js-generate.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash -env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package plugin --allow-writing-to-package-directory bridge-js -env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --package-path ./Benchmarks plugin --allow-writing-to-package-directory bridge-js -env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --package-path ./Examples/PlayBridgeJS plugin --allow-writing-to-package-directory bridge-js +set -euxo pipefail +swift build --package-path ./Plugins/BridgeJS --product BridgeJSTool + +./Plugins/BridgeJS/.build/debug/BridgeJSTool generate --project ./tsconfig.json --module-name BridgeJSRuntimeTests --target-dir ./Tests/BridgeJSRuntimeTests --output-dir ./Tests/BridgeJSRuntimeTests/Generated +./Plugins/BridgeJS/.build/debug/BridgeJSTool generate --project ./tsconfig.json --module-name BridgeJSGlobalTests --target-dir ./Tests/BridgeJSGlobalTests --output-dir ./Tests/BridgeJSGlobalTests/Generated +./Plugins/BridgeJS/.build/debug/BridgeJSTool generate --project ./tsconfig.json --module-name Benchmarks --target-dir ./Benchmarks/Sources --output-dir ./Benchmarks/Sources/Generated +./Plugins/BridgeJS/.build/debug/BridgeJSTool generate --project ./tsconfig.json --module-name PlayBridgeJS --target-dir ./Examples/PlayBridgeJS/Sources/PlayBridgeJS --output-dir ./Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated From 4f3b593d95b25aebb143faed5af1b57777fcb547 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 16:25:50 +0900 Subject: [PATCH 068/252] BridgeJS: Fix PackageToJS build --- .../Sources/Generated/BridgeJS.Macros.swift | 2 +- Benchmarks/Sources/Generated/BridgeJS.swift | 2 +- .../Generated/BridgeJS.Macros.swift | 2 +- .../PlayBridgeJS/Generated/BridgeJS.swift | 2 +- .../Sources/PlayBridgeJS/main.swift | 19 +++-- .../BridgeJSCore/ImportSwiftMacros.swift | 72 +++++++++++-------- .../Sources/BridgeJSTool/BridgeJSTool.swift | 3 +- .../Sources/BridgeJSUtilities/Utilities.swift | 8 +-- .../TS2Swift/JavaScript/src/processor.js | 16 ++--- .../BridgeJSToolTests/BridgeJSLinkTests.swift | 4 +- .../ImportTSTests/ArrayParameter.Macros.swift | 2 +- .../ImportTSTests/Async.Macros.swift | 2 +- .../ImportTSTests/Interface.Macros.swift | 2 +- .../InvalidPropertyNames.Macros.swift | 2 +- .../MultipleImportedTypes.Macros.swift | 2 +- .../PrimitiveParameters.Macros.swift | 2 +- .../PrimitiveReturn.Macros.swift | 2 +- .../StringParameter.Macros.swift | 2 +- .../ImportTSTests/StringReturn.Macros.swift | 2 +- .../TS2SkeletonLike.Macros.swift | 2 +- .../ImportTSTests/TypeAlias.Macros.swift | 2 +- .../TypeScriptClass.Macros.swift | 2 +- .../VoidParameterVoidReturn.Macros.swift | 2 +- Plugins/PackageToJS/Sources/PackageToJS.swift | 29 +++----- .../Sources/PackageToJSPlugin.swift | 30 +++----- .../Generated/BridgeJS.swift | 2 +- .../Generated/BridgeJS.Macros.swift | 2 +- .../Generated/BridgeJS.swift | 2 +- 28 files changed, 109 insertions(+), 112 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift index c96789495..bc2ceb32b 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func benchmarkHelperNoop() throws (JSException) -> Void diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index b80dbb56a..85d81f4a2 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -5,7 +5,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift index feb0a2ead..053db4472 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func createTS2Swift() throws (JSException) -> TS2Swift diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index 469f13de9..e1975b2d8 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -5,7 +5,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @_expose(wasm, "bjs_PlayBridgeJS_init") @_cdecl("bjs_PlayBridgeJS_init") diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index b82fc6f43..812c34260 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -17,11 +17,12 @@ import class Foundation.JSONDecoder } func _update(swiftSource: String, dtsSource: String) throws -> PlayBridgeJSOutput { - let exportSwift = ExportSwift(progress: .silent, moduleName: "Playground", exposeToGlobal: false) + let moduleName = "Playground" + let exportSwift = ExportSwift(progress: .silent, moduleName: moduleName, exposeToGlobal: false) let sourceFile = Parser.parse(source: swiftSource) try exportSwift.addSourceFile(sourceFile, "Playground.swift") let exportResult = try exportSwift.finalize() - var importTS = ImportTS(progress: .silent, moduleName: "Playground") + var importTS = ImportTS(progress: .silent, moduleName: moduleName) let ts2swift = try createTS2Swift() let skeletonJSONString = try ts2swift.convert(dtsSource) let decoder = JSONDecoder() @@ -32,16 +33,12 @@ import class Foundation.JSONDecoder importTS.addSkeleton(importSkeleton) let importSwiftGlue = try importTS.finalize() - let linker = BridgeJSLink( - exportedSkeletons: exportResult.map { [$0.outputSkeleton] } ?? [], - importedSkeletons: [ - ImportedModuleSkeleton( - moduleName: "Playground", - children: [importSkeleton] - ) - ], - sharedMemory: false + let skeleton = BridgeJSSkeleton( + moduleName: moduleName, + exported: exportResult.map { $0.outputSkeleton }, + imported: ImportedModuleSkeleton(children: [importSkeleton]) ) + let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false) let linked = try linker.link() return PlayBridgeJSOutput( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift index 90e3d7313..b4c5820df 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift @@ -155,7 +155,6 @@ public final class ImportSwiftMacros { } } - /// Extracts the jsName argument value from a @JSSetter attribute, if present. static func extractJSName(from attribute: AttributeSyntax) -> String? { guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { @@ -163,8 +162,8 @@ public final class ImportSwiftMacros { } for argument in arguments { if argument.label?.text == "jsName", - let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self), - let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) + let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self), + let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) { return segment.content.text } @@ -217,7 +216,8 @@ public final class ImportSwiftMacros { jsSetter: AttributeSyntax, enclosingTypeName: String? ) -> SetterValidationResult? { - guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") else { + guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") + else { return nil } @@ -270,7 +270,8 @@ public final class ImportSwiftMacros { return (propertyName: propertyName, functionBaseName: functionBaseName) } - let rawFunctionName = functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 + let rawFunctionName = + functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 ? String(functionName.dropFirst().dropLast()) : functionName @@ -367,7 +368,8 @@ public final class ImportSwiftMacros { private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { if AttributeChecker.hasJSFunctionAttribute(node.attributes), - let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) { + let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) + { importedFunctions.append(function) return .skipChildren } @@ -392,9 +394,13 @@ public final class ImportSwiftMacros { ) -> Bool { if AttributeChecker.hasJSFunctionAttribute(node.attributes) { if isStaticMember { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { importedFunctions.append($0) } + parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { + importedFunctions.append($0) + } } else { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { type.methods.append($0) } + parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { + type.methods.append($0) + } } return true } @@ -404,11 +410,13 @@ public final class ImportSwiftMacros { errors.append( DiagnosticError( node: node, - message: "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + message: + "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) } else if let jsSetter = AttributeChecker.firstJSSetterAttribute(node.attributes), - let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) { + let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) + { type.setters.append(setter) } return true @@ -440,7 +448,8 @@ public final class ImportSwiftMacros { errors.append( DiagnosticError( node: node, - message: "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + message: + "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) } else if let getter = parseGetterSkeleton(node, enclosingTypeName: typeName) { @@ -481,29 +490,32 @@ public final class ImportSwiftMacros { } } - // MARK: - Member Collection private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { for member in members { if let function = member.decl.as(FunctionDeclSyntax.self) { if AttributeChecker.hasJSFunctionAttribute(function.attributes), - let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) { + let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) + { importedFunctions.append(parsed) } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { errors.append( DiagnosticError( node: function, - message: "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + message: + "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) } } else if let variable = member.decl.as(VariableDeclSyntax.self), - AttributeChecker.hasJSGetterAttribute(variable.attributes) { + AttributeChecker.hasJSGetterAttribute(variable.attributes) + { errors.append( DiagnosticError( node: variable, - message: "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + message: + "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) } @@ -516,7 +528,10 @@ public final class ImportSwiftMacros { _ initializer: InitializerDeclSyntax, typeName: String ) -> ImportedConstructorSkeleton? { - guard validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction") != nil else { + guard + validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction") + != nil + else { return nil } return ImportedConstructorSkeleton( @@ -532,7 +547,8 @@ public final class ImportSwiftMacros { enclosingTypeName: String?, isStaticMember: Bool ) -> ImportedFunctionSkeleton? { - guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil else { + guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil + else { return nil } @@ -562,15 +578,15 @@ public final class ImportSwiftMacros { ) } - /// Extracts property info from a VariableDeclSyntax (binding, identifier, type) private func extractPropertyInfo( _ node: VariableDeclSyntax, errorMessage: String = "@JSGetter must declare a single stored property with an explicit type." ) -> (identifier: IdentifierPatternSyntax, type: TypeSyntax)? { guard let binding = node.bindings.first, - let identifier = binding.pattern.as(IdentifierPatternSyntax.self), - let typeAnnotation = binding.typeAnnotation else { + let identifier = binding.pattern.as(IdentifierPatternSyntax.self), + let typeAnnotation = binding.typeAnnotation + else { errors.append(DiagnosticError(node: node, message: errorMessage)) return nil } @@ -605,11 +621,13 @@ public final class ImportSwiftMacros { } let functionName = node.name.text - guard let (propertyName, functionBaseName) = PropertyNameResolver.resolve( - functionName: functionName, - jsName: validation.jsName, - normalizeIdentifier: normalizeIdentifier - ) else { + guard + let (propertyName, functionBaseName) = PropertyNameResolver.resolve( + functionName: functionName, + jsName: validation.jsName, + normalizeIdentifier: normalizeIdentifier + ) + else { return nil } @@ -621,7 +639,6 @@ public final class ImportSwiftMacros { ) } - // MARK: - Type and Parameter Parsing private func parseParameters( @@ -648,7 +665,6 @@ public final class ImportSwiftMacros { } } - private func parseType(_ type: TypeSyntax, enclosingTypeName: String?) -> BridgeType { guard let identifier = type.as(IdentifierTypeSyntax.self) else { errors.append( diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 1f3aadf1c..eb6927852 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -218,7 +218,8 @@ private func hasBridgeJSSkipComment(_ content: String) -> Bool { } private func combineGeneratedSwift(_ pieces: [String]) -> String { - let trimmedPieces = pieces + let trimmedPieces = + pieces .map { $0.trimmingCharacters(in: .newlines) } .filter { !$0.isEmpty } guard !trimmedPieces.isEmpty else { return "" } diff --git a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift index 1117575ab..2791aa5be 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift @@ -1,5 +1,3 @@ -import Foundation - extension String { public var capitalizedFirstLetter: String { guard !isEmpty else { return self } @@ -8,6 +6,7 @@ extension String { } public enum BridgeJSGeneratedFile { + /// The magic comment to skip processing by BridgeJS. public static let skipLine = "// bridge-js: skip" public static func hasSkipComment(_ content: String) -> Bool { @@ -15,6 +14,7 @@ public enum BridgeJSGeneratedFile { } public static var swiftPreamble: String { + // The generated Swift file itself should not be processed by BridgeJS again. """ \(skipLine) // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, @@ -23,7 +23,7 @@ public enum BridgeJSGeneratedFile { // To update this file, just rebuild your project or run // `swift package bridge-js`. - @_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit - """.trimmingCharacters(in: .newlines) + @_spi(BridgeJS) import JavaScriptKit + """ } } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index a7855797b..7a21d3619 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -78,7 +78,7 @@ export class TypeProcessor { "// To update this file, just rebuild your project or run", "// `swift package bridge-js`.", "", - "import JavaScriptKit", + "@_spi(Experimental) import JavaScriptKit", "" ); @@ -142,7 +142,7 @@ export class TypeProcessor { const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); const effects = this.renderEffects({ isAsync: false }); const swiftName = this.renderIdentifier(name); - + this.swiftLines.push(`@JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); this.swiftLines.push(""); } @@ -276,7 +276,7 @@ export class TypeProcessor { // Collect all declarations with their positions to preserve order /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */ const allDecls = []; - + for (const symbol of members) { for (const decl of symbol.getDeclarations() ?? []) { const sourceFile = decl.getSourceFile(); @@ -284,10 +284,10 @@ export class TypeProcessor { allDecls.push({ decl, symbol, position: pos }); } } - + // Sort by position to preserve declaration order allDecls.sort((a, b) => a.position - b.position); - + // Process declarations in order for (const { decl, symbol } of allDecls) { if (symbol.flags & ts.SymbolFlags.Property) { @@ -410,10 +410,10 @@ export class TypeProcessor { const type = this.renderBridgeType(property.type, node); const name = this.renderIdentifier(property.name); - + // Always render getter this.swiftLines.push(` @JSGetter var ${name}: ${type}`); - + // Render setter if not readonly if (!property.isReadonly) { const capitalizedName = property.name.charAt(0).toUpperCase() + property.name.slice(1); @@ -441,7 +441,7 @@ export class TypeProcessor { const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); const effects = this.renderEffects({ isAsync: false }); const swiftName = this.renderIdentifier(name); - + this.swiftLines.push(` @JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 89f346d2a..0485adfca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -55,7 +55,7 @@ import Testing let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) let bridgeJSLink: BridgeJSLink = BridgeJSLink( skeletons: [ - BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton), + BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton) ], sharedMemory: false ) @@ -116,7 +116,7 @@ import Testing let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) let bridgeJSLink: BridgeJSLink = BridgeJSLink( skeletons: [ - BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton), + BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton) ], sharedMemory: false ) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift index e5b2742ae..cf1118df0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift index 1f16ba9f1..dd0377377 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift index 435d5011c..1017ded74 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func returnAnimatable() throws (JSException) -> Animatable diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index 8bd4798df..ee6360203 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift index 0d5635c35..64317b792 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift index 6ede7fabc..eea42f30d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift index 198c44c91..15867131d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func checkNumber() throws (JSException) -> Double diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift index 46643d1ee..38fe0dd2b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func checkString(_ a: String) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift index 0d2b146cb..60aae03c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func checkString() throws (JSException) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift index 7149a24a3..39998492a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift index 5724d9d47..62b2b4663 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift index 9f33c11e1..4026e0078 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSClass struct Greeter: _JSBridgedClass { @JSGetter var name: String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift index 1fe58af34..b3a7fc6f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func check() throws (JSException) -> Void diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index ea99f0b09..268f3f200 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -394,10 +394,8 @@ struct PackagingPlanner { let selfPackageDir: BuildPath /// The path of this file itself, used to capture changes of planner code let selfPath: BuildPath - /// The exported API skeletons source files - let exportedSkeletons: [BuildPath] - /// The imported API skeletons source files - let importedSkeletons: [BuildPath] + /// The BridgeJS API skeletons source files + let skeletons: [BuildPath] /// The directory for the final output let outputDir: BuildPath /// The directory for intermediate files @@ -418,8 +416,7 @@ struct PackagingPlanner { packageId: String, intermediatesDir: BuildPath, selfPackageDir: BuildPath, - exportedSkeletons: [BuildPath], - importedSkeletons: [BuildPath], + skeletons: [BuildPath], outputDir: BuildPath, wasmProductArtifact: BuildPath, wasmFilename: String, @@ -431,8 +428,7 @@ struct PackagingPlanner { self.options = options self.packageId = packageId self.selfPackageDir = selfPackageDir - self.exportedSkeletons = exportedSkeletons - self.importedSkeletons = importedSkeletons + self.skeletons = skeletons self.outputDir = outputDir self.intermediatesDir = intermediatesDir self.wasmFilename = wasmFilename @@ -592,7 +588,7 @@ struct PackagingPlanner { ) packageInputs.append(packageJsonTask) - if exportedSkeletons.count > 0 || importedSkeletons.count > 0 { + if skeletons.count > 0 { if ProcessInfo.processInfo.environment["JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS"] == nil { fatalError( "BridgeJS is still an experimental feature. Set the environment variable JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 to enable." @@ -601,18 +597,13 @@ struct PackagingPlanner { let bridgeJs = outputDir.appending(path: "bridge-js.js") let bridgeDts = outputDir.appending(path: "bridge-js.d.ts") packageInputs.append( - make.addTask(inputFiles: exportedSkeletons + importedSkeletons, output: bridgeJs) { _, scope in + make.addTask(inputFiles: skeletons, output: bridgeJs) { _, scope in var link = BridgeJSLink( - exportedSkeletons: [], - importedSkeletons: [], sharedMemory: Self.isSharedMemoryEnabled(triple: triple) ) - // Decode unified skeleton format - // Unified skeleton files can contain both exported and imported parts - // Deduplicate file paths since we may have the same file in both lists - let allSkeletonPaths = Set(exportedSkeletons + importedSkeletons) - for skeletonPath in allSkeletonPaths { + // Decode skeleton format + for skeletonPath in skeletons { let data = try Data(contentsOf: URL(fileURLWithPath: scope.resolve(path: skeletonPath).path)) try link.addSkeletonFile(data: data) } @@ -734,8 +725,8 @@ struct PackagingPlanner { "USE_SHARED_MEMORY": Self.isSharedMemoryEnabled(triple: triple), "IS_WASI": triple.hasPrefix("wasm32-unknown-wasi"), "USE_WASI_CDN": options.useCDN, - "HAS_BRIDGE": exportedSkeletons.count > 0 || importedSkeletons.count > 0, - "HAS_IMPORTS": importedSkeletons.count > 0, + "HAS_BRIDGE": skeletons.count > 0, + "HAS_IMPORTS": skeletons.count > 0, "TARGET_DEFAULT_PLATFORM_NODE": options.defaultPlatform == .node, "TARGET_DEFAULT_PLATFORM_BROWSER": options.defaultPlatform == .browser, ] diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 32271f243..3cbd29014 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -199,7 +199,7 @@ struct PackageToJSPlugin: CommandPlugin { exit(1) } let skeletonCollector = SkeletonCollector(context: context) - let (exportedSkeletons, importedSkeletons) = skeletonCollector.collectFromProduct(name: productName) + let skeletons = skeletonCollector.collectFromProduct(name: productName) let productArtifact = try build.findWasmArtifact(for: productName) let outputDir = if let outputPath = buildOptions.packageOptions.outputPath { @@ -215,8 +215,7 @@ struct PackageToJSPlugin: CommandPlugin { options: buildOptions.packageOptions, context: context, selfPackage: selfPackage, - exportedSkeletons: exportedSkeletons, - importedSkeletons: importedSkeletons, + skeletons: skeletons, outputDir: outputDir, wasmProductArtifact: productArtifact, wasmFilename: productArtifact.lastPathComponent @@ -263,7 +262,7 @@ struct PackageToJSPlugin: CommandPlugin { } let skeletonCollector = SkeletonCollector(context: context) - let (exportedSkeletons, importedSkeletons) = skeletonCollector.collectFromTests() + let skeletons = skeletonCollector.collectFromTests() // NOTE: Find the product artifact from the default build directory // because PackageManager.BuildResult doesn't include the @@ -300,8 +299,7 @@ struct PackageToJSPlugin: CommandPlugin { options: testOptions.packageOptions, context: context, selfPackage: selfPackage, - exportedSkeletons: exportedSkeletons, - importedSkeletons: importedSkeletons, + skeletons: skeletons, outputDir: outputDir, wasmProductArtifact: productArtifact, // If the product artifact doesn't have a .wasm extension, add it @@ -714,17 +712,15 @@ class SkeletonCollector { self.context = context } - func collectFromProduct(name: String) -> (exportedSkeletons: [URL], importedSkeletons: [URL]) { + func collectFromProduct(name: String) -> [URL] { guard let product = context.package.products.first(where: { $0.name == name }) else { - return ([], []) + return [] } visit(product: product, package: context.package) - // Unified skeleton files contain both exported and imported parts - // Return the same list for both since BridgeJSLink.addSkeletonFile handles the unified format - return (skeletons, skeletons) + return skeletons } - func collectFromTests() -> (exportedSkeletons: [URL], importedSkeletons: [URL]) { + func collectFromTests() -> [URL] { let tests = context.package.targets.filter { guard let target = $0 as? SwiftSourceModuleTarget else { return false } return target.kind == .test @@ -732,9 +728,7 @@ class SkeletonCollector { for test in tests { visit(target: test, package: context.package) } - // Unified skeleton files contain both exported and imported parts - // Return the same list for both since BridgeJSLink.addSkeletonFile handles the unified format - return (skeletons, skeletons) + return skeletons } private func visit(product: Product, package: Package) { @@ -794,8 +788,7 @@ extension PackagingPlanner { options: PackageToJS.PackageOptions, context: PluginContext, selfPackage: Package, - exportedSkeletons: [URL], - importedSkeletons: [URL], + skeletons: [URL], outputDir: URL, wasmProductArtifact: URL, wasmFilename: String @@ -810,8 +803,7 @@ extension PackagingPlanner { absolute: context.pluginWorkDirectoryURL.appending(path: outputBaseName + ".tmp").path ), selfPackageDir: BuildPath(absolute: selfPackage.directoryURL.path), - exportedSkeletons: exportedSkeletons.map { BuildPath(absolute: $0.path) }, - importedSkeletons: importedSkeletons.map { BuildPath(absolute: $0.path) }, + skeletons: skeletons.map { BuildPath(absolute: $0.path) }, outputDir: BuildPath(absolute: outputDir.path), wasmProductArtifact: BuildPath(absolute: wasmProductArtifact.path), wasmFilename: wasmFilename, diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift index 3a41f337e..aaa5f1b8a 100644 --- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift @@ -5,7 +5,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit extension GlobalNetworking.API.CallMethod: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 1f06bd2a9..f65f5d23c 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit @JSFunction func jsRoundTripVoid() throws (JSException) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index e4b4bf08b..1b39e77b8 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -5,7 +5,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(BridgeJS) @_spi(Experimental) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") From 233f1dc944a923bc38aaed13a79a00c9d42af894 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 17:08:17 +0900 Subject: [PATCH 069/252] BridgeJS: Fix PlayBridgeJS build --- .../PlayBridgeJS/Sources/JavaScript/app.js | 6 ++-- .../PlayBridgeJS/Sources/JavaScript/editor.js | 22 ++++++------ .../Sources/JavaScript/processor.js | 2 +- .../PlayBridgeJS/Generated/BridgeJS.swift | 16 ++++----- .../Generated/JavaScript/BridgeJS.json | 8 ++--- .../Sources/PlayBridgeJS/main.swift | 36 +++++++++---------- Examples/PlayBridgeJS/index.html | 12 +++---- .../TS2Swift/JavaScript/src/processor.js | 9 ++--- .../BridgeJSToolTests/ImportTSTests.swift | 8 +---- 9 files changed, 53 insertions(+), 66 deletions(-) diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/app.js b/Examples/PlayBridgeJS/Sources/JavaScript/app.js index b82810238..7da78e038 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/app.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/app.js @@ -250,9 +250,9 @@ export class BridgeJSPlayground { // Process the TypeScript definitions to generate skeleton const processor = new TypeProcessor(tsProgram.getTypeChecker(), diagnosticEngine); - const skeleton = processor.processTypeDeclarations(tsProgram, virtualFilePath); + const { content } = processor.processTypeDeclarations(tsProgram, virtualFilePath); - return JSON.stringify(skeleton); + return content; } } } @@ -340,4 +340,4 @@ export class BridgeJSPlayground { this.progressBar.classList.add('hidden'); } } -} \ No newline at end of file +} diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js index dabe7dc5b..dc3d362eb 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js @@ -38,20 +38,20 @@ export class EditorSystem { modelUri: 'Playground.d.ts' }, { - key: 'import-glue', - id: 'importGlueOutput', + key: 'swift-import-macros', + id: 'swiftImportMacrosOutput', language: 'swift', - placeholder: '// Import Swift Glue will appear here...', + placeholder: '// Import Swift Macros will appear here...', readOnly: true, - modelUri: 'ImportTS.swift' + modelUri: 'BridgeJS.Macros.swift' }, { - key: 'export-glue', - id: 'exportGlueOutput', + key: 'swift-glue', + id: 'swiftGlueOutput', language: 'swift', - placeholder: '// Export Swift Glue will appear here...', + placeholder: '// Swift Glue will appear here...', readOnly: true, - modelUri: 'ExportTS.swift' + modelUri: 'BridgeJS.swift' }, { key: 'js-generated', @@ -206,8 +206,8 @@ export class EditorSystem { updateOutputs(result) { const outputMap = { - 'import-glue': () => result.importSwiftGlue(), - 'export-glue': () => result.exportSwiftGlue(), + 'swift-glue': () => result.swiftGlue(), + 'swift-import-macros': () => result.importSwiftMacroDecls(), 'js-generated': () => result.outputJs(), 'dts-generated': () => result.outputDts() }; @@ -238,4 +238,4 @@ export class EditorSystem { getActiveTabs() { return this.activeTabs; } -} \ No newline at end of file +} diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/processor.js b/Examples/PlayBridgeJS/Sources/JavaScript/processor.js index 61c833925..646254cd4 120000 --- a/Examples/PlayBridgeJS/Sources/JavaScript/processor.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/processor.js @@ -1 +1 @@ -../../../../Plugins/BridgeJS/Sources/TS2Skeleton/JavaScript/src/processor.js \ No newline at end of file +../../../../Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js \ No newline at end of file diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index e1975b2d8..f97c181d9 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -90,22 +90,22 @@ public func _bjs_PlayBridgeJSOutput_outputDts(_ _self: UnsafeMutableRawPointer) #endif } -@_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftGlue") -@_cdecl("bjs_PlayBridgeJSOutput_importSwiftGlue") -public func _bjs_PlayBridgeJSOutput_importSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftMacroDecls") +@_cdecl("bjs_PlayBridgeJSOutput_importSwiftMacroDecls") +public func _bjs_PlayBridgeJSOutput_importSwiftMacroDecls(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftGlue() + let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftMacroDecls() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_PlayBridgeJSOutput_exportSwiftGlue") -@_cdecl("bjs_PlayBridgeJSOutput_exportSwiftGlue") -public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_PlayBridgeJSOutput_swiftGlue") +@_cdecl("bjs_PlayBridgeJSOutput_swiftGlue") +public func _bjs_PlayBridgeJSOutput_swiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).exportSwiftGlue() + let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).swiftGlue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json index c1cf453d3..1cf8e64c6 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json @@ -92,13 +92,13 @@ } }, { - "abiName" : "bjs_PlayBridgeJSOutput_importSwiftGlue", + "abiName" : "bjs_PlayBridgeJSOutput_importSwiftMacroDecls", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "importSwiftGlue", + "name" : "importSwiftMacroDecls", "parameters" : [ ], @@ -109,13 +109,13 @@ } }, { - "abiName" : "bjs_PlayBridgeJSOutput_exportSwiftGlue", + "abiName" : "bjs_PlayBridgeJSOutput_swiftGlue", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "exportSwiftGlue", + "name" : "swiftGlue", "parameters" : [ ], diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index 812c34260..e7f70311d 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -22,21 +22,17 @@ import class Foundation.JSONDecoder let sourceFile = Parser.parse(source: swiftSource) try exportSwift.addSourceFile(sourceFile, "Playground.swift") let exportResult = try exportSwift.finalize() - var importTS = ImportTS(progress: .silent, moduleName: moduleName) let ts2swift = try createTS2Swift() - let skeletonJSONString = try ts2swift.convert(dtsSource) - let decoder = JSONDecoder() - let importSkeleton = try decoder.decode( - ImportedFileSkeleton.self, - from: skeletonJSONString.data(using: .utf8)! - ) - importTS.addSkeleton(importSkeleton) - let importSwiftGlue = try importTS.finalize() - + let importSwiftMacroDecls = try ts2swift.convert(dtsSource) + let importSwift = ImportSwiftMacros(progress: .silent, moduleName: moduleName) + let importSourceFile = Parser.parse(source: importSwiftMacroDecls) + importSwift.addSourceFile(importSourceFile, "Playground.Macros.swift") + importSwift.addSourceFile(sourceFile, "Playground.swift") + let importResult = try importSwift.finalize() let skeleton = BridgeJSSkeleton( moduleName: moduleName, exported: exportResult.map { $0.outputSkeleton }, - imported: ImportedModuleSkeleton(children: [importSkeleton]) + imported: importResult.outputSkeleton ) let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false) let linked = try linker.link() @@ -44,8 +40,8 @@ import class Foundation.JSONDecoder return PlayBridgeJSOutput( outputJs: linked.outputJs, outputDts: linked.outputDts, - importSwiftGlue: importSwiftGlue ?? "", - exportSwiftGlue: exportResult?.outputSwift ?? "" + importSwiftMacroDecls: importSwiftMacroDecls, + swiftGlue: (importResult.outputSwift ?? "") + "\n\n" + (exportResult?.outputSwift ?? "") ) } } @@ -53,18 +49,18 @@ import class Foundation.JSONDecoder @JS class PlayBridgeJSOutput { let _outputJs: String let _outputDts: String - let _importSwiftGlue: String - let _exportSwiftGlue: String + let _importSwiftMacroDecls: String + let _swiftGlue: String - init(outputJs: String, outputDts: String, importSwiftGlue: String, exportSwiftGlue: String) { + init(outputJs: String, outputDts: String, importSwiftMacroDecls: String, swiftGlue: String) { self._outputJs = outputJs self._outputDts = outputDts - self._importSwiftGlue = importSwiftGlue - self._exportSwiftGlue = exportSwiftGlue + self._importSwiftMacroDecls = importSwiftMacroDecls + self._swiftGlue = swiftGlue } @JS func outputJs() -> String { self._outputJs } @JS func outputDts() -> String { self._outputDts } - @JS func importSwiftGlue() -> String { self._importSwiftGlue } - @JS func exportSwiftGlue() -> String { self._exportSwiftGlue } + @JS func importSwiftMacroDecls() -> String { self._importSwiftMacroDecls } + @JS func swiftGlue() -> String { self._swiftGlue } } diff --git a/Examples/PlayBridgeJS/index.html b/Examples/PlayBridgeJS/index.html index 799c36a19..1dd07fe2a 100644 --- a/Examples/PlayBridgeJS/index.html +++ b/Examples/PlayBridgeJS/index.html @@ -84,15 +84,15 @@

        Output

        + - - +
        -
        -
        +
        +
        -
        -
        +
        +
        diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 7a21d3619..830c0d0a8 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -5,7 +5,6 @@ // @ts-check import ts from 'typescript'; -import path from 'path'; /** @typedef {import('./index.d.ts').Parameter} Parameter */ /** @typedef {import('./index.d.ts').BridgeType} BridgeType */ @@ -64,11 +63,9 @@ export class TypeProcessor { * @returns {{ content: string, hasAny: boolean }} Rendered Swift code */ processTypeDeclarations(program, inputFilePath) { - const normalizedInput = path.resolve(inputFilePath); - const sourceFiles = program.getSourceFiles().filter(sf => { - if (!sf.isDeclarationFile) return true; - return path.resolve(sf.fileName) === normalizedInput; - }); + const sourceFiles = program.getSourceFiles().filter( + sf => !sf.isDeclarationFile || sf.fileName === inputFilePath + ); // Add prelude this.swiftLines.push( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift index f56fbfb6d..0a3101f11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift @@ -22,7 +22,6 @@ import SwiftParser let nodePath = try #require(which("node")) let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json") - // Use the new workflow: invokeTS2Swift -> ImportSwiftMacros -> ImportTS let swiftSource = try invokeTS2Swift( dtsFile: url.path, tsconfigPath: tsconfigPath.path, @@ -42,12 +41,7 @@ import SwiftParser importSwift.addSourceFile(sourceFile, "\(name).Macros.swift") let importResult = try importSwift.finalize() - var api = ImportTS(progress: .silent, moduleName: "Check") - for child in importResult.outputSkeleton.children { - api.addSkeleton(child) - } - - let outputSwift = try #require(try api.finalize()) + let outputSwift = try #require(importResult.outputSwift) try assertSnapshot( name: name, filePath: #filePath, From 61290eb0abc93daf877bd8d4e4e4dd9f84d859b5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 17:51:30 +0900 Subject: [PATCH 070/252] BridgeJS: Fix PackagingPlannerTests build --- Plugins/PackageToJS/Tests/PackagingPlannerTests.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift index 03fc4c9cc..3e0d67a3e 100644 --- a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift +++ b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift @@ -65,8 +65,7 @@ import Testing packageId: "test", intermediatesDir: BuildPath(prefix: "INTERMEDIATES"), selfPackageDir: BuildPath(prefix: "SELF_PACKAGE"), - exportedSkeletons: [], - importedSkeletons: [], + skeletons: [], outputDir: BuildPath(prefix: "OUTPUT"), wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"), wasmFilename: "main.wasm", @@ -96,8 +95,7 @@ import Testing packageId: "test", intermediatesDir: BuildPath(prefix: "INTERMEDIATES"), selfPackageDir: BuildPath(prefix: "SELF_PACKAGE"), - exportedSkeletons: [], - importedSkeletons: [], + skeletons: [], outputDir: BuildPath(prefix: "OUTPUT"), wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"), wasmFilename: "main.wasm", From 702b9668de51069bf946356615f22af4032cff5f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 17 Jan 2026 20:29:48 +0900 Subject: [PATCH 071/252] PackageToJS: Use toolset file to set linker flags in tests -Xlinker options are passed to host linker as well (for linking macro plugins), which causes issues. Use a toolset file to set the options only for the target being built. --- Plugins/PackageToJS/Package.swift | 2 +- Plugins/PackageToJS/Tests/ExampleTests.swift | 7 +++---- Plugins/PackageToJS/Tests/Inputs/example-toolset.json | 6 ++++++ 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 Plugins/PackageToJS/Tests/Inputs/example-toolset.json diff --git a/Plugins/PackageToJS/Package.swift b/Plugins/PackageToJS/Package.swift index 57ccf3cf9..fc3faa81c 100644 --- a/Plugins/PackageToJS/Package.swift +++ b/Plugins/PackageToJS/Package.swift @@ -10,7 +10,7 @@ let package = Package( .testTarget( name: "PackageToJSTests", dependencies: ["PackageToJS"], - exclude: ["__Snapshots__"] + exclude: ["__Snapshots__", "Inputs"] ), ] ) diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift index 6e2b4e1c2..01c02c193 100644 --- a/Plugins/PackageToJS/Tests/ExampleTests.swift +++ b/Plugins/PackageToJS/Tests/ExampleTests.swift @@ -236,10 +236,9 @@ extension Trait where Self == ConditionTrait { /// FIXME: swift-testing uses too much stack space, so we need to increase the stack size for tests using swift-testing. static var stackSizeLinkerFlags: [String] { [ - "-Xlinker", "--stack-first", - "-Xlinker", "-z", - "-Xlinker", "stack-size=524288", - "-Xlinker", "--global-base=524288", + "--toolset", + URL(fileURLWithPath: #filePath).deletingLastPathComponent().appending(path: "Inputs/example-toolset.json") + .path, ] } diff --git a/Plugins/PackageToJS/Tests/Inputs/example-toolset.json b/Plugins/PackageToJS/Tests/Inputs/example-toolset.json new file mode 100644 index 000000000..307777db3 --- /dev/null +++ b/Plugins/PackageToJS/Tests/Inputs/example-toolset.json @@ -0,0 +1,6 @@ +{ + "schemaVersion" : "1.0", + "linker": { + "extraCLIOptions": ["--stack-first", "-z", "stack-size=524288", "--global-base=524288"] + } +} From c97a618451469cbd1cfad31bbfcb25f615c1a0a2 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 20 Jan 2026 22:26:28 +0700 Subject: [PATCH 072/252] chore: Update main README.md to highlight BridgeJS and link more articles from Documentation --- README.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c18cc1ccf..6a0acaa27 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # JavaScriptKit [![Run unit tests](https://github.com/swiftwasm/JavaScriptKit/actions/workflows/test.yml/badge.svg)](https://github.com/swiftwasm/JavaScriptKit/actions/workflows/test.yml) -[![](https://img.shields.io/badge/docc-read_documentation-blue)](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation) +[![Documentation](https://img.shields.io/badge/docc-read_documentation-blue)](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation) Swift framework to interact with JavaScript through WebAssembly. @@ -40,7 +40,81 @@ button.onclick = .object(JSClosure { _ in _ = document.body.appendChild(button) ``` -Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Examples) for more detailed usage. +**Learn more:** [JavaScript Interop Cheat Sheet](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/javascript-interop-cheat-sheet) + +## BridgeJS Plugin + +> **Note:** BridgeJS is experimental. APIs may change in future releases. + +BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. It enables: + +- **Exporting Swift APIs to JavaScript**: Make your Swift code callable from JavaScript +- **Importing TypeScript APIs into Swift**: Use JavaScript APIs with type safety in Swift + +For architecture details, see the [BridgeJS Plugin README](Plugins/BridgeJS/README.md). + +### Exporting Swift to JavaScript + +Mark Swift code with `@JS` to make it callable from JavaScript: + +```swift +import JavaScriptKit + +@JS class Greeter { + @JS var name: String + + @JS init(name: String) { + self.name = name + } + + @JS func greet() -> String { + return "Hello, \(name)!" + } +} +``` + +**JavaScript usage:** +```javascript +const greeter = new exports.Greeter("World"); +console.log(greeter.greet()); // "Hello, World!" +``` + +**Learn more:** [Exporting Swift to JavaScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-to-javascript) + +### Importing TypeScript into Swift + +Define TypeScript interfaces and BridgeJS generates type-safe Swift bindings: + +```typescript +// bridge-js.d.ts +interface Document { + title: string; + getElementById(id: string): HTMLElement; + createElement(tagName: string): HTMLElement; +} + +export function getDocument(): Document; +``` + +**Swift usage:** +```swift +@JS func run() throws(JSException) { + let document = try getDocument() + try document.setTitle("My Swift App") + let button = try document.createElement("button") + try button.setInnerText("Click Me") +} +``` + +**Learn more:** [Importing TypeScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-typescript-into-swift) + +### Try It Online + +Use the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/) to preview what interfaces will be exposed on the Swift/TypeScript sides. + +## Examples + +Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Examples) for more detailed usage patterns. ## Contributing From 58f2f1b4c93b29d748e0f6e043125cc5ebba51ef Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 21 Jan 2026 16:40:00 +0900 Subject: [PATCH 073/252] - Updated `@JSClass` to synthesize `_JSBridgedClass` conformance via an attached extension (`Sources/JavaScriptKit/Macros.swift:176`, `Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift:56`). - Removed `: _JSBridgedClass` from TS2Swift output so generated wrappers are just `@JSClass struct Name { ... }` (`Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js:216`). - Updated BridgeJS snapshots + generated fixtures to match (`Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/*.Macros.swift`, `Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift:25`, `Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift:11`). - `swift test --package-path ./Plugins/BridgeJS` now passes (after installing JS deps with `npm ci`). --- .../Generated/BridgeJS.Macros.swift | 2 +- .../Sources/BridgeJSMacros/JSClassMacro.swift | 18 ++++ .../TS2Swift/JavaScript/src/processor.js | 4 +- .../JSClassMacroTests.swift | 85 ++++++++++++++++--- .../ImportTSTests/Interface.Macros.swift | 2 +- .../InvalidPropertyNames.Macros.swift | 4 +- .../MultipleImportedTypes.Macros.swift | 6 +- .../TS2SkeletonLike.Macros.swift | 4 +- .../TypeScriptClass.Macros.swift | 2 +- Sources/JavaScriptKit/JSBridgedType.swift | 2 +- Sources/JavaScriptKit/Macros.swift | 3 +- .../Generated/BridgeJS.Macros.swift | 2 +- 12 files changed, 107 insertions(+), 27 deletions(-) diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift index 053db4472..221302716 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -8,6 +8,6 @@ @JSFunction func createTS2Swift() throws (JSException) -> TS2Swift -@JSClass struct TS2Swift: _JSBridgedClass { +@JSClass struct TS2Swift { @JSFunction func convert(_ ts: String) throws (JSException) -> String } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift index fc7af6cda..060d2269b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -9,6 +9,7 @@ extension JSClassMacro: MemberMacro { public static func expansion( of node: AttributeSyntax, providingMembersOf declaration: some DeclGroupSyntax, + conformingTo protocols: [TypeSyntax], in context: some MacroExpansionContext ) throws -> [DeclSyntax] { var members: [DeclSyntax] = [] @@ -49,3 +50,20 @@ extension JSClassMacro: MemberMacro { return members } } + +extension JSClassMacro: ExtensionMacro { + public static func expansion( + of node: AttributeSyntax, + attachedTo declaration: some DeclGroupSyntax, + providingExtensionsOf type: some TypeSyntaxProtocol, + conformingTo protocols: [TypeSyntax], + in context: some MacroExpansionContext + ) throws -> [ExtensionDeclSyntax] { + guard !protocols.isEmpty else { return [] } + + let conformanceList = protocols.map { $0.trimmed.description }.joined(separator: ", ") + return [ + try ExtensionDeclSyntax("extension \(type.trimmed): \(raw: conformanceList) {}") + ] + } +} diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 830c0d0a8..47a4a1ac1 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -213,7 +213,7 @@ export class TypeProcessor { if (!node.name) return; const className = this.renderIdentifier(node.name.text); - this.swiftLines.push(`@JSClass struct ${className}: _JSBridgedClass {`); + this.swiftLines.push(`@JSClass struct ${className} {`); // Process members in declaration order for (const member of node.members) { @@ -268,7 +268,7 @@ export class TypeProcessor { */ visitStructuredType(name, members) { const typeName = this.renderIdentifier(name); - this.swiftLines.push(`@JSClass struct ${typeName}: _JSBridgedClass {`); + this.swiftLines.push(`@JSClass struct ${typeName} {`); // Collect all declarations with their positions to preserve order /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */ diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift index 5997d3052..95e3893ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -1,5 +1,6 @@ import SwiftDiagnostics import SwiftSyntax +import SwiftSyntaxMacroExpansion import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import Testing @@ -7,6 +8,9 @@ import BridgeJSMacros @Suite struct JSClassMacroTests { private let indentationWidth: Trivia = .spaces(4) + private let macroSpecs: [String: MacroSpec] = [ + "JSClass": MacroSpec(type: JSClassMacro.self, conformances: ["_JSBridgedClass"]) + ] @Test func emptyStruct() { assertMacroExpansion( @@ -23,8 +27,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -45,8 +52,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -69,8 +79,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -95,8 +108,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -119,8 +135,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -140,8 +159,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -161,8 +183,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyEnum: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -182,8 +207,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyActor: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -206,8 +234,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -232,8 +263,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -258,8 +292,11 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } @@ -281,8 +318,32 @@ import BridgeJSMacros self.jsObject = jsObject } } + + extension MyClass: _JSBridgedClass { + } + """, + macroSpecs: macroSpecs, + indentationWidth: indentationWidth + ) + } + + @Test func structAlreadyConforms() { + assertMacroExpansion( + """ + @JSClass + struct MyClass: _JSBridgedClass { + } + """, + expandedSource: """ + struct MyClass: _JSBridgedClass { + let jsObject: JSObject + + init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } """, - macros: ["JSClass": JSClassMacro.self], + macroSpecs: macroSpecs, indentationWidth: indentationWidth ) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift index 1017ded74..5d13234ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift @@ -8,7 +8,7 @@ @JSFunction func returnAnimatable() throws (JSException) -> Animatable -@JSClass struct Animatable: _JSBridgedClass { +@JSClass struct Animatable { @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index ee6360203..6fa9b6d8c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -8,14 +8,14 @@ @JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike -@JSClass struct ArrayBufferLike: _JSBridgedClass { +@JSClass struct ArrayBufferLike { @JSGetter var byteLength: Double @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike } @JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming -@JSClass struct WeirdNaming: _JSBridgedClass { +@JSClass struct WeirdNaming { @JSGetter var normalProperty: String @JSSetter func setNormalProperty(_ value: String) throws (JSException) @JSGetter var `for`: String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift index 64317b792..47efcbc84 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift @@ -8,7 +8,7 @@ @JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection -@JSClass struct DatabaseConnection: _JSBridgedClass { +@JSClass struct DatabaseConnection { @JSFunction func connect(_ url: String) throws (JSException) -> Void @JSFunction func execute(_ query: String) throws (JSException) -> JSObject @JSGetter var isConnected: Bool @@ -18,7 +18,7 @@ @JSFunction func createLogger(_ level: String) throws (JSException) -> Logger -@JSClass struct Logger: _JSBridgedClass { +@JSClass struct Logger { @JSFunction func log(_ message: String) throws (JSException) -> Void @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void @JSGetter var level: String @@ -26,7 +26,7 @@ @JSFunction func getConfigManager() throws (JSException) -> ConfigManager -@JSClass struct ConfigManager: _JSBridgedClass { +@JSClass struct ConfigManager { @JSFunction func get(_ key: String) throws (JSException) -> JSObject @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void @JSGetter var configPath: String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift index 39998492a..e0d6c9d24 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift @@ -8,7 +8,7 @@ @JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor -@JSClass struct TypeScriptProcessor: _JSBridgedClass { +@JSClass struct TypeScriptProcessor { @JSFunction func convert(_ ts: String) throws (JSException) -> String @JSFunction func validate(_ ts: String) throws (JSException) -> Bool @JSGetter var version: String @@ -16,7 +16,7 @@ @JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator -@JSClass struct CodeGenerator: _JSBridgedClass { +@JSClass struct CodeGenerator { @JSFunction func generate(_ input: JSObject) throws (JSException) -> String @JSGetter var outputFormat: String } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift index 4026e0078..1fbf3376d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift @@ -6,7 +6,7 @@ @_spi(Experimental) import JavaScriptKit -@JSClass struct Greeter: _JSBridgedClass { +@JSClass struct Greeter { @JSGetter var name: String @JSSetter func setName(_ value: String) throws (JSException) @JSGetter var age: Double diff --git a/Sources/JavaScriptKit/JSBridgedType.swift b/Sources/JavaScriptKit/JSBridgedType.swift index 8f5cf55a2..bb23cc00c 100644 --- a/Sources/JavaScriptKit/JSBridgedType.swift +++ b/Sources/JavaScriptKit/JSBridgedType.swift @@ -15,7 +15,7 @@ extension JSBridgedType { /// A protocol that Swift classes that are exposed to JavaScript via `@JS class` conform to. /// -/// The conformance is automatically synthesized by the BridgeJS code generator. +/// The conformance is automatically synthesized by `@JSClass` for BridgeJS-generated declarations. public protocol _JSBridgedClass { /// The JavaScript object wrapped by this instance. /// You may assume that `jsObject instanceof Self.constructor == true` diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 9e11db3b4..8cc3dbc64 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -174,7 +174,7 @@ public macro JSFunction() = /// @_spi(Experimental) import JavaScriptKit /// /// @JSClass -/// struct JsGreeter: _JSBridgedClass { +/// struct JsGreeter { /// @JSGetter var name: String /// @JSSetter func setName(_ value: String) throws (JSException) /// @JSFunction init(_ name: String) throws (JSException) @@ -182,6 +182,7 @@ public macro JSFunction() = /// } /// ``` @attached(member, names: arbitrary) +@attached(extension, conformances: _JSBridgedClass) @_spi(Experimental) public macro JSClass() = #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro") diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index f65f5d23c..2ad11fd9b 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -22,7 +22,7 @@ @JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws (JSException) -> String -@JSClass struct JsGreeter: _JSBridgedClass { +@JSClass struct JsGreeter { @JSGetter var name: String @JSSetter func setName(_ value: String) throws (JSException) @JSGetter var `prefix`: String From 4c0d367915291273feba3157dd76566f3bd684bd Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 21 Jan 2026 19:46:13 +0700 Subject: [PATCH 074/252] chore: Minor updates to BridgeJS documentation (#503) --- Plugins/BridgeJS/README.md | 108 ++++++++---- .../Exporting-Swift/Exporting-Swift-Class.md | 11 ++ .../Exporting-Swift-Closure.md | 16 +- .../Exporting-Swift-Default-Parameters.md | 1 + .../Exporting-Swift/Exporting-Swift-Enum.md | 156 +++++++----------- .../Exporting-Swift-Optional.md | 4 +- .../Exporting-Swift-Protocols.md | 104 +++++------- .../Exporting-Swift-Static-Functions.md | 6 +- .../Exporting-Swift-Static-Properties.md | 6 +- .../Exporting-Swift/Exporting-Swift-Struct.md | 66 ++++---- .../Exporting-Swift/Using-Namespace.md | 12 +- 11 files changed, 248 insertions(+), 242 deletions(-) diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 0cc4ceba9..29d7df2e1 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -4,7 +4,7 @@ > This feature is still experimental, and the API may change frequently. Use at your own risk with `JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1` environment variable. > [!NOTE] -> This documentation is intended for JavaScriptKit developers, not JavaScriptKit users. +> This documentation is intended for JavaScriptKit developers, not JavaScriptKit users. For user documentation, see [Exporting Swift to JavaScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-to-javascript) and [Importing TypeScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-typescript-into-swift). ## Overview @@ -14,6 +14,7 @@ BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. 2. **Exporting Swift APIs to JavaScript**: Make your Swift APIs available to JavaScript code The workflow is: + 1. `ts2swift` converts TypeScript definitions (`bridge-js.d.ts`) to macro-annotated Swift declarations (`BridgeJS.Macros.swift`) 2. `bridge-js generate` processes both Swift source files (for export) and macro-annotated Swift files (for import) to generate: - `BridgeJS.swift` (Swift glue code) @@ -59,27 +60,53 @@ graph LR ## Type Mapping -### Primitive Type Conversions - -TBD - -| Swift Type | JS Type | Wasm Core Type | -|:--------------|:-----------|:---------------| -| `Int` | `number` | `i32` | -| `UInt` | `number` | `i32` | -| `Int8` | `number` | `i32` | -| `UInt8` | `number` | `i32` | -| `Int16` | `number` | `i32` | -| `UInt16` | `number` | `i32` | -| `Int32` | `number` | `i32` | -| `UInt32` | `number` | `i32` | -| `Int64` | `bigint` | `i64` | -| `UInt64` | `bigint` | `i64` | -| `Float` | `number` | `f32` | -| `Double` | `number` | `f64` | -| `Bool` | `boolean` | `i32` | -| `Void` | `void` | - | -| `String` | `string` | `i32` | +### Primitive Types + +| Swift Type | TypeScript Type | Wasm Core Type | +|:--------------|:----------------|:---------------| +| `Int` | `number` | `i32` | +| `UInt` | `number` | `i32` | +| `Int8` | `number` | `i32` | +| `UInt8` | `number` | `i32` | +| `Int16` | `number` | `i32` | +| `UInt16` | `number` | `i32` | +| `Int32` | `number` | `i32` | +| `UInt32` | `number` | `i32` | +| `Int64` | `bigint` | `i64` | +| `UInt64` | `bigint` | `i64` | +| `Float` | `number` | `f32` | +| `Double` | `number` | `f64` | +| `Bool` | `boolean` | `i32` | +| `Void` | `void` | - | + +### Complex Types + +| Swift Type | TypeScript Type | Semantics | Status | +|:-----------|:----------------|:----------|:-------| +| `String` | `string` | Copy | ✅ | +| `@JS class` | `interface` + constructor | Reference (pointer) | ✅ | +| `@JS struct` | `interface` | Copy (fields via stacks) | ✅ | +| `@JS enum` (case) | const object + tag type | Copy (integer) | ✅ | +| `@JS enum` (raw value) | const object + tag type | Copy (raw value) | ✅ | +| `@JS enum` (associated) | discriminated union | Copy (fields via stacks) | ✅ | +| `@JS protocol` | `interface` | Reference (wrapper) | ✅ | +| `Optional` | `T \| null` | Depends on T | ✅ | +| `(T) -> U` | `(arg: T) => U` | Reference (boxed) | ✅ | +| `JSObject` | `any` / `object` | Reference | ✅ | +| `Array` | `T[]` | Copy | ✅ | +| `Array>` | `T[][]` | Copy | ✅ | +| `Dictionary` | `Record` | - | [#495](https://github.com/swiftwasm/JavaScriptKit/issues/495) | +| `Set` | `Set` | - | [#397](https://github.com/swiftwasm/JavaScriptKit/issues/397) | +| `Foundation.URL` | `string` | - | [#496](https://github.com/swiftwasm/JavaScriptKit/issues/496) | +| Generics | - | - | [#398](https://github.com/swiftwasm/JavaScriptKit/issues/398) | + +### Import-specific (TypeScript → Swift) + +| TypeScript Type | Swift Type | Status | +|:----------------|:-----------|:-------| +| `T \| null` | `Optional` | [#475](https://github.com/swiftwasm/JavaScriptKit/issues/475) | +| `T \| undefined` | `Optional` | [#475](https://github.com/swiftwasm/JavaScriptKit/issues/475) | +| `enum` | `@JS enum` | [#489](https://github.com/swiftwasm/JavaScriptKit/issues/489) | ## Type Modeling @@ -109,23 +136,37 @@ The ABI will not be stable, and not meant to be interposed by other tools. ### Parameter Passing -Parameter passing follows Wasm calling conventions, with custom handling for complex types like strings and objects. +Parameter passing follows Wasm calling conventions, with custom handling for complex types: -TBD +- **Primitives**: Passed directly as Wasm arguments (`i32`, `i64`, `f32`, `f64`) +- **Strings**: UTF-8 bytes stored in `swift.memory`, ID + length passed as Wasm arguments +- **Swift Classes**: Raw Swift heap pointer passed as `i32` +- **JSObjects**: Object stored in `swift.memory.heap`, object ID passed as `i32` +- **Structs/Arrays**: Fields/elements pushed to type-specific stacks, Swift pops in reverse order +- **Closures**: Boxed and retained in memory, handle passed as `i32` ### Return Values -TBD +Return values use direct Wasm returns for primitives, and imported intrinsic functions for complex types: + +- **Primitives**: Returned directly via Wasm return value +- **Strings**: Swift writes UTF-8 bytes to shared memory, JS decodes +- **Swift Classes**: Pointer returned directly, JS wraps in `SwiftHeapObject` with `FinalizationRegistry` +- **Structs/Arrays**: Swift pushes fields/elements to type-specific stacks, JS reconstructs + +### Memory Management + +- **Swift Classes**: Live on Swift heap. JS holds pointer wrapped in `SwiftHeapObject`. `FinalizationRegistry` calls `deinit` on GC. Optional `release()` for deterministic cleanup. +- **JSObjects**: Live in `swift.memory.heap` (JS side). Swift holds ID wrapped in `JSObject`. Reference counted via `retain`/`release`. +- **Structs/Arrays/Enums**: Copy semantics - data serialized across boundary. No cleanup needed. +- **Closures**: Boxed on source side, released when GC'd on either side. + +For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#How-It-Works) in the user documentation. ## Future Work -- [ ] Struct on parameter or return type -- [ ] Throws functions -- [ ] Async functions - [ ] Cast between TS interface -- [ ] Closure support -- [ ] Simplify constructor pattern - * https://github.com/ocsigen/ts2ocaml/blob/main/docs/js_of_ocaml.md#feature-immediate-constructor +- [ ] Simplify constructor pattern ([reference](https://github.com/ocsigen/ts2ocaml/blob/main/docs/js_of_ocaml.md#feature-immediate-constructor)) ```typescript interface Foo = { someMethod(value: number): void; @@ -141,3 +182,8 @@ TBD ``` - [ ] Use `externref` once it's widely available - [ ] Test SwiftObject roundtrip +- [ ] Import TS `enum` as Swift enum ([#489](https://github.com/swiftwasm/JavaScriptKit/issues/489)) +- [ ] Support `T | null` and `T | undefined` imports ([#475](https://github.com/swiftwasm/JavaScriptKit/issues/475)) +- [ ] Support `@JS var` for global scope imports ([#466](https://github.com/swiftwasm/JavaScriptKit/issues/466)) +- [ ] Support `export { thing } from 'pkg'` form ([#437](https://github.com/swiftwasm/JavaScriptKit/issues/437)) +- [ ] Support imported TS type usage on exported interface ([#497](https://github.com/swiftwasm/JavaScriptKit/issues/497)) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md index 3a4df4ae2..3e44581fa 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md @@ -76,6 +76,17 @@ export type Exports = { } ``` +## How It Works + +Classes use **reference semantics** when crossing the Swift/JavaScript boundary: + +1. **Object Creation**: When you create a class instance (via `new` in JS), the object lives on the Swift heap +2. **Reference Passing**: JavaScript receives a reference (handle) to the Swift object, not a copy +3. **Shared State**: Changes made through either Swift or JavaScript affect the same object +4. **Memory Management**: `FinalizationRegistry` automatically releases Swift objects when they're garbage collected in JavaScript. You can optionally call `release()` for deterministic cleanup. + +This differs from structs, which use copy semantics and transfer data by value. + ## Supported Features | Swift Feature | Status | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md index 498e6c077..fe934ddba 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md @@ -1,4 +1,4 @@ -# Exporting Swift Closures +# Exporting Swift Closures to JS Learn how to use closure/function types as parameters and return values in BridgeJS. @@ -89,18 +89,20 @@ export type Exports = { } ``` -## Memory Management +## How It Works -When JavaScript passes a function to Swift, it's automatically stored in `swift.memory` with reference counting. When Swift's closure wrapper is deallocated by ARC, the JavaScript function is released. +Closures use **reference semantics** when crossing the Swift/JavaScript boundary: -When Swift returns a closure to JavaScript, the Swift closure is boxed and automatically released when the JavaScript function is garbage collected. +1. **JavaScript → Swift**: When JavaScript passes a function to Swift, it's stored in `swift.memory` with reference counting. When Swift's closure wrapper is deallocated by ARC, the JavaScript function is released. +2. **Swift → JavaScript**: When Swift returns a closure to JavaScript, the Swift closure is boxed and automatically released when the JavaScript function is garbage collected. +3. **Memory Management**: Both directions use automatic memory management via `FinalizationRegistry` - no manual cleanup required. -Both directions use automatic memory management - no manual cleanup required. +This differs from structs and arrays, which use copy semantics and transfer data by value. ## Supported Features -| Feature | Status | -|:--------|:-------| +| Swift Feature | Status | +|:--------------|:-------| | Closure Parameters with Supported Types `(String, Int) -> Person` | ✅ | | Closure Return Value with Supported Types `() -> Person` | ✅ | | `@escaping` closures | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md index 9eec622f0..21925685d 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md @@ -143,6 +143,7 @@ custom.release(); ``` **Requirements:** + - Constructor/initializer arguments must be literal values (`"text"`, `42`, `true`, `false`, `nil`) - Struct initializers must use labeled arguments (e.g., `Point(x: 1.0, y: 2.0)`) - Complex expressions, computed properties, or method calls are not supported diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md index 93c1fdd26..3dda2b9c5 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md @@ -19,9 +19,7 @@ BridgeJS generates separate objects with descriptive naming for `.const` enums: - **`EnumNameTag`**: Represents the union type for enums - **`EnumNameObject`**: Object type for all const-style enums, contains static members for enums with methods/properties or references the values type for simple enums -#### Case Enums - -**Swift Definition:** +### Case Enums ```swift @JS enum Direction { @@ -45,7 +43,7 @@ BridgeJS generates separate objects with descriptive naming for `.const` enums: } ``` -**Generated TypeScript Declaration:** +Generated TypeScript declarations: ```typescript // Const object style (default) @@ -73,7 +71,7 @@ export const StatusValues: { export type StatusTag = typeof StatusValues[keyof typeof StatusValues]; ``` -**Usage in TypeScript:** +In TypeScript: ```typescript const direction: DirectionTag = DirectionValues.North; @@ -100,66 +98,9 @@ function handleDirection(direction: DirectionTag) { } ``` -BridgeJS also generates convenience initializers and computed properties for each case-style enum, allowing the rest of the Swift glue code to remain minimal and consistent. This avoids repetitive switch statements in every function that passes enum values between JavaScript and Swift. +### Raw Value Enums -```swift -extension Direction { - init?(bridgeJSRawValue: Int32) { - switch bridgeJSRawValue { - case 0: - self = .north - case 1: - self = .south - case 2: - self = .east - case 3: - self = .west - default: - return nil - } - } - - var bridgeJSRawValue: Int32 { - switch self { - case .north: - return 0 - case .south: - return 1 - case .east: - return 2 - case .west: - return 3 - } - } -} -... -@_expose(wasm, "bjs_setDirection") -@_cdecl("bjs_setDirection") -public func _bjs_setDirection(direction: Int32) -> Void { - #if arch(wasm32) - setDirection(_: Direction(bridgeJSRawValue: direction)!) - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_getDirection") -@_cdecl("bjs_getDirection") -public func _bjs_getDirection() -> Int32 { - #if arch(wasm32) - let ret = getDirection() - return ret.bridgeJSRawValue - #else - fatalError("Only available on WebAssembly") - #endif -} -``` - -#### Raw Value Enums - -##### String Raw Values - -**Swift Definition:** +#### String Raw Values ```swift // Default const object style @@ -177,7 +118,7 @@ public func _bjs_getDirection() -> Int32 { } ``` -**Generated TypeScript Declaration:** +Generated TypeScript declarations: ```typescript // Const object style (default) @@ -196,7 +137,7 @@ export enum TSTheme { } ``` -**Usage in TypeScript:** +In TypeScript: ```typescript // Raw value enums work similarly to case enums @@ -209,9 +150,7 @@ const currentTheme: ThemeTag = exports.getTheme(); const status: HttpStatusTag = exports.processTheme(ThemeValues.Auto); ``` -##### Integer Raw Values - -**Swift Definition:** +#### Integer Raw Values ```swift // Default const object style @@ -237,7 +176,7 @@ const status: HttpStatusTag = exports.processTheme(ThemeValues.Auto); } ``` -**Generated TypeScript Declaration:** +Generated TypeScript declarations: ```typescript // Const object style (default) @@ -265,7 +204,7 @@ export const PriorityValues: { export type PriorityTag = typeof PriorityValues[keyof typeof PriorityValues]; ``` -**Usage in TypeScript:** +In TypeScript: ```typescript const status: HttpStatusTag = HttpStatusValues.Ok; @@ -280,9 +219,7 @@ const convertedPriority: PriorityTag = exports.convertPriority(HttpStatusValues. ### Namespace Enums -Namespace enums are empty enums (containing no cases) used for organizing related types and functions into hierarchical namespaces. - -**Swift Definition:** +Namespace enums are empty enums (containing no cases) used for organizing related types and functions into hierarchical namespaces. See for more details on namespace organization. ```swift @JS enum Utils { @@ -325,7 +262,7 @@ enum Internal { } ``` -**Generated TypeScript Declaration:** +Generated TypeScript declarations: ```typescript declare global { @@ -364,7 +301,7 @@ declare global { } ``` -**Usage in TypeScript:** +In TypeScript: ```typescript // Access nested classes through namespaces (no globalThis prefix needed) @@ -386,7 +323,7 @@ Things to remember when using enums for namespacing: 2. Top-level enums can use `@JS(namespace: "Custom.Path")` to place themselves in custom namespaces, which will be used as "base namespace" for all nested elements as well 3. Classes and enums nested within namespace enums **cannot** use `@JS(namespace:)` - this would create conflicting namespace declarations -**Invalid Usage:** +Invalid usage: ```swift @JS enum Utils { @@ -397,7 +334,7 @@ Things to remember when using enums for namespacing: } ``` -**Valid Usage:** +Valid usage: ```swift // Valid - top-level enum with explicit namespace @@ -409,12 +346,10 @@ enum Helper { } ``` -#### Associated Value Enums +### Associated Value Enums Associated value enums are supported and allow you to pass data along with each enum case. BridgeJS generates TypeScript discriminated union types. Associated values are encoded into a binary format for efficient transfer between JavaScript and WebAssembly -**Swift Definition:** - ```swift @JS enum APIResult { @@ -440,7 +375,7 @@ enum ComplexResult { @JS func getResult() -> APIResult ``` -**Generated TypeScript Declaration:** +Generated TypeScript declarations: ```typescript export const APIResultValues: { @@ -482,7 +417,7 @@ export type ComplexResultTag = { tag: typeof ComplexResultValues.Tag.Info } ``` -**Usage in TypeScript:** +In TypeScript: ```typescript const successResult: APIResultTag = { @@ -528,21 +463,54 @@ function processResult(result: APIResultTag) { } ``` -**Supported Features:** +## How It Works + +Enums use **copy semantics** when crossing the Swift/JavaScript boundary: + +1. **Case Enums**: Passed as integer tag values (0, 1, 2, ...) representing each case +2. **Raw Value Enums**: Passed using their raw value type (string or integer) +3. **Associated Value Enums**: Tag value passed directly, associated data pushed to type-specific stacks and reconstructed on the receiving side + +BridgeJS generates convenience initializers and computed properties for each enum, keeping the glue code minimal and consistent: + +```swift +extension Direction { + init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: self = .north + case 1: self = .south + // ... + default: return nil + } + } + + var bridgeJSRawValue: Int32 { + switch self { + case .north: return 0 + case .south: return 1 + // ... + } + } +} +``` + +This differs from classes, which use reference semantics and share state across the boundary. + +## Supported Features | Swift Feature | Status | |:--------------|:-------| -| Associated values: `String` | ✅ | -| Associated values: `Int` | ✅ | -| Associated values: `Bool` | ✅ | -| Associated values: `Float` | ✅ | -| Associated values: `Double` | ✅ | +| Case enums | ✅ | +| Raw value enums (`String`) | ✅ | +| Raw value enums (`Int`, `Int32`, etc.) | ✅ | +| Namespace enums (empty enums) | ✅ | +| Associated value enums | ✅ | +| `.tsEnum` style option | ✅ | +| Static functions | ✅ | +| Static properties | ✅ | +| Associated values: `String`, `Int`, `Bool`, `Float`, `Double` | ✅ | | Associated values: Custom classes/structs | ❌ | | Associated values: Other enums | ❌ | | Associated values: Arrays/Collections | ❌ | | Associated values: Optionals | ❌ | -| Use as exported function parameters | ✅ | -| Use as exported function return values | ✅ | -| Use as imported function parameters | ❌ | -| Use as imported function return values | ❌ | -| Namespace support | ✅ | +| Generics | ❌ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md index 24b04d74e..91fdc3472 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md @@ -112,8 +112,8 @@ export type UserProfile = { ## Supported Features -| Swift Optional Feature | Status | -|:----------------------|:-------| +| Swift Feature | Status | +|:--------------|:-------| | Optional primitive parameters: `Int?`, `String?`, etc. | ✅ | | Optional primitive return values | ✅ | | Optional object parameters: `MyClass?`, `JSObject?` | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 4dba78c38..111b1f052 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -1,4 +1,4 @@ -# Exporting Swift Protocols +# Exporting Swift Protocols to JS Learn how to expose Swift protocols to JavaScript as TypeScript interfaces. @@ -114,63 +114,6 @@ export type Exports = { } ``` -## Generated Wrapper - -BridgeJS generates a Swift wrapper struct for each `@JS` protocol. This wrapper holds a `JSObject` reference and forwards protocol method calls to the JavaScript implementation: - -```swift -struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - - var count: Int { - get { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_get") - func _extern_get(this: Int32) -> Int32 - let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) - return Int.bridgeJSLiftReturn(ret) - } - set { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_set") - func _extern_set(this: Int32, value: Int32) - _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) - } - } - - var name: String { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_name_get") - func _extern_get(this: Int32) - _extern_get(this: Int32(bitPattern: jsObject.id)) - return String.bridgeJSLiftReturn() - } - - func increment(by amount: Int) { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") - func _extern_increment(this: Int32, amount: Int32) - _extern_increment( - this: Int32(bitPattern: jsObject.id), - amount: amount.bridgeJSLowerParameter() - ) - } - - func reset() { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_reset") - func _extern_reset(this: Int32) - _extern_reset(this: Int32(bitPattern: jsObject.id)) - } - - func getValue() -> Int { - @_extern(wasm, module: "TestModule", name: "bjs_Counter_getValue") - func _extern_getValue(this: Int32) -> Int32 - let ret = _extern_getValue(this: Int32(bitPattern: jsObject.id)) - return Int.bridgeJSLiftReturn(ret) - } - - static func bridgeJSLiftParameter(_ value: Int32) -> Self { - return AnyCounter(jsObject: JSObject(id: UInt32(bitPattern: value))) - } -} -``` - ## Swift Implementation You can also implement protocols in Swift and use them from JavaScript: @@ -223,12 +166,47 @@ console.log(counter.getValue()); // 0 ## How It Works -When you pass a JavaScript object implementing a protocol to Swift: +Protocols use **reference semantics** when crossing the Swift/JavaScript boundary: + +1. **JavaScript → Swift**: The JavaScript object is stored in JavaScriptKit's memory heap and its ID is passed as an `Int32` to Swift +2. **Wrapper Generation**: BridgeJS generates an `Any{ProtocolName}` wrapper struct that holds a `JSObject` reference and forwards protocol method calls through WASM to the JavaScript implementation +3. **Swift → JavaScript**: When returning a Swift protocol implementation to JavaScript, the object is stored on the Swift heap and JavaScript receives a reference +4. **Memory Management**: `FinalizationRegistry` automatically handles cleanup. The `JSObject` reference keeps the JavaScript object alive, and when the Swift wrapper is deallocated, the JavaScript object is released. + +### Generated Wrapper + +BridgeJS generates a Swift wrapper struct for each `@JS` protocol: + +```swift +struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject -1. **JavaScript Side**: The object is stored in JavaScriptKit's memory heap and its ID is passed as an `Int32` to Swift -2. **Swift Side**: BridgeJS creates an `Any{ProtocolName}` wrapper that holds a `JSObject` reference -3. **Method Calls**: Protocol method calls are forwarded through WASM to the JavaScript implementation -4. **Memory Management**: The `JSObject` reference keeps the JavaScript object alive using JavaScriptKit's retain/release system. When the Swift wrapper is deallocated, the JavaScript object is automatically released. + var count: Int { + get { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_get") + func _extern_get(this: Int32) -> Int32 + let ret = _extern_get(this: Int32(bitPattern: jsObject.id)) + return Int.bridgeJSLiftReturn(ret) + } + set { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_count_set") + func _extern_set(this: Int32, value: Int32) + _extern_set(this: Int32(bitPattern: jsObject.id), value: newValue.bridgeJSLowerParameter()) + } + } + + func increment(by amount: Int) { + @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") + func _extern_increment(this: Int32, amount: Int32) + _extern_increment( + this: Int32(bitPattern: jsObject.id), + amount: amount.bridgeJSLowerParameter() + ) + } + + // ... other protocol requirements +} +``` ## Supported Features diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md index 8602d937d..00e7c1f22 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md @@ -122,7 +122,7 @@ const result: number = exports.Calculator.square(5); // 25 ## Namespace Enum Static Functions -Namespace enums organize related utility functions and are assigned to `globalThis`: +Namespace enums organize related utility functions and are assigned to `globalThis`. See for more details on namespace organization. ```swift @JS enum Utils { @@ -156,8 +156,8 @@ const result: string = Utils.String.uppercase("world"); ## Supported Features -| Swift Static Function Feature | Status | -|:------------------------------|:-------| +| Swift Feature | Status | +|:--------------|:-------| | Class `static func` | ✅ | | Class `class func` | ✅ | | Enum `static func` | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md index 097f644bf..4110e6166 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md @@ -128,7 +128,7 @@ exports.PropertyEnum.enumProperty = "updated"; ## Namespace Enum Static Properties -Namespace enums organize related static properties and are assigned to `globalThis`: +Namespace enums organize related static properties and are assigned to `globalThis`. See for more details on namespace organization. ```swift @JS enum PropertyNamespace { @@ -173,8 +173,8 @@ const value: number = PropertyNamespace.Nested.nestedProperty; ## Supported Features -| Swift Static Property Feature | Status | -|:------------------------------|:-------| +| Swift Feature | Status | +|:--------------|:-------| | Class `static let` | ✅ | | Class `static var` | ✅ | | Class `class var` | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md index e20a324c2..236b822ab 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md @@ -104,33 +104,9 @@ exports.Config.defaultTimeout = 60.0; console.log(exports.Config.maxRetries); // 3 (readonly) ``` -## Struct Methods +## Struct Methods and Initializers -Structs can have instance and static methods, both require @JS annotation: - -```swift -@JS struct Calculator { - @JS func add(a: Double, b: Double) -> Double { - return a + b - } - - @JS static func multiply(x: Double, y: Double) -> Double { - return x * y - } -} -``` - -In JavaScript: - -```javascript -const calc = {}; -console.log(exports.useMathOperations(calc, 5.0, 3.0)); // Uses instance methods -console.log(exports.Calculator.multiply(4.0, 5.0)); // Static method -``` - -## Struct Initializers - -Struct initializers are exported as static `init` methods, not constructors: +Structs can have instance methods, static methods, and initializers. All require `@JS` annotation: ```swift @JS struct Point { @@ -141,30 +117,46 @@ Struct initializers are exported as static `init` methods, not constructors: self.x = x self.y = y } + + @JS func distanceFromOrigin() -> Double { + return (x * x + y * y).squareRoot() + } + + @JS static func origin() -> Point { + return Point(x: 0, y: 0) + } } ``` In JavaScript: ```javascript -const point = exports.Point.init(10.0, 20.0); -console.log(point.x); // 10.0 +// Create via static init method (not constructor) +const point = exports.Point.init(3.0, 4.0); +console.log(point.distanceFromOrigin()); // 5.0 + +// Static method +const origin = exports.Point.origin(); +console.log(origin.x); // 0.0 ``` -This differs from classes, where `@JS init` maps to a JavaScript constructor using `new`: +Note: Struct initializers are exported as static `init` methods. This differs from classes, where `@JS init` maps to a JavaScript constructor using `new`. -```javascript -// Class: uses `new` -const cart = new exports.ShoppingCart(); +## How It Works -// Struct: uses static `init` method -const point = exports.Point.init(10.0, 20.0); -``` +Structs use **copy semantics** when crossing the Swift/JavaScript boundary: + +1. **Data Transfer**: Struct fields are pushed to type-specific stacks and reconstructed as plain JavaScript objects +2. **No Shared State**: Each side has its own copy - modifications don't affect the other +3. **No Memory Management**: No `release()` needed since there's no shared reference +4. **Plain Objects**: In JavaScript, structs become plain objects matching the TypeScript interface + +This differs from classes, which use reference semantics and share state across the boundary. ## Supported Features -| Feature | Status | -|:--------|:-------| +| Swift Feature | Status | +|:--------------|:-------| | Stored fields with supported types | ✅ | | Optional fields | ✅ | | Nested structs | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md index 0c4027b77..057b5f030 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md @@ -8,7 +8,11 @@ Learn how to organize exported Swift code into JavaScript namespaces. The `@JS` macro supports organizing your exported Swift code into namespaces using dot-separated strings. This allows you to create hierarchical structures in JavaScript that mirror your Swift code organization. -### Functions with Namespaces +There are two ways to create namespaces: +1. **`@JS(namespace:)`** - Explicitly specify a namespace for functions, classes, or enums +2. **Namespace enums** - Use empty enums to create implicit namespace hierarchies (see ) + +## Functions with Namespaces You can export functions to specific namespaces by providing a namespace parameter: @@ -49,7 +53,7 @@ declare global { } ``` -### Classes with Namespaces +## Classes with Namespaces For classes, you only need to specify the namespace on the top-level class declaration. All exported methods within the class will be part of that namespace: @@ -117,3 +121,7 @@ export interface Greeter extends SwiftHeapObject { ``` Using namespaces can be preferable for projects with many global functions, as they help prevent naming collisions. Namespaces also provide intuitive hierarchies for organizing your exported Swift code, and they do not affect the code generated by `@JS` declarations without namespaces. + +## See Also + +- - Namespace enums section From 724e62e51137bbd5e2f0faa9526c2dbaf162e312 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 21 Jan 2026 22:21:11 +0800 Subject: [PATCH 075/252] [BridgeJS] Support @JS var declarations for global scope imports (#505) --- Plugins/BridgeJS/Package.swift | 2 +- .../BridgeJSCore/ImportSwiftMacros.swift | 13 +- .../Sources/BridgeJSCore/ImportTS.swift | 22 ++ .../Sources/BridgeJSLink/BridgeJSLink.swift | 44 ++++ .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 44 +++- .../BridgeJSToolTests/BridgeJSLinkTests.swift | 38 +++ .../ImportMacroInputs/GlobalGetter.swift | 6 + .../GlobalGetter.ImportMacros.d.ts | 21 ++ .../GlobalGetter.ImportMacros.js | 231 ++++++++++++++++++ 9 files changed, 410 insertions(+), 11 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index 63c74c53e..a4385bd37 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -55,7 +55,7 @@ let package = Package( "BridgeJSLink", "TS2Swift", ], - exclude: ["__Snapshots__", "Inputs", "MultifileInputs"] + exclude: ["__Snapshots__", "Inputs", "MultifileInputs", "ImportMacroInputs"] ), .macro( name: "BridgeJSMacros", diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift index b4c5820df..db6b983e1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift @@ -44,7 +44,8 @@ public final class ImportSwiftMacros { importedFiles.append( ImportedFileSkeleton( functions: collector.importedFunctions, - types: collector.importedTypes + types: collector.importedTypes, + globalGetters: collector.importedGlobalGetters ) ) } @@ -94,6 +95,7 @@ public final class ImportSwiftMacros { fileprivate final class APICollector: SyntaxAnyVisitor { var importedFunctions: [ImportedFunctionSkeleton] = [] var importedTypes: [ImportedTypeSkeleton] = [] + var importedGlobalGetters: [ImportedGetterSkeleton] = [] var errors: [DiagnosticError] = [] private let inputFilePath: String @@ -432,12 +434,9 @@ public final class ImportSwiftMacros { switch state { case .topLevel: - errors.append( - DiagnosticError( - node: node, - message: "@JSGetter is not supported at top-level. Use it only in @JSClass types." - ) - ) + if let getter = parseGetterSkeleton(node, enclosingTypeName: nil) { + importedGlobalGetters.append(getter) + } return .skipChildren case .jsClassBody(let typeName): diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 402e6e671..675708c45 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -36,6 +36,10 @@ public struct ImportTS { public func finalize() throws -> String? { var decls: [DeclSyntax] = [] for skeleton in self.skeleton.children { + for getter in skeleton.globalGetters { + let getterDecls = try renderSwiftGlobalGetter(getter, topLevelDecls: &decls) + decls.append(contentsOf: getterDecls) + } for function in skeleton.functions { let thunkDecls = try renderSwiftThunk(function, topLevelDecls: &decls) decls.append(contentsOf: thunkDecls) @@ -54,6 +58,24 @@ public struct ImportTS { return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") } + func renderSwiftGlobalGetter( + _ getter: ImportedGetterSkeleton, + topLevelDecls: inout [DeclSyntax] + ) throws -> [DeclSyntax] { + let builder = CallJSEmission(moduleName: moduleName, abiName: getter.abiName(context: nil)) + try builder.call(returnType: getter.type) + try builder.liftReturnValue(returnType: getter.type) + topLevelDecls.append(builder.renderImportDecl()) + return [ + builder.renderThunkDecl( + name: "_$\(getter.name)_get", + parameters: [], + returnType: getter.type + ) + .with(\.leadingTrivia, Self.renderDocumentation(documentation: getter.documentation)) + ] + } + class CallJSEmission { let abiName: String let moduleName: String diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index d6103f7de..1f55eb187 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -172,6 +172,9 @@ struct BridgeJSLink { guard let imported = unified.imported else { continue } let importObjectBuilder = ImportObjectBuilder(moduleName: unified.moduleName) for fileSkeleton in imported.children { + for getter in fileSkeleton.globalGetters { + try renderImportedGlobalGetter(importObjectBuilder: importObjectBuilder, getter: getter) + } for function in fileSkeleton.functions { try renderImportedFunction(importObjectBuilder: importObjectBuilder, function: function) } @@ -2142,6 +2145,31 @@ extension BridgeJSLink { body.write("\(call);") } + func getImportProperty(name: String, returnType: BridgeType) throws -> String? { + if returnType == .void { + throw BridgeJSLinkError(message: "Void is not supported for imported JS properties") + } + + let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context) + let expr = "imports[\"\(name)\"]" + + let returnExpr: String? + if loweringFragment.parameters.count == 0 { + body.write("\(expr);") + returnExpr = nil + } else { + let resultVariable = scope.variable("ret") + body.write("let \(resultVariable) = \(expr);") + returnExpr = resultVariable + } + + return try lowerReturnValue( + returnType: returnType, + returnExpr: returnExpr, + loweringFragment: loweringFragment + ) + } + private func lowerReturnValue( returnType: BridgeType, returnExpr: String?, @@ -2881,6 +2909,22 @@ extension BridgeJSLink { importObjectBuilder.assignToImportObject(name: function.abiName(context: nil), function: funcLines) } + func renderImportedGlobalGetter( + importObjectBuilder: ImportObjectBuilder, + getter: ImportedGetterSkeleton + ) throws { + let thunkBuilder = ImportedThunkBuilder() + let returnExpr = try thunkBuilder.getImportProperty(name: getter.name, returnType: getter.type) + let abiName = getter.abiName(context: nil) + let funcLines = thunkBuilder.renderFunction( + name: abiName, + returnExpr: returnExpr, + returnType: getter.type + ) + importObjectBuilder.appendDts(["readonly \(getter.name): \(getter.type.tsType);"]) + importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) + } + func renderImportedType( importObjectBuilder: ImportObjectBuilder, type: ImportedTypeSkeleton diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index e1815fbeb..10f06802d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -634,7 +634,7 @@ public struct ImportedGetterSkeleton: Codable { self.functionName = functionName } - public func abiName(context: ImportedTypeSkeleton) -> String { + public func abiName(context: ImportedTypeSkeleton?) -> String { if let functionName = functionName { return ABINameGenerator.generateImportedABIName( baseName: functionName, @@ -669,7 +669,7 @@ public struct ImportedSetterSkeleton: Codable { self.functionName = functionName } - public func abiName(context: ImportedTypeSkeleton) -> String { + public func abiName(context: ImportedTypeSkeleton?) -> String { if let functionName = functionName { return ABINameGenerator.generateImportedABIName( baseName: functionName, @@ -713,10 +713,48 @@ public struct ImportedTypeSkeleton: Codable { public struct ImportedFileSkeleton: Codable { public let functions: [ImportedFunctionSkeleton] public let types: [ImportedTypeSkeleton] + /// Global-scope imported properties (e.g. `@JSGetter var console: JSConsole`) + public let globalGetters: [ImportedGetterSkeleton] + /// Global-scope imported properties (future use; not currently emitted by macros) + public let globalSetters: [ImportedSetterSkeleton] - public init(functions: [ImportedFunctionSkeleton], types: [ImportedTypeSkeleton]) { + public init( + functions: [ImportedFunctionSkeleton], + types: [ImportedTypeSkeleton], + globalGetters: [ImportedGetterSkeleton] = [], + globalSetters: [ImportedSetterSkeleton] = [] + ) { self.functions = functions self.types = types + self.globalGetters = globalGetters + self.globalSetters = globalSetters + } + + private enum CodingKeys: String, CodingKey { + case functions + case types + case globalGetters + case globalSetters + } + + public init(from decoder: any Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + self.functions = try container.decode([ImportedFunctionSkeleton].self, forKey: .functions) + self.types = try container.decode([ImportedTypeSkeleton].self, forKey: .types) + self.globalGetters = try container.decodeIfPresent([ImportedGetterSkeleton].self, forKey: .globalGetters) ?? [] + self.globalSetters = try container.decodeIfPresent([ImportedSetterSkeleton].self, forKey: .globalSetters) ?? [] + } + + public func encode(to encoder: any Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(functions, forKey: .functions) + try container.encode(types, forKey: .types) + if !globalGetters.isEmpty { + try container.encode(globalGetters, forKey: .globalGetters) + } + if !globalSetters.isEmpty { + try container.encode(globalSetters, forKey: .globalSetters) + } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 0485adfca..4cb46124d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -38,12 +38,21 @@ import Testing "Inputs" ) + static let importMacroInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() + .appendingPathComponent("ImportMacroInputs") + static func collectInputs(extension: String) -> [String] { let fileManager = FileManager.default let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path) return inputs.filter { $0.hasSuffix(`extension`) } } + static func collectImportMacroInputs() -> [String] { + let fileManager = FileManager.default + let inputs = try! fileManager.contentsOfDirectory(atPath: Self.importMacroInputsDirectory.path) + return inputs.filter { $0.hasSuffix(".swift") } + } + @Test(arguments: collectInputs(extension: ".swift")) func snapshotExport(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) @@ -101,6 +110,35 @@ import Testing try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") } + @Test(arguments: collectImportMacroInputs()) + func snapshotImportMacroInput(input: String) throws { + let url = Self.importMacroInputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().lastPathComponent + + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "TestModule") + importSwift.addSourceFile(sourceFile, "\(name).swift") + let importResult = try importSwift.finalize() + + var importTS = ImportTS(progress: .silent, moduleName: "TestModule") + for child in importResult.outputSkeleton.children { + importTS.addSkeleton(child) + } + let importSkeleton = importTS.skeleton + + var bridgeJSLink = BridgeJSLink(sharedMemory: false) + let unifiedSkeleton = BridgeJSSkeleton( + moduleName: "TestModule", + exported: nil, + imported: importSkeleton + ) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let unifiedData = try encoder.encode(unifiedSkeleton) + try bridgeJSLink.addSkeletonFile(data: unifiedData) + try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".ImportMacros") + } + @Test(arguments: [ "Namespaces.swift", "StaticFunctions.swift", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift new file mode 100644 index 000000000..fe3f7b068 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift @@ -0,0 +1,6 @@ +@JSClass +struct JSConsole { + @JSFunction func log(_ message: String) throws(JSException) +} + +@JSGetter var console: JSConsole diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts new file mode 100644 index 000000000..312f56786 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts @@ -0,0 +1,21 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface JSConsole { + log(message: string): void; +} +export type Exports = { +} +export type Imports = { + readonly console: JSConsole; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js new file mode 100644 index 000000000..89aa3af9d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -0,0 +1,231 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_console_get"] = function bjs_console_get() { + try { + let ret = imports["console"]; + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, message) { + try { + const messageObject = swift.memory.getObject(message); + swift.memory.release(message); + swift.memory.getObject(self).log(messageObject); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file From 8ea5ebb99e69c9182785b63e7f7b405beaf2b25c Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 22 Jan 2026 10:59:17 +0900 Subject: [PATCH 076/252] TS2Swift: Remove unused type definitions --- .../TS2Swift/JavaScript/src/index.d.ts | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts index b53e2420c..e5af49d9e 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts @@ -11,39 +11,3 @@ export type Parameter = { name: string; type: BridgeType; } - -export type Effects = { - isAsync: boolean; -} - -export type ImportFunctionSkeleton = { - name: string; - parameters: Parameter[]; - returnType: BridgeType; - effects: Effects; - documentation: string | undefined; -} - -export type ImportConstructorSkeleton = { - parameters: Parameter[]; -} - -export type ImportPropertySkeleton = { - name: string; - type: BridgeType; - isReadonly: boolean; - documentation: string | undefined; -} - -export type ImportTypeSkeleton = { - name: string; - documentation: string | undefined; - constructor?: ImportConstructorSkeleton; - properties: ImportPropertySkeleton[]; - methods: ImportFunctionSkeleton[]; -} - -export type ImportSkeleton = { - functions: ImportFunctionSkeleton[]; - types: ImportTypeSkeleton[]; -} From e97074013fc1220f9389e9c28aae2c580e0e929b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 22 Jan 2026 13:44:48 +0800 Subject: [PATCH 077/252] [BridgeJS][ImportTS] Support `export { thing } from "pkg"` form in `bridge-js.d.ts` (#506) --- .../TS2Swift/JavaScript/src/processor.js | 66 +++++ .../Inputs/ReExportFrom.d.ts | 2 + .../Inputs/Support/ReExportTarget.d.ts | 7 + .../ReExportFrom.Import.d.ts | 24 ++ .../BridgeJSLinkTests/ReExportFrom.Import.js | 241 ++++++++++++++++++ .../ImportTSTests/ReExportFrom.Macros.swift | 14 + .../ImportTSTests/ReExportFrom.swift | 53 ++++ 7 files changed, 407 insertions(+) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 47a4a1ac1..47b921764 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -54,6 +54,9 @@ export class TypeProcessor { this.seenTypes = new Map(); /** @type {string[]} Collected Swift code lines */ this.swiftLines = []; + + /** @type {Set} */ + this.visitedDeclarationKeys = new Set(); } /** @@ -117,6 +120,69 @@ export class TypeProcessor { this.visitFunctionDeclaration(node); } else if (ts.isClassDeclaration(node)) { this.visitClassDecl(node); + } else if (ts.isExportDeclaration(node)) { + this.visitExportDeclaration(node); + } + } + + /** + * Visit an export declaration and process re-exports like: + * - export { Thing } from "./module"; + * - export { Thing as Alias } from "./module"; + * - export * from "./module"; + * @param {ts.ExportDeclaration} node + */ + visitExportDeclaration(node) { + if (!node.moduleSpecifier) return; + + const moduleSymbol = this.checker.getSymbolAtLocation(node.moduleSpecifier); + if (!moduleSymbol) { + this.diagnosticEngine.print("warning", "Failed to resolve module for export declaration", node); + return; + } + + /** @type {ts.Symbol[]} */ + let targetSymbols = []; + + if (!node.exportClause) { + // export * from "..." + targetSymbols = this.checker.getExportsOfModule(moduleSymbol); + } else if (ts.isNamedExports(node.exportClause)) { + const moduleExports = this.checker.getExportsOfModule(moduleSymbol); + for (const element of node.exportClause.elements) { + const originalName = element.propertyName?.text ?? element.name.text; + + const match = moduleExports.find(s => s.name === originalName); + if (match) { + targetSymbols.push(match); + continue; + } + + // Fallback for unusual bindings/resolution failures. + const fallback = this.checker.getSymbolAtLocation(element.propertyName ?? element.name); + if (fallback) { + targetSymbols.push(fallback); + continue; + } + + this.diagnosticEngine.print("warning", `Failed to resolve re-exported symbol '${originalName}'`, node); + } + } else { + // export * as ns from "..." is not currently supported by BridgeJS imports. + return; + } + + for (const symbol of targetSymbols) { + const declarations = symbol.getDeclarations() ?? []; + for (const declaration of declarations) { + // Avoid duplicate emission when the same declaration is reached via multiple re-exports. + const sourceFile = declaration.getSourceFile(); + const key = `${sourceFile.fileName}:${declaration.pos}:${declaration.end}`; + if (this.visitedDeclarationKeys.has(key)) continue; + this.visitedDeclarationKeys.add(key); + + this.visitNode(declaration); + } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts new file mode 100644 index 000000000..0614f14c3 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts @@ -0,0 +1,2 @@ +export { jsRoundTripNumber } from "./Support/ReExportTarget" +export { JsGreeter } from "./Support/ReExportTarget" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts new file mode 100644 index 000000000..1867b1979 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts @@ -0,0 +1,7 @@ +export function jsRoundTripNumber(v: number): number + +export class JsGreeter { + constructor(name: string); + greet(): string; +} + diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts new file mode 100644 index 000000000..db6d2be05 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts @@ -0,0 +1,24 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface JsGreeter { + greet(): string; +} +export type Exports = { +} +export type Imports = { + jsRoundTripNumber(v: number): number; + JsGreeter: { + new(name: string): JsGreeter; + } +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js new file mode 100644 index 000000000..4a13f2d7d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -0,0 +1,241 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_jsRoundTripNumber"] = function bjs_jsRoundTripNumber(v) { + try { + let ret = imports.jsRoundTripNumber(v); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_JsGreeter_init"] = function bjs_JsGreeter_init(name) { + try { + const nameObject = swift.memory.getObject(name); + swift.memory.release(name); + return swift.memory.retain(new imports.JsGreeter(nameObject)); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_JsGreeter_greet"] = function bjs_JsGreeter_greet(self) { + try { + let ret = swift.memory.getObject(self).greet(); + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift new file mode 100644 index 000000000..0c0dfb362 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift @@ -0,0 +1,14 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(Experimental) import JavaScriptKit + +@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double + +@JSClass struct JsGreeter { + @JSFunction init(_ name: String) throws (JSException) + @JSFunction func greet() throws (JSException) -> String +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift new file mode 100644 index 000000000..01c2b1e6e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift @@ -0,0 +1,53 @@ +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_jsRoundTripNumber") +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 +#else +fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { + let vValue = v.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripNumber(vValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_JsGreeter_init") +fileprivate func bjs_JsGreeter_init(_ name: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_init(_ name: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_JsGreeter_greet") +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 +#else +fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$JsGreeter_init(_ name: String) throws(JSException) -> JSObject { + let nameValue = name.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_init(nameValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_JsGreeter_greet(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} \ No newline at end of file From 549ee5df7bd67c6a7b19d7c940d2c3dd17704bfb Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 22 Jan 2026 22:25:51 +0000 Subject: [PATCH 078/252] Test building `BridgeJSTool` on macOS on CI (#511) --- .github/workflows/test.yml | 3 +++ Package.swift | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ee5bf317..5d7e40337 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,6 +70,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v6 + - run: swift build --product BridgeJSTool + env: + DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/ - run: swift build --package-path ./Examples/Basic env: DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/ diff --git a/Package.swift b/Package.swift index 521b543cc..7dac6fbae 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let testingLinkerFlags: [LinkerSetting] = [ let package = Package( name: "JavaScriptKit", platforms: [ - .macOS(.v10_15), + .macOS(.v13), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), @@ -37,7 +37,7 @@ let package = Package( .plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]), ], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0") + .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"601.0.0") ], targets: [ .target( From fdc474e71fbc8244437ecc07115782e90a878387 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 23 Jan 2026 14:37:44 +0800 Subject: [PATCH 079/252] PlayBridgeJS: Stop using fixed heights --- .../PlayBridgeJS/Sources/JavaScript/styles.css | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/styles.css b/Examples/PlayBridgeJS/Sources/JavaScript/styles.css index da62834ee..ab943c6e0 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/styles.css +++ b/Examples/PlayBridgeJS/Sources/JavaScript/styles.css @@ -49,13 +49,12 @@ body { background-color: var(--color-fill); color: var(--color-text); font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', 'Segoe UI', Roboto, sans-serif; - height: 100vh; - overflow: hidden; + min-height: 100vh; line-height: 1.5; } .container { - height: 100vh; + min-height: 100vh; padding: 24px; display: flex; flex-direction: column; @@ -383,15 +382,26 @@ body { } @media (max-width: 768px) { + body { + overflow: auto; + } + .main-content { grid-template-columns: 1fr; gap: 16px; + flex: none; } .container { + height: auto; + min-height: 100vh; padding: 12px; } + .editor-container { + min-height: 300px; + } + .header h1 { font-size: 24px; } From d0e75f1fd266a7de8474c1ae7d726eddb0a9d788 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 23 Jan 2026 21:32:29 +0800 Subject: [PATCH 080/252] BridgeJS: Relax SwiftSyntax version constraint to support 602 and 603 (#513) --- Package.swift | 2 +- .../Sources/BridgeJSCore/ExportSwift.swift | 12 +++++++ .../Sources/BridgeJSCore/ImportTS.swift | 32 ++++++++++++++----- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 7dac6fbae..a513ec406 100644 --- a/Package.swift +++ b/Package.swift @@ -37,7 +37,7 @@ let package = Package( .plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]), ], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"601.0.0") + .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0") ], targets: [ .target( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index b9b9e0634..bb51ebafc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -2528,9 +2528,21 @@ struct ClosureCodegen { capture: ClosureCaptureClauseSyntax( leftSquare: .leftSquareToken(), items: ClosureCaptureListSyntax { + #if canImport(SwiftSyntax602) + ClosureCaptureSyntax( + name: .identifier("", presence: .missing), + initializer: InitializerClauseSyntax( + equal: .equalToken(presence: .missing), + nil, + value: ExprSyntax("callback") + ), + trailingTrivia: nil + ) + #else ClosureCaptureSyntax( expression: ExprSyntax("callback") ) + #endif }, rightSquare: .rightSquareToken() ), diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 675708c45..0ca301b68 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -734,16 +734,32 @@ enum SwiftCodePattern { /// Builds the standard @_expose and @_cdecl attributes for WebAssembly-exposed functions static func buildExposeAttributes(abiName: String) -> AttributeListSyntax { return AttributeListSyntax { + #if canImport(SwiftSyntax602) + let exposeAttrArgs = AttributeSyntax.Arguments.argumentList( + [ + LabeledExprSyntax(label: nil, expression: DeclReferenceExprSyntax(baseName: "wasm")), + LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)), + ] + ) + let cdeclAttrArgs = AttributeSyntax.Arguments.argumentList( + [ + LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)) + ] + ) + #else + let exposeAttrArgs = AttributeSyntax.Arguments.exposeAttributeArguments( + ExposeAttributeArgumentsSyntax( + language: .identifier("wasm"), + comma: .commaToken(), + cxxName: StringLiteralExprSyntax(content: abiName) + ) + ) + let cdeclAttrArgs = AttributeSyntax.Arguments.string(StringLiteralExprSyntax(content: abiName)) + #endif AttributeSyntax( attributeName: IdentifierTypeSyntax(name: .identifier("_expose")), leftParen: .leftParenToken(), - arguments: .exposeAttributeArguments( - ExposeAttributeArgumentsSyntax( - language: .identifier("wasm"), - comma: .commaToken(), - cxxName: StringLiteralExprSyntax(content: abiName) - ) - ), + arguments: exposeAttrArgs, rightParen: .rightParenToken() ) .with(\.trailingTrivia, .newline) @@ -751,7 +767,7 @@ enum SwiftCodePattern { AttributeSyntax( attributeName: IdentifierTypeSyntax(name: .identifier("_cdecl")), leftParen: .leftParenToken(), - arguments: .string(StringLiteralExprSyntax(content: abiName)), + arguments: cdeclAttrArgs, rightParen: .rightParenToken() ) .with(\.trailingTrivia, .newline) From 1f3ba606c1031dca66427e1be06e041117ca2002 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 25 Jan 2026 09:49:38 +0800 Subject: [PATCH 081/252] Build: Enforce SWIFT_SDK_ID is set for unittest target The default value for SWIFT_SDK_ID in the Makefile was causing confusion when developers ran `make unittest` without the env var set, leading to unexpected SDK usage. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c46431dd1..0c5d0122a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SWIFT_SDK_ID ?= wasm32-unknown-wasi +SWIFT_SDK_ID ?= .PHONY: bootstrap bootstrap: @@ -7,6 +7,10 @@ bootstrap: .PHONY: unittest unittest: @echo Running unit tests + @test -n "$(SWIFT_SDK_ID)" || { \ + echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID='."; \ + exit 2; \ + } env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ --disable-sandbox \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc From 222b12c37a64ba0cb11dc4ea872036e3ba1d6e9f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 25 Jan 2026 10:03:34 +0800 Subject: [PATCH 082/252] BridgeJS: Remove adhoc `exportedProtocolNameByKey` recording TypeDeclResolver should be responsible for handling this --- Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift | 8 -------- .../BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index bb51ebafc..d9564aff4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -26,7 +26,6 @@ public class ExportSwift { private var exportedEnums: [ExportedEnum] = [] private var exportedStructs: [ExportedStruct] = [] private var exportedProtocols: [ExportedProtocol] = [] - private var exportedProtocolNameByKey: [String: String] = [:] private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] @@ -1136,8 +1135,6 @@ public class ExportSwift { stateStack.pop() - parent.exportedProtocolNameByKey[protocolUniqueKey] = name - return .skipChildren } @@ -1598,11 +1595,6 @@ public class ExportSwift { return primitiveType } - let protocolKey = typeName - if let protocolName = exportedProtocolNameByKey[protocolKey] { - return .swiftProtocol(protocolName) - } - guard let typeDecl = typeDeclResolver.resolve(type) else { return nil } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift index 33e36a4a2..975c0c9dc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift @@ -63,6 +63,12 @@ class TypeDeclResolver { override func visitPost(_ node: EnumDeclSyntax) { visitPostNominalDecl() } + override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind { + return visitNominalDecl(node) + } + override func visitPost(_ node: ProtocolDeclSyntax) { + visitPostNominalDecl() + } override func visit(_ node: TypeAliasDeclSyntax) -> SyntaxVisitorContinueKind { let name = node.name.text From a2b9900616d1e073ed05721d1f7963da27d590e1 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 25 Jan 2026 10:11:56 +0800 Subject: [PATCH 083/252] BridgeJS: Merge small core files into single Misc.swift Ugry hack to allow me to add new files later without paying build time penalty... --- .../BridgeJSCore/BridgeJSCoreError.swift | 7 --- .../BridgeJSCore/DiagnosticError.swift | 23 ------- .../{BridgeJSConfig.swift => Misc.swift} | 60 +++++++++++++++++++ .../BridgeJSCore/ProgressReporting.swift | 19 ------ 4 files changed, 60 insertions(+), 49 deletions(-) delete mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSCoreError.swift delete mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/DiagnosticError.swift rename Plugins/BridgeJS/Sources/BridgeJSCore/{BridgeJSConfig.swift => Misc.swift} (67%) delete mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/ProgressReporting.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSCoreError.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSCoreError.swift deleted file mode 100644 index 9cbec438e..000000000 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSCoreError.swift +++ /dev/null @@ -1,7 +0,0 @@ -public struct BridgeJSCoreError: Swift.Error, CustomStringConvertible { - public let description: String - - public init(_ message: String) { - self.description = message - } -} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/DiagnosticError.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/DiagnosticError.swift deleted file mode 100644 index 2688f8da2..000000000 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/DiagnosticError.swift +++ /dev/null @@ -1,23 +0,0 @@ -import SwiftSyntax - -struct DiagnosticError: Error { - let node: Syntax - let message: String - let hint: String? - - init(node: some SyntaxProtocol, message: String, hint: String? = nil) { - self.node = Syntax(node) - self.message = message - self.hint = hint - } - - func formattedDescription(fileName: String) -> String { - let locationConverter = SourceLocationConverter(fileName: fileName, tree: node.root) - let location = locationConverter.location(for: node.position) - var description = "\(fileName):\(location.line):\(location.column): error: \(message)" - if let hint { - description += "\nHint: \(hint)" - } - return description - } -} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift similarity index 67% rename from Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift rename to Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 56646b59c..e11bd4058 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSConfig.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -1,3 +1,63 @@ +// MARK: - ProgressReporting + +public struct ProgressReporting { + let print: (String) -> Void + + public init(verbose: Bool) { + self.init(print: verbose ? { Swift.print($0) } : { _ in }) + } + + private init(print: @escaping (String) -> Void) { + self.print = print + } + + public static var silent: ProgressReporting { + return ProgressReporting(print: { _ in }) + } + + public func print(_ message: String) { + self.print(message) + } +} + +// MARK: - DiagnosticError + +import SwiftSyntax + +struct DiagnosticError: Error { + let node: Syntax + let message: String + let hint: String? + + init(node: some SyntaxProtocol, message: String, hint: String? = nil) { + self.node = Syntax(node) + self.message = message + self.hint = hint + } + + func formattedDescription(fileName: String) -> String { + let locationConverter = SourceLocationConverter(fileName: fileName, tree: node.root) + let location = locationConverter.location(for: node.position) + var description = "\(fileName):\(location.line):\(location.column): error: \(message)" + if let hint { + description += "\nHint: \(hint)" + } + return description + } +} + +// MARK: - BridgeJSCoreError + +public struct BridgeJSCoreError: Swift.Error, CustomStringConvertible { + public let description: String + + public init(_ message: String) { + self.description = message + } +} + +// MARK: - BridgeJSConfig + import struct Foundation.URL import struct Foundation.Data import class Foundation.FileManager diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ProgressReporting.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ProgressReporting.swift deleted file mode 100644 index d1a2aa6d8..000000000 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ProgressReporting.swift +++ /dev/null @@ -1,19 +0,0 @@ -public struct ProgressReporting { - let print: (String) -> Void - - public init(verbose: Bool) { - self.init(print: verbose ? { Swift.print($0) } : { _ in }) - } - - private init(print: @escaping (String) -> Void) { - self.print = print - } - - public static var silent: ProgressReporting { - return ProgressReporting(print: { _ in }) - } - - public func print(_ message: String) { - self.print(message) - } -} From de0928b7539b1f4e5cba012a73b35c7e4b07378b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 11:40:16 +0800 Subject: [PATCH 084/252] Add SwiftToSkeleton unified Swift-to-skeleton API (#516) * Add SwiftToSkeleton unified Swift-to-skeleton API Now ExportSwift/ImportTS are not responsible for collecting macro-annotated decls and produce skeletons. * PlayBridgeJS: Update to use SwiftToSkeleton --- .../Sources/PlayBridgeJS/main.swift | 33 +- .../Sources/BridgeJSCore/ExportSwift.swift | 1682 +----------- .../BridgeJSCore/ImportSwiftMacros.swift | 710 ----- .../Sources/BridgeJSCore/ImportTS.swift | 9 +- .../BridgeJSCore/SwiftToSkeleton.swift | 2300 +++++++++++++++++ .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 19 +- .../Sources/BridgeJSTool/BridgeJSTool.swift | 38 +- .../BridgeJSToolTests/BridgeJSLinkTests.swift | 78 +- .../BridgeJSToolTests/ExportSwiftTests.swift | 53 +- .../BridgeJSToolTests/ImportTSTests.swift | 11 +- .../Generated/JavaScript/BridgeJS.json | 12 - 11 files changed, 2437 insertions(+), 2508 deletions(-) delete mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index e7f70311d..80572962a 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -18,22 +18,27 @@ import class Foundation.JSONDecoder func _update(swiftSource: String, dtsSource: String) throws -> PlayBridgeJSOutput { let moduleName = "Playground" - let exportSwift = ExportSwift(progress: .silent, moduleName: moduleName, exposeToGlobal: false) - let sourceFile = Parser.parse(source: swiftSource) - try exportSwift.addSourceFile(sourceFile, "Playground.swift") - let exportResult = try exportSwift.finalize() + + let swiftToSkeleton = SwiftToSkeleton(progress: .silent, moduleName: moduleName, exposeToGlobal: false) + swiftToSkeleton.addSourceFile(Parser.parse(source: swiftSource), inputFilePath: "Playground.swift") + let ts2swift = try createTS2Swift() let importSwiftMacroDecls = try ts2swift.convert(dtsSource) - let importSwift = ImportSwiftMacros(progress: .silent, moduleName: moduleName) - let importSourceFile = Parser.parse(source: importSwiftMacroDecls) - importSwift.addSourceFile(importSourceFile, "Playground.Macros.swift") - importSwift.addSourceFile(sourceFile, "Playground.swift") - let importResult = try importSwift.finalize() - let skeleton = BridgeJSSkeleton( - moduleName: moduleName, - exported: exportResult.map { $0.outputSkeleton }, - imported: importResult.outputSkeleton + swiftToSkeleton.addSourceFile( + Parser.parse(source: importSwiftMacroDecls), + inputFilePath: "Playground.Macros.swift" ) + + let skeleton = try swiftToSkeleton.finalize() + + let exportResult = try skeleton.exported.flatMap { + let exportSwift = ExportSwift(progress: .silent, moduleName: moduleName, skeleton: $0) + return try exportSwift.finalize() + } + let importResult = try skeleton.imported.flatMap { + let importTS = ImportTS(progress: .silent, moduleName: moduleName, skeleton: $0) + return try importTS.finalize() + } let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false) let linked = try linker.link() @@ -41,7 +46,7 @@ import class Foundation.JSONDecoder outputJs: linked.outputJs, outputDts: linked.outputDts, importSwiftMacroDecls: importSwiftMacroDecls, - swiftGlue: (importResult.outputSwift ?? "") + "\n\n" + (exportResult?.outputSwift ?? "") + swiftGlue: (importResult ?? "") + "\n\n" + (exportResult ?? "") ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index d9564aff4..18d529d3e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -21,1651 +21,39 @@ public class ExportSwift { let progress: ProgressReporting let moduleName: String private let exposeToGlobal: Bool - private var exportedFunctions: [ExportedFunction] = [] - private var exportedClasses: [ExportedClass] = [] - private var exportedEnums: [ExportedEnum] = [] - private var exportedStructs: [ExportedStruct] = [] - private var exportedProtocols: [ExportedProtocol] = [] - private var typeDeclResolver: TypeDeclResolver = TypeDeclResolver() + private var skeleton: ExportedSkeleton private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] - public init(progress: ProgressReporting, moduleName: String, exposeToGlobal: Bool) { + public init(progress: ProgressReporting, moduleName: String, skeleton: ExportedSkeleton) { self.progress = progress self.moduleName = moduleName - self.exposeToGlobal = exposeToGlobal + self.exposeToGlobal = skeleton.exposeToGlobal + self.skeleton = skeleton } - /// Processes a Swift source file to find declarations marked with @JS - /// - /// - Parameters: - /// - sourceFile: The parsed Swift source file to process - /// - inputFilePath: The file path for error reporting - public func addSourceFile(_ sourceFile: SourceFileSyntax, _ inputFilePath: String) throws { - // First, register type declarations before walking for exposed APIs - typeDeclResolver.addSourceFile(sourceFile) - sourceFiles.append((sourceFile, inputFilePath)) - } - - /// Finalizes the export process and generates the bridge code - /// - /// - Parameters: - /// - exposeToGlobal: Whether to expose exported APIs to the global namespace (default: false) - /// - Returns: A tuple containing the generated Swift code and a skeleton - /// describing the exported APIs - public func finalize() throws -> (outputSwift: String, outputSkeleton: ExportedSkeleton)? { - // Walk through each source file and collect exported APIs - var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = [] - for (sourceFile, inputFilePath) in sourceFiles { - progress.print("Processing \(inputFilePath)") - let errors = try parseSingleFile(sourceFile) - if errors.count > 0 { - perSourceErrors.append((inputFilePath: inputFilePath, errors: errors)) - } - } - - if !perSourceErrors.isEmpty { - // Aggregate and throw all errors - var allErrors: [String] = [] - for (inputFilePath, errors) in perSourceErrors { - for error in errors { - allErrors.append(error.formattedDescription(fileName: inputFilePath)) - } - } - throw BridgeJSCoreError(allErrors.joined(separator: "\n")) - } - - guard let outputSwift = try renderSwiftGlue() else { - return nil - } - return ( - outputSwift: outputSwift, - outputSkeleton: ExportedSkeleton( - functions: exportedFunctions, - classes: exportedClasses, - enums: exportedEnums, - structs: exportedStructs, - protocols: exportedProtocols, - exposeToGlobal: exposeToGlobal - ) - ) - } - - fileprivate final class APICollector: SyntaxAnyVisitor { - var exportedFunctions: [ExportedFunction] = [] - /// The names of the exported classes, in the order they were written in the source file - var exportedClassNames: [String] = [] - var exportedClassByName: [String: ExportedClass] = [:] - /// The names of the exported enums, in the order they were written in the source file - var exportedEnumNames: [String] = [] - var exportedEnumByName: [String: ExportedEnum] = [:] - /// The names of the exported protocols, in the order they were written in the source file - var exportedProtocolNames: [String] = [] - var exportedProtocolByName: [String: ExportedProtocol] = [:] - /// The names of the exported structs, in the order they were written in the source file - var exportedStructNames: [String] = [] - var exportedStructByName: [String: ExportedStruct] = [:] - var errors: [DiagnosticError] = [] - - /// Creates a unique key by combining name and namespace - private func makeKey(name: String, namespace: [String]?) -> String { - if let namespace = namespace, !namespace.isEmpty { - return "\(namespace.joined(separator: ".")).\(name)" - } else { - return name - } - } - - struct NamespaceResolution { - let namespace: [String]? - let isValid: Bool - } - - /// Resolves and validates namespace from both @JS attribute and computed (nested) namespace - /// Returns the effective namespace and whether validation succeeded - private func resolveNamespace( - from jsAttribute: AttributeSyntax, - for node: some SyntaxProtocol, - declarationType: String - ) -> NamespaceResolution { - let attributeNamespace = extractNamespace(from: jsAttribute) - let computedNamespace = computeNamespace(for: node) - - if computedNamespace != nil && attributeNamespace != nil { - diagnose( - node: jsAttribute, - message: "Nested \(declarationType)s cannot specify their own namespace", - hint: - "Remove the namespace from @JS attribute - nested \(declarationType)s inherit namespace from parent" - ) - return NamespaceResolution(namespace: nil, isValid: false) - } - - return NamespaceResolution(namespace: computedNamespace ?? attributeNamespace, isValid: true) - } - - enum State { - case topLevel - case classBody(name: String, key: String) - case enumBody(name: String, key: String) - case protocolBody(name: String, key: String) - case structBody(name: String, key: String) - } - - struct StateStack { - private var states: [State] - var current: State { - return states.last! - } - - init(_ initialState: State) { - self.states = [initialState] - } - mutating func push(state: State) { - states.append(state) - } - - mutating func pop() { - _ = states.removeLast() - } - } - - var stateStack: StateStack = StateStack(.topLevel) - var state: State { - return stateStack.current - } - let parent: ExportSwift - - init(parent: ExportSwift) { - self.parent = parent - super.init(viewMode: .sourceAccurate) - } - - private func diagnose(node: some SyntaxProtocol, message: String, hint: String? = nil) { - errors.append(DiagnosticError(node: node, message: message, hint: hint)) - } - - private func diagnoseUnsupportedType(node: some SyntaxProtocol, type: String) { - diagnose( - node: node, - message: "Unsupported type: \(type)", - hint: "Only primitive types and types defined in the same module are allowed" - ) - } - - private func diagnoseNestedOptional(node: some SyntaxProtocol, type: String) { - diagnose( - node: node, - message: "Nested optional types are not supported: \(type)", - hint: "Use a single optional like String? instead of String?? or Optional>" - ) - } - - /// Detects whether given expression is supported as default parameter value - private func isSupportedDefaultValueExpression(_ initClause: InitializerClauseSyntax) -> Bool { - let expression = initClause.value - - // Function calls are checked later in extractDefaultValue (as constructors are allowed) - if expression.is(ArrayExprSyntax.self) { return false } - if expression.is(DictionaryExprSyntax.self) { return false } - if expression.is(BinaryOperatorExprSyntax.self) { return false } - if expression.is(ClosureExprSyntax.self) { return false } - - // Method call chains (e.g., obj.foo()) - if let memberExpression = expression.as(MemberAccessExprSyntax.self), - memberExpression.base?.is(FunctionCallExprSyntax.self) == true - { - return false - } - - return true - } - - /// Extract enum case value from member access expression - private func extractEnumCaseValue( - from memberExpr: MemberAccessExprSyntax, - type: BridgeType - ) -> DefaultValue? { - let caseName = memberExpr.declName.baseName.text - - let enumName: String? - switch type { - case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): - enumName = name - case .optional(let wrappedType): - switch wrappedType { - case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): - enumName = name - default: - return nil - } - default: - return nil - } - - guard let enumName = enumName else { return nil } - - if memberExpr.base == nil { - return .enumCase(enumName, caseName) - } - - if let baseExpr = memberExpr.base?.as(DeclReferenceExprSyntax.self) { - let baseName = baseExpr.baseName.text - let lastComponent = enumName.split(separator: ".").last.map(String.init) ?? enumName - if baseName == enumName || baseName == lastComponent { - return .enumCase(enumName, caseName) - } - } - - return nil - } - - /// Extracts default value from parameter's default value clause - private func extractDefaultValue( - from defaultClause: InitializerClauseSyntax?, - type: BridgeType - ) -> DefaultValue? { - guard let defaultClause = defaultClause else { - return nil - } - - if !isSupportedDefaultValueExpression(defaultClause) { - diagnose( - node: defaultClause, - message: "Complex default parameter expressions are not supported", - hint: "Use simple literal values (e.g., \"text\", 42, true, nil) or simple constants" - ) - return nil - } - - let expr = defaultClause.value - - if expr.is(NilLiteralExprSyntax.self) { - guard case .optional(_) = type else { - diagnose( - node: expr, - message: "nil is only valid for optional parameters", - hint: "Make the parameter optional by adding ? to the type" - ) - return nil - } - return .null - } - - if let memberExpr = expr.as(MemberAccessExprSyntax.self), - let enumValue = extractEnumCaseValue(from: memberExpr, type: type) - { - return enumValue - } - - if let funcCall = expr.as(FunctionCallExprSyntax.self) { - return extractConstructorDefaultValue(from: funcCall, type: type) - } - - if let literalValue = extractLiteralValue(from: expr, type: type) { - return literalValue - } - - diagnose( - node: expr, - message: "Unsupported default parameter value expression", - hint: "Use simple literal values like \"text\", 42, true, false, nil, or enum cases like .caseName" - ) - return nil - } - - /// Extracts default value from a constructor call expression - private func extractConstructorDefaultValue( - from funcCall: FunctionCallExprSyntax, - type: BridgeType - ) -> DefaultValue? { - guard let calledExpr = funcCall.calledExpression.as(DeclReferenceExprSyntax.self) else { - diagnose( - node: funcCall, - message: "Complex constructor expressions are not supported", - hint: "Use a simple constructor call like ClassName() or ClassName(arg: value)" - ) - return nil - } - - let typeName = calledExpr.baseName.text - - let isStructType: Bool - let expectedTypeName: String? - switch type { - case .swiftStruct(let name), .optional(.swiftStruct(let name)): - isStructType = true - expectedTypeName = name.split(separator: ".").last.map(String.init) - case .swiftHeapObject(let name), .optional(.swiftHeapObject(let name)): - isStructType = false - expectedTypeName = name.split(separator: ".").last.map(String.init) - default: - diagnose( - node: funcCall, - message: "Constructor calls are only supported for class and struct types", - hint: "Parameter type should be a Swift class or struct" - ) - return nil - } - - guard let expectedTypeName = expectedTypeName, typeName == expectedTypeName else { - diagnose( - node: funcCall, - message: "Constructor type name '\(typeName)' doesn't match parameter type", - hint: "Ensure the constructor matches the parameter type" - ) - return nil - } - - if isStructType { - // For structs, extract field name/value pairs - var fields: [DefaultValueField] = [] - for argument in funcCall.arguments { - guard let fieldName = argument.label?.text else { - diagnose( - node: argument, - message: "Struct initializer arguments must have labels", - hint: "Use labeled arguments like MyStruct(x: 1, y: 2)" - ) - return nil - } - guard let fieldValue = extractLiteralValue(from: argument.expression) else { - diagnose( - node: argument.expression, - message: "Struct field value must be a literal", - hint: "Use simple literals like \"text\", 42, true, false in struct fields" - ) - return nil - } - fields.append(DefaultValueField(name: fieldName, value: fieldValue)) - } - return .structLiteral(typeName, fields) - } else { - if funcCall.arguments.isEmpty { - return .object(typeName) - } - - var constructorArgs: [DefaultValue] = [] - for argument in funcCall.arguments { - guard let argValue = extractLiteralValue(from: argument.expression) else { - diagnose( - node: argument.expression, - message: "Constructor argument must be a literal value", - hint: "Use simple literals like \"text\", 42, true, false in constructor arguments" - ) - return nil - } - constructorArgs.append(argValue) - } - return .objectWithArguments(typeName, constructorArgs) - } - } - - /// Extracts a literal value from an expression with optional type checking - private func extractLiteralValue(from expr: ExprSyntax, type: BridgeType? = nil) -> DefaultValue? { - if expr.is(NilLiteralExprSyntax.self) { - return .null - } - - if let stringLiteral = expr.as(StringLiteralExprSyntax.self), - let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) - { - let value = DefaultValue.string(segment.content.text) - if let type = type, !type.isCompatibleWith(.string) { - return nil - } - return value - } - - if let boolLiteral = expr.as(BooleanLiteralExprSyntax.self) { - let value = DefaultValue.bool(boolLiteral.literal.text == "true") - if let type = type, !type.isCompatibleWith(.bool) { - return nil - } - return value - } - - var numericExpr = expr - var isNegative = false - if let prefixExpr = expr.as(PrefixOperatorExprSyntax.self), - prefixExpr.operator.text == "-" - { - numericExpr = prefixExpr.expression - isNegative = true - } - - if let intLiteral = numericExpr.as(IntegerLiteralExprSyntax.self), - let intValue = Int(intLiteral.literal.text) - { - let value = DefaultValue.int(isNegative ? -intValue : intValue) - if let type = type, !type.isCompatibleWith(.int) { - return nil - } - return value - } - - if let floatLiteral = numericExpr.as(FloatLiteralExprSyntax.self) { - if let floatValue = Float(floatLiteral.literal.text) { - let value = DefaultValue.float(isNegative ? -floatValue : floatValue) - if type == nil || type?.isCompatibleWith(.float) == true { - return value - } - } - if let doubleValue = Double(floatLiteral.literal.text) { - let value = DefaultValue.double(isNegative ? -doubleValue : doubleValue) - if type == nil || type?.isCompatibleWith(.double) == true { - return value - } - } - } - - return nil - } - - /// Shared parameter parsing logic used by functions, initializers, and protocol methods - private func parseParameters( - from parameterClause: FunctionParameterClauseSyntax, - allowDefaults: Bool = true - ) -> [Parameter] { - var parameters: [Parameter] = [] - - for param in parameterClause.parameters { - let resolvedType = self.parent.lookupType(for: param.type) - if let type = resolvedType, case .closure(let signature) = type { - if signature.isAsync { - diagnose( - node: param.type, - message: "Async is not supported for Swift closures yet." - ) - continue - } - if signature.isThrows { - diagnose( - node: param.type, - message: "Throws is not supported for Swift closures yet." - ) - continue - } - } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { - diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) - continue - } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { - diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) - continue - } - - guard let type = resolvedType else { - diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) - continue - } - - let name = param.secondName?.text ?? param.firstName.text - let label = param.firstName.text - - let defaultValue: DefaultValue? - if allowDefaults { - defaultValue = extractDefaultValue(from: param.defaultValue, type: type) - } else { - defaultValue = nil - } - - parameters.append(Parameter(label: label, name: name, type: type, defaultValue: defaultValue)) - } - - return parameters - } - - override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { - guard node.attributes.hasJSAttribute() else { - return .skipChildren - } - - let isStatic = node.modifiers.contains { modifier in - modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) - } - - switch state { - case .topLevel: - if isStatic { - diagnose(node: node, message: "Top-level functions cannot be static") - return .skipChildren - } - if let exportedFunction = visitFunction(node: node, isStatic: false) { - exportedFunctions.append(exportedFunction) - } - return .skipChildren - case .classBody(let className, let classKey): - if let exportedFunction = visitFunction( - node: node, - isStatic: isStatic, - className: className, - classKey: classKey - ) { - exportedClassByName[classKey]?.methods.append(exportedFunction) - } - return .skipChildren - case .enumBody(let enumName, let enumKey): - if !isStatic { - diagnose(node: node, message: "Only static functions are supported in enums") - return .skipChildren - } - if let exportedFunction = visitFunction(node: node, isStatic: isStatic, enumName: enumName) { - if var currentEnum = exportedEnumByName[enumKey] { - currentEnum.staticMethods.append(exportedFunction) - exportedEnumByName[enumKey] = currentEnum - } - } - return .skipChildren - case .protocolBody(_, _): - // Protocol methods are handled in visitProtocolMethod during protocol parsing - return .skipChildren - case .structBody(let structName, let structKey): - if let exportedFunction = visitFunction(node: node, isStatic: isStatic, structName: structName) { - if var currentStruct = exportedStructByName[structKey] { - currentStruct.methods.append(exportedFunction) - exportedStructByName[structKey] = currentStruct - } - } - return .skipChildren - } - } - - private func visitFunction( - node: FunctionDeclSyntax, - isStatic: Bool, - className: String? = nil, - classKey: String? = nil, - enumName: String? = nil, - structName: String? = nil - ) -> ExportedFunction? { - guard let jsAttribute = node.attributes.firstJSAttribute else { - return nil - } - - let name = node.name.text - - let attributeNamespace = extractNamespace(from: jsAttribute) - let computedNamespace = computeNamespace(for: node) - - let finalNamespace: [String]? - - if let computed = computedNamespace, !computed.isEmpty { - finalNamespace = computed - } else { - finalNamespace = attributeNamespace - } - - if attributeNamespace != nil, case .classBody = state { - diagnose( - node: jsAttribute, - message: "Namespace is only needed in top-level declaration", - hint: "Remove the namespace from @JS attribute or move this function to top-level" - ) - } - - if attributeNamespace != nil, case .enumBody = state { - diagnose( - node: jsAttribute, - message: "Namespace is not supported for enum static functions", - hint: "Remove the namespace from @JS attribute - enum functions inherit namespace from enum" - ) - } - - let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) - let returnType: BridgeType - if let returnClause = node.signature.returnClause { - let resolvedType = self.parent.lookupType(for: returnClause.type) - - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { - diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } - - guard let type = resolvedType else { - diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } - returnType = type - } else { - returnType = .void - } - - let abiName: String - let staticContext: StaticContext? - - switch state { - case .topLevel: - staticContext = nil - case .classBody(let className, _): - if isStatic { - staticContext = .className(className) - } else { - staticContext = nil - } - case .enumBody(let enumName, let enumKey): - if !isStatic { - diagnose(node: node, message: "Only static functions are supported in enums") - return nil - } - - let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true - staticContext = isNamespaceEnum ? .namespaceEnum : .enumName(enumName) - case .protocolBody(_, _): - return nil - case .structBody(let structName, _): - if isStatic { - staticContext = .structName(structName) - } else { - staticContext = nil - } - } - - let classNameForABI: String? - switch state { - case .classBody(let className, _): - classNameForABI = className - case .structBody(let structName, _): - classNameForABI = structName - default: - classNameForABI = nil - } - abiName = ABINameGenerator.generateABIName( - baseName: name, - namespace: finalNamespace, - staticContext: isStatic ? staticContext : nil, - className: classNameForABI - ) - - guard let effects = collectEffects(signature: node.signature, isStatic: isStatic) else { - return nil - } - - return ExportedFunction( - name: name, - abiName: abiName, - parameters: parameters, - returnType: returnType, - effects: effects, - namespace: finalNamespace, - staticContext: staticContext - ) - } - - private func collectEffects(signature: FunctionSignatureSyntax, isStatic: Bool = false) -> Effects? { - let isAsync = signature.effectSpecifiers?.asyncSpecifier != nil - var isThrows = false - if let throwsClause: ThrowsClauseSyntax = signature.effectSpecifiers?.throwsClause { - // Limit the thrown type to JSException for now - guard let thrownType = throwsClause.type else { - diagnose( - node: throwsClause, - message: "Thrown type is not specified, only JSException is supported for now" - ) - return nil - } - guard thrownType.trimmedDescription == "JSException" else { - diagnose( - node: throwsClause, - message: "Only JSException is supported for thrown type, got \(thrownType.trimmedDescription)" - ) - return nil - } - isThrows = true - } - return Effects(isAsync: isAsync, isThrows: isThrows, isStatic: isStatic) - } - - private func extractNamespace( - from jsAttribute: AttributeSyntax - ) -> [String]? { - guard let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self) else { - return nil - } - - guard let namespaceArg = arguments.first(where: { $0.label?.text == "namespace" }), - let stringLiteral = namespaceArg.expression.as(StringLiteralExprSyntax.self), - let namespaceString = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text - else { - return nil - } - - return namespaceString.split(separator: ".").map(String.init) - } - - private func extractEnumStyle( - from jsAttribute: AttributeSyntax - ) -> EnumEmitStyle? { - guard let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self), - let styleArg = arguments.first(where: { $0.label?.text == "enumStyle" }) - else { - return nil - } - let text = styleArg.expression.trimmedDescription - if text.contains("tsEnum") { - return .tsEnum - } - if text.contains("const") { - return .const - } - return nil - } - - override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { - guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } - - switch state { - case .classBody(let className, let classKey): - if extractNamespace(from: jsAttribute) != nil { - diagnose( - node: jsAttribute, - message: "Namespace is not supported for initializer declarations", - hint: "Remove the namespace from @JS attribute" - ) - } - - let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) - - guard let effects = collectEffects(signature: node.signature) else { - return .skipChildren - } - - let constructor = ExportedConstructor( - abiName: "bjs_\(className)_init", - parameters: parameters, - effects: effects - ) - exportedClassByName[classKey]?.constructor = constructor - - case .structBody(let structName, let structKey): - if extractNamespace(from: jsAttribute) != nil { - diagnose( - node: jsAttribute, - message: "Namespace is not supported for initializer declarations", - hint: "Remove the namespace from @JS attribute" - ) - } - - let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) - - guard let effects = collectEffects(signature: node.signature) else { - return .skipChildren - } - - let constructor = ExportedConstructor( - abiName: "bjs_\(structName)_init", - parameters: parameters, - effects: effects - ) - exportedStructByName[structKey]?.constructor = constructor - - case .enumBody(_, _): - diagnose(node: node, message: "Initializers are not supported inside enums") - - case .topLevel, .protocolBody(_, _): - diagnose(node: node, message: "@JS init must be inside a @JS class or struct") - } - - return .skipChildren - } - - override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind { - guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } - - let isStatic = node.modifiers.contains { modifier in - modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) - } - - let attributeNamespace = extractNamespace(from: jsAttribute) - if attributeNamespace != nil { - diagnose( - node: jsAttribute, - message: "Namespace parameter within @JS attribute is not supported for property declarations", - hint: - "Remove the namespace from @JS attribute. If you need dedicated namespace, consider using a nested enum or class instead." - ) - } - - let computedNamespace = computeNamespace(for: node) - let finalNamespace: [String]? - - if let computed = computedNamespace, !computed.isEmpty { - finalNamespace = computed - } else { - finalNamespace = nil - } - - // Determine static context and validate placement - let staticContext: StaticContext? - - switch state { - case .classBody(let className, _): - staticContext = isStatic ? .className(className) : nil - case .enumBody(let enumName, let enumKey): - if !isStatic { - diagnose(node: node, message: "Only static properties are supported in enums") - return .skipChildren - } - let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true - staticContext = isStatic ? (isNamespaceEnum ? .namespaceEnum : .enumName(enumName)) : nil - case .topLevel: - diagnose(node: node, message: "@JS var must be inside a @JS class or enum") - return .skipChildren - case .protocolBody(let protocolName, let protocolKey): - return visitProtocolProperty(node: node, protocolName: protocolName, protocolKey: protocolKey) - case .structBody(let structName, _): - if isStatic { - staticContext = .structName(structName) - } else { - diagnose(node: node, message: "@JS var must be static in structs (instance fields don't need @JS)") - return .skipChildren - } - } - - // Process each binding (variable declaration) - for binding in node.bindings { - guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { - diagnose(node: binding.pattern, message: "Complex patterns not supported for @JS properties") - continue - } - - let propertyName = pattern.identifier.text - - guard let typeAnnotation = binding.typeAnnotation else { - diagnose(node: binding, message: "@JS property must have explicit type annotation") - continue - } - - guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) - continue - } - - // Check if property is readonly - let isLet = node.bindingSpecifier.tokenKind == .keyword(.let) - let isGetterOnly = node.bindings.contains(where: { self.hasOnlyGetter($0.accessorBlock) }) - - let isReadonly = isLet || isGetterOnly - - let exportedProperty = ExportedProperty( - name: propertyName, - type: propertyType, - isReadonly: isReadonly, - isStatic: isStatic, - namespace: finalNamespace, - staticContext: staticContext - ) - - if case .enumBody(_, let key) = state { - if var currentEnum = exportedEnumByName[key] { - currentEnum.staticProperties.append(exportedProperty) - exportedEnumByName[key] = currentEnum - } - } else if case .structBody(_, let key) = state { - exportedStructByName[key]?.properties.append(exportedProperty) - } else if case .classBody(_, let key) = state { - exportedClassByName[key]?.properties.append(exportedProperty) - } - } - - return .skipChildren - } - - override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { - let name = node.name.text - - guard let jsAttribute = node.attributes.firstJSAttribute else { - return .skipChildren - } - - let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "class") - guard namespaceResult.isValid else { - return .skipChildren - } - let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) - let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( - for: node, - message: "Class visibility must be at least internal" - ) - let exportedClass = ExportedClass( - name: name, - swiftCallName: swiftCallName, - explicitAccessControl: explicitAccessControl, - constructor: nil, - methods: [], - properties: [], - namespace: namespaceResult.namespace - ) - let uniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) - - stateStack.push(state: .classBody(name: name, key: uniqueKey)) - exportedClassByName[uniqueKey] = exportedClass - exportedClassNames.append(uniqueKey) - return .visitChildren - } - - override func visitPost(_ node: ClassDeclSyntax) { - // Make sure we pop the state stack only if we're in a class body state (meaning we successfully pushed) - if case .classBody(_, _) = stateStack.current { - stateStack.pop() - } - } - - override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind { - guard let jsAttribute = node.attributes.firstJSAttribute else { - return .skipChildren - } - - let name = node.name.text - - let rawType: String? = node.inheritanceClause?.inheritedTypes.first { inheritedType in - let typeName = inheritedType.type.trimmedDescription - return Constants.supportedRawTypes.contains(typeName) - }?.type.trimmedDescription - - let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "enum") - guard namespaceResult.isValid else { - return .skipChildren - } - let emitStyle = extractEnumStyle(from: jsAttribute) ?? .const - let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) - let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( - for: node, - message: "Enum visibility must be at least internal" - ) - - let tsFullPath: String - if let namespace = namespaceResult.namespace, !namespace.isEmpty { - tsFullPath = namespace.joined(separator: ".") + "." + name - } else { - tsFullPath = name - } - - // Create enum directly in dictionary - let exportedEnum = ExportedEnum( - name: name, - swiftCallName: swiftCallName, - tsFullPath: tsFullPath, - explicitAccessControl: explicitAccessControl, - cases: [], // Will be populated in visit(EnumCaseDeclSyntax) - rawType: SwiftEnumRawType(rawType), - namespace: namespaceResult.namespace, - emitStyle: emitStyle, - staticMethods: [], - staticProperties: [] - ) - - let enumUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) - exportedEnumByName[enumUniqueKey] = exportedEnum - exportedEnumNames.append(enumUniqueKey) - - stateStack.push(state: .enumBody(name: name, key: enumUniqueKey)) - - return .visitChildren - } - - override func visitPost(_ node: EnumDeclSyntax) { - guard let jsAttribute = node.attributes.firstJSAttribute else { - // Only pop if we have a valid enum that was processed - if case .enumBody(_, _) = stateStack.current { - stateStack.pop() - } - return - } - - guard case .enumBody(_, let enumKey) = stateStack.current else { - return - } - - guard let exportedEnum = exportedEnumByName[enumKey] else { - stateStack.pop() - return - } - - let emitStyle = exportedEnum.emitStyle - - if case .tsEnum = emitStyle { - if exportedEnum.rawType == .bool { - diagnose( - node: jsAttribute, - message: "TypeScript enum style is not supported for Bool raw-value enums", - hint: "Use enumStyle: .const or change the raw type to String or a numeric type" - ) - } - if !exportedEnum.staticMethods.isEmpty { - diagnose( - node: jsAttribute, - message: "TypeScript enum style does not support static functions", - hint: "Use enumStyle: .const to generate a const object that supports static functions" - ) - } - } - - if exportedEnum.cases.contains(where: { !$0.associatedValues.isEmpty }) { - if case .tsEnum = emitStyle { - diagnose( - node: jsAttribute, - message: "TypeScript enum style is not supported for associated value enums", - hint: "Use enumStyle: .const in order to map associated-value enums" - ) - } - for enumCase in exportedEnum.cases { - for associatedValue in enumCase.associatedValues { - switch associatedValue.type { - case .string, .int, .float, .double, .bool: - break - case .optional(let wrappedType): - switch wrappedType { - case .string, .int, .float, .double, .bool: - break - default: - diagnose( - node: node, - message: "Unsupported associated value type: \(associatedValue.type.swiftType)", - hint: - "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" - ) - } - default: - diagnose( - node: node, - message: "Unsupported associated value type: \(associatedValue.type.swiftType)", - hint: - "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" - ) - } - } - } - } - - stateStack.pop() - } - - override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind { - guard let jsAttribute = node.attributes.firstJSAttribute else { - return .skipChildren - } - - let name = node.name.text - - let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "protocol") - guard namespaceResult.isValid else { - return .skipChildren - } - _ = computeExplicitAtLeastInternalAccessControl( - for: node, - message: "Protocol visibility must be at least internal" - ) - - let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) - - exportedProtocolByName[protocolUniqueKey] = ExportedProtocol( - name: name, - methods: [], - properties: [], - namespace: namespaceResult.namespace - ) - - stateStack.push(state: .protocolBody(name: name, key: protocolUniqueKey)) - - var methods: [ExportedFunction] = [] - for member in node.memberBlock.members { - if let funcDecl = member.decl.as(FunctionDeclSyntax.self) { - if let exportedFunction = visitProtocolMethod( - node: funcDecl, - protocolName: name, - namespace: namespaceResult.namespace - ) { - methods.append(exportedFunction) - } - } else if let varDecl = member.decl.as(VariableDeclSyntax.self) { - _ = visitProtocolProperty(node: varDecl, protocolName: name, protocolKey: protocolUniqueKey) - } - } - - let exportedProtocol = ExportedProtocol( - name: name, - methods: methods, - properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [], - namespace: namespaceResult.namespace - ) - - exportedProtocolByName[protocolUniqueKey] = exportedProtocol - exportedProtocolNames.append(protocolUniqueKey) - - stateStack.pop() - - return .skipChildren - } - - override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { - guard let jsAttribute = node.attributes.firstJSAttribute else { - return .skipChildren - } - - let name = node.name.text - - let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "struct") - guard namespaceResult.isValid else { - return .skipChildren - } - let swiftCallName = ExportSwift.computeSwiftCallName(for: node, itemName: name) - let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( - for: node, - message: "Struct visibility must be at least internal" - ) - - var properties: [ExportedProperty] = [] - - // Process all variables in struct as readonly (value semantics) and don't require @JS - for member in node.memberBlock.members { - if let varDecl = member.decl.as(VariableDeclSyntax.self) { - let isStatic = varDecl.modifiers.contains { modifier in - modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) - } - - // Handled with error in visitVariable - if varDecl.attributes.hasJSAttribute() { - continue - } - // Skips static non-@JS properties - if isStatic { - continue - } - - for binding in varDecl.bindings { - guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { - continue - } - - let fieldName = pattern.identifier.text - - guard let typeAnnotation = binding.typeAnnotation else { - diagnose(node: binding, message: "Struct field must have explicit type annotation") - continue - } - - guard let fieldType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType( - node: typeAnnotation.type, - type: typeAnnotation.type.trimmedDescription - ) - continue - } - - let property = ExportedProperty( - name: fieldName, - type: fieldType, - isReadonly: true, - isStatic: false, - namespace: namespaceResult.namespace, - staticContext: nil - ) - properties.append(property) - } - } - } - - let structUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) - let exportedStruct = ExportedStruct( - name: name, - swiftCallName: swiftCallName, - explicitAccessControl: explicitAccessControl, - properties: properties, - methods: [], - namespace: namespaceResult.namespace - ) - - exportedStructByName[structUniqueKey] = exportedStruct - exportedStructNames.append(structUniqueKey) - - stateStack.push(state: .structBody(name: name, key: structUniqueKey)) - - return .visitChildren - } - - override func visitPost(_ node: StructDeclSyntax) { - if case .structBody(_, _) = stateStack.current { - stateStack.pop() - } - } - - private func visitProtocolMethod( - node: FunctionDeclSyntax, - protocolName: String, - namespace: [String]? - ) -> ExportedFunction? { - let name = node.name.text - - let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: false) - - let returnType: BridgeType - if let returnClause = node.signature.returnClause { - let resolvedType = self.parent.lookupType(for: returnClause.type) - - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { - diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } - - guard let type = resolvedType else { - diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } - returnType = type - } else { - returnType = .void - } - - let abiName = ABINameGenerator.generateABIName( - baseName: name, - namespace: namespace, - className: protocolName - ) - - guard let effects = collectEffects(signature: node.signature) else { - return nil - } - - return ExportedFunction( - name: name, - abiName: abiName, - parameters: parameters, - returnType: returnType, - effects: effects, - namespace: namespace, - staticContext: nil - ) - } - - private func visitProtocolProperty( - node: VariableDeclSyntax, - protocolName: String, - protocolKey: String - ) -> SyntaxVisitorContinueKind { - for binding in node.bindings { - guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { - diagnose(node: binding.pattern, message: "Complex patterns not supported for protocol properties") - continue - } - - let propertyName = pattern.identifier.text - - guard let typeAnnotation = binding.typeAnnotation else { - diagnose(node: binding, message: "Protocol property must have explicit type annotation") - continue - } - - guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) - continue - } - - guard let accessorBlock = binding.accessorBlock else { - diagnose( - node: binding, - message: "Protocol property must specify { get } or { get set }", - hint: "Add { get } for readonly or { get set } for readwrite property" - ) - continue - } - - let isReadonly = hasOnlyGetter(accessorBlock) - - let exportedProperty = ExportedProtocolProperty( - name: propertyName, - type: propertyType, - isReadonly: isReadonly - ) - - if var currentProtocol = exportedProtocolByName[protocolKey] { - var properties = currentProtocol.properties - properties.append(exportedProperty) - - currentProtocol = ExportedProtocol( - name: currentProtocol.name, - methods: currentProtocol.methods, - properties: properties, - namespace: currentProtocol.namespace - ) - exportedProtocolByName[protocolKey] = currentProtocol - } - } - - return .skipChildren - } - - private func hasOnlyGetter(_ accessorBlock: AccessorBlockSyntax?) -> Bool { - switch accessorBlock?.accessors { - case .accessors(let accessors): - // Has accessors - check if it only has a getter (no setter, willSet, or didSet) - return !accessors.contains(where: { accessor in - let tokenKind = accessor.accessorSpecifier.tokenKind - return tokenKind == .keyword(.set) || tokenKind == .keyword(.willSet) - || tokenKind == .keyword(.didSet) - }) - case .getter: - // Has only a getter block - return true - case nil: - // No accessor block - this is a stored property, not readonly - return false - } - } - - override func visit(_ node: EnumCaseDeclSyntax) -> SyntaxVisitorContinueKind { - guard case .enumBody(_, let enumKey) = stateStack.current else { - return .visitChildren - } - - for element in node.elements { - let caseName = element.name.text - let rawValue: String? - var associatedValues: [AssociatedValue] = [] - - if exportedEnumByName[enumKey]?.rawType != nil { - if let stringLiteral = element.rawValue?.value.as(StringLiteralExprSyntax.self) { - rawValue = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text - } else if let boolLiteral = element.rawValue?.value.as(BooleanLiteralExprSyntax.self) { - rawValue = boolLiteral.literal.text - } else { - var numericExpr = element.rawValue?.value - var isNegative = false - - // Check for prefix operator (for negative numbers) - if let prefixExpr = numericExpr?.as(PrefixOperatorExprSyntax.self), - prefixExpr.operator.text == "-" - { - numericExpr = prefixExpr.expression - isNegative = true - } - - if let intLiteral = numericExpr?.as(IntegerLiteralExprSyntax.self) { - rawValue = isNegative ? "-\(intLiteral.literal.text)" : intLiteral.literal.text - } else if let floatLiteral = numericExpr?.as(FloatLiteralExprSyntax.self) { - rawValue = isNegative ? "-\(floatLiteral.literal.text)" : floatLiteral.literal.text - } else { - rawValue = nil - } - } - } else { - rawValue = nil - } - if let parameterClause = element.parameterClause { - for param in parameterClause.parameters { - guard let bridgeType = parent.lookupType(for: param.type) else { - diagnose( - node: param.type, - message: "Unsupported associated value type: \(param.type.trimmedDescription)", - hint: "Only primitive types and types defined in the same module are allowed" - ) - continue - } - - let label = param.firstName?.text - associatedValues.append(AssociatedValue(label: label, type: bridgeType)) - } - } - let enumCase = EnumCase( - name: caseName, - rawValue: rawValue, - associatedValues: associatedValues - ) - exportedEnumByName[enumKey]?.cases.append(enumCase) - } - - return .visitChildren - } - - /// Computes namespace by walking up the AST hierarchy to find parent namespace enums - /// If parent enum is a namespace enum (no cases) then it will be used as part of namespace for given node - /// - /// - /// Method allows for explicit namespace for top level enum, it will be used as base namespace and will concat enum name - private func computeNamespace(for node: some SyntaxProtocol) -> [String]? { - var namespace: [String] = [] - var currentNode: Syntax? = node.parent - - while let parent = currentNode { - if let enumDecl = parent.as(EnumDeclSyntax.self), - enumDecl.attributes.hasJSAttribute() - { - let isNamespaceEnum = !enumDecl.memberBlock.members.contains { member in - member.decl.is(EnumCaseDeclSyntax.self) - } - if isNamespaceEnum { - namespace.insert(enumDecl.name.text, at: 0) - - if let jsAttribute = enumDecl.attributes.firstJSAttribute, - let explicitNamespace = extractNamespace(from: jsAttribute) - { - namespace = explicitNamespace + namespace - break - } - } - } - currentNode = parent.parent - } - - return namespace.isEmpty ? nil : namespace - } - - /// Requires the node to have at least internal access control. - private func computeExplicitAtLeastInternalAccessControl( - for node: some WithModifiersSyntax, - message: String - ) -> String? { - guard let accessControl = node.explicitAccessControl else { - return nil - } - guard accessControl.isAtLeastInternal else { - diagnose( - node: accessControl, - message: message, - hint: "Use `internal`, `package` or `public` access control" - ) - return nil - } - return accessControl.name.text - } - } - - func parseSingleFile(_ sourceFile: SourceFileSyntax) throws -> [DiagnosticError] { - let collector = APICollector(parent: self) - collector.walk(sourceFile) - exportedFunctions.append(contentsOf: collector.exportedFunctions) - exportedClasses.append( - contentsOf: collector.exportedClassNames.map { - collector.exportedClassByName[$0]! - } - ) - exportedEnums.append( - contentsOf: collector.exportedEnumNames.map { - collector.exportedEnumByName[$0]! - } - ) - exportedProtocols.append( - contentsOf: collector.exportedProtocolNames.map { - collector.exportedProtocolByName[$0]! - } - ) - exportedStructs.append( - contentsOf: collector.exportedStructNames.map { - collector.exportedStructByName[$0]! - } - ) - - return collector.errors - } - - /// Computes the full Swift call name by walking up the AST hierarchy to find all parent enums - /// This generates the qualified name needed for Swift code generation (e.g., "Networking.API.HTTPServer") - private static func computeSwiftCallName(for node: some SyntaxProtocol, itemName: String) -> String { - var swiftPath: [String] = [] - var currentNode: Syntax? = node.parent - - while let parent = currentNode { - if let enumDecl = parent.as(EnumDeclSyntax.self), - enumDecl.attributes.hasJSAttribute() - { - swiftPath.insert(enumDecl.name.text, at: 0) - } - currentNode = parent.parent - } - - if swiftPath.isEmpty { - return itemName - } else { - return swiftPath.joined(separator: ".") + "." + itemName - } - } - - func lookupType(for type: TypeSyntax) -> BridgeType? { - if let attributedType = type.as(AttributedTypeSyntax.self) { - return lookupType(for: attributedType.baseType) - } - - // (T1, T2, ...) -> R - if let functionType = type.as(FunctionTypeSyntax.self) { - var parameters: [BridgeType] = [] - for param in functionType.parameters { - guard let paramType = lookupType(for: param.type) else { - return nil - } - parameters.append(paramType) - } - - guard let returnType = lookupType(for: functionType.returnClause.type) else { - return nil - } - - let isAsync = functionType.effectSpecifiers?.asyncSpecifier != nil - let isThrows = functionType.effectSpecifiers?.throwsClause != nil - - return .closure( - ClosureSignature( - parameters: parameters, - returnType: returnType, - moduleName: moduleName, - isAsync: isAsync, - isThrows: isThrows - ) - ) - } - - // T? - if let optionalType = type.as(OptionalTypeSyntax.self) { - let wrappedType = optionalType.wrappedType - if let baseType = lookupType(for: wrappedType) { - return .optional(baseType) - } - } - // Optional - if let identifierType = type.as(IdentifierTypeSyntax.self), - identifierType.name.text == "Optional", - let genericArgs = identifierType.genericArgumentClause?.arguments, - genericArgs.count == 1, - let argType = TypeSyntax(genericArgs.first?.argument) - { - if let baseType = lookupType(for: argType) { - return .optional(baseType) - } - } - // Swift.Optional - if let memberType = type.as(MemberTypeSyntax.self), - let baseType = memberType.baseType.as(IdentifierTypeSyntax.self), - baseType.name.text == "Swift", - memberType.name.text == "Optional", - let genericArgs = memberType.genericArgumentClause?.arguments, - genericArgs.count == 1, - let argType = TypeSyntax(genericArgs.first?.argument) - { - if let wrappedType = lookupType(for: argType) { - return .optional(wrappedType) - } - } - if let aliasDecl = typeDeclResolver.resolveTypeAlias(type) { - if let resolvedType = lookupType(for: aliasDecl.initializer.value) { - return resolvedType - } - } - - let typeName = type.trimmedDescription - if let primitiveType = BridgeType(swiftType: typeName) { - return primitiveType - } - - guard let typeDecl = typeDeclResolver.resolve(type) else { - return nil - } - - if typeDecl.is(ProtocolDeclSyntax.self) { - let swiftCallName = ExportSwift.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) - return .swiftProtocol(swiftCallName) - } - - if let enumDecl = typeDecl.as(EnumDeclSyntax.self) { - let swiftCallName = ExportSwift.computeSwiftCallName(for: enumDecl, itemName: enumDecl.name.text) - let rawTypeString = enumDecl.inheritanceClause?.inheritedTypes.first { inheritedType in - let typeName = inheritedType.type.trimmedDescription - return Constants.supportedRawTypes.contains(typeName) - }?.type.trimmedDescription - - if let rawType = SwiftEnumRawType(rawTypeString) { - return .rawValueEnum(swiftCallName, rawType) - } else { - let hasAnyCases = enumDecl.memberBlock.members.contains { member in - member.decl.is(EnumCaseDeclSyntax.self) - } - if !hasAnyCases { - return .namespaceEnum(swiftCallName) - } - let hasAssociatedValues = - enumDecl.memberBlock.members.contains { member in - guard let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) else { return false } - return caseDecl.elements.contains { element in - if let params = element.parameterClause?.parameters { - return !params.isEmpty - } - return false - } - } - if hasAssociatedValues { - return .associatedValueEnum(swiftCallName) - } else { - return .caseEnum(swiftCallName) - } - } - } - - if let structDecl = typeDecl.as(StructDeclSyntax.self) { - let swiftCallName = ExportSwift.computeSwiftCallName(for: structDecl, itemName: structDecl.name.text) - return .swiftStruct(swiftCallName) - } - - guard typeDecl.is(ClassDeclSyntax.self) || typeDecl.is(ActorDeclSyntax.self) else { + /// Finalizes the export process and generates the bridge code + /// + /// - Parameters: + /// - exposeToGlobal: Whether to expose exported APIs to the global namespace (default: false) + /// - Returns: A tuple containing the generated Swift code and a skeleton + /// describing the exported APIs + public func finalize() throws -> String? { + guard let outputSwift = try renderSwiftGlue() else { return nil } - let swiftCallName = ExportSwift.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) - return .swiftHeapObject(swiftCallName) + return outputSwift } func renderSwiftGlue() throws -> String? { var decls: [DeclSyntax] = [] - guard - exportedFunctions.count > 0 || exportedClasses.count > 0 || exportedEnums.count > 0 - || exportedProtocols.count > 0 || exportedStructs.count > 0 - else { - return nil - } let closureCodegen = ClosureCodegen() var closureSignatures: Set = [] - for function in exportedFunctions { + for function in skeleton.functions { closureCodegen.collectClosureSignatures(from: function.parameters, into: &closureSignatures) closureCodegen.collectClosureSignatures(from: function.returnType, into: &closureSignatures) } - for klass in exportedClasses { + for klass in skeleton.classes { if let constructor = klass.constructor { closureCodegen.collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) } @@ -1684,12 +72,12 @@ public class ExportSwift { } let protocolCodegen = ProtocolCodegen() - for proto in exportedProtocols { + for proto in skeleton.protocols { decls.append(contentsOf: try protocolCodegen.renderProtocolWrapper(proto, moduleName: moduleName)) } let enumCodegen = EnumCodegen() - for enumDef in exportedEnums { + for enumDef in skeleton.enums { if let enumHelpers = enumCodegen.renderEnumHelpers(enumDef) { decls.append(enumHelpers) } @@ -1709,15 +97,15 @@ public class ExportSwift { } let structCodegen = StructCodegen() - for structDef in exportedStructs { + for structDef in skeleton.structs { decls.append(structCodegen.renderStructHelpers(structDef)) decls.append(contentsOf: try renderSingleExportedStruct(struct: structDef)) } - for function in exportedFunctions { + for function in skeleton.functions { decls.append(try renderSingleExportedFunction(function: function)) } - for klass in exportedClasses { + for klass in skeleton.classes { decls.append(contentsOf: try renderSingleExportedClass(klass: klass)) } let format = BasicFormat() @@ -3286,22 +1674,6 @@ struct ProtocolCodegen { } } -fileprivate enum Constants { - static let supportedRawTypes = SwiftEnumRawType.allCases.map { $0.rawValue } -} - -extension AttributeListSyntax { - fileprivate func hasJSAttribute() -> Bool { - firstJSAttribute != nil - } - - fileprivate var firstJSAttribute: AttributeSyntax? { - first(where: { - $0.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JS" - })?.as(AttributeSyntax.self) - } -} - extension BridgeType { init?(swiftType: String) { switch swiftType { @@ -3523,17 +1895,3 @@ extension WithModifiersSyntax { } } } - -fileprivate extension BridgeType { - /// Returns true if a value of `expectedType` can be assigned to this type. - func isCompatibleWith(_ expectedType: BridgeType) -> Bool { - switch (self, expectedType) { - case let (lhs, rhs) where lhs == rhs: - return true - case (.optional(let wrapped), expectedType): - return wrapped == expectedType - default: - return false - } - } -} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift deleted file mode 100644 index db6b983e1..000000000 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift +++ /dev/null @@ -1,710 +0,0 @@ -import SwiftSyntax -#if canImport(BridgeJSSkeleton) -import BridgeJSSkeleton -#endif -#if canImport(BridgeJSUtilities) -import BridgeJSUtilities -#endif - -/// Collects macro-annotated Swift declarations and produces ImportedModuleSkeleton. -public final class ImportSwiftMacros { - let progress: ProgressReporting - let moduleName: String - private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] - - public init(progress: ProgressReporting, moduleName: String) { - self.progress = progress - self.moduleName = moduleName - } - - /// Processes a Swift source file to find declarations marked with @JSFunction/@JSGetter/@JSSetter/@JSClass - /// - /// - Parameters: - /// - sourceFile: The parsed Swift source file to process - /// - inputFilePath: The file path for error reporting - public func addSourceFile(_ sourceFile: SourceFileSyntax, _ inputFilePath: String) { - sourceFiles.append((sourceFile, inputFilePath)) - } - - /// Finalizes the import process and generates the bridge code plus skeleton. - public func finalize() throws -> (outputSwift: String?, outputSkeleton: ImportedModuleSkeleton) { - var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = [] - var importedFiles: [ImportedFileSkeleton] = [] - - for (sourceFile, inputFilePath) in sourceFiles { - progress.print("Processing \(inputFilePath)") - let collector = APICollector( - inputFilePath: inputFilePath, - knownJSClassNames: Self.collectJSClassNames(from: sourceFile) - ) - collector.walk(sourceFile) - if !collector.errors.isEmpty { - perSourceErrors.append((inputFilePath: inputFilePath, errors: collector.errors)) - } - importedFiles.append( - ImportedFileSkeleton( - functions: collector.importedFunctions, - types: collector.importedTypes, - globalGetters: collector.importedGlobalGetters - ) - ) - } - - if !perSourceErrors.isEmpty { - let allErrors = perSourceErrors.flatMap { inputFilePath, errors in - errors.map { $0.formattedDescription(fileName: inputFilePath) } - } - throw BridgeJSCoreError(allErrors.joined(separator: "\n")) - } - - let moduleSkeleton = ImportedModuleSkeleton(children: importedFiles) - - var importer = ImportTS(progress: progress, moduleName: moduleName) - for skeleton in importedFiles { - importer.addSkeleton(skeleton) - } - let outputSwift = try importer.finalize() - return (outputSwift: outputSwift, outputSkeleton: moduleSkeleton) - } - - private static func collectJSClassNames(from sourceFile: SourceFileSyntax) -> Set { - let collector = JSImportTypeNameCollector(viewMode: .sourceAccurate) - collector.walk(sourceFile) - return collector.typeNames - } - - private final class JSImportTypeNameCollector: SyntaxAnyVisitor { - var typeNames: Set = [] - - private func visitTypeDecl(_ attributes: AttributeListSyntax?, _ name: String) -> SyntaxVisitorContinueKind { - if APICollector.AttributeChecker.hasJSClassAttribute(attributes) { - typeNames.insert(name) - } - return .visitChildren - } - - override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { - visitTypeDecl(node.attributes, node.name.text) - } - - override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { - visitTypeDecl(node.attributes, node.name.text) - } - } - - fileprivate final class APICollector: SyntaxAnyVisitor { - var importedFunctions: [ImportedFunctionSkeleton] = [] - var importedTypes: [ImportedTypeSkeleton] = [] - var importedGlobalGetters: [ImportedGetterSkeleton] = [] - var errors: [DiagnosticError] = [] - - private let inputFilePath: String - private var jsClassNames: Set - - // MARK: - State Management - - enum State { - case topLevel - case jsClassBody(name: String) - } - - private var stateStack: [State] = [.topLevel] - var state: State { - return stateStack.last! - } - - // Current type being collected (when in jsClassBody state) - private struct CurrentType { - let name: String - var constructor: ImportedConstructorSkeleton? - var methods: [ImportedFunctionSkeleton] - var getters: [ImportedGetterSkeleton] - var setters: [ImportedSetterSkeleton] - } - private var currentType: CurrentType? - - // MARK: - Attribute Checking - - /// Helper struct for checking and extracting attributes - fileprivate struct AttributeChecker { - static func hasJSFunctionAttribute(_ attributes: AttributeListSyntax?) -> Bool { - hasAttribute(attributes, name: "JSFunction") - } - - static func hasJSGetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { - hasAttribute(attributes, name: "JSGetter") - } - - static func hasJSSetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { - hasAttribute(attributes, name: "JSSetter") - } - - static func firstJSSetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { - attributes?.first { attribute in - attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSSetter" - }?.as(AttributeSyntax.self) - } - - static func hasJSClassAttribute(_ attributes: AttributeListSyntax?) -> Bool { - hasAttribute(attributes, name: "JSClass") - } - - static func hasAttribute(_ attributes: AttributeListSyntax?, name: String) -> Bool { - guard let attributes else { return false } - return attributes.contains { attribute in - guard let syntax = attribute.as(AttributeSyntax.self) else { return false } - return syntax.attributeName.trimmedDescription == name - } - } - - /// Extracts the jsName argument value from a @JSSetter attribute, if present. - static func extractJSName(from attribute: AttributeSyntax) -> String? { - guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { - return nil - } - for argument in arguments { - if argument.label?.text == "jsName", - let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self), - let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) - { - return segment.content.text - } - } - return nil - } - } - - // MARK: - Validation Helpers - - /// Common validation result for setter functions - private struct SetterValidationResult { - let effects: Effects - let jsName: String? - let firstParam: FunctionParameterSyntax - let valueType: BridgeType - } - - /// Validates effects (throws required, async not supported) - private func validateEffects( - _ effects: FunctionEffectSpecifiersSyntax?, - node: some SyntaxProtocol, - attributeName: String - ) -> Effects? { - guard let effects = parseEffects(effects) else { - errors.append( - DiagnosticError( - node: node, - message: "@\(attributeName) declarations must be throws.", - hint: "Declare the function as 'throws (JSException)'." - ) - ) - return nil - } - if effects.isAsync { - errors.append( - DiagnosticError( - node: node, - message: "@\(attributeName) declarations do not support async yet." - ) - ) - return nil - } - return effects - } - - /// Validates a setter function and extracts common information - private func validateSetter( - _ node: FunctionDeclSyntax, - jsSetter: AttributeSyntax, - enclosingTypeName: String? - ) -> SetterValidationResult? { - guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") - else { - return nil - } - - let jsName = AttributeChecker.extractJSName(from: jsSetter) - let parameters = node.signature.parameterClause.parameters - - guard let firstParam = parameters.first else { - errors.append( - DiagnosticError( - node: node, - message: "@JSSetter function must have at least one parameter." - ) - ) - return nil - } - - if firstParam.type.is(MissingTypeSyntax.self) { - errors.append( - DiagnosticError( - node: firstParam, - message: "All @JSSetter parameters must have explicit types." - ) - ) - return nil - } - - return SetterValidationResult( - effects: effects, - jsName: jsName, - firstParam: firstParam, - valueType: parseType(firstParam.type, enclosingTypeName: enclosingTypeName) - ) - } - - // MARK: - Property Name Resolution - - /// Helper for resolving property names from setter function names and jsName attributes - private struct PropertyNameResolver { - /// Resolves property name and function base name from a setter function and optional jsName - /// - Returns: (propertyName, functionBaseName) where propertyName preserves case for getter matching, - /// and functionBaseName has lowercase first char for ABI generation - static func resolve( - functionName: String, - jsName: String?, - normalizeIdentifier: (String) -> String - ) -> (propertyName: String, functionBaseName: String)? { - if let jsName = jsName { - let propertyName = normalizeIdentifier(jsName) - let functionBaseName = propertyName.prefix(1).lowercased() + propertyName.dropFirst() - return (propertyName: propertyName, functionBaseName: functionBaseName) - } - - let rawFunctionName = - functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 - ? String(functionName.dropFirst().dropLast()) - : functionName - - guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { - return nil - } - - let derivedPropertyName = String(rawFunctionName.dropFirst(3)) - let normalized = normalizeIdentifier(derivedPropertyName) - let propertyName = normalized.prefix(1).lowercased() + normalized.dropFirst() - return (propertyName: propertyName, functionBaseName: propertyName) - } - } - - init(inputFilePath: String, knownJSClassNames: Set) { - self.inputFilePath = inputFilePath - self.jsClassNames = knownJSClassNames - super.init(viewMode: .sourceAccurate) - } - - private func enterJSClass(_ typeName: String) { - stateStack.append(.jsClassBody(name: typeName)) - currentType = CurrentType(name: typeName, constructor: nil, methods: [], getters: [], setters: []) - } - - private func exitJSClass() { - if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName { - importedTypes.append( - ImportedTypeSkeleton( - name: type.name, - constructor: type.constructor, - methods: type.methods, - getters: type.getters, - setters: type.setters, - documentation: nil - ) - ) - currentType = nil - } - stateStack.removeLast() - } - - override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { - if AttributeChecker.hasJSClassAttribute(node.attributes) { - enterJSClass(node.name.text) - } - return .visitChildren - } - - override func visitPost(_ node: StructDeclSyntax) { - if AttributeChecker.hasJSClassAttribute(node.attributes) { - exitJSClass() - } - } - - override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { - if AttributeChecker.hasJSClassAttribute(node.attributes) { - enterJSClass(node.name.text) - } - return .visitChildren - } - - override func visitPost(_ node: ClassDeclSyntax) { - if AttributeChecker.hasJSClassAttribute(node.attributes) { - exitJSClass() - } - } - - // MARK: - Visitor Methods - - override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind { - let typeName = node.extendedType.trimmedDescription - collectStaticMembers(in: node.memberBlock.members, typeName: typeName) - return .skipChildren - } - - override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { - switch state { - case .topLevel: - return handleTopLevelFunction(node) - - case .jsClassBody(let typeName): - guard var type = currentType, type.name == typeName else { - return .skipChildren - } - let isStaticMember = isStatic(node.modifiers) - let handled = handleClassFunction(node, typeName: typeName, isStaticMember: isStaticMember, type: &type) - if handled { - currentType = type - } - return .skipChildren - } - } - - private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { - if AttributeChecker.hasJSFunctionAttribute(node.attributes), - let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) - { - importedFunctions.append(function) - return .skipChildren - } - // Top-level setters are not supported - if AttributeChecker.hasJSSetterAttribute(node.attributes) { - errors.append( - DiagnosticError( - node: node, - message: "@JSSetter is not supported at top-level. Use it only in @JSClass types." - ) - ) - return .skipChildren - } - return .visitChildren - } - - private func handleClassFunction( - _ node: FunctionDeclSyntax, - typeName: String, - isStaticMember: Bool, - type: inout CurrentType - ) -> Bool { - if AttributeChecker.hasJSFunctionAttribute(node.attributes) { - if isStaticMember { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { - importedFunctions.append($0) - } - } else { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { - type.methods.append($0) - } - } - return true - } - - if AttributeChecker.hasJSSetterAttribute(node.attributes) { - if isStaticMember { - errors.append( - DiagnosticError( - node: node, - message: - "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } else if let jsSetter = AttributeChecker.firstJSSetterAttribute(node.attributes), - let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) - { - type.setters.append(setter) - } - return true - } - - return false - } - - override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind { - guard AttributeChecker.hasJSGetterAttribute(node.attributes) else { - return .visitChildren - } - - switch state { - case .topLevel: - if let getter = parseGetterSkeleton(node, enclosingTypeName: nil) { - importedGlobalGetters.append(getter) - } - return .skipChildren - - case .jsClassBody(let typeName): - guard var type = currentType, type.name == typeName else { - return .skipChildren - } - if isStatic(node.modifiers) { - errors.append( - DiagnosticError( - node: node, - message: - "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } else if let getter = parseGetterSkeleton(node, enclosingTypeName: typeName) { - type.getters.append(getter) - currentType = type - } - return .skipChildren - } - } - - override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { - guard AttributeChecker.hasJSFunctionAttribute(node.attributes) else { - return .visitChildren - } - - switch state { - case .topLevel: - return .visitChildren - - case .jsClassBody(let typeName): - guard var type = currentType, type.name == typeName else { - return .skipChildren - } - if type.constructor != nil { - errors.append( - DiagnosticError( - node: node, - message: "Only one @JSFunction initializer is supported in @JSClass types." - ) - ) - return .skipChildren - } - if let parsed = parseConstructor(node, typeName: typeName) { - type.constructor = parsed - currentType = type - } - return .skipChildren - } - } - - // MARK: - Member Collection - - private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { - for member in members { - if let function = member.decl.as(FunctionDeclSyntax.self) { - if AttributeChecker.hasJSFunctionAttribute(function.attributes), - let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) - { - importedFunctions.append(parsed) - } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { - errors.append( - DiagnosticError( - node: function, - message: - "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } - } else if let variable = member.decl.as(VariableDeclSyntax.self), - AttributeChecker.hasJSGetterAttribute(variable.attributes) - { - errors.append( - DiagnosticError( - node: variable, - message: - "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } - } - } - - // MARK: - Parsing Methods - - private func parseConstructor( - _ initializer: InitializerDeclSyntax, - typeName: String - ) -> ImportedConstructorSkeleton? { - guard - validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction") - != nil - else { - return nil - } - return ImportedConstructorSkeleton( - parameters: parseParameters( - from: initializer.signature.parameterClause, - enclosingTypeName: typeName - ) - ) - } - - private func parseFunction( - _ node: FunctionDeclSyntax, - enclosingTypeName: String?, - isStaticMember: Bool - ) -> ImportedFunctionSkeleton? { - guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil - else { - return nil - } - - let baseName = normalizeIdentifier(node.name.text) - let name: String - if isStaticMember, let enclosingTypeName { - name = "\(enclosingTypeName)_\(baseName)" - } else { - name = baseName - } - - let parameters = parseParameters( - from: node.signature.parameterClause, - enclosingTypeName: enclosingTypeName - ) - let returnType: BridgeType - if let returnTypeSyntax = node.signature.returnClause?.type { - returnType = parseType(returnTypeSyntax, enclosingTypeName: enclosingTypeName) - } else { - returnType = .void - } - return ImportedFunctionSkeleton( - name: name, - parameters: parameters, - returnType: returnType, - documentation: nil - ) - } - - /// Extracts property info from a VariableDeclSyntax (binding, identifier, type) - private func extractPropertyInfo( - _ node: VariableDeclSyntax, - errorMessage: String = "@JSGetter must declare a single stored property with an explicit type." - ) -> (identifier: IdentifierPatternSyntax, type: TypeSyntax)? { - guard let binding = node.bindings.first, - let identifier = binding.pattern.as(IdentifierPatternSyntax.self), - let typeAnnotation = binding.typeAnnotation - else { - errors.append(DiagnosticError(node: node, message: errorMessage)) - return nil - } - return (identifier, typeAnnotation.type) - } - - private func parseGetterSkeleton( - _ node: VariableDeclSyntax, - enclosingTypeName: String? - ) -> ImportedGetterSkeleton? { - guard let (identifier, type) = extractPropertyInfo(node) else { - return nil - } - let propertyType = parseType(type, enclosingTypeName: enclosingTypeName) - let propertyName = normalizeIdentifier(identifier.identifier.text) - return ImportedGetterSkeleton( - name: propertyName, - type: propertyType, - documentation: nil, - functionName: nil - ) - } - - /// Parses a setter as part of a type's property system (for instance setters) - private func parseSetterSkeleton( - _ jsSetter: AttributeSyntax, - _ node: FunctionDeclSyntax, - enclosingTypeName: String? - ) -> ImportedSetterSkeleton? { - guard let validation = validateSetter(node, jsSetter: jsSetter, enclosingTypeName: enclosingTypeName) else { - return nil - } - - let functionName = node.name.text - guard - let (propertyName, functionBaseName) = PropertyNameResolver.resolve( - functionName: functionName, - jsName: validation.jsName, - normalizeIdentifier: normalizeIdentifier - ) - else { - return nil - } - - return ImportedSetterSkeleton( - name: propertyName, - type: validation.valueType, - documentation: nil, - functionName: "\(functionBaseName)_set" - ) - } - - // MARK: - Type and Parameter Parsing - - private func parseParameters( - from clause: FunctionParameterClauseSyntax, - enclosingTypeName: String? - ) -> [Parameter] { - clause.parameters.compactMap { param in - let type = param.type - if type.is(MissingTypeSyntax.self) { - errors.append( - DiagnosticError( - node: param, - message: "All @JSFunction parameters must have explicit types." - ) - ) - return nil - } - let nameToken = param.secondName ?? param.firstName - let name = normalizeIdentifier(nameToken.text) - let labelToken = param.secondName == nil ? nil : param.firstName - let label = labelToken?.text == "_" ? nil : labelToken?.text - let bridgeType = parseType(type, enclosingTypeName: enclosingTypeName) - return Parameter(label: label, name: name, type: bridgeType) - } - } - - private func parseType(_ type: TypeSyntax, enclosingTypeName: String?) -> BridgeType { - guard let identifier = type.as(IdentifierTypeSyntax.self) else { - errors.append( - DiagnosticError( - node: type, - message: "Unsupported @JS type '\(type.trimmedDescription)'." - ) - ) - return .void - } - - let name = normalizeIdentifier(identifier.name.text) - if name == "Self", let enclosingTypeName { - return .jsObject(enclosingTypeName) - } - return BridgeType(swiftType: name) ?? .jsObject(name) - } - - // MARK: - Helper Methods - - private func parseEffects(_ effects: FunctionEffectSpecifiersSyntax?) -> Effects? { - let isThrows = effects?.throwsClause != nil - let isAsync = effects?.asyncSpecifier != nil - guard isThrows else { - return nil - } - return Effects(isAsync: isAsync, isThrows: isThrows) - } - - private func isStatic(_ modifiers: DeclModifierListSyntax?) -> Bool { - guard let modifiers else { return false } - return modifiers.contains { modifier in - modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) - } - } - - private func normalizeIdentifier(_ name: String) -> String { - guard name.hasPrefix("`"), name.hasSuffix("`"), name.count >= 2 else { - return name - } - return String(name.dropFirst().dropLast()) - } - } -} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 0ca301b68..27f5a7c51 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -21,15 +21,10 @@ public struct ImportTS { public private(set) var skeleton: ImportedModuleSkeleton private let moduleName: String - public init(progress: ProgressReporting, moduleName: String) { + public init(progress: ProgressReporting, moduleName: String, skeleton: ImportedModuleSkeleton) { self.progress = progress self.moduleName = moduleName - self.skeleton = ImportedModuleSkeleton(children: []) - } - - /// Adds a skeleton to the importer's state - public mutating func addSkeleton(_ skeleton: ImportedFileSkeleton) { - self.skeleton.children.append(skeleton) + self.skeleton = skeleton } /// Finalizes the import process and generates Swift code diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift new file mode 100644 index 000000000..71132568b --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -0,0 +1,2300 @@ +import SwiftSyntax +import SwiftSyntaxBuilder +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif +#if canImport(BridgeJSSkeleton) +import BridgeJSSkeleton +#endif + +/// Builds BridgeJS skeletons from Swift source files using SwiftSyntax walk for API collection. +/// +/// This is a shared entry point for producing: +/// - exported skeletons from `@JS` declarations +/// - imported skeletons from `@JSFunction/@JSGetter/@JSSetter/@JSClass` macro signatures +public final class SwiftToSkeleton { + public let progress: ProgressReporting + public let moduleName: String + public let exposeToGlobal: Bool + + private var sourceFiles: [(sourceFile: SourceFileSyntax, inputFilePath: String)] = [] + let typeDeclResolver: TypeDeclResolver + + public init(progress: ProgressReporting, moduleName: String, exposeToGlobal: Bool) { + self.progress = progress + self.moduleName = moduleName + self.exposeToGlobal = exposeToGlobal + self.typeDeclResolver = TypeDeclResolver() + } + + public func addSourceFile(_ sourceFile: SourceFileSyntax, inputFilePath: String) { + self.typeDeclResolver.addSourceFile(sourceFile) + sourceFiles.append((sourceFile, inputFilePath)) + } + + public func finalize() throws -> BridgeJSSkeleton { + var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = [] + var importedFiles: [ImportedFileSkeleton] = [] + var exported = ExportedSkeleton(functions: [], classes: [], enums: [], exposeToGlobal: exposeToGlobal) + + for (sourceFile, inputFilePath) in sourceFiles { + progress.print("Processing \(inputFilePath)") + + let exportCollector = ExportSwiftAPICollector(parent: self) + exportCollector.walk(sourceFile) + + let typeNameCollector = ImportSwiftMacrosJSImportTypeNameCollector(viewMode: .sourceAccurate) + typeNameCollector.walk(sourceFile) + let importCollector = ImportSwiftMacrosAPICollector( + inputFilePath: inputFilePath, + knownJSClassNames: typeNameCollector.typeNames + ) + importCollector.walk(sourceFile) + + if !exportCollector.errors.isEmpty || !importCollector.errors.isEmpty { + perSourceErrors.append( + (inputFilePath: inputFilePath, errors: exportCollector.errors + importCollector.errors) + ) + } + + importedFiles.append( + ImportedFileSkeleton( + functions: importCollector.importedFunctions, + types: importCollector.importedTypes, + globalGetters: importCollector.importedGlobalGetters + ) + ) + exportCollector.finalize(&exported) + } + + if !perSourceErrors.isEmpty { + let allErrors = perSourceErrors.flatMap { inputFilePath, errors in + errors.map { $0.formattedDescription(fileName: inputFilePath) } + } + throw BridgeJSCoreError(allErrors.joined(separator: "\n")) + } + let importedSkeleton: ImportedModuleSkeleton? = { + let module = ImportedModuleSkeleton(children: importedFiles) + if module.children.allSatisfy({ $0.functions.isEmpty && $0.types.isEmpty && $0.globalGetters.isEmpty }) { + return nil + } + return module + }() + + return BridgeJSSkeleton(moduleName: moduleName, exported: exported, imported: importedSkeleton) + } + + func lookupType(for type: TypeSyntax) -> BridgeType? { + if let attributedType = type.as(AttributedTypeSyntax.self) { + return lookupType(for: attributedType.baseType) + } + + // (T1, T2, ...) -> R + if let functionType = type.as(FunctionTypeSyntax.self) { + var parameters: [BridgeType] = [] + for param in functionType.parameters { + guard let paramType = lookupType(for: param.type) else { + return nil + } + parameters.append(paramType) + } + + guard let returnType = lookupType(for: functionType.returnClause.type) else { + return nil + } + + let isAsync = functionType.effectSpecifiers?.asyncSpecifier != nil + let isThrows = functionType.effectSpecifiers?.throwsClause != nil + + return .closure( + ClosureSignature( + parameters: parameters, + returnType: returnType, + moduleName: moduleName, + isAsync: isAsync, + isThrows: isThrows + ) + ) + } + + // T? + if let optionalType = type.as(OptionalTypeSyntax.self) { + let wrappedType = optionalType.wrappedType + if let baseType = lookupType(for: wrappedType) { + return .optional(baseType) + } + } + // Optional + if let identifierType = type.as(IdentifierTypeSyntax.self), + identifierType.name.text == "Optional", + let genericArgs = identifierType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let baseType = lookupType(for: argType) { + return .optional(baseType) + } + } + // Swift.Optional + if let memberType = type.as(MemberTypeSyntax.self), + let baseType = memberType.baseType.as(IdentifierTypeSyntax.self), + baseType.name.text == "Swift", + memberType.name.text == "Optional", + let genericArgs = memberType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let wrappedType = lookupType(for: argType) { + return .optional(wrappedType) + } + } + if let aliasDecl = typeDeclResolver.resolveTypeAlias(type) { + if let resolvedType = lookupType(for: aliasDecl.initializer.value) { + return resolvedType + } + } + + let typeName = type.trimmedDescription + if let primitiveType = BridgeType(swiftType: typeName) { + return primitiveType + } + + guard let typeDecl = typeDeclResolver.resolve(type) else { + return nil + } + + if typeDecl.is(ProtocolDeclSyntax.self) { + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) + return .swiftProtocol(swiftCallName) + } + + if let enumDecl = typeDecl.as(EnumDeclSyntax.self) { + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: enumDecl, itemName: enumDecl.name.text) + let rawTypeString = enumDecl.inheritanceClause?.inheritedTypes.first { inheritedType in + let typeName = inheritedType.type.trimmedDescription + return ExportSwiftConstants.supportedRawTypes.contains(typeName) + }?.type.trimmedDescription + + if let rawType = SwiftEnumRawType(rawTypeString) { + return .rawValueEnum(swiftCallName, rawType) + } else { + let hasAnyCases = enumDecl.memberBlock.members.contains { member in + member.decl.is(EnumCaseDeclSyntax.self) + } + if !hasAnyCases { + return .namespaceEnum(swiftCallName) + } + let hasAssociatedValues = + enumDecl.memberBlock.members.contains { member in + guard let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) else { return false } + return caseDecl.elements.contains { element in + if let params = element.parameterClause?.parameters { + return !params.isEmpty + } + return false + } + } + if hasAssociatedValues { + return .associatedValueEnum(swiftCallName) + } else { + return .caseEnum(swiftCallName) + } + } + } + + if let structDecl = typeDecl.as(StructDeclSyntax.self) { + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: structDecl, itemName: structDecl.name.text) + return .swiftStruct(swiftCallName) + } + + guard typeDecl.is(ClassDeclSyntax.self) || typeDecl.is(ActorDeclSyntax.self) else { + return nil + } + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) + return .swiftHeapObject(swiftCallName) + } + + /// Computes the full Swift call name by walking up the AST hierarchy to find all parent enums + /// This generates the qualified name needed for Swift code generation (e.g., "Networking.API.HTTPServer") + fileprivate static func computeSwiftCallName(for node: some SyntaxProtocol, itemName: String) -> String { + var swiftPath: [String] = [] + var currentNode: Syntax? = node.parent + + while let parent = currentNode { + if let enumDecl = parent.as(EnumDeclSyntax.self), + enumDecl.attributes.hasJSAttribute() + { + swiftPath.insert(enumDecl.name.text, at: 0) + } + currentNode = parent.parent + } + + if swiftPath.isEmpty { + return itemName + } else { + return swiftPath.joined(separator: ".") + "." + itemName + } + } + +} + +private enum ExportSwiftConstants { + static let supportedRawTypes = SwiftEnumRawType.allCases.map { $0.rawValue } +} + +extension AttributeListSyntax { + func hasJSAttribute() -> Bool { + firstJSAttribute != nil + } + + var firstJSAttribute: AttributeSyntax? { + first(where: { + $0.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JS" + })?.as(AttributeSyntax.self) + } +} + +private final class ExportSwiftAPICollector: SyntaxAnyVisitor { + var exportedFunctions: [ExportedFunction] = [] + /// The names of the exported classes, in the order they were written in the source file + var exportedClassNames: [String] = [] + var exportedClassByName: [String: ExportedClass] = [:] + /// The names of the exported enums, in the order they were written in the source file + var exportedEnumNames: [String] = [] + var exportedEnumByName: [String: ExportedEnum] = [:] + /// The names of the exported protocols, in the order they were written in the source file + var exportedProtocolNames: [String] = [] + var exportedProtocolByName: [String: ExportedProtocol] = [:] + /// The names of the exported structs, in the order they were written in the source file + var exportedStructNames: [String] = [] + var exportedStructByName: [String: ExportedStruct] = [:] + var errors: [DiagnosticError] = [] + + func finalize(_ result: inout ExportedSkeleton) { + result.functions.append(contentsOf: exportedFunctions) + result.classes.append(contentsOf: exportedClassNames.map { exportedClassByName[$0]! }) + result.enums.append(contentsOf: exportedEnumNames.map { exportedEnumByName[$0]! }) + result.structs.append(contentsOf: exportedStructNames.map { exportedStructByName[$0]! }) + result.protocols.append(contentsOf: exportedProtocolNames.map { exportedProtocolByName[$0]! }) + } + + /// Creates a unique key by combining name and namespace + private func makeKey(name: String, namespace: [String]?) -> String { + if let namespace = namespace, !namespace.isEmpty { + return "\(namespace.joined(separator: ".")).\(name)" + } else { + return name + } + } + + struct NamespaceResolution { + let namespace: [String]? + let isValid: Bool + } + + /// Resolves and validates namespace from both @JS attribute and computed (nested) namespace + /// Returns the effective namespace and whether validation succeeded + private func resolveNamespace( + from jsAttribute: AttributeSyntax, + for node: some SyntaxProtocol, + declarationType: String + ) -> NamespaceResolution { + let attributeNamespace = extractNamespace(from: jsAttribute) + let computedNamespace = computeNamespace(for: node) + + if computedNamespace != nil && attributeNamespace != nil { + diagnose( + node: jsAttribute, + message: "Nested \(declarationType)s cannot specify their own namespace", + hint: + "Remove the namespace from @JS attribute - nested \(declarationType)s inherit namespace from parent" + ) + return NamespaceResolution(namespace: nil, isValid: false) + } + + return NamespaceResolution(namespace: computedNamespace ?? attributeNamespace, isValid: true) + } + + enum State { + case topLevel + case classBody(name: String, key: String) + case enumBody(name: String, key: String) + case protocolBody(name: String, key: String) + case structBody(name: String, key: String) + } + + struct StateStack { + private var states: [State] + var current: State { + return states.last! + } + + init(_ initialState: State) { + self.states = [initialState] + } + mutating func push(state: State) { + states.append(state) + } + + mutating func pop() { + _ = states.removeLast() + } + } + + var stateStack: StateStack = StateStack(.topLevel) + var state: State { + return stateStack.current + } + let parent: SwiftToSkeleton + + init(parent: SwiftToSkeleton) { + self.parent = parent + super.init(viewMode: .sourceAccurate) + } + + private func diagnose(node: some SyntaxProtocol, message: String, hint: String? = nil) { + errors.append(DiagnosticError(node: node, message: message, hint: hint)) + } + + private func diagnoseUnsupportedType(node: some SyntaxProtocol, type: String) { + diagnose( + node: node, + message: "Unsupported type: \(type)", + hint: "Only primitive types and types defined in the same module are allowed" + ) + } + + private func diagnoseNestedOptional(node: some SyntaxProtocol, type: String) { + diagnose( + node: node, + message: "Nested optional types are not supported: \(type)", + hint: "Use a single optional like String? instead of String?? or Optional>" + ) + } + + /// Detects whether given expression is supported as default parameter value + private func isSupportedDefaultValueExpression(_ initClause: InitializerClauseSyntax) -> Bool { + let expression = initClause.value + + // Function calls are checked later in extractDefaultValue (as constructors are allowed) + if expression.is(ArrayExprSyntax.self) { return false } + if expression.is(DictionaryExprSyntax.self) { return false } + if expression.is(BinaryOperatorExprSyntax.self) { return false } + if expression.is(ClosureExprSyntax.self) { return false } + + // Method call chains (e.g., obj.foo()) + if let memberExpression = expression.as(MemberAccessExprSyntax.self), + memberExpression.base?.is(FunctionCallExprSyntax.self) == true + { + return false + } + + return true + } + + /// Extract enum case value from member access expression + private func extractEnumCaseValue( + from memberExpr: MemberAccessExprSyntax, + type: BridgeType + ) -> DefaultValue? { + let caseName = memberExpr.declName.baseName.text + + let enumName: String? + switch type { + case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): + enumName = name + case .optional(let wrappedType): + switch wrappedType { + case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): + enumName = name + default: + return nil + } + default: + return nil + } + + guard let enumName = enumName else { return nil } + + if memberExpr.base == nil { + return .enumCase(enumName, caseName) + } + + if let baseExpr = memberExpr.base?.as(DeclReferenceExprSyntax.self) { + let baseName = baseExpr.baseName.text + let lastComponent = enumName.split(separator: ".").last.map(String.init) ?? enumName + if baseName == enumName || baseName == lastComponent { + return .enumCase(enumName, caseName) + } + } + + return nil + } + + /// Extracts default value from parameter's default value clause + private func extractDefaultValue( + from defaultClause: InitializerClauseSyntax?, + type: BridgeType + ) -> DefaultValue? { + guard let defaultClause = defaultClause else { + return nil + } + + if !isSupportedDefaultValueExpression(defaultClause) { + diagnose( + node: defaultClause, + message: "Complex default parameter expressions are not supported", + hint: "Use simple literal values (e.g., \"text\", 42, true, nil) or simple constants" + ) + return nil + } + + let expr = defaultClause.value + + if expr.is(NilLiteralExprSyntax.self) { + guard case .optional(_) = type else { + diagnose( + node: expr, + message: "nil is only valid for optional parameters", + hint: "Make the parameter optional by adding ? to the type" + ) + return nil + } + return .null + } + + if let memberExpr = expr.as(MemberAccessExprSyntax.self), + let enumValue = extractEnumCaseValue(from: memberExpr, type: type) + { + return enumValue + } + + if let funcCall = expr.as(FunctionCallExprSyntax.self) { + return extractConstructorDefaultValue(from: funcCall, type: type) + } + + if let literalValue = extractLiteralValue(from: expr, type: type) { + return literalValue + } + + diagnose( + node: expr, + message: "Unsupported default parameter value expression", + hint: "Use simple literal values like \"text\", 42, true, false, nil, or enum cases like .caseName" + ) + return nil + } + + /// Extracts default value from a constructor call expression + private func extractConstructorDefaultValue( + from funcCall: FunctionCallExprSyntax, + type: BridgeType + ) -> DefaultValue? { + guard let calledExpr = funcCall.calledExpression.as(DeclReferenceExprSyntax.self) else { + diagnose( + node: funcCall, + message: "Complex constructor expressions are not supported", + hint: "Use a simple constructor call like ClassName() or ClassName(arg: value)" + ) + return nil + } + + let typeName = calledExpr.baseName.text + + let isStructType: Bool + let expectedTypeName: String? + switch type { + case .swiftStruct(let name), .optional(.swiftStruct(let name)): + isStructType = true + expectedTypeName = name.split(separator: ".").last.map(String.init) + case .swiftHeapObject(let name), .optional(.swiftHeapObject(let name)): + isStructType = false + expectedTypeName = name.split(separator: ".").last.map(String.init) + default: + diagnose( + node: funcCall, + message: "Constructor calls are only supported for class and struct types", + hint: "Parameter type should be a Swift class or struct" + ) + return nil + } + + guard let expectedTypeName = expectedTypeName, typeName == expectedTypeName else { + diagnose( + node: funcCall, + message: "Constructor type name '\(typeName)' doesn't match parameter type", + hint: "Ensure the constructor matches the parameter type" + ) + return nil + } + + if isStructType { + // For structs, extract field name/value pairs + var fields: [DefaultValueField] = [] + for argument in funcCall.arguments { + guard let fieldName = argument.label?.text else { + diagnose( + node: argument, + message: "Struct initializer arguments must have labels", + hint: "Use labeled arguments like MyStruct(x: 1, y: 2)" + ) + return nil + } + guard let fieldValue = extractLiteralValue(from: argument.expression) else { + diagnose( + node: argument.expression, + message: "Struct field value must be a literal", + hint: "Use simple literals like \"text\", 42, true, false in struct fields" + ) + return nil + } + fields.append(DefaultValueField(name: fieldName, value: fieldValue)) + } + return .structLiteral(typeName, fields) + } else { + if funcCall.arguments.isEmpty { + return .object(typeName) + } + + var constructorArgs: [DefaultValue] = [] + for argument in funcCall.arguments { + guard let argValue = extractLiteralValue(from: argument.expression) else { + diagnose( + node: argument.expression, + message: "Constructor argument must be a literal value", + hint: "Use simple literals like \"text\", 42, true, false in constructor arguments" + ) + return nil + } + constructorArgs.append(argValue) + } + return .objectWithArguments(typeName, constructorArgs) + } + } + + /// Extracts a literal value from an expression with optional type checking + private func extractLiteralValue(from expr: ExprSyntax, type: BridgeType? = nil) -> DefaultValue? { + if expr.is(NilLiteralExprSyntax.self) { + return .null + } + + if let stringLiteral = expr.as(StringLiteralExprSyntax.self), + let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) + { + let value = DefaultValue.string(segment.content.text) + if let type = type, !type.isCompatibleWith(.string) { + return nil + } + return value + } + + if let boolLiteral = expr.as(BooleanLiteralExprSyntax.self) { + let value = DefaultValue.bool(boolLiteral.literal.text == "true") + if let type = type, !type.isCompatibleWith(.bool) { + return nil + } + return value + } + + var numericExpr = expr + var isNegative = false + if let prefixExpr = expr.as(PrefixOperatorExprSyntax.self), + prefixExpr.operator.text == "-" + { + numericExpr = prefixExpr.expression + isNegative = true + } + + if let intLiteral = numericExpr.as(IntegerLiteralExprSyntax.self), + let intValue = Int(intLiteral.literal.text) + { + let value = DefaultValue.int(isNegative ? -intValue : intValue) + if let type = type, !type.isCompatibleWith(.int) { + return nil + } + return value + } + + if let floatLiteral = numericExpr.as(FloatLiteralExprSyntax.self) { + if let floatValue = Float(floatLiteral.literal.text) { + let value = DefaultValue.float(isNegative ? -floatValue : floatValue) + if type == nil || type?.isCompatibleWith(.float) == true { + return value + } + } + if let doubleValue = Double(floatLiteral.literal.text) { + let value = DefaultValue.double(isNegative ? -doubleValue : doubleValue) + if type == nil || type?.isCompatibleWith(.double) == true { + return value + } + } + } + + return nil + } + + /// Shared parameter parsing logic used by functions, initializers, and protocol methods + private func parseParameters( + from parameterClause: FunctionParameterClauseSyntax, + allowDefaults: Bool = true + ) -> [Parameter] { + var parameters: [Parameter] = [] + + for param in parameterClause.parameters { + let resolvedType = self.parent.lookupType(for: param.type) + if let type = resolvedType, case .closure(let signature) = type { + if signature.isAsync { + diagnose( + node: param.type, + message: "Async is not supported for Swift closures yet." + ) + continue + } + if signature.isThrows { + diagnose( + node: param.type, + message: "Throws is not supported for Swift closures yet." + ) + continue + } + } + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) + continue + } + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) + continue + } + + guard let type = resolvedType else { + diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) + continue + } + + let name = param.secondName?.text ?? param.firstName.text + let label = param.firstName.text + + let defaultValue: DefaultValue? + if allowDefaults { + defaultValue = extractDefaultValue(from: param.defaultValue, type: type) + } else { + defaultValue = nil + } + + parameters.append(Parameter(label: label, name: name, type: type, defaultValue: defaultValue)) + } + + return parameters + } + + override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { + guard node.attributes.hasJSAttribute() else { + return .skipChildren + } + + let isStatic = node.modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + + switch state { + case .topLevel: + if isStatic { + diagnose(node: node, message: "Top-level functions cannot be static") + return .skipChildren + } + if let exportedFunction = visitFunction(node: node, isStatic: false) { + exportedFunctions.append(exportedFunction) + } + return .skipChildren + case .classBody(let className, let classKey): + if let exportedFunction = visitFunction( + node: node, + isStatic: isStatic, + className: className, + classKey: classKey + ) { + exportedClassByName[classKey]?.methods.append(exportedFunction) + } + return .skipChildren + case .enumBody(let enumName, let enumKey): + if !isStatic { + diagnose(node: node, message: "Only static functions are supported in enums") + return .skipChildren + } + if let exportedFunction = visitFunction(node: node, isStatic: isStatic, enumName: enumName) { + if var currentEnum = exportedEnumByName[enumKey] { + currentEnum.staticMethods.append(exportedFunction) + exportedEnumByName[enumKey] = currentEnum + } + } + return .skipChildren + case .protocolBody(_, _): + // Protocol methods are handled in visitProtocolMethod during protocol parsing + return .skipChildren + case .structBody(let structName, let structKey): + if let exportedFunction = visitFunction(node: node, isStatic: isStatic, structName: structName) { + if var currentStruct = exportedStructByName[structKey] { + currentStruct.methods.append(exportedFunction) + exportedStructByName[structKey] = currentStruct + } + } + return .skipChildren + } + } + + private func visitFunction( + node: FunctionDeclSyntax, + isStatic: Bool, + className: String? = nil, + classKey: String? = nil, + enumName: String? = nil, + structName: String? = nil + ) -> ExportedFunction? { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return nil + } + + let name = node.name.text + + let attributeNamespace = extractNamespace(from: jsAttribute) + let computedNamespace = computeNamespace(for: node) + + let finalNamespace: [String]? + + if let computed = computedNamespace, !computed.isEmpty { + finalNamespace = computed + } else { + finalNamespace = attributeNamespace + } + + if attributeNamespace != nil, case .classBody = state { + diagnose( + node: jsAttribute, + message: "Namespace is only needed in top-level declaration", + hint: "Remove the namespace from @JS attribute or move this function to top-level" + ) + } + + if attributeNamespace != nil, case .enumBody = state { + diagnose( + node: jsAttribute, + message: "Namespace is not supported for enum static functions", + hint: "Remove the namespace from @JS attribute - enum functions inherit namespace from enum" + ) + } + + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) + let returnType: BridgeType + if let returnClause = node.signature.returnClause { + let resolvedType = self.parent.lookupType(for: returnClause.type) + + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + + guard let type = resolvedType else { + diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + returnType = type + } else { + returnType = .void + } + + let abiName: String + let staticContext: StaticContext? + + switch state { + case .topLevel: + staticContext = nil + case .classBody(let className, _): + if isStatic { + staticContext = .className(className) + } else { + staticContext = nil + } + case .enumBody(let enumName, let enumKey): + if !isStatic { + diagnose(node: node, message: "Only static functions are supported in enums") + return nil + } + + let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true + staticContext = isNamespaceEnum ? .namespaceEnum : .enumName(enumName) + case .protocolBody(_, _): + return nil + case .structBody(let structName, _): + if isStatic { + staticContext = .structName(structName) + } else { + staticContext = nil + } + } + + let classNameForABI: String? + switch state { + case .classBody(let className, _): + classNameForABI = className + case .structBody(let structName, _): + classNameForABI = structName + default: + classNameForABI = nil + } + abiName = ABINameGenerator.generateABIName( + baseName: name, + namespace: finalNamespace, + staticContext: isStatic ? staticContext : nil, + className: classNameForABI + ) + + guard let effects = collectEffects(signature: node.signature, isStatic: isStatic) else { + return nil + } + + return ExportedFunction( + name: name, + abiName: abiName, + parameters: parameters, + returnType: returnType, + effects: effects, + namespace: finalNamespace, + staticContext: staticContext + ) + } + + private func collectEffects(signature: FunctionSignatureSyntax, isStatic: Bool = false) -> Effects? { + let isAsync = signature.effectSpecifiers?.asyncSpecifier != nil + var isThrows = false + if let throwsClause: ThrowsClauseSyntax = signature.effectSpecifiers?.throwsClause { + // Limit the thrown type to JSException for now + guard let thrownType = throwsClause.type else { + diagnose( + node: throwsClause, + message: "Thrown type is not specified, only JSException is supported for now" + ) + return nil + } + guard thrownType.trimmedDescription == "JSException" else { + diagnose( + node: throwsClause, + message: "Only JSException is supported for thrown type, got \(thrownType.trimmedDescription)" + ) + return nil + } + isThrows = true + } + return Effects(isAsync: isAsync, isThrows: isThrows, isStatic: isStatic) + } + + private func extractNamespace( + from jsAttribute: AttributeSyntax + ) -> [String]? { + guard let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self) else { + return nil + } + + guard let namespaceArg = arguments.first(where: { $0.label?.text == "namespace" }), + let stringLiteral = namespaceArg.expression.as(StringLiteralExprSyntax.self), + let namespaceString = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text + else { + return nil + } + + return namespaceString.split(separator: ".").map(String.init) + } + + private func extractEnumStyle( + from jsAttribute: AttributeSyntax + ) -> EnumEmitStyle? { + guard let arguments = jsAttribute.arguments?.as(LabeledExprListSyntax.self), + let styleArg = arguments.first(where: { $0.label?.text == "enumStyle" }) + else { + return nil + } + let text = styleArg.expression.trimmedDescription + if text.contains("tsEnum") { + return .tsEnum + } + if text.contains("const") { + return .const + } + return nil + } + + override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } + + switch state { + case .classBody(let className, let classKey): + if extractNamespace(from: jsAttribute) != nil { + diagnose( + node: jsAttribute, + message: "Namespace is not supported for initializer declarations", + hint: "Remove the namespace from @JS attribute" + ) + } + + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) + + guard let effects = collectEffects(signature: node.signature) else { + return .skipChildren + } + + let constructor = ExportedConstructor( + abiName: "bjs_\(className)_init", + parameters: parameters, + effects: effects + ) + exportedClassByName[classKey]?.constructor = constructor + + case .structBody(let structName, let structKey): + if extractNamespace(from: jsAttribute) != nil { + diagnose( + node: jsAttribute, + message: "Namespace is not supported for initializer declarations", + hint: "Remove the namespace from @JS attribute" + ) + } + + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) + + guard let effects = collectEffects(signature: node.signature) else { + return .skipChildren + } + + let constructor = ExportedConstructor( + abiName: "bjs_\(structName)_init", + parameters: parameters, + effects: effects + ) + exportedStructByName[structKey]?.constructor = constructor + + case .enumBody(_, _): + diagnose(node: node, message: "Initializers are not supported inside enums") + + case .topLevel, .protocolBody(_, _): + diagnose(node: node, message: "@JS init must be inside a @JS class or struct") + } + + return .skipChildren + } + + override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren } + + let isStatic = node.modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + + let attributeNamespace = extractNamespace(from: jsAttribute) + if attributeNamespace != nil { + diagnose( + node: jsAttribute, + message: "Namespace parameter within @JS attribute is not supported for property declarations", + hint: + "Remove the namespace from @JS attribute. If you need dedicated namespace, consider using a nested enum or class instead." + ) + } + + let computedNamespace = computeNamespace(for: node) + let finalNamespace: [String]? + + if let computed = computedNamespace, !computed.isEmpty { + finalNamespace = computed + } else { + finalNamespace = nil + } + + // Determine static context and validate placement + let staticContext: StaticContext? + + switch state { + case .classBody(let className, _): + staticContext = isStatic ? .className(className) : nil + case .enumBody(let enumName, let enumKey): + if !isStatic { + diagnose(node: node, message: "Only static properties are supported in enums") + return .skipChildren + } + let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true + staticContext = isStatic ? (isNamespaceEnum ? .namespaceEnum : .enumName(enumName)) : nil + case .topLevel: + diagnose(node: node, message: "@JS var must be inside a @JS class or enum") + return .skipChildren + case .protocolBody(let protocolName, let protocolKey): + return visitProtocolProperty(node: node, protocolName: protocolName, protocolKey: protocolKey) + case .structBody(let structName, _): + if isStatic { + staticContext = .structName(structName) + } else { + diagnose(node: node, message: "@JS var must be static in structs (instance fields don't need @JS)") + return .skipChildren + } + } + + // Process each binding (variable declaration) + for binding in node.bindings { + guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { + diagnose(node: binding.pattern, message: "Complex patterns not supported for @JS properties") + continue + } + + let propertyName = pattern.identifier.text + + guard let typeAnnotation = binding.typeAnnotation else { + diagnose(node: binding, message: "@JS property must have explicit type annotation") + continue + } + + guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { + diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) + continue + } + + // Check if property is readonly + let isLet = node.bindingSpecifier.tokenKind == .keyword(.let) + let isGetterOnly = node.bindings.contains(where: { self.hasOnlyGetter($0.accessorBlock) }) + + let isReadonly = isLet || isGetterOnly + + let exportedProperty = ExportedProperty( + name: propertyName, + type: propertyType, + isReadonly: isReadonly, + isStatic: isStatic, + namespace: finalNamespace, + staticContext: staticContext + ) + + if case .enumBody(_, let key) = state { + if var currentEnum = exportedEnumByName[key] { + currentEnum.staticProperties.append(exportedProperty) + exportedEnumByName[key] = currentEnum + } + } else if case .structBody(_, let key) = state { + exportedStructByName[key]?.properties.append(exportedProperty) + } else if case .classBody(_, let key) = state { + exportedClassByName[key]?.properties.append(exportedProperty) + } + } + + return .skipChildren + } + + override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { + let name = node.name.text + + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "class") + guard namespaceResult.isValid else { + return .skipChildren + } + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name) + let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Class visibility must be at least internal" + ) + let exportedClass = ExportedClass( + name: name, + swiftCallName: swiftCallName, + explicitAccessControl: explicitAccessControl, + constructor: nil, + methods: [], + properties: [], + namespace: namespaceResult.namespace + ) + let uniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + + stateStack.push(state: .classBody(name: name, key: uniqueKey)) + exportedClassByName[uniqueKey] = exportedClass + exportedClassNames.append(uniqueKey) + return .visitChildren + } + + override func visitPost(_ node: ClassDeclSyntax) { + // Make sure we pop the state stack only if we're in a class body state (meaning we successfully pushed) + if case .classBody(_, _) = stateStack.current { + stateStack.pop() + } + } + + override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let name = node.name.text + + let rawType: String? = node.inheritanceClause?.inheritedTypes.first { inheritedType in + let typeName = inheritedType.type.trimmedDescription + return ExportSwiftConstants.supportedRawTypes.contains(typeName) + }?.type.trimmedDescription + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "enum") + guard namespaceResult.isValid else { + return .skipChildren + } + let emitStyle = extractEnumStyle(from: jsAttribute) ?? .const + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name) + let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Enum visibility must be at least internal" + ) + + let tsFullPath: String + if let namespace = namespaceResult.namespace, !namespace.isEmpty { + tsFullPath = namespace.joined(separator: ".") + "." + name + } else { + tsFullPath = name + } + + // Create enum directly in dictionary + let exportedEnum = ExportedEnum( + name: name, + swiftCallName: swiftCallName, + tsFullPath: tsFullPath, + explicitAccessControl: explicitAccessControl, + cases: [], // Will be populated in visit(EnumCaseDeclSyntax) + rawType: SwiftEnumRawType(rawType), + namespace: namespaceResult.namespace, + emitStyle: emitStyle, + staticMethods: [], + staticProperties: [] + ) + + let enumUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + exportedEnumByName[enumUniqueKey] = exportedEnum + exportedEnumNames.append(enumUniqueKey) + + stateStack.push(state: .enumBody(name: name, key: enumUniqueKey)) + + return .visitChildren + } + + override func visitPost(_ node: EnumDeclSyntax) { + guard let jsAttribute = node.attributes.firstJSAttribute else { + // Only pop if we have a valid enum that was processed + if case .enumBody(_, _) = stateStack.current { + stateStack.pop() + } + return + } + + guard case .enumBody(_, let enumKey) = stateStack.current else { + return + } + + guard let exportedEnum = exportedEnumByName[enumKey] else { + stateStack.pop() + return + } + + let emitStyle = exportedEnum.emitStyle + + if case .tsEnum = emitStyle { + if exportedEnum.rawType == .bool { + diagnose( + node: jsAttribute, + message: "TypeScript enum style is not supported for Bool raw-value enums", + hint: "Use enumStyle: .const or change the raw type to String or a numeric type" + ) + } + if !exportedEnum.staticMethods.isEmpty { + diagnose( + node: jsAttribute, + message: "TypeScript enum style does not support static functions", + hint: "Use enumStyle: .const to generate a const object that supports static functions" + ) + } + } + + if exportedEnum.cases.contains(where: { !$0.associatedValues.isEmpty }) { + if case .tsEnum = emitStyle { + diagnose( + node: jsAttribute, + message: "TypeScript enum style is not supported for associated value enums", + hint: "Use enumStyle: .const in order to map associated-value enums" + ) + } + for enumCase in exportedEnum.cases { + for associatedValue in enumCase.associatedValues { + switch associatedValue.type { + case .string, .int, .float, .double, .bool: + break + case .optional(let wrappedType): + switch wrappedType { + case .string, .int, .float, .double, .bool: + break + default: + diagnose( + node: node, + message: "Unsupported associated value type: \(associatedValue.type.swiftType)", + hint: + "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" + ) + } + default: + diagnose( + node: node, + message: "Unsupported associated value type: \(associatedValue.type.swiftType)", + hint: + "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" + ) + } + } + } + } + + stateStack.pop() + } + + override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let name = node.name.text + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "protocol") + guard namespaceResult.isValid else { + return .skipChildren + } + _ = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Protocol visibility must be at least internal" + ) + + let protocolUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + + exportedProtocolByName[protocolUniqueKey] = ExportedProtocol( + name: name, + methods: [], + properties: [], + namespace: namespaceResult.namespace + ) + + stateStack.push(state: .protocolBody(name: name, key: protocolUniqueKey)) + + var methods: [ExportedFunction] = [] + for member in node.memberBlock.members { + if let funcDecl = member.decl.as(FunctionDeclSyntax.self) { + if let exportedFunction = visitProtocolMethod( + node: funcDecl, + protocolName: name, + namespace: namespaceResult.namespace + ) { + methods.append(exportedFunction) + } + } else if let varDecl = member.decl.as(VariableDeclSyntax.self) { + _ = visitProtocolProperty(node: varDecl, protocolName: name, protocolKey: protocolUniqueKey) + } + } + + let exportedProtocol = ExportedProtocol( + name: name, + methods: methods, + properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [], + namespace: namespaceResult.namespace + ) + + exportedProtocolByName[protocolUniqueKey] = exportedProtocol + exportedProtocolNames.append(protocolUniqueKey) + + stateStack.pop() + + return .skipChildren + } + + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + guard let jsAttribute = node.attributes.firstJSAttribute else { + return .skipChildren + } + + let name = node.name.text + + let namespaceResult = resolveNamespace(from: jsAttribute, for: node, declarationType: "struct") + guard namespaceResult.isValid else { + return .skipChildren + } + let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: node, itemName: name) + let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( + for: node, + message: "Struct visibility must be at least internal" + ) + + var properties: [ExportedProperty] = [] + + // Process all variables in struct as readonly (value semantics) and don't require @JS + for member in node.memberBlock.members { + if let varDecl = member.decl.as(VariableDeclSyntax.self) { + let isStatic = varDecl.modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + + // Handled with error in visitVariable + if varDecl.attributes.hasJSAttribute() { + continue + } + // Skips static non-@JS properties + if isStatic { + continue + } + + for binding in varDecl.bindings { + guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { + continue + } + + let fieldName = pattern.identifier.text + + guard let typeAnnotation = binding.typeAnnotation else { + diagnose(node: binding, message: "Struct field must have explicit type annotation") + continue + } + + guard let fieldType = self.parent.lookupType(for: typeAnnotation.type) else { + diagnoseUnsupportedType( + node: typeAnnotation.type, + type: typeAnnotation.type.trimmedDescription + ) + continue + } + + let property = ExportedProperty( + name: fieldName, + type: fieldType, + isReadonly: true, + isStatic: false, + namespace: namespaceResult.namespace, + staticContext: nil + ) + properties.append(property) + } + } + } + + let structUniqueKey = makeKey(name: name, namespace: namespaceResult.namespace) + let exportedStruct = ExportedStruct( + name: name, + swiftCallName: swiftCallName, + explicitAccessControl: explicitAccessControl, + properties: properties, + methods: [], + namespace: namespaceResult.namespace + ) + + exportedStructByName[structUniqueKey] = exportedStruct + exportedStructNames.append(structUniqueKey) + + stateStack.push(state: .structBody(name: name, key: structUniqueKey)) + + return .visitChildren + } + + override func visitPost(_ node: StructDeclSyntax) { + if case .structBody(_, _) = stateStack.current { + stateStack.pop() + } + } + + private func visitProtocolMethod( + node: FunctionDeclSyntax, + protocolName: String, + namespace: [String]? + ) -> ExportedFunction? { + let name = node.name.text + + let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: false) + + let returnType: BridgeType + if let returnClause = node.signature.returnClause { + let resolvedType = self.parent.lookupType(for: returnClause.type) + + if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + + guard let type = resolvedType else { + diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) + return nil + } + returnType = type + } else { + returnType = .void + } + + let abiName = ABINameGenerator.generateABIName( + baseName: name, + namespace: namespace, + className: protocolName + ) + + guard let effects = collectEffects(signature: node.signature) else { + return nil + } + + return ExportedFunction( + name: name, + abiName: abiName, + parameters: parameters, + returnType: returnType, + effects: effects, + namespace: namespace, + staticContext: nil + ) + } + + private func visitProtocolProperty( + node: VariableDeclSyntax, + protocolName: String, + protocolKey: String + ) -> SyntaxVisitorContinueKind { + for binding in node.bindings { + guard let pattern = binding.pattern.as(IdentifierPatternSyntax.self) else { + diagnose(node: binding.pattern, message: "Complex patterns not supported for protocol properties") + continue + } + + let propertyName = pattern.identifier.text + + guard let typeAnnotation = binding.typeAnnotation else { + diagnose(node: binding, message: "Protocol property must have explicit type annotation") + continue + } + + guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { + diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) + continue + } + + guard let accessorBlock = binding.accessorBlock else { + diagnose( + node: binding, + message: "Protocol property must specify { get } or { get set }", + hint: "Add { get } for readonly or { get set } for readwrite property" + ) + continue + } + + let isReadonly = hasOnlyGetter(accessorBlock) + + let exportedProperty = ExportedProtocolProperty( + name: propertyName, + type: propertyType, + isReadonly: isReadonly + ) + + if var currentProtocol = exportedProtocolByName[protocolKey] { + var properties = currentProtocol.properties + properties.append(exportedProperty) + + currentProtocol = ExportedProtocol( + name: currentProtocol.name, + methods: currentProtocol.methods, + properties: properties, + namespace: currentProtocol.namespace + ) + exportedProtocolByName[protocolKey] = currentProtocol + } + } + + return .skipChildren + } + + private func hasOnlyGetter(_ accessorBlock: AccessorBlockSyntax?) -> Bool { + switch accessorBlock?.accessors { + case .accessors(let accessors): + // Has accessors - check if it only has a getter (no setter, willSet, or didSet) + return !accessors.contains(where: { accessor in + let tokenKind = accessor.accessorSpecifier.tokenKind + return tokenKind == .keyword(.set) || tokenKind == .keyword(.willSet) + || tokenKind == .keyword(.didSet) + }) + case .getter: + // Has only a getter block + return true + case nil: + // No accessor block - this is a stored property, not readonly + return false + } + } + + override func visit(_ node: EnumCaseDeclSyntax) -> SyntaxVisitorContinueKind { + guard case .enumBody(_, let enumKey) = stateStack.current else { + return .visitChildren + } + + for element in node.elements { + let caseName = element.name.text + let rawValue: String? + var associatedValues: [AssociatedValue] = [] + + if exportedEnumByName[enumKey]?.rawType != nil { + if let stringLiteral = element.rawValue?.value.as(StringLiteralExprSyntax.self) { + rawValue = stringLiteral.segments.first?.as(StringSegmentSyntax.self)?.content.text + } else if let boolLiteral = element.rawValue?.value.as(BooleanLiteralExprSyntax.self) { + rawValue = boolLiteral.literal.text + } else { + var numericExpr = element.rawValue?.value + var isNegative = false + + // Check for prefix operator (for negative numbers) + if let prefixExpr = numericExpr?.as(PrefixOperatorExprSyntax.self), + prefixExpr.operator.text == "-" + { + numericExpr = prefixExpr.expression + isNegative = true + } + + if let intLiteral = numericExpr?.as(IntegerLiteralExprSyntax.self) { + rawValue = isNegative ? "-\(intLiteral.literal.text)" : intLiteral.literal.text + } else if let floatLiteral = numericExpr?.as(FloatLiteralExprSyntax.self) { + rawValue = isNegative ? "-\(floatLiteral.literal.text)" : floatLiteral.literal.text + } else { + rawValue = nil + } + } + } else { + rawValue = nil + } + if let parameterClause = element.parameterClause { + for param in parameterClause.parameters { + guard let bridgeType = parent.lookupType(for: param.type) else { + diagnose( + node: param.type, + message: "Unsupported associated value type: \(param.type.trimmedDescription)", + hint: "Only primitive types and types defined in the same module are allowed" + ) + continue + } + + let label = param.firstName?.text + associatedValues.append(AssociatedValue(label: label, type: bridgeType)) + } + } + let enumCase = EnumCase( + name: caseName, + rawValue: rawValue, + associatedValues: associatedValues + ) + exportedEnumByName[enumKey]?.cases.append(enumCase) + } + + return .visitChildren + } + + /// Computes namespace by walking up the AST hierarchy to find parent namespace enums + /// If parent enum is a namespace enum (no cases) then it will be used as part of namespace for given node + /// + /// + /// Method allows for explicit namespace for top level enum, it will be used as base namespace and will concat enum name + private func computeNamespace(for node: some SyntaxProtocol) -> [String]? { + var namespace: [String] = [] + var currentNode: Syntax? = node.parent + + while let parent = currentNode { + if let enumDecl = parent.as(EnumDeclSyntax.self), + enumDecl.attributes.hasJSAttribute() + { + let isNamespaceEnum = !enumDecl.memberBlock.members.contains { member in + member.decl.is(EnumCaseDeclSyntax.self) + } + if isNamespaceEnum { + namespace.insert(enumDecl.name.text, at: 0) + + if let jsAttribute = enumDecl.attributes.firstJSAttribute, + let explicitNamespace = extractNamespace(from: jsAttribute) + { + namespace = explicitNamespace + namespace + break + } + } + } + currentNode = parent.parent + } + + return namespace.isEmpty ? nil : namespace + } + + /// Requires the node to have at least internal access control. + private func computeExplicitAtLeastInternalAccessControl( + for node: some WithModifiersSyntax, + message: String + ) -> String? { + guard let accessControl = node.explicitAccessControl else { + return nil + } + guard accessControl.isAtLeastInternal else { + diagnose( + node: accessControl, + message: message, + hint: "Use `internal`, `package` or `public` access control" + ) + return nil + } + return accessControl.name.text + } +} + +fileprivate extension BridgeType { + /// Returns true if a value of `expectedType` can be assigned to this type. + func isCompatibleWith(_ expectedType: BridgeType) -> Bool { + switch (self, expectedType) { + case let (lhs, rhs) where lhs == rhs: + return true + case (.optional(let wrapped), expectedType): + return wrapped == expectedType + default: + return false + } + } +} + +import SwiftSyntax +#if canImport(BridgeJSSkeleton) +import BridgeJSSkeleton +#endif +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif + +private final class ImportSwiftMacrosJSImportTypeNameCollector: SyntaxAnyVisitor { + var typeNames: Set = [] + + private func visitTypeDecl(_ attributes: AttributeListSyntax?, _ name: String) -> SyntaxVisitorContinueKind { + if ImportSwiftMacrosAPICollector.AttributeChecker.hasJSClassAttribute(attributes) { + typeNames.insert(name) + } + return .visitChildren + } + + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + visitTypeDecl(node.attributes, node.name.text) + } + + override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { + visitTypeDecl(node.attributes, node.name.text) + } +} + +private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { + var importedFunctions: [ImportedFunctionSkeleton] = [] + var importedTypes: [ImportedTypeSkeleton] = [] + var importedGlobalGetters: [ImportedGetterSkeleton] = [] + var errors: [DiagnosticError] = [] + + private let inputFilePath: String + private var jsClassNames: Set + + // MARK: - State Management + + enum State { + case topLevel + case jsClassBody(name: String) + } + + private var stateStack: [State] = [.topLevel] + var state: State { + return stateStack.last! + } + + // Current type being collected (when in jsClassBody state) + private struct CurrentType { + let name: String + var constructor: ImportedConstructorSkeleton? + var methods: [ImportedFunctionSkeleton] + var getters: [ImportedGetterSkeleton] + var setters: [ImportedSetterSkeleton] + } + private var currentType: CurrentType? + + // MARK: - Attribute Checking + + /// Helper struct for checking and extracting attributes + fileprivate struct AttributeChecker { + static func hasJSFunctionAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSFunction") + } + + static func hasJSGetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSGetter") + } + + static func hasJSSetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSSetter") + } + + static func firstJSSetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { + attributes?.first { attribute in + attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSSetter" + }?.as(AttributeSyntax.self) + } + + static func hasJSClassAttribute(_ attributes: AttributeListSyntax?) -> Bool { + hasAttribute(attributes, name: "JSClass") + } + + static func hasAttribute(_ attributes: AttributeListSyntax?, name: String) -> Bool { + guard let attributes else { return false } + return attributes.contains { attribute in + guard let syntax = attribute.as(AttributeSyntax.self) else { return false } + return syntax.attributeName.trimmedDescription == name + } + } + + /// Extracts the jsName argument value from a @JSSetter attribute, if present. + static func extractJSName(from attribute: AttributeSyntax) -> String? { + guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { + return nil + } + for argument in arguments { + if argument.label?.text == "jsName", + let stringLiteral = argument.expression.as(StringLiteralExprSyntax.self), + let segment = stringLiteral.segments.first?.as(StringSegmentSyntax.self) + { + return segment.content.text + } + } + return nil + } + } + + // MARK: - Validation Helpers + + /// Common validation result for setter functions + private struct SetterValidationResult { + let effects: Effects + let jsName: String? + let firstParam: FunctionParameterSyntax + let valueType: BridgeType + } + + /// Validates effects (throws required, async not supported) + private func validateEffects( + _ effects: FunctionEffectSpecifiersSyntax?, + node: some SyntaxProtocol, + attributeName: String + ) -> Effects? { + guard let effects = parseEffects(effects) else { + errors.append( + DiagnosticError( + node: node, + message: "@\(attributeName) declarations must be throws.", + hint: "Declare the function as 'throws (JSException)'." + ) + ) + return nil + } + if effects.isAsync { + errors.append( + DiagnosticError( + node: node, + message: "@\(attributeName) declarations do not support async yet." + ) + ) + return nil + } + return effects + } + + /// Validates a setter function and extracts common information + private func validateSetter( + _ node: FunctionDeclSyntax, + jsSetter: AttributeSyntax, + enclosingTypeName: String? + ) -> SetterValidationResult? { + guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") + else { + return nil + } + + let jsName = AttributeChecker.extractJSName(from: jsSetter) + let parameters = node.signature.parameterClause.parameters + + guard let firstParam = parameters.first else { + errors.append( + DiagnosticError( + node: node, + message: "@JSSetter function must have at least one parameter." + ) + ) + return nil + } + + if firstParam.type.is(MissingTypeSyntax.self) { + errors.append( + DiagnosticError( + node: firstParam, + message: "All @JSSetter parameters must have explicit types." + ) + ) + return nil + } + + return SetterValidationResult( + effects: effects, + jsName: jsName, + firstParam: firstParam, + valueType: parseType(firstParam.type, enclosingTypeName: enclosingTypeName) + ) + } + + // MARK: - Property Name Resolution + + /// Helper for resolving property names from setter function names and jsName attributes + private struct PropertyNameResolver { + /// Resolves property name and function base name from a setter function and optional jsName + /// - Returns: (propertyName, functionBaseName) where propertyName preserves case for getter matching, + /// and functionBaseName has lowercase first char for ABI generation + static func resolve( + functionName: String, + jsName: String?, + normalizeIdentifier: (String) -> String + ) -> (propertyName: String, functionBaseName: String)? { + if let jsName = jsName { + let propertyName = normalizeIdentifier(jsName) + let functionBaseName = propertyName.prefix(1).lowercased() + propertyName.dropFirst() + return (propertyName: propertyName, functionBaseName: functionBaseName) + } + + let rawFunctionName = + functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 + ? String(functionName.dropFirst().dropLast()) + : functionName + + guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { + return nil + } + + let derivedPropertyName = String(rawFunctionName.dropFirst(3)) + let normalized = normalizeIdentifier(derivedPropertyName) + let propertyName = normalized.prefix(1).lowercased() + normalized.dropFirst() + return (propertyName: propertyName, functionBaseName: propertyName) + } + } + + init(inputFilePath: String, knownJSClassNames: Set) { + self.inputFilePath = inputFilePath + self.jsClassNames = knownJSClassNames + super.init(viewMode: .sourceAccurate) + } + + private func enterJSClass(_ typeName: String) { + stateStack.append(.jsClassBody(name: typeName)) + currentType = CurrentType(name: typeName, constructor: nil, methods: [], getters: [], setters: []) + } + + private func exitJSClass() { + if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName { + importedTypes.append( + ImportedTypeSkeleton( + name: type.name, + constructor: type.constructor, + methods: type.methods, + getters: type.getters, + setters: type.setters, + documentation: nil + ) + ) + currentType = nil + } + stateStack.removeLast() + } + + override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + enterJSClass(node.name.text) + } + return .visitChildren + } + + override func visitPost(_ node: StructDeclSyntax) { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + exitJSClass() + } + } + + override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + enterJSClass(node.name.text) + } + return .visitChildren + } + + override func visitPost(_ node: ClassDeclSyntax) { + if AttributeChecker.hasJSClassAttribute(node.attributes) { + exitJSClass() + } + } + + // MARK: - Visitor Methods + + override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind { + let typeName = node.extendedType.trimmedDescription + collectStaticMembers(in: node.memberBlock.members, typeName: typeName) + return .skipChildren + } + + override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { + switch state { + case .topLevel: + return handleTopLevelFunction(node) + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + let isStaticMember = isStatic(node.modifiers) + let handled = handleClassFunction(node, typeName: typeName, isStaticMember: isStaticMember, type: &type) + if handled { + currentType = type + } + return .skipChildren + } + } + + private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { + if AttributeChecker.hasJSFunctionAttribute(node.attributes), + let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) + { + importedFunctions.append(function) + return .skipChildren + } + // Top-level setters are not supported + if AttributeChecker.hasJSSetterAttribute(node.attributes) { + errors.append( + DiagnosticError( + node: node, + message: "@JSSetter is not supported at top-level. Use it only in @JSClass types." + ) + ) + return .skipChildren + } + return .visitChildren + } + + private func handleClassFunction( + _ node: FunctionDeclSyntax, + typeName: String, + isStaticMember: Bool, + type: inout CurrentType + ) -> Bool { + if AttributeChecker.hasJSFunctionAttribute(node.attributes) { + if isStaticMember { + parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { + importedFunctions.append($0) + } + } else { + parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { + type.methods.append($0) + } + } + return true + } + + if AttributeChecker.hasJSSetterAttribute(node.attributes) { + if isStaticMember { + errors.append( + DiagnosticError( + node: node, + message: + "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } else if let jsSetter = AttributeChecker.firstJSSetterAttribute(node.attributes), + let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) + { + type.setters.append(setter) + } + return true + } + + return false + } + + override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind { + guard AttributeChecker.hasJSGetterAttribute(node.attributes) else { + return .visitChildren + } + + switch state { + case .topLevel: + if let getter = parseGetterSkeleton(node, enclosingTypeName: nil) { + importedGlobalGetters.append(getter) + } + return .skipChildren + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + if isStatic(node.modifiers) { + errors.append( + DiagnosticError( + node: node, + message: + "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } else if let getter = parseGetterSkeleton(node, enclosingTypeName: typeName) { + type.getters.append(getter) + currentType = type + } + return .skipChildren + } + } + + override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind { + guard AttributeChecker.hasJSFunctionAttribute(node.attributes) else { + return .visitChildren + } + + switch state { + case .topLevel: + return .visitChildren + + case .jsClassBody(let typeName): + guard var type = currentType, type.name == typeName else { + return .skipChildren + } + if type.constructor != nil { + errors.append( + DiagnosticError( + node: node, + message: "Only one @JSFunction initializer is supported in @JSClass types." + ) + ) + return .skipChildren + } + if let parsed = parseConstructor(node, typeName: typeName) { + type.constructor = parsed + currentType = type + } + return .skipChildren + } + } + + // MARK: - Member Collection + + private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { + for member in members { + if let function = member.decl.as(FunctionDeclSyntax.self) { + if AttributeChecker.hasJSFunctionAttribute(function.attributes), + let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) + { + importedFunctions.append(parsed) + } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { + errors.append( + DiagnosticError( + node: function, + message: + "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } + } else if let variable = member.decl.as(VariableDeclSyntax.self), + AttributeChecker.hasJSGetterAttribute(variable.attributes) + { + errors.append( + DiagnosticError( + node: variable, + message: + "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." + ) + ) + } + } + } + + // MARK: - Parsing Methods + + private func parseConstructor( + _ initializer: InitializerDeclSyntax, + typeName: String + ) -> ImportedConstructorSkeleton? { + guard + validateEffects(initializer.signature.effectSpecifiers, node: initializer, attributeName: "JSFunction") + != nil + else { + return nil + } + return ImportedConstructorSkeleton( + parameters: parseParameters( + from: initializer.signature.parameterClause, + enclosingTypeName: typeName + ) + ) + } + + private func parseFunction( + _ node: FunctionDeclSyntax, + enclosingTypeName: String?, + isStaticMember: Bool + ) -> ImportedFunctionSkeleton? { + guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil + else { + return nil + } + + let baseName = normalizeIdentifier(node.name.text) + let name: String + if isStaticMember, let enclosingTypeName { + name = "\(enclosingTypeName)_\(baseName)" + } else { + name = baseName + } + + let parameters = parseParameters( + from: node.signature.parameterClause, + enclosingTypeName: enclosingTypeName + ) + let returnType: BridgeType + if let returnTypeSyntax = node.signature.returnClause?.type { + returnType = parseType(returnTypeSyntax, enclosingTypeName: enclosingTypeName) + } else { + returnType = .void + } + return ImportedFunctionSkeleton( + name: name, + parameters: parameters, + returnType: returnType, + documentation: nil + ) + } + + /// Extracts property info from a VariableDeclSyntax (binding, identifier, type) + private func extractPropertyInfo( + _ node: VariableDeclSyntax, + errorMessage: String = "@JSGetter must declare a single stored property with an explicit type." + ) -> (identifier: IdentifierPatternSyntax, type: TypeSyntax)? { + guard let binding = node.bindings.first, + let identifier = binding.pattern.as(IdentifierPatternSyntax.self), + let typeAnnotation = binding.typeAnnotation + else { + errors.append(DiagnosticError(node: node, message: errorMessage)) + return nil + } + return (identifier, typeAnnotation.type) + } + + private func parseGetterSkeleton( + _ node: VariableDeclSyntax, + enclosingTypeName: String? + ) -> ImportedGetterSkeleton? { + guard let (identifier, type) = extractPropertyInfo(node) else { + return nil + } + let propertyType = parseType(type, enclosingTypeName: enclosingTypeName) + let propertyName = normalizeIdentifier(identifier.identifier.text) + return ImportedGetterSkeleton( + name: propertyName, + type: propertyType, + documentation: nil, + functionName: nil + ) + } + + /// Parses a setter as part of a type's property system (for instance setters) + private func parseSetterSkeleton( + _ jsSetter: AttributeSyntax, + _ node: FunctionDeclSyntax, + enclosingTypeName: String? + ) -> ImportedSetterSkeleton? { + guard let validation = validateSetter(node, jsSetter: jsSetter, enclosingTypeName: enclosingTypeName) else { + return nil + } + + let functionName = node.name.text + guard + let (propertyName, functionBaseName) = PropertyNameResolver.resolve( + functionName: functionName, + jsName: validation.jsName, + normalizeIdentifier: normalizeIdentifier + ) + else { + return nil + } + + return ImportedSetterSkeleton( + name: propertyName, + type: validation.valueType, + documentation: nil, + functionName: "\(functionBaseName)_set" + ) + } + + // MARK: - Type and Parameter Parsing + + private func parseParameters( + from clause: FunctionParameterClauseSyntax, + enclosingTypeName: String? + ) -> [Parameter] { + clause.parameters.compactMap { param in + let type = param.type + if type.is(MissingTypeSyntax.self) { + errors.append( + DiagnosticError( + node: param, + message: "All @JSFunction parameters must have explicit types." + ) + ) + return nil + } + let nameToken = param.secondName ?? param.firstName + let name = normalizeIdentifier(nameToken.text) + let labelToken = param.secondName == nil ? nil : param.firstName + let label = labelToken?.text == "_" ? nil : labelToken?.text + let bridgeType = parseType(type, enclosingTypeName: enclosingTypeName) + return Parameter(label: label, name: name, type: bridgeType) + } + } + + private func parseType(_ type: TypeSyntax, enclosingTypeName: String?) -> BridgeType { + guard let identifier = type.as(IdentifierTypeSyntax.self) else { + errors.append( + DiagnosticError( + node: type, + message: "Unsupported @JS type '\(type.trimmedDescription)'." + ) + ) + return .void + } + + let name = normalizeIdentifier(identifier.name.text) + if name == "Self", let enclosingTypeName { + return .jsObject(enclosingTypeName) + } + return BridgeType(swiftType: name) ?? .jsObject(name) + } + + // MARK: - Helper Methods + + private func parseEffects(_ effects: FunctionEffectSpecifiersSyntax?) -> Effects? { + let isThrows = effects?.throwsClause != nil + let isAsync = effects?.asyncSpecifier != nil + guard isThrows else { + return nil + } + return Effects(isAsync: isAsync, isThrows: isThrows) + } + + private func isStatic(_ modifiers: DeclModifierListSyntax?) -> Bool { + guard let modifiers else { return false } + return modifiers.contains { modifier in + modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) + } + } + + private func normalizeIdentifier(_ name: String) -> String { + guard name.hasPrefix("`"), name.hasSuffix("`"), name.count >= 2 else { + return name + } + return String(name.dropFirst().dropLast()) + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 10f06802d..97001c5f8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -548,11 +548,11 @@ public struct ExportedProperty: Codable, Equatable, Sendable { } public struct ExportedSkeleton: Codable { - public let functions: [ExportedFunction] - public let classes: [ExportedClass] - public let enums: [ExportedEnum] - public let structs: [ExportedStruct] - public let protocols: [ExportedProtocol] + public var functions: [ExportedFunction] + public var classes: [ExportedClass] + public var enums: [ExportedEnum] + public var structs: [ExportedStruct] + public var protocols: [ExportedProtocol] /// Whether to expose exported APIs to the global namespace. /// /// When `true`, exported functions, classes, and namespaces are available @@ -575,6 +575,15 @@ public struct ExportedSkeleton: Codable { self.protocols = protocols self.exposeToGlobal = exposeToGlobal } + + public mutating func append(_ other: ExportedSkeleton) { + self.functions.append(contentsOf: other.functions) + self.classes.append(contentsOf: other.classes) + self.enums.append(contentsOf: other.enums) + self.structs.append(contentsOf: other.structs) + self.protocols.append(contentsOf: other.protocols) + assert(self.exposeToGlobal == other.exposeToGlobal) + } } // MARK: - Imported Skeleton diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index eb6927852..f75c7b758 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -125,13 +125,11 @@ import BridgeJSUtilities } let inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) - let exporter = ExportSwift( + let swiftToSkeleton = SwiftToSkeleton( progress: progress, moduleName: moduleName, exposeToGlobal: config.exposeToGlobal ) - let importSwift = ImportSwiftMacros(progress: progress, moduleName: moduleName) - for inputFile in inputFiles.sorted() { let content = try String(contentsOf: URL(fileURLWithPath: inputFile), encoding: .utf8) if hasBridgeJSSkipComment(content) { @@ -139,17 +137,30 @@ import BridgeJSUtilities } let sourceFile = Parser.parse(source: content) - try exporter.addSourceFile(sourceFile, inputFile) - importSwift.addSourceFile(sourceFile, inputFile) + swiftToSkeleton.addSourceFile(sourceFile, inputFilePath: inputFile) } - let importResult = try importSwift.finalize() - let exportResult = try exporter.finalize() - let importSkeleton = importResult.outputSkeleton + let skeleton = try swiftToSkeleton.finalize() + + var exporter: ExportSwift? + if let skeleton = skeleton.exported { + exporter = ExportSwift( + progress: progress, + moduleName: moduleName, + skeleton: skeleton + ) + } + var importer: ImportTS? + if let skeleton = skeleton.imported { + importer = ImportTS(progress: progress, moduleName: moduleName, skeleton: skeleton) + } + + let importResult = try importer?.finalize() + let exportResult = try exporter?.finalize() // Combine and write unified Swift output let outputSwiftURL = outputDirectory.appending(path: "BridgeJS.swift") - let combinedSwift = [exportResult?.outputSwift, importResult.outputSwift].compactMap { $0 } + let combinedSwift = [exportResult, importResult].compactMap { $0 } let outputSwift = combineGeneratedSwift(combinedSwift) let shouldWrite = doubleDashOptions["always-write"] == "true" || !outputSwift.isEmpty if shouldWrite { @@ -163,11 +174,6 @@ import BridgeJSUtilities // Write unified skeleton let outputSkeletonURL = outputDirectory.appending(path: "JavaScript/BridgeJS.json") - let unifiedSkeleton = BridgeJSSkeleton( - moduleName: moduleName, - exported: exportResult?.outputSkeleton, - imported: importSkeleton - ) try FileManager.default.createDirectory( at: outputSkeletonURL.deletingLastPathComponent(), withIntermediateDirectories: true, @@ -175,10 +181,10 @@ import BridgeJSUtilities ) let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let skeletonData = try encoder.encode(unifiedSkeleton) + let skeletonData = try encoder.encode(skeleton) try skeletonData.write(to: outputSkeletonURL) - if exportResult != nil || importResult.outputSwift != nil { + if skeleton.exported != nil || skeleton.imported != nil { progress.print("Generated BridgeJS code") } case "export", "import": diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 4cb46124d..16de8617e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -57,15 +57,13 @@ import Testing func snapshotExport(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - try swiftAPI.addSourceFile(sourceFile, input) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + swiftAPI.addSourceFile(sourceFile, inputFilePath: input) let name = url.deletingPathExtension().lastPathComponent - let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) + let outputSkeleton = try swiftAPI.finalize() let bridgeJSLink: BridgeJSLink = BridgeJSLink( - skeletons: [ - BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton) - ], + skeletons: [outputSkeleton], sharedMemory: false ) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Export") @@ -86,27 +84,13 @@ import Testing ) let sourceFile = Parser.parse(source: swiftSource) - let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "TestModule") - importSwift.addSourceFile(sourceFile, "\(name).Macros.swift") - let importResult = try importSwift.finalize() - - var importTS = ImportTS(progress: .silent, moduleName: "TestModule") - for child in importResult.outputSkeleton.children { - importTS.addSkeleton(child) - } - let importSkeleton = importTS.skeleton - - var bridgeJSLink = BridgeJSLink(sharedMemory: false) - // Create unified skeleton for test - let unifiedSkeleton = BridgeJSSkeleton( - moduleName: "TestModule", - exported: nil, - imported: importSkeleton + let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).Macros.swift") + let skeleton = try importSwift.finalize() + let bridgeJSLink = BridgeJSLink( + skeletons: [skeleton], + sharedMemory: false ) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let unifiedData = try encoder.encode(unifiedSkeleton) - try bridgeJSLink.addSkeletonFile(data: unifiedData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") } @@ -116,25 +100,13 @@ import Testing let name = url.deletingPathExtension().lastPathComponent let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "TestModule") - importSwift.addSourceFile(sourceFile, "\(name).swift") + let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift") let importResult = try importSwift.finalize() - - var importTS = ImportTS(progress: .silent, moduleName: "TestModule") - for child in importResult.outputSkeleton.children { - importTS.addSkeleton(child) - } - let importSkeleton = importTS.skeleton - var bridgeJSLink = BridgeJSLink(sharedMemory: false) - let unifiedSkeleton = BridgeJSSkeleton( - moduleName: "TestModule", - exported: nil, - imported: importSkeleton - ) let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let unifiedData = try encoder.encode(unifiedSkeleton) + let unifiedData = try encoder.encode(importResult) try bridgeJSLink.addSkeletonFile(data: unifiedData) try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".ImportMacros") } @@ -148,13 +120,13 @@ import Testing func snapshotExportWithGlobal(inputFile: String) throws { let url = Self.inputsDirectory.appendingPathComponent(inputFile) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) - try swiftAPI.addSourceFile(sourceFile, inputFile) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) + swiftAPI.addSourceFile(sourceFile, inputFilePath: inputFile) let name = url.deletingPathExtension().lastPathComponent - let (_, outputSkeleton) = try #require(try swiftAPI.finalize()) + let outputSkeleton = try swiftAPI.finalize() let bridgeJSLink: BridgeJSLink = BridgeJSLink( skeletons: [ - BridgeJSSkeleton(moduleName: "TestModule", exported: outputSkeleton) + outputSkeleton ], sharedMemory: false ) @@ -165,20 +137,20 @@ import Testing func snapshotMixedModuleExposure() throws { let globalURL = Self.inputsDirectory.appendingPathComponent("MixedGlobal.swift") let globalSourceFile = Parser.parse(source: try String(contentsOf: globalURL, encoding: .utf8)) - let globalAPI = ExportSwift(progress: .silent, moduleName: "GlobalModule", exposeToGlobal: true) - try globalAPI.addSourceFile(globalSourceFile, "MixedGlobal.swift") - let (_, globalSkeleton) = try #require(try globalAPI.finalize()) + let globalAPI = SwiftToSkeleton(progress: .silent, moduleName: "GlobalModule", exposeToGlobal: true) + globalAPI.addSourceFile(globalSourceFile, inputFilePath: "MixedGlobal.swift") + let globalSkeleton = try globalAPI.finalize() let privateURL = Self.inputsDirectory.appendingPathComponent("MixedPrivate.swift") let privateSourceFile = Parser.parse(source: try String(contentsOf: privateURL, encoding: .utf8)) - let privateAPI = ExportSwift(progress: .silent, moduleName: "PrivateModule", exposeToGlobal: false) - try privateAPI.addSourceFile(privateSourceFile, "MixedPrivate.swift") - let (_, privateSkeleton) = try #require(try privateAPI.finalize()) + let privateAPI = SwiftToSkeleton(progress: .silent, moduleName: "PrivateModule", exposeToGlobal: false) + privateAPI.addSourceFile(privateSourceFile, inputFilePath: "MixedPrivate.swift") + let privateSkeleton = try privateAPI.finalize() let bridgeJSLink = BridgeJSLink( skeletons: [ - BridgeJSSkeleton(moduleName: "GlobalModule", exported: globalSkeleton), - BridgeJSSkeleton(moduleName: "PrivateModule", exported: privateSkeleton), + globalSkeleton, + privateSkeleton, ], sharedMemory: false ) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift index 41e118315..fd86a2ad7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift @@ -4,16 +4,19 @@ import SwiftParser import Testing @testable import BridgeJSCore +@testable import BridgeJSSkeleton @Suite struct ExportSwiftTests { private func snapshot( - swiftAPI: ExportSwift, + skeleton: BridgeJSSkeleton, name: String? = nil, filePath: String = #filePath, function: String = #function, sourceLocation: Testing.SourceLocation = #_sourceLocation ) throws { - let (outputSwift, outputSkeleton) = try #require(try swiftAPI.finalize()) + guard let exported = skeleton.exported else { return } + let exportSwift = ExportSwift(progress: .silent, moduleName: skeleton.moduleName, skeleton: exported) + let outputSwift = try #require(try exportSwift.finalize()) try assertSnapshot( name: name, filePath: filePath, @@ -24,7 +27,7 @@ import Testing ) let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(outputSkeleton) + let outputSkeletonData = try encoder.encode(exported) try assertSnapshot( name: name, filePath: filePath, @@ -52,12 +55,12 @@ import Testing @Test(arguments: collectInputs()) func snapshot(input: String) throws { - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) let url = Self.inputsDirectory.appendingPathComponent(input) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - try swiftAPI.addSourceFile(sourceFile, input) + swiftAPI.addSourceFile(sourceFile, inputFilePath: input) let name = url.deletingPathExtension().lastPathComponent - try snapshot(swiftAPI: swiftAPI, name: name) + try snapshot(skeleton: swiftAPI.finalize(), name: name) } @Test(arguments: [ @@ -67,80 +70,80 @@ import Testing "EnumNamespace.swift", ]) func snapshotWithGlobal(input: String) throws { - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) let url = Self.inputsDirectory.appendingPathComponent(input) let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - try swiftAPI.addSourceFile(sourceFile, input) + swiftAPI.addSourceFile(sourceFile, inputFilePath: input) let name = url.deletingPathExtension().lastPathComponent - try snapshot(swiftAPI: swiftAPI, name: name + ".Global") + try snapshot(skeleton: swiftAPI.finalize(), name: name + ".Global") } @Test func snapshotCrossFileTypeResolution() throws { // Test that types defined in one file can be referenced from another file // This tests the fix for cross-file type resolution in BridgeJS - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) // Add ClassB first, then ClassA (which references ClassB) let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) - try swiftAPI.addSourceFile(classBSourceFile, "CrossFileClassB.swift") + swiftAPI.addSourceFile(classBSourceFile, inputFilePath: "CrossFileClassB.swift") let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) - try swiftAPI.addSourceFile(classASourceFile, "CrossFileClassA.swift") + swiftAPI.addSourceFile(classASourceFile, inputFilePath: "CrossFileClassA.swift") - try snapshot(swiftAPI: swiftAPI, name: "CrossFileTypeResolution") + try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileTypeResolution") } @Test func snapshotCrossFileTypeResolutionReverseOrder() throws { // Test that types can be resolved regardless of the order files are added // Add ClassA first (which references ClassB), then ClassB - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) - try swiftAPI.addSourceFile(classASourceFile, "CrossFileClassA.swift") + swiftAPI.addSourceFile(classASourceFile, inputFilePath: "CrossFileClassA.swift") let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) - try swiftAPI.addSourceFile(classBSourceFile, "CrossFileClassB.swift") + swiftAPI.addSourceFile(classBSourceFile, inputFilePath: "CrossFileClassB.swift") - try snapshot(swiftAPI: swiftAPI, name: "CrossFileTypeResolution.ReverseOrder") + try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileTypeResolution.ReverseOrder") } @Test func snapshotCrossFileFunctionTypes() throws { // Test that functions and methods can use cross-file types as parameters and return types - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) // Add FunctionB first, then FunctionA (which references FunctionB in methods and functions) let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) - try swiftAPI.addSourceFile(functionBSourceFile, "CrossFileFunctionB.swift") + swiftAPI.addSourceFile(functionBSourceFile, inputFilePath: "CrossFileFunctionB.swift") let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) - try swiftAPI.addSourceFile(functionASourceFile, "CrossFileFunctionA.swift") + swiftAPI.addSourceFile(functionASourceFile, inputFilePath: "CrossFileFunctionA.swift") - try snapshot(swiftAPI: swiftAPI, name: "CrossFileFunctionTypes") + try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileFunctionTypes") } @Test func snapshotCrossFileFunctionTypesReverseOrder() throws { // Test that function types can be resolved regardless of the order files are added - let swiftAPI = ExportSwift(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) // Add FunctionA first (which references FunctionB), then FunctionB let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) - try swiftAPI.addSourceFile(functionASourceFile, "CrossFileFunctionA.swift") + swiftAPI.addSourceFile(functionASourceFile, inputFilePath: "CrossFileFunctionA.swift") let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) - try swiftAPI.addSourceFile(functionBSourceFile, "CrossFileFunctionB.swift") + swiftAPI.addSourceFile(functionBSourceFile, inputFilePath: "CrossFileFunctionB.swift") - try snapshot(swiftAPI: swiftAPI, name: "CrossFileFunctionTypes.ReverseOrder") + try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileFunctionTypes.ReverseOrder") } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift index 0a3101f11..158e4511e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift @@ -37,11 +37,14 @@ import SwiftParser ) let sourceFile = Parser.parse(source: swiftSource) - let importSwift = ImportSwiftMacros(progress: .silent, moduleName: "Check") - importSwift.addSourceFile(sourceFile, "\(name).Macros.swift") - let importResult = try importSwift.finalize() + let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "Check", exposeToGlobal: false) + importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).Macros.swift") + let skeleton = try importSwift.finalize() - let outputSwift = try #require(importResult.outputSwift) + guard let imported = skeleton.imported else { return } + + let importTS = ImportTS(progress: .silent, moduleName: "Check", skeleton: imported) + let outputSwift = try #require(try importTS.finalize()) try assertSnapshot( name: name, filePath: #filePath, diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json index 3e7f4a6dd..8b91ea964 100644 --- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json @@ -538,17 +538,5 @@ ] }, - "imported" : { - "children" : [ - { - "functions" : [ - - ], - "types" : [ - - ] - } - ] - }, "moduleName" : "BridgeJSGlobalTests" } \ No newline at end of file From 237223550f795da4edaeca64bbe06d83e7adc2be Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 13:54:53 +0800 Subject: [PATCH 085/252] PackageToJS: Rename SWIFT_PATH to SWIFT_BIN_PATH env var (#518) Utilities/format.swift now looks up `SWIFT_PATH` for the "swift" command location, but PackageToJS's test suites also use this env var to locate the Swift toolchain bin path. To avoid confusion, rename the env var in PackageToJS from `SWIFT_PATH` to `SWIFT_BIN_PATH`. --- .github/workflows/test.yml | 2 +- Plugins/PackageToJS/README.md | 2 +- Plugins/PackageToJS/Tests/ExampleTests.swift | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d7e40337..4f1eb0a5b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: - name: Configure environment variables run: | echo "SWIFT_SDK_ID=${{ steps.setup-swiftwasm.outputs.swift-sdk-id }}" >> $GITHUB_ENV - echo "SWIFT_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV + echo "SWIFT_BIN_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV - run: make bootstrap - run: make unittest # Skip unit tests with uwasi because its proc_exit throws diff --git a/Plugins/PackageToJS/README.md b/Plugins/PackageToJS/README.md index 8b1821187..cbcaf19c5 100644 --- a/Plugins/PackageToJS/README.md +++ b/Plugins/PackageToJS/README.md @@ -41,5 +41,5 @@ swift test --package-path ./Plugins/PackageToJS Please define the following environment variables when you want to run E2E tests: - `SWIFT_SDK_ID`: Specifies the Swift SDK identifier to use -- `SWIFT_PATH`: Specifies the `bin` path to the Swift toolchain to use +- `SWIFT_BIN_PATH`: Specifies the `bin` path to the Swift toolchain to use diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift index 01c02c193..d26832771 100644 --- a/Plugins/PackageToJS/Tests/ExampleTests.swift +++ b/Plugins/PackageToJS/Tests/ExampleTests.swift @@ -7,8 +7,8 @@ extension Trait where Self == ConditionTrait { static var requireSwiftSDK: ConditionTrait { .enabled( if: ProcessInfo.processInfo.environment["SWIFT_SDK_ID"] != nil - && ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil, - "Requires SWIFT_SDK_ID and SWIFT_PATH environment variables" + && ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] != nil, + "Requires SWIFT_SDK_ID and SWIFT_BIN_PATH environment variables" ) } @@ -16,7 +16,7 @@ extension Trait where Self == ConditionTrait { .enabled( if: { guard let swiftSDKID = ProcessInfo.processInfo.environment["SWIFT_SDK_ID"], - ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil + ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] != nil else { return false } @@ -32,22 +32,22 @@ extension Trait where Self == ConditionTrait { } return sanityCheckCompatibility(triple: triple) }(), - "Requires SWIFT_SDK_ID and SWIFT_PATH environment variables" + "Requires SWIFT_SDK_ID and SWIFT_BIN_PATH environment variables" ) } static func requireEmbeddedSwiftInToolchain(triple: String) -> ConditionTrait { - // Check if $SWIFT_PATH/../lib/swift/embedded/wasm32-unknown-none-wasm/ exists + // Check if $SWIFT_BIN_PATH/../lib/swift/embedded/wasm32-unknown-none-wasm/ exists return .enabled( if: { - guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_PATH"] else { + guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] else { return false } let embeddedPath = URL(fileURLWithPath: swiftPath).deletingLastPathComponent() .appending(path: "lib/swift/embedded/\(triple)") return FileManager.default.fileExists(atPath: embeddedPath.path) }(), - "Requires embedded Swift SDK under $SWIFT_PATH/../lib/swift/embedded" + "Requires embedded Swift SDK under $SWIFT_BIN_PATH/../lib/swift/embedded" ) } @@ -75,7 +75,7 @@ extension Trait where Self == ConditionTrait { return false } } - guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_PATH"], + guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"], let swiftSDKID = ProcessInfo.processInfo.environment["SWIFT_SDK_ID"] else { return false @@ -102,7 +102,7 @@ extension Trait where Self == ConditionTrait { } static func getSwiftPath() -> String? { - ProcessInfo.processInfo.environment["SWIFT_PATH"] + ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] } static func getEmbeddedSwiftSDKID() -> String? { From bcbeea08f302ed7e785e84894fcb2fd985ae6b5a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 13:59:23 +0800 Subject: [PATCH 086/252] BridgeJS: Unify Swift type lookup logic between import/export (#517) * BridgeJS: Unify Swift type lookup logic between import/export * BridgeJS: Index known JS types for type lookup --- .../Sources/BridgeJSCore/ExportSwift.swift | 23 -- .../BridgeJSCore/SwiftToSkeleton.swift | 228 +++++++++--------- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 22 ++ 3 files changed, 137 insertions(+), 136 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 18d529d3e..b8790ec97 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1674,29 +1674,6 @@ struct ProtocolCodegen { } } -extension BridgeType { - init?(swiftType: String) { - switch swiftType { - case "Int": - self = .int - case "Float": - self = .float - case "Double": - self = .double - case "String": - self = .string - case "Bool": - self = .bool - case "Void": - self = .void - case "JSObject": - self = .jsObject(nil) - default: - return nil - } - } -} - extension WasmCoreType { var swiftType: String { switch self { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 71132568b..6628a3043 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -25,6 +25,13 @@ public final class SwiftToSkeleton { self.moduleName = moduleName self.exposeToGlobal = exposeToGlobal self.typeDeclResolver = TypeDeclResolver() + + // Index known types provided by JavaScriptKit + self.typeDeclResolver.addSourceFile( + """ + @JSClass struct JSPromise {} + """ + ) } public func addSourceFile(_ sourceFile: SourceFileSyntax, inputFilePath: String) { @@ -47,13 +54,15 @@ public final class SwiftToSkeleton { typeNameCollector.walk(sourceFile) let importCollector = ImportSwiftMacrosAPICollector( inputFilePath: inputFilePath, - knownJSClassNames: typeNameCollector.typeNames + knownJSClassNames: typeNameCollector.typeNames, + parent: self ) importCollector.walk(sourceFile) - if !exportCollector.errors.isEmpty || !importCollector.errors.isEmpty { + let importErrorsFatal = importCollector.errors.filter { !$0.message.contains("Unsupported type '") } + if !exportCollector.errors.isEmpty || !importErrorsFatal.isEmpty { perSourceErrors.append( - (inputFilePath: inputFilePath, errors: exportCollector.errors + importCollector.errors) + (inputFilePath: inputFilePath, errors: exportCollector.errors + importErrorsFatal) ) } @@ -84,22 +93,22 @@ public final class SwiftToSkeleton { return BridgeJSSkeleton(moduleName: moduleName, exported: exported, imported: importedSkeleton) } - func lookupType(for type: TypeSyntax) -> BridgeType? { + func lookupType(for type: TypeSyntax, errors: inout [DiagnosticError]) -> BridgeType? { if let attributedType = type.as(AttributedTypeSyntax.self) { - return lookupType(for: attributedType.baseType) + return lookupType(for: attributedType.baseType, errors: &errors) } // (T1, T2, ...) -> R if let functionType = type.as(FunctionTypeSyntax.self) { var parameters: [BridgeType] = [] for param in functionType.parameters { - guard let paramType = lookupType(for: param.type) else { + guard let paramType = lookupType(for: param.type, errors: &errors) else { return nil } parameters.append(paramType) } - guard let returnType = lookupType(for: functionType.returnClause.type) else { + guard let returnType = lookupType(for: functionType.returnClause.type, errors: &errors) else { return nil } @@ -120,7 +129,7 @@ public final class SwiftToSkeleton { // T? if let optionalType = type.as(OptionalTypeSyntax.self) { let wrappedType = optionalType.wrappedType - if let baseType = lookupType(for: wrappedType) { + if let baseType = lookupType(for: wrappedType, errors: &errors) { return .optional(baseType) } } @@ -131,7 +140,7 @@ public final class SwiftToSkeleton { genericArgs.count == 1, let argType = TypeSyntax(genericArgs.first?.argument) { - if let baseType = lookupType(for: argType) { + if let baseType = lookupType(for: argType, errors: &errors) { return .optional(baseType) } } @@ -144,22 +153,34 @@ public final class SwiftToSkeleton { genericArgs.count == 1, let argType = TypeSyntax(genericArgs.first?.argument) { - if let wrappedType = lookupType(for: argType) { + if let wrappedType = lookupType(for: argType, errors: &errors) { return .optional(wrappedType) } } if let aliasDecl = typeDeclResolver.resolveTypeAlias(type) { - if let resolvedType = lookupType(for: aliasDecl.initializer.value) { + if let resolvedType = lookupType(for: aliasDecl.initializer.value, errors: &errors) { return resolvedType } } - let typeName = type.trimmedDescription + let typeName: String + if let identifier = type.as(IdentifierTypeSyntax.self) { + typeName = Self.normalizeIdentifier(identifier.name.text) + } else { + typeName = type.trimmedDescription + } if let primitiveType = BridgeType(swiftType: typeName) { return primitiveType } guard let typeDecl = typeDeclResolver.resolve(type) else { + errors.append( + DiagnosticError( + node: type, + message: "Unsupported type '\(type.trimmedDescription)'.", + hint: "Only primitive types and types defined in the same module are allowed" + ) + ) return nil } @@ -204,6 +225,9 @@ public final class SwiftToSkeleton { if let structDecl = typeDecl.as(StructDeclSyntax.self) { let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: structDecl, itemName: structDecl.name.text) + if structDecl.attributes.hasAttribute(name: "JSClass") { + return .jsObject(swiftCallName) + } return .swiftStruct(swiftCallName) } @@ -236,6 +260,14 @@ public final class SwiftToSkeleton { } } + /// Strips surrounding backticks from an identifier (e.g. "`Foo`" -> "Foo"). + static func normalizeIdentifier(_ name: String) -> String { + guard name.hasPrefix("`"), name.hasSuffix("`"), name.count >= 2 else { + return name + } + return String(name.dropFirst().dropLast()) + } + } private enum ExportSwiftConstants { @@ -252,6 +284,14 @@ extension AttributeListSyntax { $0.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JS" })?.as(AttributeSyntax.self) } + + /// Returns true if any attribute has the given name (e.g. "JSClass"). + func hasAttribute(name: String) -> Bool { + contains { attribute in + guard let syntax = attribute.as(AttributeSyntax.self) else { return false } + return syntax.attributeName.trimmedDescription == name + } + } } private final class ExportSwiftAPICollector: SyntaxAnyVisitor { @@ -356,12 +396,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { errors.append(DiagnosticError(node: node, message: message, hint: hint)) } - private func diagnoseUnsupportedType(node: some SyntaxProtocol, type: String) { - diagnose( - node: node, - message: "Unsupported type: \(type)", - hint: "Only primitive types and types defined in the same module are allowed" - ) + private func withLookupErrors(_ body: (inout [DiagnosticError]) -> T) -> T { + var errs = self.errors + defer { self.errors = errs } + return body(&errs) } private func diagnoseNestedOptional(node: some SyntaxProtocol, type: String) { @@ -641,8 +679,11 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { var parameters: [Parameter] = [] for param in parameterClause.parameters { - let resolvedType = self.parent.lookupType(for: param.type) - if let type = resolvedType, case .closure(let signature) = type { + let resolvedType = withLookupErrors { self.parent.lookupType(for: param.type, errors: &$0) } + guard let type = resolvedType else { + continue // Skip unsupported types + } + if case .closure(let signature) = type { if signature.isAsync { diagnose( node: param.type, @@ -658,20 +699,15 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + if case .optional(let wrappedType) = type, wrappedType.isOptional { diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) continue } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + if case .optional(let wrappedType) = type, wrappedType.isOptional { diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) continue } - guard let type = resolvedType else { - diagnoseUnsupportedType(node: param.type, type: param.type.trimmedDescription) - continue - } - let name = param.secondName?.text ?? param.firstName.text let label = param.firstName.text @@ -787,17 +823,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let parameters = parseParameters(from: node.signature.parameterClause, allowDefaults: true) let returnType: BridgeType if let returnClause = node.signature.returnClause { - let resolvedType = self.parent.lookupType(for: returnClause.type) + let resolvedType = withLookupErrors { self.parent.lookupType(for: returnClause.type, errors: &$0) } if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) return nil } - guard let type = resolvedType else { - diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } + guard let type = resolvedType else { return nil } returnType = type } else { returnType = .void @@ -1048,8 +1081,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } - guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) + guard let propertyType = withLookupErrors({ self.parent.lookupType(for: typeAnnotation.type, errors: &$0) }) + else { continue } @@ -1357,11 +1390,11 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } - guard let fieldType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType( - node: typeAnnotation.type, - type: typeAnnotation.type.trimmedDescription - ) + guard + let fieldType = withLookupErrors({ + self.parent.lookupType(for: typeAnnotation.type, errors: &$0) + }) + else { continue } @@ -1413,17 +1446,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let returnType: BridgeType if let returnClause = node.signature.returnClause { - let resolvedType = self.parent.lookupType(for: returnClause.type) + let resolvedType = withLookupErrors { self.parent.lookupType(for: returnClause.type, errors: &$0) } if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) return nil } - guard let type = resolvedType else { - diagnoseUnsupportedType(node: returnClause.type, type: returnClause.type.trimmedDescription) - return nil - } + guard let type = resolvedType else { return nil } returnType = type } else { returnType = .void @@ -1468,8 +1498,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } - guard let propertyType = self.parent.lookupType(for: typeAnnotation.type) else { - diagnoseUnsupportedType(node: typeAnnotation.type, type: typeAnnotation.type.trimmedDescription) + guard let propertyType = withLookupErrors({ self.parent.lookupType(for: typeAnnotation.type, errors: &$0) }) + else { continue } @@ -1565,12 +1595,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { } if let parameterClause = element.parameterClause { for param in parameterClause.parameters { - guard let bridgeType = parent.lookupType(for: param.type) else { - diagnose( - node: param.type, - message: "Unsupported associated value type: \(param.type.trimmedDescription)", - hint: "Only primitive types and types defined in the same module are allowed" - ) + guard let bridgeType = withLookupErrors({ parent.lookupType(for: param.type, errors: &$0) }) else { continue } @@ -1691,6 +1716,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private let inputFilePath: String private var jsClassNames: Set + private let parent: SwiftToSkeleton // MARK: - State Management @@ -1804,11 +1830,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } /// Validates a setter function and extracts common information - private func validateSetter( - _ node: FunctionDeclSyntax, - jsSetter: AttributeSyntax, - enclosingTypeName: String? - ) -> SetterValidationResult? { + private func validateSetter(_ node: FunctionDeclSyntax, jsSetter: AttributeSyntax) -> SetterValidationResult? { guard let effects = validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSSetter") else { return nil @@ -1837,11 +1859,15 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } + guard let valueType = withLookupErrors({ parent.lookupType(for: firstParam.type, errors: &$0) }) else { + return nil + } + return SetterValidationResult( effects: effects, jsName: jsName, firstParam: firstParam, - valueType: parseType(firstParam.type, enclosingTypeName: enclosingTypeName) + valueType: valueType ) } @@ -1879,12 +1905,19 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } } - init(inputFilePath: String, knownJSClassNames: Set) { + init(inputFilePath: String, knownJSClassNames: Set, parent: SwiftToSkeleton) { self.inputFilePath = inputFilePath self.jsClassNames = knownJSClassNames + self.parent = parent super.init(viewMode: .sourceAccurate) } + private func withLookupErrors(_ body: (inout [DiagnosticError]) -> T) -> T { + var errs = self.errors + defer { self.errors = errs } + return body(&errs) + } + private func enterJSClass(_ typeName: String) { stateStack.append(.jsClassBody(name: typeName)) currentType = CurrentType(name: typeName, constructor: nil, methods: [], getters: [], setters: []) @@ -2008,7 +2041,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { ) ) } else if let jsSetter = AttributeChecker.firstJSSetterAttribute(node.attributes), - let setter = parseSetterSkeleton(jsSetter, node, enclosingTypeName: typeName) + let setter = parseSetterSkeleton(jsSetter, node) { type.setters.append(setter) } @@ -2025,7 +2058,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { switch state { case .topLevel: - if let getter = parseGetterSkeleton(node, enclosingTypeName: nil) { + if let getter = parseGetterSkeleton(node) { importedGlobalGetters.append(getter) } return .skipChildren @@ -2042,7 +2075,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) - } else if let getter = parseGetterSkeleton(node, enclosingTypeName: typeName) { + } else if let getter = parseGetterSkeleton(node) { type.getters.append(getter) currentType = type } @@ -2125,10 +2158,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } return ImportedConstructorSkeleton( - parameters: parseParameters( - from: initializer.signature.parameterClause, - enclosingTypeName: typeName - ) + parameters: parseParameters(from: initializer.signature.parameterClause) ) } @@ -2142,7 +2172,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } - let baseName = normalizeIdentifier(node.name.text) + let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text) let name: String if isStaticMember, let enclosingTypeName { name = "\(enclosingTypeName)_\(baseName)" @@ -2150,13 +2180,13 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { name = baseName } - let parameters = parseParameters( - from: node.signature.parameterClause, - enclosingTypeName: enclosingTypeName - ) + let parameters = parseParameters(from: node.signature.parameterClause) let returnType: BridgeType if let returnTypeSyntax = node.signature.returnClause?.type { - returnType = parseType(returnTypeSyntax, enclosingTypeName: enclosingTypeName) + guard let resolved = withLookupErrors({ parent.lookupType(for: returnTypeSyntax, errors: &$0) }) else { + return nil + } + returnType = resolved } else { returnType = .void } @@ -2183,15 +2213,14 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return (identifier, typeAnnotation.type) } - private func parseGetterSkeleton( - _ node: VariableDeclSyntax, - enclosingTypeName: String? - ) -> ImportedGetterSkeleton? { + private func parseGetterSkeleton(_ node: VariableDeclSyntax) -> ImportedGetterSkeleton? { guard let (identifier, type) = extractPropertyInfo(node) else { return nil } - let propertyType = parseType(type, enclosingTypeName: enclosingTypeName) - let propertyName = normalizeIdentifier(identifier.identifier.text) + guard let propertyType = withLookupErrors({ parent.lookupType(for: type, errors: &$0) }) else { + return nil + } + let propertyName = SwiftToSkeleton.normalizeIdentifier(identifier.identifier.text) return ImportedGetterSkeleton( name: propertyName, type: propertyType, @@ -2203,10 +2232,9 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { /// Parses a setter as part of a type's property system (for instance setters) private func parseSetterSkeleton( _ jsSetter: AttributeSyntax, - _ node: FunctionDeclSyntax, - enclosingTypeName: String? + _ node: FunctionDeclSyntax ) -> ImportedSetterSkeleton? { - guard let validation = validateSetter(node, jsSetter: jsSetter, enclosingTypeName: enclosingTypeName) else { + guard let validation = validateSetter(node, jsSetter: jsSetter) else { return nil } @@ -2215,7 +2243,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { let (propertyName, functionBaseName) = PropertyNameResolver.resolve( functionName: functionName, jsName: validation.jsName, - normalizeIdentifier: normalizeIdentifier + normalizeIdentifier: SwiftToSkeleton.normalizeIdentifier ) else { return nil @@ -2231,10 +2259,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { // MARK: - Type and Parameter Parsing - private func parseParameters( - from clause: FunctionParameterClauseSyntax, - enclosingTypeName: String? - ) -> [Parameter] { + private func parseParameters(from clause: FunctionParameterClauseSyntax) -> [Parameter] { clause.parameters.compactMap { param in let type = param.type if type.is(MissingTypeSyntax.self) { @@ -2246,33 +2271,17 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { ) return nil } + guard let bridgeType = withLookupErrors({ parent.lookupType(for: type, errors: &$0) }) else { + return nil + } let nameToken = param.secondName ?? param.firstName - let name = normalizeIdentifier(nameToken.text) + let name = SwiftToSkeleton.normalizeIdentifier(nameToken.text) let labelToken = param.secondName == nil ? nil : param.firstName let label = labelToken?.text == "_" ? nil : labelToken?.text - let bridgeType = parseType(type, enclosingTypeName: enclosingTypeName) return Parameter(label: label, name: name, type: bridgeType) } } - private func parseType(_ type: TypeSyntax, enclosingTypeName: String?) -> BridgeType { - guard let identifier = type.as(IdentifierTypeSyntax.self) else { - errors.append( - DiagnosticError( - node: type, - message: "Unsupported @JS type '\(type.trimmedDescription)'." - ) - ) - return .void - } - - let name = normalizeIdentifier(identifier.name.text) - if name == "Self", let enclosingTypeName { - return .jsObject(enclosingTypeName) - } - return BridgeType(swiftType: name) ?? .jsObject(name) - } - // MARK: - Helper Methods private func parseEffects(_ effects: FunctionEffectSpecifiersSyntax?) -> Effects? { @@ -2290,11 +2299,4 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { modifier.name.tokenKind == .keyword(.static) || modifier.name.tokenKind == .keyword(.class) } } - - private func normalizeIdentifier(_ name: String) -> String { - guard name.hasPrefix("`"), name.hasSuffix("`"), name.count >= 2 else { - return name - } - return String(name.dropFirst().dropLast()) - } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 97001c5f8..28e4b6dcd 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -793,6 +793,28 @@ public struct BridgeJSSkeleton: Codable { // MARK: - BridgeType extension extension BridgeType { + /// Maps Swift primitive type names to BridgeType. Returns nil for unknown types. + public init?(swiftType: String) { + switch swiftType { + case "Int": + self = .int + case "Float": + self = .float + case "Double": + self = .double + case "String": + self = .string + case "Bool": + self = .bool + case "Void": + self = .void + case "JSObject": + self = .jsObject(nil) + default: + return nil + } + } + public var abiReturnType: WasmCoreType? { switch self { case .void: return nil From 1496944d8f230b9d960183d977c9195379e4846a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 14:37:58 +0800 Subject: [PATCH 087/252] BridgeJS: Add internal debug tool for inspecting intermediate stages (#519) --- Plugins/BridgeJS/Package.swift | 13 +- Plugins/BridgeJS/README.md | 20 +++ .../Sources/BridgeJSLink/BridgeJSLink.swift | 6 +- .../BridgeJSToolInternal.swift | 137 ++++++++++++++++++ 4 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index a4385bd37..eb675c86b 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -7,7 +7,9 @@ let package = Package( name: "BridgeJS", platforms: [.macOS(.v13)], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.1") + .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.1"), + // Development dependencies + .package(url: "https://github.com/apple/swift-argument-parser", from: "1.7.0"), ], targets: [ .target(name: "BridgeJSBuildPlugin"), @@ -71,5 +73,14 @@ let package = Package( .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"), ] ), + + .executableTarget( + name: "BridgeJSToolInternal", + dependencies: [ + "BridgeJSCore", + "BridgeJSLink", + .product(name: "ArgumentParser", package: "swift-argument-parser"), + ] + ), ] ) diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 29d7df2e1..0e84674ac 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -163,6 +163,26 @@ Return values use direct Wasm returns for primitives, and imported intrinsic fun For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#How-It-Works) in the user documentation. +## Debug utilities + +`BridgeJSToolInternal` exposes pipeline stages for debugging: + +- `emit-skeleton` - Parse Swift files (or `-` for stdin) and print the BridgeJS skeleton as JSON. +- `emit-swift-thunks` — Read skeleton JSON (from a file or `-` for stdin) and print the generated Swift glue (export and import thunks). +- `emit-js` / `emit-dts` - Read skeleton JSON files (or `-` for stdin) and print the .js/.d.ts + +Use these to inspect parser output and generated code without running the full generate/link pipeline. + +```console +$ cat < Int +@JS class Bar { + @JS init() {} + @JS func baz() {} +} +EOS +``` + ## Future Work - [ ] Cast between TS interface diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 1f55eb187..625bfc364 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -7,12 +7,12 @@ import BridgeJSSkeleton import BridgeJSUtilities #endif -struct BridgeJSLink { +public struct BridgeJSLink { var skeletons: [BridgeJSSkeleton] = [] let sharedMemory: Bool private let namespaceBuilder = NamespaceBuilder() - init( + public init( skeletons: [BridgeJSSkeleton] = [], sharedMemory: Bool ) { @@ -1035,7 +1035,7 @@ struct BridgeJSLink { return printer.lines.joined(separator: "\n") } - func link() throws -> (outputJs: String, outputDts: String) { + public func link() throws -> (outputJs: String, outputDts: String) { let data = try collectLinkData() let outputJs = try generateJavaScript(data: data) let outputDts = generateTypeScript(data: data) diff --git a/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift new file mode 100644 index 000000000..8a6a6b7b4 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift @@ -0,0 +1,137 @@ +@preconcurrency import struct Foundation.URL +@preconcurrency import struct Foundation.Data +@preconcurrency import class Foundation.JSONEncoder +@preconcurrency import class Foundation.JSONDecoder +@preconcurrency import class Foundation.FileHandle +import SwiftParser +import SwiftSyntax + +import BridgeJSCore +import BridgeJSSkeleton +import BridgeJSLink +import BridgeJSUtilities + +import ArgumentParser + +@main struct BridgeJSToolInternal: ParsableCommand { + + static let configuration = CommandConfiguration( + commandName: "bridge-js-tool-internal", + abstract: "BridgeJS Tool Internal", + version: "0.1.0", + subcommands: [ + EmitSkeleton.self, + EmitSwiftThunks.self, + EmitJS.self, + EmitDTS.self, + ] + ) + + static func readData(from file: String) throws -> Data { + if file == "-" { + return try FileHandle.standardInput.readToEnd() ?? Data() + } else { + return try Data(contentsOf: URL(fileURLWithPath: file)) + } + } + + struct EmitSkeleton: ParsableCommand { + static let configuration = CommandConfiguration( + commandName: "emit-skeleton", + abstract: "Emit the BridgeJS skeleton", + ) + + @Argument(help: "The input files to emit the BridgeJS skeleton from") + var inputFiles: [String] + + func run() throws { + let swiftToSkeleton = SwiftToSkeleton( + progress: ProgressReporting(verbose: false), + moduleName: "InternalModule", + exposeToGlobal: false + ) + for inputFile in inputFiles.sorted() { + let content = try String(decoding: readData(from: inputFile), as: UTF8.self) + if BridgeJSGeneratedFile.hasSkipComment(content) { + continue + } + let sourceFile = Parser.parse(source: content) + swiftToSkeleton.addSourceFile(sourceFile, inputFilePath: inputFile) + } + let skeleton = try swiftToSkeleton.finalize() + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let skeletonData = try encoder.encode(skeleton) + print(String(data: skeletonData, encoding: .utf8)!) + } + } + + struct EmitSwiftThunks: ParsableCommand { + static let configuration = CommandConfiguration( + commandName: "emit-swift-thunks", + abstract: "Emit the Swift thunks", + ) + @Argument(help: "The skeleton file to emit the Swift thunks from") + var skeletonFile: String + + func run() throws { + let skeletonData = try readData(from: skeletonFile) + let skeleton = try JSONDecoder().decode(BridgeJSSkeleton.self, from: skeletonData) + let moduleName = "InternalModule" + let exported = try skeleton.exported.flatMap { + try ExportSwift( + progress: ProgressReporting(verbose: false), + moduleName: moduleName, + skeleton: $0 + ).finalize() + } + let imported = try skeleton.imported.flatMap { + try ImportTS( + progress: ProgressReporting(verbose: false), + moduleName: moduleName, + skeleton: $0 + ).finalize() + } + let combinedSwift = [exported, imported].compactMap { $0 } + print(combinedSwift.joined(separator: "\n\n")) + } + } + + static func linkSkeletons(skeletonFiles: [String]) throws -> (outputJs: String, outputDts: String) { + var skeletons: [BridgeJSSkeleton] = [] + for skeletonFile in skeletonFiles.sorted() { + let skeletonData = try readData(from: skeletonFile) + skeletons.append(try JSONDecoder().decode(BridgeJSSkeleton.self, from: skeletonData)) + } + let link = BridgeJSLink(skeletons: skeletons, sharedMemory: false) + return try link.link() + } + + struct EmitJS: ParsableCommand { + static let configuration = CommandConfiguration( + commandName: "emit-js", + abstract: "Emit the JavaScript glue code", + ) + @Argument(help: "The skeleton files to emit the JavaScript glue code from") + var skeletonFiles: [String] + + func run() throws { + let (outputJs, _) = try linkSkeletons(skeletonFiles: skeletonFiles) + print(outputJs) + } + } + + struct EmitDTS: ParsableCommand { + static let configuration = CommandConfiguration( + commandName: "emit-dts", + abstract: "Emit the TypeScript type definitions", + ) + @Argument(help: "The skeleton files to emit the TypeScript type definitions from") + var skeletonFiles: [String] + + func run() throws { + let (_, outputDts) = try linkSkeletons(skeletonFiles: skeletonFiles) + print(outputDts) + } + } +} From cd3edbe5a91b13335e1c939fdbc9a3139919ec5b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 15:06:10 +0800 Subject: [PATCH 088/252] BridgeJS: Remove BridgeType usage from ts2swift (#520) --- .../TS2Swift/JavaScript/src/index.d.ts | 11 +- .../TS2Swift/JavaScript/src/processor.js | 100 +++++++----------- 2 files changed, 38 insertions(+), 73 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts index e5af49d9e..97af7b169 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts @@ -1,13 +1,4 @@ -export type BridgeType = - | { "int": {} } - | { "float": {} } - | { "double": {} } - | { "string": {} } - | { "bool": {} } - | { "jsObject": { "_0": string } | {} } - | { "void": {} } - export type Parameter = { name: string; - type: BridgeType; + type: string; } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 47b921764..50f797de7 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -7,7 +7,6 @@ import ts from 'typescript'; /** @typedef {import('./index.d.ts').Parameter} Parameter */ -/** @typedef {import('./index.d.ts').BridgeType} BridgeType */ /** * @typedef {{ @@ -48,7 +47,7 @@ export class TypeProcessor { this.diagnosticEngine = diagnosticEngine; this.options = options; - /** @type {Map} */ + /** @type {Map} */ this.processedTypes = new Map(); /** @type {Map} Seen position by type */ this.seenTypes = new Map(); @@ -202,7 +201,7 @@ export class TypeProcessor { if (!signature) return; const params = this.renderParameters(signature.getParameters(), node); - const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); + const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); const swiftName = this.renderIdentifier(name); @@ -242,7 +241,7 @@ export class TypeProcessor { /** * @param {ts.PropertyDeclaration | ts.PropertySignature} node - * @returns {{ name: string, type: BridgeType, isReadonly: boolean, documentation: string | undefined } | null} + * @returns {{ name: string, type: string, isReadonly: boolean, documentation: string | undefined } | null} */ visitPropertyDecl(node) { if (!node.name) return null; @@ -253,10 +252,10 @@ export class TypeProcessor { } const type = this.checker.getTypeAtLocation(node) - const bridgeType = this.visitType(type, node); + const swiftType = this.visitType(type, node); const isReadonly = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ReadonlyKeyword) ?? false; const documentation = this.getFullJSDocText(node); - return { name: propertyName, type: bridgeType, isReadonly, documentation }; + return { name: propertyName, type: swiftType, isReadonly, documentation }; } /** @@ -266,8 +265,8 @@ export class TypeProcessor { */ visitSignatureParameter(symbol, node) { const type = this.checker.getTypeOfSymbolAtLocation(symbol, node); - const bridgeType = this.visitType(type, node); - return { name: symbol.name, type: bridgeType }; + const swiftType = this.visitType(type, node); + return { name: symbol.name, type: swiftType }; } /** @@ -375,10 +374,10 @@ export class TypeProcessor { } /** - * Convert TypeScript type string to BridgeType - * @param {ts.Type} type - TypeScript type string + * Convert TypeScript type to Swift type string + * @param {ts.Type} type - TypeScript type * @param {ts.Node} node - Node - * @returns {BridgeType} Bridge type + * @returns {string} Swift type string * @private */ visitType(type, node) { @@ -392,28 +391,24 @@ export class TypeProcessor { } /** * @param {ts.Type} type - * @returns {BridgeType} + * @returns {string} */ const convert = (type) => { - /** @type {Record} */ + /** @type {Record} */ const typeMap = { - "number": { "double": {} }, - "string": { "string": {} }, - "boolean": { "bool": {} }, - "void": { "void": {} }, - "any": { "jsObject": {} }, - "unknown": { "jsObject": {} }, - "null": { "void": {} }, - "undefined": { "void": {} }, - "bigint": { "int": {} }, - "object": { "jsObject": {} }, - "symbol": { "jsObject": {} }, - "never": { "void": {} }, - "Promise": { - "jsObject": { - "_0": "JSPromise" - } - }, + "number": "Double", + "string": "String", + "boolean": "Bool", + "void": "Void", + "any": "JSObject", + "unknown": "JSObject", + "null": "Void", + "undefined": "Void", + "bigint": "Int", + "object": "JSObject", + "symbol": "JSObject", + "never": "Void", + "Promise": "JSPromise", }; const typeString = type.getSymbol()?.name ?? this.checker.typeToString(type); if (typeMap[typeString]) { @@ -421,27 +416,27 @@ export class TypeProcessor { } if (this.checker.isArrayType(type) || this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { - return { "jsObject": {} }; + return "JSObject"; } // "a" | "b" -> string if (this.checker.isTypeAssignableTo(type, this.checker.getStringType())) { - return { "string": {} }; + return "String"; } if (type.isTypeParameter()) { - return { "jsObject": {} }; + return "JSObject"; } const typeName = this.deriveTypeName(type); if (!typeName) { this.diagnosticEngine.print("warning", `Unknown non-nominal type: ${typeString}`, node); - return { "jsObject": {} }; + return "JSObject"; } this.seenTypes.set(type, node); - return { "jsObject": { "_0": typeName } }; + return this.renderIdentifier(typeName); } - const bridgeType = convert(type); - this.processedTypes.set(type, bridgeType); - return bridgeType; + const swiftType = convert(type); + this.processedTypes.set(type, swiftType); + return swiftType; } /** @@ -471,7 +466,7 @@ export class TypeProcessor { const property = this.visitPropertyDecl(node); if (!property) return; - const type = this.renderBridgeType(property.type, node); + const type = property.type; const name = this.renderIdentifier(property.name); // Always render getter @@ -501,7 +496,7 @@ export class TypeProcessor { if (!signature) return; const params = this.renderParameters(signature.getParameters(), node); - const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node); + const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); const swiftName = this.renderIdentifier(name); @@ -538,35 +533,14 @@ export class TypeProcessor { renderParameters(parameters, node) { const params = []; for (const p of parameters) { - const bridgeType = this.visitSignatureParameter(p, node); + const param = this.visitSignatureParameter(p, node); const paramName = this.renderIdentifier(p.name); - const type = this.renderBridgeType(bridgeType.type, node); + const type = param.type; params.push(`_ ${paramName}: ${type}`); } return params.join(", "); } - /** - * Render bridge type to Swift type - * @param {BridgeType} bridgeType - * @param {ts.Node} node - * @returns {string} - * @private - */ - renderBridgeType(bridgeType, node) { - if ("int" in bridgeType) return "Int"; - if ("float" in bridgeType) return "Float"; - if ("double" in bridgeType) return "Double"; - if ("string" in bridgeType) return "String"; - if ("bool" in bridgeType) return "Bool"; - if ("void" in bridgeType) return "Void"; - if ("jsObject" in bridgeType) { - const name = "_0" in bridgeType.jsObject ? bridgeType.jsObject._0 : undefined; - return name ? this.renderIdentifier(name) : "JSObject"; - } - return "JSObject"; - } - /** * Render effects (async/throws) * @param {{ isAsync: boolean }} effects From 8565d3ba971cfb426b28c3ffde281ed6b0fc8d75 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 16:04:25 +0800 Subject: [PATCH 089/252] BridgeJS: Import TypeScript enums into Swift (#521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Implemented TypeScript `enum` → Swift `enum` import for BridgeJS (string-valued enums, plus int-valued as a bonus). - `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js`: emits Swift `enum Name: String { ... }` (or `: Int`) for TS enums, adds `extension Name: _BridgedSwiftEnumNoPayload {}`, and ensures enum-typed parameters/returns stay typed as the enum (not downgraded to `String`). - `Plugins/BridgeJS/Sources/BridgeJSCore/ImportSwiftMacros.swift`: resolves referenced Swift enums/typealiases via `TypeDeclResolver` so `FeatureFlag` becomes `.rawValueEnum("FeatureFlag", .string)` in the imported skeleton. - `Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift`: enables lowering/lifting for `.rawValueEnum` in the `.importTS` context (parameters + returns). - Added coverage: `Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts` with new snapshots `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift` and `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift`. - Verified with `swift test --package-path ./Plugins/BridgeJS --filter ImportTSTests`. * Added a BridgeJS runtime import test for TS string enums. - Updated `Tests/BridgeJSRuntimeTests/bridge-js.d.ts` with `FeatureFlag` + `jsRoundTripFeatureFlag`. - Added JS implementation in `Tests/prelude.mjs`. - Added XCTest in `Tests/BridgeJSRuntimeTests/ImportAPITests.swift` (`testRoundTripFeatureFlag`). - Regenerated runtime fixtures under `Tests/BridgeJSRuntimeTests/Generated/` (via `BridgeJSTool generate`). - Verified runtime: `make unittest SWIFT_SDK_ID=DEVELOPMENT-SNAPSHOT+MAIN-wasm32-unknown-wasip1-threads` (passes). --- .../Sources/BridgeJSCore/ImportTS.swift | 4 +- .../TS2Swift/JavaScript/src/processor.js | 189 ++++++++++++++ .../BridgeJSToolTests/Inputs/StringEnum.d.ts | 8 + .../BridgeJSLinkTests/StringEnum.Import.d.ts | 19 ++ .../BridgeJSLinkTests/StringEnum.Import.js | 231 ++++++++++++++++++ .../ImportTSTests/StringEnum.Macros.swift | 17 ++ .../ImportTSTests/StringEnum.swift | 33 +++ .../Generated/BridgeJS.Macros.swift | 8 + .../Generated/BridgeJS.swift | 18 ++ .../Generated/JavaScript/BridgeJS.json | 20 ++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 6 + Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 9 +- Tests/prelude.mjs | 3 + 13 files changed, 562 insertions(+), 3 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 27f5a7c51..acbf995b2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -869,7 +869,7 @@ extension BridgeType { case .rawValueEnum(_, let rawType): switch context { case .importTS: - throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) @@ -952,7 +952,7 @@ extension BridgeType { case .rawValueEnum(_, let rawType): switch context { case .importTS: - throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") + return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 50f797de7..6a752ab80 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -53,6 +53,10 @@ export class TypeProcessor { this.seenTypes = new Map(); /** @type {string[]} Collected Swift code lines */ this.swiftLines = []; + /** @type {Set} */ + this.emittedEnumNames = new Set(); + /** @type {Set} */ + this.emittedStructuredTypeNames = new Set(); /** @type {Set} */ this.visitedDeclarationKeys = new Set(); @@ -92,6 +96,10 @@ export class TypeProcessor { for (const [type, node] of this.seenTypes) { this.seenTypes.delete(type); + if (this.isEnumType(type)) { + this.visitEnumType(type, node); + continue; + } const typeString = this.checker.typeToString(type); const members = type.getProperties(); if (members) { @@ -119,6 +127,8 @@ export class TypeProcessor { this.visitFunctionDeclaration(node); } else if (ts.isClassDeclaration(node)) { this.visitClassDecl(node); + } else if (ts.isEnumDeclaration(node)) { + this.visitEnumDeclaration(node); } else if (ts.isExportDeclaration(node)) { this.visitExportDeclaration(node); } @@ -185,6 +195,145 @@ export class TypeProcessor { } } + /** + * @param {ts.Type} type + * @returns {boolean} + * @private + */ + isEnumType(type) { + const symbol = type.getSymbol() ?? type.aliasSymbol; + if (!symbol) return false; + return (symbol.flags & ts.SymbolFlags.Enum) !== 0; + } + + /** + * @param {ts.EnumDeclaration} node + * @private + */ + visitEnumDeclaration(node) { + const name = node.name?.text; + if (!name) return; + this.emitEnumFromDeclaration(name, node, node); + } + + /** + * @param {ts.Type} type + * @param {ts.Node} node + * @private + */ + visitEnumType(type, node) { + const symbol = type.getSymbol() ?? type.aliasSymbol; + const name = symbol?.name; + if (!name) return; + const decl = symbol?.getDeclarations()?.find(d => ts.isEnumDeclaration(d)); + if (!decl || !ts.isEnumDeclaration(decl)) { + this.diagnosticEngine.print("warning", `Enum declaration not found for type: ${name}`, node); + return; + } + this.emitEnumFromDeclaration(name, decl, node); + } + + /** + * @param {string} enumName + * @param {ts.EnumDeclaration} decl + * @param {ts.Node} diagnosticNode + * @private + */ + emitEnumFromDeclaration(enumName, decl, diagnosticNode) { + if (this.emittedEnumNames.has(enumName)) return; + this.emittedEnumNames.add(enumName); + + const members = decl.members ?? []; + if (members.length === 0) { + this.diagnosticEngine.print("warning", `Empty enum is not supported: ${enumName}`, diagnosticNode); + this.swiftLines.push(`typealias ${this.renderIdentifier(enumName)} = String`); + this.swiftLines.push(""); + return; + } + + /** @type {{ name: string, raw: string }[]} */ + const stringMembers = []; + /** @type {{ name: string, raw: number }[]} */ + const intMembers = []; + let canBeStringEnum = true; + let canBeIntEnum = true; + let nextAutoValue = 0; + + for (const member of members) { + const rawMemberName = member.name.getText(); + const unquotedName = rawMemberName.replace(/^["']|["']$/g, ""); + const swiftCaseNameBase = makeValidSwiftIdentifier(unquotedName, { emptyFallback: "_case" }); + + if (member.initializer && ts.isStringLiteral(member.initializer)) { + stringMembers.push({ name: swiftCaseNameBase, raw: member.initializer.text }); + canBeIntEnum = false; + continue; + } + + if (member.initializer && ts.isNumericLiteral(member.initializer)) { + const rawValue = Number(member.initializer.text); + if (!Number.isInteger(rawValue)) { + canBeIntEnum = false; + } else { + intMembers.push({ name: swiftCaseNameBase, raw: rawValue }); + nextAutoValue = rawValue + 1; + canBeStringEnum = false; + continue; + } + } + + if (!member.initializer) { + intMembers.push({ name: swiftCaseNameBase, raw: nextAutoValue }); + nextAutoValue += 1; + canBeStringEnum = false; + continue; + } + + canBeStringEnum = false; + canBeIntEnum = false; + } + const swiftEnumName = this.renderIdentifier(enumName); + const dedupeNames = (items) => { + const seen = new Map(); + return items.map(item => { + const count = seen.get(item.name) ?? 0; + seen.set(item.name, count + 1); + if (count === 0) return item; + return { ...item, name: `${item.name}_${count + 1}` }; + }); + }; + + if (canBeStringEnum && stringMembers.length > 0) { + this.swiftLines.push(`enum ${swiftEnumName}: String {`); + for (const { name, raw } of dedupeNames(stringMembers)) { + this.swiftLines.push(` case ${this.renderIdentifier(name)} = "${raw.replaceAll("\"", "\\\\\"")}"`); + } + this.swiftLines.push("}"); + this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload {}`); + this.swiftLines.push(""); + return; + } + + if (canBeIntEnum && intMembers.length > 0) { + this.swiftLines.push(`enum ${swiftEnumName}: Int {`); + for (const { name, raw } of dedupeNames(intMembers)) { + this.swiftLines.push(` case ${this.renderIdentifier(name)} = ${raw}`); + } + this.swiftLines.push("}"); + this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload {}`); + this.swiftLines.push(""); + return; + } + + this.diagnosticEngine.print( + "warning", + `Unsupported enum (only string or int enums are supported): ${enumName}`, + diagnosticNode + ); + this.swiftLines.push(`typealias ${swiftEnumName} = String`); + this.swiftLines.push(""); + } + /** * Visit a function declaration and render Swift code * @param {ts.FunctionDeclaration} node - The function node @@ -332,6 +481,9 @@ export class TypeProcessor { * @private */ visitStructuredType(name, members) { + if (this.emittedStructuredTypeNames.has(name)) return; + this.emittedStructuredTypeNames.add(name); + const typeName = this.renderIdentifier(name); this.swiftLines.push(`@JSClass struct ${typeName} {`); @@ -415,6 +567,13 @@ export class TypeProcessor { return typeMap[typeString]; } + const symbol = type.getSymbol() ?? type.aliasSymbol; + if (symbol && (symbol.flags & ts.SymbolFlags.Enum) !== 0) { + const typeName = symbol.name; + this.seenTypes.set(type, node); + return this.renderIdentifier(typeName); + } + if (this.checker.isArrayType(type) || this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { return "JSObject"; } @@ -623,3 +782,33 @@ export function isValidSwiftDeclName(name) { const swiftIdentifierRegex = /^[_\p{ID_Start}][\p{ID_Continue}\u{200C}\u{200D}]*$/u; return swiftIdentifierRegex.test(name); } + +/** + * Convert an arbitrary string into a valid Swift identifier. + * @param {string} name + * @param {{ emptyFallback?: string }} options + * @returns {string} + */ +function makeValidSwiftIdentifier(name, options = {}) { + const emptyFallback = options.emptyFallback ?? "_"; + let result = ""; + for (const ch of name) { + const isIdentifierChar = /^[_\p{ID_Continue}\u{200C}\u{200D}]$/u.test(ch); + result += isIdentifierChar ? ch : "_"; + } + if (!result) result = emptyFallback; + if (!/^[_\p{ID_Start}]$/u.test(result[0])) { + result = "_" + result; + } + if (!isValidSwiftDeclName(result)) { + result = result.replace(/[^_\p{ID_Continue}\u{200C}\u{200D}]/gu, "_"); + if (!result) result = emptyFallback; + if (!/^[_\p{ID_Start}]$/u.test(result[0])) { + result = "_" + result; + } + } + if (isSwiftKeyword(result)) { + result = result + "_"; + } + return result; +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts new file mode 100644 index 000000000..10f6dd819 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts @@ -0,0 +1,8 @@ +export enum FeatureFlag { + foo = "foo", + bar = "bar", +} + +export function takesFeatureFlag(flag: FeatureFlag): void + +export function returnsFeatureFlag(): FeatureFlag diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts new file mode 100644 index 000000000..bb9f163cc --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts @@ -0,0 +1,19 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export type Exports = { +} +export type Imports = { + takesFeatureFlag(flag: FeatureFlagTag): void; + returnsFeatureFlag(): FeatureFlagTag; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js new file mode 100644 index 000000000..7c30768f5 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -0,0 +1,231 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flag) { + try { + const flagObject = swift.memory.getObject(flag); + swift.memory.release(flag); + imports.takesFeatureFlag(flagObject); + } catch (error) { + setException(error); + } + } + TestModule["bjs_returnsFeatureFlag"] = function bjs_returnsFeatureFlag() { + try { + let ret = imports.returnsFeatureFlag(); + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift new file mode 100644 index 000000000..b0049af28 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift @@ -0,0 +1,17 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +@_spi(Experimental) import JavaScriptKit + +enum FeatureFlag: String { + case foo = "foo" + case bar = "bar" +} +extension FeatureFlag: _BridgedSwiftEnumNoPayload {} + +@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> Void + +@JSFunction func returnsFeatureFlag() throws (JSException) -> FeatureFlag diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift new file mode 100644 index 000000000..3059865ac --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift @@ -0,0 +1,33 @@ +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_takesFeatureFlag") +fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void +#else +fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { + let flagValue = flag.bridgeJSLowerParameter() + bjs_takesFeatureFlag(flagValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_returnsFeatureFlag") +fileprivate func bjs_returnsFeatureFlag() -> Int32 +#else +fileprivate func bjs_returnsFeatureFlag() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$returnsFeatureFlag() throws(JSException) -> FeatureFlag { + let ret = bjs_returnsFeatureFlag() + if let error = _swift_js_take_exception() { + throw error + } + return FeatureFlag.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 2ad11fd9b..65a46a3f2 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -22,6 +22,14 @@ @JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws (JSException) -> String +enum FeatureFlag: String { + case foo = "foo" + case bar = "bar" +} +extension FeatureFlag: _BridgedSwiftEnumNoPayload {} + +@JSFunction func jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> FeatureFlag + @JSClass struct JsGreeter { @JSGetter var name: String @JSSetter func setName(_ value: String) throws (JSException) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 1b39e77b8..51048feb6 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -6307,6 +6307,24 @@ func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripFeatureFlag") +fileprivate func bjs_jsRoundTripFeatureFlag(_ flag: Int32) -> Int32 +#else +fileprivate func bjs_jsRoundTripFeatureFlag(_ flag: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag { + let flagValue = flag.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripFeatureFlag(flagValue) + if let error = _swift_js_take_exception() { + throw error + } + return FeatureFlag.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") fileprivate func bjs_runAsyncWorks() -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 727508f3c..3dcb35239 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9070,6 +9070,26 @@ } } }, + { + "name" : "jsRoundTripFeatureFlag", + "parameters" : [ + { + "name" : "flag", + "type" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + }, { "name" : "runAsyncWorks", "parameters" : [ diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index f0112ed1a..e31c89cbf 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -35,6 +35,12 @@ class ImportAPITests: XCTestCase { } } + func testRoundTripFeatureFlag() throws { + for v in [FeatureFlag.foo, .bar] { + try XCTAssertEqual(jsRoundTripFeatureFlag(v), v) + } + } + func ensureThrows(_ f: (Bool) throws(JSException) -> T) throws { do { _ = try f(true) diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 86a72ca05..87de440d8 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -7,6 +7,13 @@ export function jsThrowOrNumber(shouldThrow: boolean): number export function jsThrowOrBool(shouldThrow: boolean): boolean export function jsThrowOrString(shouldThrow: boolean): string +export enum FeatureFlag { + foo = "foo", + bar = "bar", +} + +export function jsRoundTripFeatureFlag(flag: FeatureFlag): FeatureFlag + export class JsGreeter { name: string; readonly prefix: string; @@ -15,4 +22,4 @@ export class JsGreeter { changeName(name: string): void; } -export function runAsyncWorks(): Promise; \ No newline at end of file +export function runAsyncWorks(): Promise; diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index a5611523c..7d048be72 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -47,6 +47,9 @@ export async function setupOptions(options, context) { } return "Hello, world!"; }, + "jsRoundTripFeatureFlag": (flag) => { + return flag; + }, JsGreeter: class { /** * @param {string} name From d9d6c56949ce89bcdfc5ea993ad7ae4420cc0e42 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 15:39:19 +0900 Subject: [PATCH 090/252] Implemented BridgeJS support for using `@JSClass`-imported TS/JS types in exported APIs by treating `@JSClass` **classes/actors** as `.jsObject` (previously they were misclassified as Swift heap objects, producing JS like `Foo.__construct(...)`). - Fix: `Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift` - Regression test + snapshots: `Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json` - Verified with `swift test --package-path ./Plugins/BridgeJS` --- .../BridgeJSCore/SwiftToSkeleton.swift | 10 + .../ImportedTypeInExportedInterface.swift | 7 + ...mportedTypeInExportedInterface.Export.d.ts | 23 ++ .../ImportedTypeInExportedInterface.Export.js | 233 ++++++++++++++++++ .../ImportedTypeInExportedInterface.json | 34 +++ .../ImportedTypeInExportedInterface.swift | 24 ++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 11 +- .../Generated/BridgeJS.swift | 61 +++++ .../Generated/JavaScript/BridgeJS.json | 55 +++++ Tests/prelude.mjs | 12 + 10 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 6628a3043..f18788e7d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -235,6 +235,16 @@ public final class SwiftToSkeleton { return nil } let swiftCallName = SwiftToSkeleton.computeSwiftCallName(for: typeDecl, itemName: typeDecl.name.text) + + // A type annotated with @JSClass is a JavaScript object wrapper (imported), + // even if it is declared as a Swift class. + if let classDecl = typeDecl.as(ClassDeclSyntax.self), classDecl.attributes.hasAttribute(name: "JSClass") { + return .jsObject(swiftCallName) + } + if let actorDecl = typeDecl.as(ActorDeclSyntax.self), actorDecl.attributes.hasAttribute(name: "JSClass") { + return .jsObject(swiftCallName) + } + return .swiftHeapObject(swiftCallName) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift new file mode 100644 index 000000000..9e3524284 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift @@ -0,0 +1,7 @@ +@JSClass class Foo { + @JSFunction init() throws(JSException) +} + +@JS func makeFoo() throws(JSException) -> Foo { + return try Foo() +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts new file mode 100644 index 000000000..654b4bc04 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts @@ -0,0 +1,23 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface Foo { +} +export type Exports = { + makeFoo(): Foo; +} +export type Imports = { + Foo: { + new(): Foo; + } +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js new file mode 100644 index 000000000..93c23a0db --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -0,0 +1,233 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_Foo_init"] = function bjs_Foo_init() { + try { + return swift.memory.retain(new imports.Foo()); + } catch (error) { + setException(error); + return 0 + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + makeFoo: function bjs_makeFoo() { + const ret = instance.exports.bjs_makeFoo(); + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return ret1; + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json new file mode 100644 index 000000000..6ee073ca8 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json @@ -0,0 +1,34 @@ +{ + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_makeFoo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "makeFoo", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift new file mode 100644 index 000000000..0bebd4e73 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift @@ -0,0 +1,24 @@ +@_expose(wasm, "bjs_makeFoo") +@_cdecl("bjs_makeFoo") +public func _bjs_makeFoo() -> Int32 { + #if arch(wasm32) + do { + let ret = try makeFoo() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 286c9a380..0df421df6 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1,5 +1,5 @@ import XCTest -import JavaScriptKit +@_spi(Experimental) import JavaScriptKit import JavaScriptEventLoop @_extern(wasm, module: "BridgeJSRuntimeTests", name: "runJsWorks") @@ -33,6 +33,15 @@ func runJsWorks() -> Void return v } +@JSClass struct Foo { + @JSGetter var value: String + @JSFunction init(_ value: String) throws(JSException) +} + +@JS func makeImportedFoo(value: String) throws(JSException) -> Foo { + return try Foo(value) +} + struct TestError: Error { let message: String } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 1b39e77b8..7134003c0 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2560,6 +2560,31 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #endif } +@_expose(wasm, "bjs_makeImportedFoo") +@_cdecl("bjs_makeImportedFoo") +public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { + #if arch(wasm32) + do { + let ret = try makeImportedFoo(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_throwsSwiftError") @_cdecl("bjs_throwsSwiftError") public func _bjs_throwsSwiftError(_ shouldThrow: Int32) -> Void { @@ -6166,6 +6191,42 @@ fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int3 } #endif +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init") +fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 +#else +fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_value_get") +fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$Foo_init(_ value: String) throws(JSException) -> JSObject { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_Foo_init(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Foo_value_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") fileprivate func bjs_jsRoundTripVoid() -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 727508f3c..6127958ea 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -4729,6 +4729,31 @@ } } }, + { + "abiName" : "bjs_makeImportedFoo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "makeImportedFoo", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "Foo" + } + } + }, { "abiName" : "bjs_throwsSwiftError", "effects" : { @@ -8928,7 +8953,37 @@ ], "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "value", + "type" : { + "string" : { + } + } + } + ] + }, + "getters" : [ + { + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "methods" : [ + + ], + "name" : "Foo", + "setters" : [ + + ] + } ] }, { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index a5611523c..5363cfd25 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -64,6 +64,7 @@ export async function setupOptions(options, context) { this.name = name; } }, + Foo: ImportedFoo, runAsyncWorks: async () => { const exports = importsContext.getExports(); if (!exports) { @@ -100,6 +101,13 @@ export async function setupOptions(options, context) { import assert from "node:assert"; +class ImportedFoo { + /** @param {string} value */ + constructor(value) { + this.value = value; + } +} + /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { exports.roundTripVoid(); @@ -173,6 +181,10 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { g.release(); + const foo = exports.makeImportedFoo("hello"); + assert.ok(foo instanceof ImportedFoo); + assert.equal(foo.value, "hello"); + // Test PropertyHolder with various types const testObj = { testProp: "test" }; const sibling = new exports.SimplePropertyHolder(999); From f822943cf98594d9a4c26850255b548538120f57 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 19:06:46 +0900 Subject: [PATCH 091/252] BridgeJS: support closures in imported APIs Enable closure parameter/return types for imported JS interfaces and emit the required closure glue from BridgeJSTool. --- .../Sources/BridgeJSCore/ClosureCodegen.swift | 337 ++++++++++++++++++ .../Sources/BridgeJSCore/ExportSwift.swift | 265 -------------- .../Sources/BridgeJSCore/ImportTS.swift | 53 ++- .../Sources/BridgeJSLink/BridgeJSLink.swift | 38 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 23 +- .../Sources/BridgeJSTool/BridgeJSTool.swift | 11 +- .../BridgeJSToolTests/ExportSwiftTests.swift | 13 +- .../SwiftClosureImports.swift | 4 + .../BridgeJSToolTests/ImportTSTests.swift | 47 ++- .../SwiftClosureImports.ImportMacros.d.ts | 19 + .../SwiftClosureImports.ImportMacros.js | 257 +++++++++++++ .../GlobalGetter.ImportMacros.swift | 34 ++ .../SwiftClosureImports.ImportMacros.swift | 84 +++++ 13 files changed, 899 insertions(+), 286 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift new file mode 100644 index 000000000..5d6545668 --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -0,0 +1,337 @@ +import SwiftBasicFormat +import SwiftSyntax +import SwiftSyntaxBuilder +#if canImport(BridgeJSSkeleton) +import BridgeJSSkeleton +#endif + +public struct ClosureCodegen { + public init() {} + + func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { + for param in parameters { + collectClosureSignatures(from: param.type, into: &signatures) + } + } + + func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { + switch type { + case .closure(let signature): + signatures.insert(signature) + for paramType in signature.parameters { + collectClosureSignatures(from: paramType, into: &signatures) + } + collectClosureSignatures(from: signature.returnType, into: &signatures) + case .optional(let wrapped): + collectClosureSignatures(from: wrapped, into: &signatures) + default: + break + } + } + + func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { + let mangledName = signature.mangleName + let helperName = "_BJS_Closure_\(mangledName)" + let boxClassName = "_BJS_ClosureBox_\(mangledName)" + + let closureParams = signature.parameters.enumerated().map { _, type in + "\(type.swiftType)" + }.joined(separator: ", ") + + let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + let swiftReturnType = signature.returnType.swiftType + let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + + let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" + + // Use CallJSEmission to generate the callback invocation + let builder = ImportTS.CallJSEmission( + moduleName: "bjs", + abiName: externName, + context: .exportSwift + ) + + // Lower the callback parameter + try builder.lowerParameter(param: Parameter(label: nil, name: "callback", type: .jsObject(nil))) + + // Lower each closure parameter + for (index, paramType) in signature.parameters.enumerated() { + try builder.lowerParameter(param: Parameter(label: nil, name: "param\(index)", type: paramType)) + } + + // Generate the call and return value lifting + try builder.call(returnType: signature.returnType) + try builder.liftReturnValue(returnType: signature.returnType) + + // Get the body code + let bodyCode = builder.getBody() + + // Generate extern declaration using CallJSEmission + let externDecl = builder.renderImportDecl() + + let boxClassDecl: DeclSyntax = """ + private final class \(raw: boxClassName): _BridgedSwiftClosureBox { + let closure: \(raw: closureType) + init(_ closure: @escaping \(raw: closureType)) { + self.closure = closure + } + } + """ + + let helperEnumDecl = EnumDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.private)) + }, + name: .identifier(helperName), + memberBlockBuilder: { + DeclSyntax( + FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.static)) + }, + name: .identifier("bridgeJSLower"), + signature: FunctionSignatureSyntax( + parameterClause: FunctionParameterClauseSyntax { + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier("closure"), + colon: .colonToken(), + type: TypeSyntax("@escaping \(raw: closureType)") + ) + }, + returnClause: ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier("UnsafeMutableRawPointer")) + ) + ), + body: CodeBlockSyntax { + "let box = \(raw: boxClassName)(closure)" + "return Unmanaged.passRetained(box).toOpaque()" + } + ) + ) + + DeclSyntax( + FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.static)) + }, + name: .identifier("bridgeJSLift"), + signature: FunctionSignatureSyntax( + parameterClause: FunctionParameterClauseSyntax { + FunctionParameterSyntax( + firstName: .wildcardToken(), + secondName: .identifier("callbackId"), + colon: .colonToken(), + type: IdentifierTypeSyntax(name: .identifier("Int32")) + ) + }, + returnClause: ReturnClauseSyntax( + arrow: .arrowToken(), + type: IdentifierTypeSyntax(name: .identifier(closureType)) + ) + ), + body: CodeBlockSyntax { + "let callback = JSObject.bridgeJSLiftParameter(callbackId)" + ReturnStmtSyntax( + expression: ClosureExprSyntax( + leftBrace: .leftBraceToken(), + signature: ClosureSignatureSyntax( + capture: ClosureCaptureClauseSyntax( + leftSquare: .leftSquareToken(), + items: ClosureCaptureListSyntax { + #if canImport(SwiftSyntax602) + ClosureCaptureSyntax( + name: .identifier("", presence: .missing), + initializer: InitializerClauseSyntax( + equal: .equalToken(presence: .missing), + nil, + value: ExprSyntax("callback") + ), + trailingTrivia: nil + ) + #else + ClosureCaptureSyntax( + expression: ExprSyntax("callback") + ) + #endif + }, + rightSquare: .rightSquareToken() + ), + parameterClause: .simpleInput( + ClosureShorthandParameterListSyntax { + for (index, _) in signature.parameters.enumerated() { + ClosureShorthandParameterSyntax(name: .identifier("param\(index)")) + } + } + ), + inKeyword: .keyword(.in) + ), + statements: CodeBlockItemListSyntax { + SwiftCodePattern.buildWasmConditionalCompilation(wasmBody: bodyCode.statements) + }, + rightBrace: .rightBraceToken() + ) + ) + } + ) + ) + } + ) + return [externDecl, boxClassDecl, DeclSyntax(helperEnumDecl)] + } + + func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { + let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" + let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" + + // Build ABI parameters directly with WasmCoreType (no string conversion needed) + var abiParams: [(name: String, type: WasmCoreType)] = [("boxPtr", .pointer)] + var liftedParams: [String] = [] + + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + let liftInfo = try paramType.liftParameterInfo() + + for (argName, wasmType) in liftInfo.parameters { + let fullName = + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + abiParams.append((fullName, wasmType)) + } + + let argNames = liftInfo.parameters.map { (argName, _) in + liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName + } + liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") + } + + let closureCallExpr = ExprSyntax("box.closure(\(raw: liftedParams.joined(separator: ", ")))") + + // Determine return type + let abiReturnWasmType: WasmCoreType? + if signature.returnType == .void { + abiReturnWasmType = nil + } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { + abiReturnWasmType = wasmType + } else { + abiReturnWasmType = nil + } + + // Build signature using SwiftSignatureBuilder + let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: abiParams, + returnType: abiReturnWasmType + ) + + // Build body + let body = CodeBlockItemListSyntax { + "let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue()" + if signature.returnType == .void { + closureCallExpr + } else { + "let result = \(closureCallExpr)" + "return result.bridgeJSLowerReturn()" + } + } + + // Build function declaration using helper + let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( + abiName: abiName, + signature: funcSignature, + body: body + ) + + return DeclSyntax(funcDecl) + } + + public func renderSupport(for skeleton: BridgeJSSkeleton) throws -> String? { + var closureSignatures: Set = [] + + if let exported = skeleton.exported { + for function in exported.functions { + collectClosureSignatures(from: function.parameters, into: &closureSignatures) + collectClosureSignatures(from: function.returnType, into: &closureSignatures) + } + for klass in exported.classes { + if let constructor = klass.constructor { + collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) + } + for method in klass.methods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + for property in klass.properties { + collectClosureSignatures(from: property.type, into: &closureSignatures) + } + } + for proto in exported.protocols { + for method in proto.methods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + for property in proto.properties { + collectClosureSignatures(from: property.type, into: &closureSignatures) + } + } + for structDecl in exported.structs { + for property in structDecl.properties { + collectClosureSignatures(from: property.type, into: &closureSignatures) + } + if let constructor = structDecl.constructor { + collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) + } + for method in structDecl.methods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + } + for enumDecl in exported.enums { + for method in enumDecl.staticMethods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + for property in enumDecl.staticProperties { + collectClosureSignatures(from: property.type, into: &closureSignatures) + } + } + } + + if let imported = skeleton.imported { + for fileSkeleton in imported.children { + for getter in fileSkeleton.globalGetters { + collectClosureSignatures(from: getter.type, into: &closureSignatures) + } + for function in fileSkeleton.functions { + collectClosureSignatures(from: function.parameters, into: &closureSignatures) + collectClosureSignatures(from: function.returnType, into: &closureSignatures) + } + for type in fileSkeleton.types { + if let constructor = type.constructor { + collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) + } + for getter in type.getters { + collectClosureSignatures(from: getter.type, into: &closureSignatures) + } + for setter in type.setters { + collectClosureSignatures(from: setter.type, into: &closureSignatures) + } + for method in type.methods { + collectClosureSignatures(from: method.parameters, into: &closureSignatures) + collectClosureSignatures(from: method.returnType, into: &closureSignatures) + } + } + } + } + + guard !closureSignatures.isEmpty else { return nil } + + var decls: [DeclSyntax] = [] + for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { + decls.append(contentsOf: try renderClosureHelpers(signature)) + decls.append(try renderClosureInvokeHandler(signature)) + } + + let format = BasicFormat() + return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index b8790ec97..a40f9c2b6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -47,30 +47,6 @@ public class ExportSwift { func renderSwiftGlue() throws -> String? { var decls: [DeclSyntax] = [] - let closureCodegen = ClosureCodegen() - var closureSignatures: Set = [] - for function in skeleton.functions { - closureCodegen.collectClosureSignatures(from: function.parameters, into: &closureSignatures) - closureCodegen.collectClosureSignatures(from: function.returnType, into: &closureSignatures) - } - for klass in skeleton.classes { - if let constructor = klass.constructor { - closureCodegen.collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) - } - for method in klass.methods { - closureCodegen.collectClosureSignatures(from: method.parameters, into: &closureSignatures) - closureCodegen.collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - for property in klass.properties { - closureCodegen.collectClosureSignatures(from: property.type, into: &closureSignatures) - } - } - - for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { - decls.append(contentsOf: try closureCodegen.renderClosureHelpers(signature)) - decls.append(try closureCodegen.renderClosureInvokeHandler(signature)) - } - let protocolCodegen = ProtocolCodegen() for proto in skeleton.protocols { decls.append(contentsOf: try protocolCodegen.renderProtocolWrapper(proto, moduleName: moduleName)) @@ -773,247 +749,6 @@ public class ExportSwift { } } -// MARK: - ClosureCodegen - -struct ClosureCodegen { - func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { - for param in parameters { - collectClosureSignatures(from: param.type, into: &signatures) - } - } - - func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { - switch type { - case .closure(let signature): - signatures.insert(signature) - for paramType in signature.parameters { - collectClosureSignatures(from: paramType, into: &signatures) - } - collectClosureSignatures(from: signature.returnType, into: &signatures) - case .optional(let wrapped): - collectClosureSignatures(from: wrapped, into: &signatures) - default: - break - } - } - - func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { - let mangledName = signature.mangleName - let helperName = "_BJS_Closure_\(mangledName)" - let boxClassName = "_BJS_ClosureBox_\(mangledName)" - - let closureParams = signature.parameters.enumerated().map { index, type in - "\(type.swiftType)" - }.joined(separator: ", ") - - let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") - let swiftReturnType = signature.returnType.swiftType - let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" - - let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" - - // Use CallJSEmission to generate the callback invocation - let builder = ImportTS.CallJSEmission( - moduleName: "bjs", - abiName: externName, - context: .exportSwift - ) - - // Lower the callback parameter - try builder.lowerParameter(param: Parameter(label: nil, name: "callback", type: .jsObject(nil))) - - // Lower each closure parameter - for (index, paramType) in signature.parameters.enumerated() { - try builder.lowerParameter(param: Parameter(label: nil, name: "param\(index)", type: paramType)) - } - - // Generate the call and return value lifting - try builder.call(returnType: signature.returnType) - try builder.liftReturnValue(returnType: signature.returnType) - - // Get the body code - let bodyCode = builder.getBody() - - // Generate extern declaration using CallJSEmission - let externDecl = builder.renderImportDecl() - - let boxClassDecl: DeclSyntax = """ - private final class \(raw: boxClassName): _BridgedSwiftClosureBox { - let closure: \(raw: closureType) - init(_ closure: @escaping \(raw: closureType)) { - self.closure = closure - } - } - """ - - let helperEnumDecl = EnumDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.private)) - }, - name: .identifier(helperName), - memberBlockBuilder: { - DeclSyntax( - FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.static)) - }, - name: .identifier("bridgeJSLower"), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier("closure"), - colon: .colonToken(), - type: TypeSyntax("@escaping \(raw: closureType)") - ) - }, - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier("UnsafeMutableRawPointer")) - ) - ), - body: CodeBlockSyntax { - "let box = \(raw: boxClassName)(closure)" - "return Unmanaged.passRetained(box).toOpaque()" - } - ) - ) - - DeclSyntax( - FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.static)) - }, - name: .identifier("bridgeJSLift"), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier("callbackId"), - colon: .colonToken(), - type: IdentifierTypeSyntax(name: .identifier("Int32")) - ) - }, - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(closureType)) - ) - ), - body: CodeBlockSyntax { - "let callback = JSObject.bridgeJSLiftParameter(callbackId)" - ReturnStmtSyntax( - expression: ClosureExprSyntax( - leftBrace: .leftBraceToken(), - signature: ClosureSignatureSyntax( - capture: ClosureCaptureClauseSyntax( - leftSquare: .leftSquareToken(), - items: ClosureCaptureListSyntax { - #if canImport(SwiftSyntax602) - ClosureCaptureSyntax( - name: .identifier("", presence: .missing), - initializer: InitializerClauseSyntax( - equal: .equalToken(presence: .missing), - nil, - value: ExprSyntax("callback") - ), - trailingTrivia: nil - ) - #else - ClosureCaptureSyntax( - expression: ExprSyntax("callback") - ) - #endif - }, - rightSquare: .rightSquareToken() - ), - parameterClause: .simpleInput( - ClosureShorthandParameterListSyntax { - for (index, _) in signature.parameters.enumerated() { - ClosureShorthandParameterSyntax(name: .identifier("param\(index)")) - } - } - ), - inKeyword: .keyword(.in) - ), - statements: CodeBlockItemListSyntax { - SwiftCodePattern.buildWasmConditionalCompilation(wasmBody: bodyCode.statements) - }, - rightBrace: .rightBraceToken() - ) - ) - } - ) - ) - } - ) - return [externDecl, boxClassDecl, DeclSyntax(helperEnumDecl)] - } - - func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { - let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" - let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" - - // Build ABI parameters directly with WasmCoreType (no string conversion needed) - var abiParams: [(name: String, type: WasmCoreType)] = [("boxPtr", .pointer)] - var liftedParams: [String] = [] - - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - let liftInfo = try paramType.liftParameterInfo() - - for (argName, wasmType) in liftInfo.parameters { - let fullName = - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - abiParams.append((fullName, wasmType)) - } - - let argNames = liftInfo.parameters.map { (argName, _) in - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - } - liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") - } - - let closureCallExpr = ExprSyntax("box.closure(\(raw: liftedParams.joined(separator: ", ")))") - - // Determine return type - let abiReturnWasmType: WasmCoreType? - if signature.returnType == .void { - abiReturnWasmType = nil - } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { - abiReturnWasmType = wasmType - } else { - abiReturnWasmType = nil - } - - // Build signature using SwiftSignatureBuilder - let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: abiParams, - returnType: abiReturnWasmType - ) - - // Build body - let body = CodeBlockItemListSyntax { - "let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue()" - if signature.returnType == .void { - closureCallExpr - } else { - "let result = \(closureCallExpr)" - "return result.bridgeJSLowerReturn()" - } - } - - // Build function declaration using helper - let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( - abiName: abiName, - signature: funcSignature, - body: body - ) - - return DeclSyntax(funcDecl) - } - -} - // MARK: - StackCodegen /// Helper for stack-based lifting and lowering operations. diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 27f5a7c51..b824bf8d8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -30,6 +30,7 @@ public struct ImportTS { /// Finalizes the import process and generates Swift code public func finalize() throws -> String? { var decls: [DeclSyntax] = [] + for skeleton in self.skeleton.children { for getter in skeleton.globalGetters { let getterDecls = try renderSwiftGlobalGetter(getter, topLevelDecls: &decls) @@ -97,6 +98,16 @@ public struct ImportTS { "\(param.name)\($0.name.capitalizedFirstLetter)" } + let initializerExpr: ExprSyntax + switch param.type { + case .closure(let signature): + initializerExpr = ExprSyntax( + "_BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(\(raw: param.name))" + ) + default: + initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + } + // Always add destructuring statement to body (unified for single and multiple) let pattern: PatternSyntax if destructuredNames.count == 1 { @@ -123,7 +134,7 @@ public struct ImportTS { PatternBindingSyntax( pattern: pattern, initializer: InitializerClauseSyntax( - value: ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + value: initializerExpr ) ) } @@ -209,10 +220,15 @@ public struct ImportTS { } else { abiReturnType = liftingInfo.valueToLift let liftExpr: ExprSyntax - if liftingInfo.valueToLift != nil { - liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn(ret)" - } else { - liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn()" + switch returnType { + case .closure(let signature): + liftExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(ret)") + default: + if liftingInfo.valueToLift != nil { + liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn(ret)" + } else { + liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn()" + } } body.append( CodeBlockItemSyntax( @@ -543,13 +559,14 @@ struct SwiftSignatureBuilder { ) -> FunctionParameterClauseSyntax { return FunctionParameterClauseSyntax(parametersBuilder: { for param in parameters { + let paramTypeSyntax = buildParameterTypeSyntax(from: param.type) if useWildcardLabels { // Always use wildcard labels: "_ name: Type" FunctionParameterSyntax( firstName: .wildcardToken(), secondName: .identifier(param.name), colon: .colonToken(), - type: buildTypeSyntax(from: param.type) + type: paramTypeSyntax ) } else { let label = param.label ?? param.name @@ -559,7 +576,7 @@ struct SwiftSignatureBuilder { firstName: .identifier(label), secondName: nil, colon: .colonToken(), - type: buildTypeSyntax(from: param.type) + type: paramTypeSyntax ) } else if param.label == nil { // No label specified: use wildcard "_ name: Type" @@ -567,7 +584,7 @@ struct SwiftSignatureBuilder { firstName: .wildcardToken(), secondName: .identifier(param.name), colon: .colonToken(), - type: buildTypeSyntax(from: param.type) + type: paramTypeSyntax ) } else { // External label differs: "label count: Int" @@ -575,7 +592,7 @@ struct SwiftSignatureBuilder { firstName: .identifier(label), secondName: .identifier(param.name), colon: .colonToken(), - type: buildTypeSyntax(from: param.type) + type: paramTypeSyntax ) } } @@ -653,6 +670,18 @@ struct SwiftSignatureBuilder { let identifierType = IdentifierTypeSyntax(name: .identifier(type.swiftType)) return TypeSyntax(identifierType) } + + /// Builds a parameter type syntax from a BridgeType. + /// + /// Swift closure parameters must be `@escaping` because they are boxed and can be invoked from JavaScript. + static func buildParameterTypeSyntax(from type: BridgeType) -> TypeSyntax { + switch type { + case .closure: + return TypeSyntax("@escaping \(raw: type.swiftType)") + default: + return buildTypeSyntax(from: type) + } + } } enum SwiftCodePattern { @@ -844,7 +873,8 @@ extension BridgeType { case .jsObject: return .jsObject case .void: return .void case .closure: - throw BridgeJSCoreError("Closure types are not yet supported in TypeScript imports") + // Swift closure is boxed and passed to JS as a pointer. + return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) case .swiftHeapObject(let className): switch context { case .importTS: @@ -927,7 +957,8 @@ extension BridgeType { case .jsObject: return .jsObject case .void: return .void case .closure: - throw BridgeJSCoreError("Closure types are not yet supported in TypeScript imports") + // JS returns a callback ID for closures, which Swift lifts to a typed closure. + return LiftingReturnInfo(valueToLift: .i32) case .swiftHeapObject(let className): switch context { case .importTS: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 625bfc364..929e6e4cd 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -589,10 +589,14 @@ public struct BridgeJSLink { printer.write("}") for unified in skeletons { - guard let skeleton = unified.exported else { continue } let moduleName = unified.moduleName var closureSignatures: Set = [] - collectClosureSignatures(from: skeleton, into: &closureSignatures) + if let exported = unified.exported { + collectClosureSignatures(from: exported, into: &closureSignatures) + } + if let imported = unified.imported { + collectClosureSignatures(from: imported, into: &closureSignatures) + } guard !closureSignatures.isEmpty else { continue } @@ -640,6 +644,36 @@ public struct BridgeJSLink { } } + private func collectClosureSignatures( + from skeleton: ImportedModuleSkeleton, + into signatures: inout Set + ) { + for fileSkeleton in skeleton.children { + for getter in fileSkeleton.globalGetters { + collectClosureSignatures(from: getter.type, into: &signatures) + } + for function in fileSkeleton.functions { + collectClosureSignatures(from: function.parameters, into: &signatures) + collectClosureSignatures(from: function.returnType, into: &signatures) + } + for type in fileSkeleton.types { + if let constructor = type.constructor { + collectClosureSignatures(from: constructor.parameters, into: &signatures) + } + for getter in type.getters { + collectClosureSignatures(from: getter.type, into: &signatures) + } + for setter in type.setters { + collectClosureSignatures(from: setter.type, into: &signatures) + } + for method in type.methods { + collectClosureSignatures(from: method.parameters, into: &signatures) + collectClosureSignatures(from: method.returnType, into: &signatures) + } + } + } + } + private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { for param in parameters { collectClosureSignatures(from: param.type, into: &signatures) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 944c1659b..d9223faf8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1459,8 +1459,14 @@ struct IntrinsicJSFragment: Sendable { } ) } - case .closure: - throw BridgeJSLinkError(message: "Closure parameters not yet implemented for imported JS functions") + case .closure(let signature): + let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)" + return IntrinsicJSFragment( + parameters: ["boxPtr"], + printCode: { arguments, scope, printer, cleanupCode in + return ["bjs[\"\(lowerFuncName)\"](\(arguments[0]))"] + } + ) case .namespaceEnum(let string): throw BridgeJSLinkError( message: @@ -1524,7 +1530,18 @@ struct IntrinsicJSFragment: Sendable { return swiftStructLowerReturn(fullName: fullName) } case .closure: - throw BridgeJSLinkError(message: "Closure return values not yet implemented for imported JS functions") + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + printer.write("if (typeof \(value) !== \"function\") {") + printer.indent { + printer.write("throw new TypeError(\"Expected a function\")") + } + printer.write("}") + return ["\(JSGlueVariableScope.reservedSwift).memory.retain(\(value))"] + } + ) case .namespaceEnum(let string): throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from imported JS functions: \(string)" diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index f75c7b758..3fb7f8114 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -152,15 +152,22 @@ import BridgeJSUtilities } var importer: ImportTS? if let skeleton = skeleton.imported { - importer = ImportTS(progress: progress, moduleName: moduleName, skeleton: skeleton) + importer = ImportTS( + progress: progress, + moduleName: moduleName, + skeleton: skeleton + ) } + // Generate unified closure support for both import/export to avoid duplicate symbols when concatenating. + let closureSupport = try ClosureCodegen().renderSupport(for: skeleton) + let importResult = try importer?.finalize() let exportResult = try exporter?.finalize() // Combine and write unified Swift output let outputSwiftURL = outputDirectory.appending(path: "BridgeJS.swift") - let combinedSwift = [exportResult, importResult].compactMap { $0 } + let combinedSwift = [closureSupport, exportResult, importResult].compactMap { $0 } let outputSwift = combineGeneratedSwift(combinedSwift) let shouldWrite = doubleDashOptions["always-write"] == "true" || !outputSwift.isEmpty if shouldWrite { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift index fd86a2ad7..fb31ac837 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift @@ -15,8 +15,17 @@ import Testing sourceLocation: Testing.SourceLocation = #_sourceLocation ) throws { guard let exported = skeleton.exported else { return } - let exportSwift = ExportSwift(progress: .silent, moduleName: skeleton.moduleName, skeleton: exported) - let outputSwift = try #require(try exportSwift.finalize()) + let exportSwift = ExportSwift( + progress: .silent, + moduleName: skeleton.moduleName, + skeleton: exported + ) + let closureSupport = try ClosureCodegen().renderSupport(for: skeleton) + let exportResult = try #require(try exportSwift.finalize()) + let outputSwift = ([closureSupport, exportResult] as [String?]) + .compactMap { $0?.trimmingCharacters(in: .newlines) } + .filter { !$0.isEmpty } + .joined(separator: "\n\n") try assertSnapshot( name: name, filePath: filePath, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift new file mode 100644 index 000000000..6efd641b9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift @@ -0,0 +1,4 @@ +@JSFunction func applyInt(_ value: Int, _ transform: (Int) -> Int) throws(JSException) -> Int + +@JSFunction func makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int + diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift index 158e4511e..89c7dd11d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift @@ -3,11 +3,14 @@ import Foundation import SwiftParser @testable import BridgeJSCore @testable import TS2Swift +@testable import BridgeJSSkeleton @Suite struct ImportTSTests { static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( "Inputs" ) + static let importMacroInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() + .appendingPathComponent("ImportMacroInputs") static func collectInputs() -> [String] { let fileManager = FileManager.default @@ -15,6 +18,12 @@ import SwiftParser return inputs.filter { $0.hasSuffix(".d.ts") } } + static func collectImportMacroInputs() -> [String] { + let fileManager = FileManager.default + let inputs = try! fileManager.contentsOfDirectory(atPath: Self.importMacroInputsDirectory.path) + return inputs.filter { $0.hasSuffix(".swift") } + } + @Test(arguments: collectInputs()) func snapshot(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) @@ -44,7 +53,14 @@ import SwiftParser guard let imported = skeleton.imported else { return } let importTS = ImportTS(progress: .silent, moduleName: "Check", skeleton: imported) - let outputSwift = try #require(try importTS.finalize()) + let importResult = try #require(try importTS.finalize()) + let closureSupport = try ClosureCodegen().renderSupport( + for: BridgeJSSkeleton(moduleName: "Check", imported: imported) + ) + let outputSwift = ([closureSupport, importResult] as [String?]) + .compactMap { $0?.trimmingCharacters(in: .newlines) } + .filter { !$0.isEmpty } + .joined(separator: "\n\n") try assertSnapshot( name: name, filePath: #filePath, @@ -53,4 +69,33 @@ import SwiftParser fileExtension: "swift" ) } + + @Test(arguments: collectImportMacroInputs()) + func snapshotImportMacroInput(input: String) throws { + let url = Self.importMacroInputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().lastPathComponent + + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "Check", exposeToGlobal: false) + importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift") + let skeleton = try importSwift.finalize() + + guard let imported = skeleton.imported else { return } + let importTS = ImportTS(progress: .silent, moduleName: "Check", skeleton: imported) + let importResult = try #require(try importTS.finalize()) + let closureSupport = try ClosureCodegen().renderSupport( + for: BridgeJSSkeleton(moduleName: "Check", imported: imported) + ) + let outputSwift = ([closureSupport, importResult] as [String?]) + .compactMap { $0?.trimmingCharacters(in: .newlines) } + .filter { !$0.isEmpty } + .joined(separator: "\n\n") + try assertSnapshot( + name: name + ".ImportMacros", + filePath: #filePath, + function: #function, + input: outputSwift.data(using: .utf8)!, + fileExtension: "swift" + ) + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts new file mode 100644 index 000000000..ebf493910 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts @@ -0,0 +1,19 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export type Exports = { +} +export type Imports = { + applyInt(value: number, transform: (arg0: number) => number): number; + makeAdder(base: number): (arg0: number) => number; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js new file mode 100644 index 000000000..db434c2ab --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -0,0 +1,257 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + + bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + return result | 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + + bjs["lower_closure_TestModule_10TestModuleSi_Si"] = function(closurePtr) { + return function(param0) { + try { + return instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(closurePtr, param0) | 0; + } catch (error) { + setException?.(error); + throw error; + } + }; + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_applyInt"] = function bjs_applyInt(value, transform) { + try { + let ret = imports.applyInt(value, bjs["lower_closure_TestModule_10TestModuleSi_Si"](transform)); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_makeAdder"] = function bjs_makeAdder(base) { + try { + let ret = imports.makeAdder(base); + if (typeof ret !== "function") { + throw new TypeError("Expected a function") + } + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift new file mode 100644 index 000000000..b5442b09e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift @@ -0,0 +1,34 @@ +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_console_get") +fileprivate func bjs_console_get() -> Int32 +#else +fileprivate func bjs_console_get() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$console_get() throws(JSException) -> JSConsole { + let ret = bjs_console_get() + if let error = _swift_js_take_exception() { + throw error + } + return JSConsole.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_JSConsole_log") +fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void +#else +fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + bjs_JSConsole_log(selfValue, messageValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift new file mode 100644 index 000000000..d1a4c4a54 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift @@ -0,0 +1,84 @@ +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_Check_5CheckSi_Si") +fileprivate func invoke_js_callback_Check_5CheckSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_Check_5CheckSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private final class _BJS_ClosureBox_5CheckSi_Si: _BridgedSwiftClosureBox { + let closure: (Int) -> Int + init(_ closure: @escaping (Int) -> Int) { + self.closure = closure + } +} + +private enum _BJS_Closure_5CheckSi_Si { + static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_5CheckSi_Si(closure) + return Unmanaged.passRetained(box).toOpaque() + } + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_Check_5CheckSi_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_Check_5CheckSi_Si") +@_cdecl("invoke_swift_closure_Check_5CheckSi_Si") +public func _invoke_swift_closure_Check_5CheckSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_5CheckSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Int.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_applyInt") +fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$applyInt(_ value: Int, _ transform: (Int) -> Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let transformPointer = _BJS_Closure_5CheckSi_Si.bridgeJSLower(transform) + let ret = bjs_applyInt(valueValue, transformPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_makeAdder") +fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 +#else +fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int { + let baseValue = base.bridgeJSLowerParameter() + let ret = bjs_makeAdder(baseValue) + if let error = _swift_js_take_exception() { + throw error + } + return _BJS_Closure_5CheckSi_Si.bridgeJSLift(ret) +} \ No newline at end of file From 987b0889a2a448a294c59ee68f0455b0c2166978 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 18:34:32 +0800 Subject: [PATCH 092/252] Restrict @JSClass to structs (#523) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated `@JSClass` macro to emit an error unless it’s attached to a `struct` (`Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift:13`). - Added new diagnostic message `@JSClass can only be applied to structs.` (`Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift:8`). - Updated macro expansion tests so `class`/`enum`/`actor` usages now produce diagnostics and no generated members/extensions (`Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift:147`). - Verified with `swift test --package-path ./Plugins/BridgeJS --filter BridgeJSMacrosTests`. --- .../Sources/BridgeJSMacros/JSClassMacro.swift | 8 ++++ .../BridgeJSMacros/JSMacroSupport.swift | 1 + .../JSClassMacroTests.swift | 45 +++++++++---------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift index 060d2269b..8a3f83f05 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -12,6 +12,13 @@ extension JSClassMacro: MemberMacro { conformingTo protocols: [TypeSyntax], in context: some MacroExpansionContext ) throws -> [DeclSyntax] { + guard declaration.is(StructDeclSyntax.self) else { + context.diagnose( + Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedJSClassDeclaration) + ) + return [] + } + var members: [DeclSyntax] = [] let existingMembers = declaration.memberBlock.members @@ -59,6 +66,7 @@ extension JSClassMacro: ExtensionMacro { conformingTo protocols: [TypeSyntax], in context: some MacroExpansionContext ) throws -> [ExtensionDeclSyntax] { + guard declaration.is(StructDeclSyntax.self) else { return [] } guard !protocols.isEmpty else { return [] } let conformanceList = protocols.map { $0.trimmed.description }.joined(separator: ", ") diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift index b10871f6a..59fa1c4c2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -5,6 +5,7 @@ import SwiftDiagnostics enum JSMacroMessage: String, DiagnosticMessage { case unsupportedDeclaration = "@JSFunction can only be applied to functions or initializers." + case unsupportedJSClassDeclaration = "@JSClass can only be applied to structs." case unsupportedVariable = "@JSGetter can only be applied to single-variable declarations." case unsupportedSetterDeclaration = "@JSSetter can only be applied to functions." case invalidSetterName = diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift index 95e3893ed..b27b93941 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -153,16 +153,15 @@ import BridgeJSMacros """, expandedSource: """ class MyClass { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - } - - extension MyClass: _JSBridgedClass { } """, + diagnostics: [ + DiagnosticSpec( + message: "@JSClass can only be applied to structs.", + line: 1, + column: 1 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth ) @@ -177,16 +176,15 @@ import BridgeJSMacros """, expandedSource: """ enum MyEnum { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - } - - extension MyEnum: _JSBridgedClass { } """, + diagnostics: [ + DiagnosticSpec( + message: "@JSClass can only be applied to structs.", + line: 1, + column: 1 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth ) @@ -201,16 +199,15 @@ import BridgeJSMacros """, expandedSource: """ actor MyActor { - let jsObject: JSObject - - init(unsafelyWrapping jsObject: JSObject) { - self.jsObject = jsObject - } - } - - extension MyActor: _JSBridgedClass { } """, + diagnostics: [ + DiagnosticSpec( + message: "@JSClass can only be applied to structs.", + line: 1, + column: 1 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth ) From cef2d6fa9423370cca1e53a2c1d20b9daf1ffee6 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 26 Jan 2026 19:07:16 +0900 Subject: [PATCH 093/252] Runtime tests: cover imported JS closures Add runtime import fixtures and tests for passing Swift closures into JS and receiving JS functions back as Swift closures. --- .../SwiftClosureImports.swift | 1 - .../SwiftClosureImports.ImportMacros.swift | 2 +- .../Generated/BridgeJS.swift | 139 ++++++++++++ .../Generated/JavaScript/BridgeJS.json | 206 ++++++++++++++++++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 30 +++ .../ImportClosureAPIs.swift | 11 + Tests/prelude.mjs | 19 +- 7 files changed, 405 insertions(+), 3 deletions(-) create mode 100644 Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift index 6efd641b9..d9f92fffb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift @@ -1,4 +1,3 @@ @JSFunction func applyInt(_ value: Int, _ transform: (Int) -> Int) throws(JSException) -> Int @JSFunction func makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int - diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift index d1a4c4a54..9e0959157 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift @@ -55,7 +55,7 @@ fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPoint } #endif -func _$applyInt(_ value: Int, _ transform: (Int) -> Int) throws(JSException) -> Int { +func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { let valueValue = value.bridgeJSLowerParameter() let transformPointer = _BJS_Closure_5CheckSi_Si.bridgeJSLower(transform) let ret = bjs_applyInt(valueValue, transformPointer) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 1b39e77b8..ad0357d4e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -537,6 +537,52 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_ #endif } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y: _BridgedSwiftClosureBox { + let closure: (Int) -> Void + init(_ closure: @escaping (Int) -> Void) { + self.closure = closure + } +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { + static func bridgeJSLower(_ closure: @escaping (Int) -> Void) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y(closure) + return Unmanaged.passRetained(box).toOpaque() + } + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(callbackValue, param0Value) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y>.fromOpaque(boxPtr).takeUnretainedValue() + box.closure(Int.bridgeJSLiftParameter(param0)) + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 @@ -6431,4 +6477,97 @@ func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException if let error = _swift_js_take_exception() { throw error } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsApplyInt") +fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsApplyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let transformPointer = _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(transform) + let ret = bjs_jsApplyInt(valueValue, transformPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMakeAdder") +fileprivate func bjs_jsMakeAdder(_ base: Int32) -> Int32 +#else +fileprivate func bjs_jsMakeAdder(_ base: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsMakeAdder(_ base: Int) throws(JSException) -> (Int) -> Int { + let baseValue = base.bridgeJSLowerParameter() + let ret = bjs_jsMakeAdder(baseValue) + if let error = _swift_js_take_exception() { + throw error + } + return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLift(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMapString") +fileprivate func bjs_jsMapString(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func bjs_jsMapString(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsMapString(_ value: String, _ transform: @escaping (String) -> String) throws(JSException) -> String { + let valueValue = value.bridgeJSLowerParameter() + let transformPointer = _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(transform) + let ret = bjs_jsMapString(valueValue, transformPointer) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMakePrefixer") +fileprivate func bjs_jsMakePrefixer(_ prefix: Int32) -> Int32 +#else +fileprivate func bjs_jsMakePrefixer(_ prefix: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsMakePrefixer(_ prefix: String) throws(JSException) -> (String) -> String { + let prefixValue = prefix.bridgeJSLowerParameter() + let ret = bjs_jsMakePrefixer(prefixValue) + if let error = _swift_js_take_exception() { + throw error + } + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsCallTwice") +fileprivate func bjs_jsCallTwice(_ value: Int32, _ callback: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func bjs_jsCallTwice(_ value: Int32, _ callback: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsCallTwice(_ value: Int, _ callback: @escaping (Int) -> Void) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let callbackPointer = _BJS_Closure_20BridgeJSRuntimeTestsSi_y.bridgeJSLower(callback) + let ret = bjs_jsCallTwice(valueValue, callbackPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 727508f3c..de90f183c 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9174,6 +9174,212 @@ ], "types" : [ + ] + }, + { + "functions" : [ + { + "name" : "jsApplyInt", + "parameters" : [ + { + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "jsMakeAdder", + "parameters" : [ + { + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "name" : "jsMapString", + "parameters" : [ + { + "name" : "value", + "type" : { + "string" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "jsMakePrefixer", + "parameters" : [ + { + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "name" : "jsCallTwice", + "parameters" : [ + { + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "void" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + } + ], + "types" : [ + ] } ] diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index f0112ed1a..20f96c682 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -84,4 +84,34 @@ class ImportAPITests: XCTestCase { XCTAssertEqual(try greeter.prefix, "Hello") } + + func testClosureParameterIntToInt() throws { + let result = try jsApplyInt(21) { $0 * 2 } + XCTAssertEqual(result, 42) + } + + func testClosureReturnIntToInt() throws { + let add10 = try jsMakeAdder(10) + XCTAssertEqual(add10(0), 10) + XCTAssertEqual(add10(32), 42) + } + + func testClosureParameterStringToString() throws { + let result = try jsMapString("Hello") { value in + value + ", world!" + } + XCTAssertEqual(result, "Hello, world!") + } + + func testClosureReturnStringToString() throws { + let prefixer = try jsMakePrefixer("Hello, ") + XCTAssertEqual(prefixer("world!"), "Hello, world!") + } + + func testClosureParameterIntToVoid() throws { + var total = 0 + let ret = try jsCallTwice(5) { total += $0 } + XCTAssertEqual(ret, 5) + XCTAssertEqual(total, 10) + } } diff --git a/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift new file mode 100644 index 000000000..bb913300b --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift @@ -0,0 +1,11 @@ +@_spi(Experimental) import JavaScriptKit + +@JSFunction func jsApplyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int + +@JSFunction func jsMakeAdder(_ base: Int) throws(JSException) -> (Int) -> Int + +@JSFunction func jsMapString(_ value: String, _ transform: @escaping (String) -> String) throws(JSException) -> String + +@JSFunction func jsMakePrefixer(_ `prefix`: String) throws(JSException) -> (String) -> String + +@JSFunction func jsCallTwice(_ value: Int, _ callback: @escaping (Int) -> Void) throws(JSException) -> Int diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index a5611523c..1b1f1d2e0 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -71,6 +71,23 @@ export async function setupOptions(options, context) { } BridgeJSRuntimeTests_runAsyncWorks(exports); return; + }, + jsApplyInt: (v, fn) => { + return fn(v); + }, + jsMakeAdder: (base) => { + return (v) => base + v; + }, + jsMapString: (value, fn) => { + return fn(value); + }, + jsMakePrefixer: (prefix) => { + return (name) => `${prefix}${name}`; + }, + jsCallTwice: (v, fn) => { + fn(v); + fn(v); + return v; } }; }, @@ -241,7 +258,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(ph.intValue, 777); // Should have parsed and set intValue assert.equal(ph.computedReadWrite, "Value: 777"); - // Test computed readonly property + // Test computed readonly property assert.equal(ph.computedReadonly, 1554); // intValue * 2 = 777 * 2 // Test property with observers From ed57d5e6be2e58da66f2a35e684e80b2567079cf Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 01:23:12 +0900 Subject: [PATCH 094/252] =?UTF-8?q?-=20Added=20`@JSGetter(jsName:=20String?= =?UTF-8?q?=3F=20=3D=20nil)`=20so=20generated=20getters=20can=20target=20n?= =?UTF-8?q?on-Swift/quoted=20JS=20property=20names=20(`Sources/JavaScriptK?= =?UTF-8?q?it/Macros.swift`).=20-=20Plumbed=20`jsName`=20through=20the=20i?= =?UTF-8?q?mported-property=20IR=20(`Plugins/BridgeJS/Sources/BridgeJSSkel?= =?UTF-8?q?eton/BridgeJSSkeleton.swift`)=20and=20extraction=20(`Plugins/Br?= =?UTF-8?q?idgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift`).=20-=20Upda?= =?UTF-8?q?ted=20TS=E2=86=92Swift=20generation=20to=20no=20longer=20drop?= =?UTF-8?q?=20quoted/invalid=20TS=20property=20names;=20it=20now=20emits?= =?UTF-8?q?=20Swift-safe=20identifiers=20plus=20`@JSGetter(jsName:=20...)`?= =?UTF-8?q?=20/=20`@JSSetter(jsName:=20...)`=20as=20needed=20(`Plugins/Bri?= =?UTF-8?q?dgeJS/Sources/TS2Swift/JavaScript/src/processor.js`).=20-=20Upd?= =?UTF-8?q?ated=20JS=20glue=20+=20generated=20`.d.ts`=20to=20use=20bracket?= =?UTF-8?q?=20property=20access=20and=20quote=20invalid=20TS=20property=20?= =?UTF-8?q?keys=20(`Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swi?= =?UTF-8?q?ft`).=20-=20Updated=20snapshots;=20`swift=20test=20--package-pa?= =?UTF-8?q?th=20./Plugins/BridgeJS`=20now=20passes=20(requires=20`npm=20ci?= =?UTF-8?q?`=20at=20repo=20root=20to=20provide=20`typescript`).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BridgeJSCore/SwiftToSkeleton.swift | 39 ++-- .../Sources/BridgeJSLink/BridgeJSLink.swift | 54 ++++-- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 8 + .../TS2Swift/JavaScript/src/processor.js | 33 ++-- .../InvalidPropertyNames.Import.d.ts | 5 + .../InvalidPropertyNames.Import.js | 98 +++++++++- .../MultipleImportedTypes.Import.js | 10 +- .../BridgeJSLinkTests/Protocol.Export.js | 42 ++-- .../TS2SkeletonLike.Import.js | 4 +- .../TypeScriptClass.Import.js | 6 +- .../InvalidPropertyNames.Macros.swift | 10 + .../ImportTSTests/InvalidPropertyNames.swift | 180 ++++++++++++++++++ Sources/JavaScriptKit/Macros.swift | 5 +- 13 files changed, 414 insertions(+), 80 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index f18788e7d..f09a9140a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1762,6 +1762,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { hasAttribute(attributes, name: "JSGetter") } + static func firstJSGetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { + attributes?.first { attribute in + attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSGetter" + }?.as(AttributeSyntax.self) + } + static func hasJSSetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { hasAttribute(attributes, name: "JSSetter") } @@ -1784,7 +1790,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } } - /// Extracts the jsName argument value from a @JSSetter attribute, if present. + /// Extracts the `jsName` argument value from an attribute, if present. static func extractJSName(from attribute: AttributeSyntax) -> String? { guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { return nil @@ -1883,22 +1889,15 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { // MARK: - Property Name Resolution - /// Helper for resolving property names from setter function names and jsName attributes + /// Helper for resolving property names from setter function names. private struct PropertyNameResolver { - /// Resolves property name and function base name from a setter function and optional jsName - /// - Returns: (propertyName, functionBaseName) where propertyName preserves case for getter matching, - /// and functionBaseName has lowercase first char for ABI generation + /// Resolves property name and function base name from a setter function. + /// - Returns: (propertyName, functionBaseName) where `propertyName` is derived from the setter name, + /// and `functionBaseName` has lowercase first char for ABI generation. static func resolve( functionName: String, - jsName: String?, normalizeIdentifier: (String) -> String ) -> (propertyName: String, functionBaseName: String)? { - if let jsName = jsName { - let propertyName = normalizeIdentifier(jsName) - let functionBaseName = propertyName.prefix(1).lowercased() + propertyName.dropFirst() - return (propertyName: propertyName, functionBaseName: functionBaseName) - } - let rawFunctionName = functionName.hasPrefix("`") && functionName.hasSuffix("`") && functionName.count > 2 ? String(functionName.dropFirst().dropLast()) @@ -2065,10 +2064,13 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { guard AttributeChecker.hasJSGetterAttribute(node.attributes) else { return .visitChildren } + guard let jsGetter = AttributeChecker.firstJSGetterAttribute(node.attributes) else { + return .skipChildren + } switch state { case .topLevel: - if let getter = parseGetterSkeleton(node) { + if let getter = parseGetterSkeleton(jsGetter, node) { importedGlobalGetters.append(getter) } return .skipChildren @@ -2085,7 +2087,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." ) ) - } else if let getter = parseGetterSkeleton(node) { + } else if let getter = parseGetterSkeleton(jsGetter, node) { type.getters.append(getter) currentType = type } @@ -2223,7 +2225,10 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return (identifier, typeAnnotation.type) } - private func parseGetterSkeleton(_ node: VariableDeclSyntax) -> ImportedGetterSkeleton? { + private func parseGetterSkeleton( + _ jsGetter: AttributeSyntax, + _ node: VariableDeclSyntax + ) -> ImportedGetterSkeleton? { guard let (identifier, type) = extractPropertyInfo(node) else { return nil } @@ -2231,8 +2236,10 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } let propertyName = SwiftToSkeleton.normalizeIdentifier(identifier.identifier.text) + let jsName = AttributeChecker.extractJSName(from: jsGetter) return ImportedGetterSkeleton( name: propertyName, + jsName: jsName, type: propertyType, documentation: nil, functionName: nil @@ -2252,7 +2259,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { guard let (propertyName, functionBaseName) = PropertyNameResolver.resolve( functionName: functionName, - jsName: validation.jsName, normalizeIdentifier: SwiftToSkeleton.normalizeIdentifier ) else { @@ -2261,6 +2267,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return ImportedSetterSkeleton( name: propertyName, + jsName: validation.jsName, type: validation.valueType, documentation: nil, functionName: "\(functionBaseName)_set" diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 929e6e4cd..bcb19320b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1202,17 +1202,20 @@ public struct BridgeJSLink { // Add properties from getters var propertyNames = Set() for getter in type.getters { - propertyNames.insert(getter.name) - let hasSetter = type.setters.contains { $0.name == getter.name } + let propertyName = getter.jsName ?? getter.name + propertyNames.insert(propertyName) + let hasSetter = type.setters.contains { ($0.jsName ?? $0.name) == propertyName } let propertySignature = hasSetter - ? "\(getter.name): \(resolveTypeScriptType(getter.type));" - : "readonly \(getter.name): \(resolveTypeScriptType(getter.type));" + ? "\(renderTSPropertyName(propertyName)): \(resolveTypeScriptType(getter.type));" + : "readonly \(renderTSPropertyName(propertyName)): \(resolveTypeScriptType(getter.type));" printer.write(propertySignature) } // Add setters that don't have corresponding getters - for setter in type.setters where !propertyNames.contains(setter.name) { - printer.write("\(setter.name): \(resolveTypeScriptType(setter.type));") + for setter in type.setters { + let propertyName = setter.jsName ?? setter.name + guard !propertyNames.contains(propertyName) else { continue } + printer.write("\(renderTSPropertyName(propertyName)): \(resolveTypeScriptType(setter.type));") } printer.unindent() @@ -1387,6 +1390,20 @@ public struct BridgeJSLink { return "(\(parameterSignatures.joined(separator: ", "))): \(returnTypeWithEffect)" } + private func renderTSPropertyName(_ name: String) -> String { + // TypeScript allows quoted property names for keys that aren't valid identifiers. + if name.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil { + return name + } + return "\"\(Self.escapeForJavaScriptStringLiteral(name))\"" + } + + fileprivate static func escapeForJavaScriptStringLiteral(_ string: String) -> String { + string + .replacingOccurrences(of: "\\", with: "\\\\") + .replacingOccurrences(of: "\"", with: "\\\"") + } + /// Helper method to append JSDoc comments for parameters with default values private func appendJSDocIfNeeded(for parameters: [Parameter], to lines: inout [String]) { let jsDocLines = DefaultValueUtils.formatJSDoc(for: parameters) @@ -2151,6 +2168,9 @@ extension BridgeJSLink { } func callPropertyGetter(name: String, returnType: BridgeType) throws -> String? { + let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) + let accessExpr = + "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)[\"\(escapedName)\"]" if context == .exportSwift, returnType.usesSideChannelForOptionalReturn() { guard case .optional(let wrappedType) = returnType else { fatalError("usesSideChannelForOptionalReturn returned true for non-optional type") @@ -2158,7 +2178,7 @@ extension BridgeJSLink { let resultVar = scope.variable("ret") body.write( - "let \(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name);" + "let \(resultVar) = \(accessExpr);" ) let fragment = try IntrinsicJSFragment.protocolPropertyOptionalToSideChannel(wrappedType: wrappedType) @@ -2168,14 +2188,15 @@ extension BridgeJSLink { } return try call( - callExpr: "\(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name)", + callExpr: accessExpr, returnType: returnType ) } func callPropertySetter(name: String, returnType: BridgeType) { + let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) let call = - "\(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name) = \(parameterForwardings.joined(separator: ", "))" + "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)[\"\(escapedName)\"] = \(parameterForwardings.joined(separator: ", "))" body.write("\(call);") } @@ -2185,7 +2206,8 @@ extension BridgeJSLink { } let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context) - let expr = "imports[\"\(name)\"]" + let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) + let expr = "imports[\"\(escapedName)\"]" let returnExpr: String? if loweringFragment.parameters.count == 0 { @@ -2948,14 +2970,15 @@ extension BridgeJSLink { getter: ImportedGetterSkeleton ) throws { let thunkBuilder = ImportedThunkBuilder() - let returnExpr = try thunkBuilder.getImportProperty(name: getter.name, returnType: getter.type) + let jsName = getter.jsName ?? getter.name + let returnExpr = try thunkBuilder.getImportProperty(name: jsName, returnType: getter.type) let abiName = getter.abiName(context: nil) let funcLines = thunkBuilder.renderFunction( name: abiName, returnExpr: returnExpr, returnType: getter.type ) - importObjectBuilder.appendDts(["readonly \(getter.name): \(getter.type.tsType);"]) + importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"]) importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) } @@ -2976,7 +2999,10 @@ extension BridgeJSLink { getter: getter, abiName: getterAbiName, emitCall: { thunkBuilder in - return try thunkBuilder.callPropertyGetter(name: getter.name, returnType: getter.type) + return try thunkBuilder.callPropertyGetter( + name: getter.jsName ?? getter.name, + returnType: getter.type + ) } ) importObjectBuilder.assignToImportObject(name: getterAbiName, function: js) @@ -2992,7 +3018,7 @@ extension BridgeJSLink { try thunkBuilder.liftParameter( param: Parameter(label: nil, name: "newValue", type: setter.type) ) - thunkBuilder.callPropertySetter(name: setter.name, returnType: setter.type) + thunkBuilder.callPropertySetter(name: setter.jsName ?? setter.name, returnType: setter.type) return nil } ) diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 28e4b6dcd..7040d607d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -626,6 +626,8 @@ public struct ImportedConstructorSkeleton: Codable { public struct ImportedGetterSkeleton: Codable { public let name: String + /// The JavaScript property name to read from, if different from `name`. + public let jsName: String? public let type: BridgeType public let documentation: String? /// Name of the getter function if it's a separate function (from @JSGetter) @@ -633,11 +635,13 @@ public struct ImportedGetterSkeleton: Codable { public init( name: String, + jsName: String? = nil, type: BridgeType, documentation: String? = nil, functionName: String? = nil ) { self.name = name + self.jsName = jsName self.type = type self.documentation = documentation self.functionName = functionName @@ -661,6 +665,8 @@ public struct ImportedGetterSkeleton: Codable { public struct ImportedSetterSkeleton: Codable { public let name: String + /// The JavaScript property name to write to, if different from `name`. + public let jsName: String? public let type: BridgeType public let documentation: String? /// Name of the setter function if it's a separate function (from @JSSetter) @@ -668,11 +674,13 @@ public struct ImportedSetterSkeleton: Codable { public init( name: String, + jsName: String? = nil, type: BridgeType, documentation: String? = nil, functionName: String? = nil ) { self.name = name + self.jsName = jsName self.type = type self.documentation = documentation self.functionName = functionName diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 6a752ab80..87663cb88 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -390,21 +390,28 @@ export class TypeProcessor { /** * @param {ts.PropertyDeclaration | ts.PropertySignature} node - * @returns {{ name: string, type: string, isReadonly: boolean, documentation: string | undefined } | null} + * @returns {{ jsName: string, swiftName: string, type: string, isReadonly: boolean, documentation: string | undefined } | null} */ visitPropertyDecl(node) { if (!node.name) return null; - - const propertyName = node.name.getText(); - if (!isValidSwiftDeclName(propertyName)) { + /** @type {string | null} */ + let jsName = null; + if (ts.isIdentifier(node.name)) { + jsName = node.name.text; + } else if (ts.isStringLiteral(node.name) || ts.isNumericLiteral(node.name)) { + jsName = node.name.text; + } else { + // Computed property names like `[Symbol.iterator]` are not supported yet. return null; } + const swiftName = isValidSwiftDeclName(jsName) ? jsName : makeValidSwiftIdentifier(jsName, { emptyFallback: "_" }); + const type = this.checker.getTypeAtLocation(node) const swiftType = this.visitType(type, node); const isReadonly = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ReadonlyKeyword) ?? false; const documentation = this.getFullJSDocText(node); - return { name: propertyName, type: swiftType, isReadonly, documentation }; + return { jsName, swiftName, type: swiftType, isReadonly, documentation }; } /** @@ -626,17 +633,21 @@ export class TypeProcessor { if (!property) return; const type = property.type; - const name = this.renderIdentifier(property.name); + const swiftName = this.renderIdentifier(property.swiftName); + const needsJSGetterName = property.jsName !== property.swiftName; + const escapedJSName = property.jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + const getterAnnotation = needsJSGetterName ? `@JSGetter(jsName: "${escapedJSName}")` : "@JSGetter"; // Always render getter - this.swiftLines.push(` @JSGetter var ${name}: ${type}`); + this.swiftLines.push(` ${getterAnnotation} var ${swiftName}: ${type}`); // Render setter if not readonly if (!property.isReadonly) { - const capitalizedName = property.name.charAt(0).toUpperCase() + property.name.slice(1); - const needsJSNameField = property.name.charAt(0) != capitalizedName.charAt(0).toLowerCase(); - const setterName = `set${capitalizedName}`; - const annotation = needsJSNameField ? `@JSSetter(jsName: "${property.name}")` : "@JSSetter"; + const capitalizedSwiftName = property.swiftName.charAt(0).toUpperCase() + property.swiftName.slice(1); + const derivedPropertyName = property.swiftName.charAt(0).toLowerCase() + property.swiftName.slice(1); + const needsJSNameField = property.jsName !== derivedPropertyName; + const setterName = `set${capitalizedSwiftName}`; + const annotation = needsJSNameField ? `@JSSetter(jsName: "${escapedJSName}")` : "@JSSetter"; this.swiftLines.push(` ${annotation} func ${this.renderIdentifier(setterName)}(_ value: ${type}) ${this.renderEffects({ isAsync: false })}`); } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts index 2b0474bb5..bcd4c7392 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts @@ -11,6 +11,11 @@ export interface ArrayBufferLike { export interface WeirdNaming { as(): void; normalProperty: string; + "property-with-dashes": number; + "123invalidStart": boolean; + "property with spaces": string; + "@specialChar": number; + constructor: string; for: string; Any: string; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 60435e569..585b276de 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -212,7 +212,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_ArrayBufferLike_byteLength_get"] = function bjs_ArrayBufferLike_byteLength_get(self) { try { - let ret = swift.memory.getObject(self).byteLength; + let ret = swift.memory.getObject(self)["byteLength"]; return ret; } catch (error) { setException(error); @@ -230,7 +230,52 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_normalProperty_get"] = function bjs_WeirdNaming_normalProperty_get(self) { try { - let ret = swift.memory.getObject(self).normalProperty; + let ret = swift.memory.getObject(self)["normalProperty"]; + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming_property_with_dashes_get"] = function bjs_WeirdNaming_property_with_dashes_get(self) { + try { + let ret = swift.memory.getObject(self)["property-with-dashes"]; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WeirdNaming__123invalidStart_get"] = function bjs_WeirdNaming__123invalidStart_get(self) { + try { + let ret = swift.memory.getObject(self)["123invalidStart"]; + return ret ? 1 : 0; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WeirdNaming_property_with_spaces_get"] = function bjs_WeirdNaming_property_with_spaces_get(self) { + try { + let ret = swift.memory.getObject(self)["property with spaces"]; + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming__specialChar_get"] = function bjs_WeirdNaming__specialChar_get(self) { + try { + let ret = swift.memory.getObject(self)["@specialChar"]; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WeirdNaming_constructor_get"] = function bjs_WeirdNaming_constructor_get(self) { + try { + let ret = swift.memory.getObject(self)["constructor"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -239,7 +284,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_for_get"] = function bjs_WeirdNaming_for_get(self) { try { - let ret = swift.memory.getObject(self).for; + let ret = swift.memory.getObject(self)["for"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -248,7 +293,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_Any_get"] = function bjs_WeirdNaming_Any_get(self) { try { - let ret = swift.memory.getObject(self).Any; + let ret = swift.memory.getObject(self)["Any"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -259,7 +304,46 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self).normalProperty = newValueObject; + swift.memory.getObject(self)["normalProperty"] = newValueObject; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming_property_with_dashes_set"] = function bjs_WeirdNaming_property_with_dashes_set(self, newValue) { + try { + swift.memory.getObject(self)["property-with-dashes"] = newValue; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming__123invalidStart_set"] = function bjs_WeirdNaming__123invalidStart_set(self, newValue) { + try { + swift.memory.getObject(self)["123invalidStart"] = newValue !== 0; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming_property_with_spaces_set"] = function bjs_WeirdNaming_property_with_spaces_set(self, newValue) { + try { + const newValueObject = swift.memory.getObject(newValue); + swift.memory.release(newValue); + swift.memory.getObject(self)["property with spaces"] = newValueObject; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming__specialChar_set"] = function bjs_WeirdNaming__specialChar_set(self, newValue) { + try { + swift.memory.getObject(self)["@specialChar"] = newValue; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WeirdNaming_constructor_set"] = function bjs_WeirdNaming_constructor_set(self, newValue) { + try { + const newValueObject = swift.memory.getObject(newValue); + swift.memory.release(newValue); + swift.memory.getObject(self)["constructor"] = newValueObject; } catch (error) { setException(error); } @@ -268,7 +352,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self).for = newValueObject; + swift.memory.getObject(self)["for"] = newValueObject; } catch (error) { setException(error); } @@ -277,7 +361,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self).Any = newValueObject; + swift.memory.getObject(self)["Any"] = newValueObject; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 40a3f4e3f..59457a1a2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -223,7 +223,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_isConnected_get"] = function bjs_DatabaseConnection_isConnected_get(self) { try { - let ret = swift.memory.getObject(self).isConnected; + let ret = swift.memory.getObject(self)["isConnected"]; return ret ? 1 : 0; } catch (error) { setException(error); @@ -232,7 +232,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_connectionTimeout_get"] = function bjs_DatabaseConnection_connectionTimeout_get(self) { try { - let ret = swift.memory.getObject(self).connectionTimeout; + let ret = swift.memory.getObject(self)["connectionTimeout"]; return ret; } catch (error) { setException(error); @@ -241,7 +241,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_connectionTimeout_set"] = function bjs_DatabaseConnection_connectionTimeout_set(self, newValue) { try { - swift.memory.getObject(self).connectionTimeout = newValue; + swift.memory.getObject(self)["connectionTimeout"] = newValue; } catch (error) { setException(error); } @@ -268,7 +268,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Logger_level_get"] = function bjs_Logger_level_get(self) { try { - let ret = swift.memory.getObject(self).level; + let ret = swift.memory.getObject(self)["level"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -295,7 +295,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_ConfigManager_configPath_get"] = function bjs_ConfigManager_configPath_get(self) { try { - let ret = swift.memory.getObject(self).configPath; + let ret = swift.memory.getObject(self)["configPath"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index d6b9a4f01..ee2212bbe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -269,7 +269,7 @@ export async function createInstantiator(options, swift) { const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_MyViewControllerDelegate_eventCount_get"] = function bjs_MyViewControllerDelegate_eventCount_get(self) { try { - let ret = swift.memory.getObject(self).eventCount; + let ret = swift.memory.getObject(self)["eventCount"]; return ret; } catch (error) { setException(error); @@ -278,14 +278,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_eventCount_set"] = function bjs_MyViewControllerDelegate_eventCount_set(self, value) { try { - swift.memory.getObject(self).eventCount = value; + swift.memory.getObject(self)["eventCount"] = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_delegateName_get"] = function bjs_MyViewControllerDelegate_delegateName_get(self) { try { - let ret = swift.memory.getObject(self).delegateName; + let ret = swift.memory.getObject(self)["delegateName"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -294,7 +294,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_optionalName_get"] = function bjs_MyViewControllerDelegate_optionalName_get(self) { try { - let ret = swift.memory.getObject(self).optionalName; + let ret = swift.memory.getObject(self)["optionalName"]; tmpRetString = ret; } catch (error) { setException(error); @@ -307,14 +307,14 @@ export async function createInstantiator(options, swift) { obj = swift.memory.getObject(valueWrappedValue); swift.memory.release(valueWrappedValue); } - swift.memory.getObject(self).optionalName = valueIsSome ? obj : null; + swift.memory.getObject(self)["optionalName"] = valueIsSome ? obj : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_get"] = function bjs_MyViewControllerDelegate_optionalRawEnum_get(self) { try { - let ret = swift.memory.getObject(self).optionalRawEnum; + let ret = swift.memory.getObject(self)["optionalRawEnum"]; tmpRetString = ret; } catch (error) { setException(error); @@ -327,14 +327,14 @@ export async function createInstantiator(options, swift) { obj = swift.memory.getObject(valueWrappedValue); swift.memory.release(valueWrappedValue); } - swift.memory.getObject(self).optionalRawEnum = valueIsSome ? obj : null; + swift.memory.getObject(self)["optionalRawEnum"] = valueIsSome ? obj : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_rawStringEnum_get"] = function bjs_MyViewControllerDelegate_rawStringEnum_get(self) { try { - let ret = swift.memory.getObject(self).rawStringEnum; + let ret = swift.memory.getObject(self)["rawStringEnum"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -345,14 +345,14 @@ export async function createInstantiator(options, swift) { try { const valueObject = swift.memory.getObject(value); swift.memory.release(value); - swift.memory.getObject(self).rawStringEnum = valueObject; + swift.memory.getObject(self)["rawStringEnum"] = valueObject; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) { try { - let ret = swift.memory.getObject(self).result; + let ret = swift.memory.getObject(self)["result"]; const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); return caseId; } catch (error) { @@ -362,14 +362,14 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { try { const enumValue = enumHelpers.Result.raise(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); - swift.memory.getObject(self).result = enumValue; + swift.memory.getObject(self)["result"] = enumValue; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_optionalResult_get"] = function bjs_MyViewControllerDelegate_optionalResult_get(self) { try { - let ret = swift.memory.getObject(self).optionalResult; + let ret = swift.memory.getObject(self)["optionalResult"]; const isSome = ret != null; if (isSome) { const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); @@ -387,14 +387,14 @@ export async function createInstantiator(options, swift) { if (valueIsSome) { enumValue = enumHelpers.Result.raise(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } - swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; + swift.memory.getObject(self)["optionalResult"] = valueIsSome ? enumValue : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_direction_get"] = function bjs_MyViewControllerDelegate_direction_get(self) { try { - let ret = swift.memory.getObject(self).direction; + let ret = swift.memory.getObject(self)["direction"]; return ret; } catch (error) { setException(error); @@ -403,14 +403,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_direction_set"] = function bjs_MyViewControllerDelegate_direction_set(self, value) { try { - swift.memory.getObject(self).direction = value; + swift.memory.getObject(self)["direction"] = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_directionOptional_get"] = function bjs_MyViewControllerDelegate_directionOptional_get(self) { try { - let ret = swift.memory.getObject(self).directionOptional; + let ret = swift.memory.getObject(self)["directionOptional"]; const isSome = ret != null; return isSome ? (ret | 0) : -1; } catch (error) { @@ -419,14 +419,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_directionOptional_set"] = function bjs_MyViewControllerDelegate_directionOptional_set(self, valueIsSome, valueWrappedValue) { try { - swift.memory.getObject(self).directionOptional = valueIsSome ? valueWrappedValue : null; + swift.memory.getObject(self)["directionOptional"] = valueIsSome ? valueWrappedValue : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_priority_get"] = function bjs_MyViewControllerDelegate_priority_get(self) { try { - let ret = swift.memory.getObject(self).priority; + let ret = swift.memory.getObject(self)["priority"]; return ret; } catch (error) { setException(error); @@ -435,14 +435,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_priority_set"] = function bjs_MyViewControllerDelegate_priority_set(self, value) { try { - swift.memory.getObject(self).priority = value; + swift.memory.getObject(self)["priority"] = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_priorityOptional_get"] = function bjs_MyViewControllerDelegate_priorityOptional_get(self) { try { - let ret = swift.memory.getObject(self).priorityOptional; + let ret = swift.memory.getObject(self)["priorityOptional"]; tmpRetOptionalInt = ret; } catch (error) { setException(error); @@ -450,7 +450,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_priorityOptional_set"] = function bjs_MyViewControllerDelegate_priorityOptional_set(self, valueIsSome, valueWrappedValue) { try { - swift.memory.getObject(self).priorityOptional = valueIsSome ? valueWrappedValue : null; + swift.memory.getObject(self)["priorityOptional"] = valueIsSome ? valueWrappedValue : null; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 2bbae4fec..7c11cb01c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -214,7 +214,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_TypeScriptProcessor_version_get"] = function bjs_TypeScriptProcessor_version_get(self) { try { - let ret = swift.memory.getObject(self).version; + let ret = swift.memory.getObject(self)["version"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -245,7 +245,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_CodeGenerator_outputFormat_get"] = function bjs_CodeGenerator_outputFormat_get(self) { try { - let ret = swift.memory.getObject(self).outputFormat; + let ret = swift.memory.getObject(self)["outputFormat"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 6c44fd008..0209bd3fd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -204,7 +204,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Greeter_name_get"] = function bjs_Greeter_name_get(self) { try { - let ret = swift.memory.getObject(self).name; + let ret = swift.memory.getObject(self)["name"]; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -213,7 +213,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Greeter_age_get"] = function bjs_Greeter_age_get(self) { try { - let ret = swift.memory.getObject(self).age; + let ret = swift.memory.getObject(self)["age"]; return ret; } catch (error) { setException(error); @@ -224,7 +224,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self).name = newValueObject; + swift.memory.getObject(self)["name"] = newValueObject; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index 6fa9b6d8c..73cd7cf45 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -18,6 +18,16 @@ @JSClass struct WeirdNaming { @JSGetter var normalProperty: String @JSSetter func setNormalProperty(_ value: String) throws (JSException) + @JSGetter(jsName: "property-with-dashes") var property_with_dashes: Double + @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws (JSException) + @JSGetter(jsName: "123invalidStart") var _123invalidStart: Bool + @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws (JSException) + @JSGetter(jsName: "property with spaces") var property_with_spaces: String + @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws (JSException) + @JSGetter(jsName: "@specialChar") var _specialChar: Double + @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws (JSException) + @JSGetter var constructor: String + @JSSetter func setConstructor(_ value: String) throws (JSException) @JSGetter var `for`: String @JSSetter func setFor(_ value: String) throws (JSException) @JSGetter var `Any`: String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index ba9e925e0..2922a23f5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -79,6 +79,51 @@ fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { } #endif +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_dashes_get") +fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 +#else +fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__123invalidStart_get") +fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_spaces_get") +fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__specialChar_get") +fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 +#else +fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_constructor_get") +fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 @@ -106,6 +151,51 @@ fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: I } #endif +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_dashes_set") +fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void +#else +fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__123invalidStart_set") +fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_spaces_set") +fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__specialChar_set") +fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void +#else +fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_constructor_set") +fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void @@ -142,6 +232,51 @@ func _$WeirdNaming_normalProperty_get(_ self: JSObject) throws(JSException) -> S return String.bridgeJSLiftReturn(ret) } +func _$WeirdNaming_property_with_dashes_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_property_with_dashes_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +func _$WeirdNaming__123invalidStart_get(_ self: JSObject) throws(JSException) -> Bool { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming__123invalidStart_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + +func _$WeirdNaming_property_with_spaces_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_property_with_spaces_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$WeirdNaming__specialChar_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming__specialChar_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +func _$WeirdNaming_constructor_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WeirdNaming_constructor_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + func _$WeirdNaming_for_get(_ self: JSObject) throws(JSException) -> String { let selfValue = self.bridgeJSLowerParameter() let ret = bjs_WeirdNaming_for_get(selfValue) @@ -169,6 +304,51 @@ func _$WeirdNaming_normalProperty_set(_ self: JSObject, _ newValue: String) thro } } +func _$WeirdNaming_property_with_dashes_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_property_with_dashes_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WeirdNaming__123invalidStart_set(_ self: JSObject, _ newValue: Bool) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming__123invalidStart_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WeirdNaming_property_with_spaces_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_property_with_spaces_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WeirdNaming__specialChar_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming__specialChar_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WeirdNaming_constructor_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_WeirdNaming_constructor_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { let selfValue = self.bridgeJSLowerParameter() let newValueValue = newValue.bridgeJSLowerParameter() diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 8cc3dbc64..5a0571ab5 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -112,6 +112,9 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Bui /// /// This macro is used by BridgeJS-generated Swift declarations. /// +/// - Parameter jsName: An optional string that specifies the name of the JavaScript property to read from. +/// If not provided, the Swift property name is used. +/// /// Example: /// /// ```swift @@ -125,7 +128,7 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Bui /// ``` @attached(accessor) @_spi(Experimental) -public macro JSGetter() = +public macro JSGetter(jsName: String? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSGetterMacro") /// A macro that generates a Swift function body that writes a value to JavaScript. From 790605023d5dea0d2f4890b340d5a1aef05696a9 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 08:24:42 +0900 Subject: [PATCH 095/252] Adjusted imported-property JS glue to prefer dot access when the property name is a normal identifier, falling back to bracket access only when needed. - Implementation: `Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift` - Updated snapshots (including `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js:215`) - `swift test --package-path ./Plugins/BridgeJS` passes --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 19 ++++++--- .../InvalidPropertyNames.Import.js | 18 ++++---- .../MultipleImportedTypes.Import.js | 10 ++--- .../BridgeJSLinkTests/Protocol.Export.js | 42 +++++++++---------- .../TS2SkeletonLike.Import.js | 4 +- .../TypeScriptClass.Import.js | 6 +-- 6 files changed, 53 insertions(+), 46 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index bcb19320b..4dce2f0ef 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -2168,9 +2168,8 @@ extension BridgeJSLink { } func callPropertyGetter(name: String, returnType: BridgeType) throws -> String? { - let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) - let accessExpr = - "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)[\"\(escapedName)\"]" + let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" + let accessExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) if context == .exportSwift, returnType.usesSideChannelForOptionalReturn() { guard case .optional(let wrappedType) = returnType else { fatalError("usesSideChannelForOptionalReturn returned true for non-optional type") @@ -2194,9 +2193,9 @@ extension BridgeJSLink { } func callPropertySetter(name: String, returnType: BridgeType) { - let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) - let call = - "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)[\"\(escapedName)\"] = \(parameterForwardings.joined(separator: ", "))" + let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" + let accessExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) + let call = "\(accessExpr) = \(parameterForwardings.joined(separator: ", "))" body.write("\(call);") } @@ -2236,6 +2235,14 @@ extension BridgeJSLink { assert(loweredValues.count <= 1, "Lowering fragment should produce at most one value") return loweredValues.first } + + private static func propertyAccessExpr(objectExpr: String, propertyName: String) -> String { + if propertyName.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil { + return "\(objectExpr).\(propertyName)" + } + let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(propertyName) + return "\(objectExpr)[\"\(escapedName)\"]" + } } class ImportObjectBuilder { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 585b276de..022b14e0e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -212,7 +212,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_ArrayBufferLike_byteLength_get"] = function bjs_ArrayBufferLike_byteLength_get(self) { try { - let ret = swift.memory.getObject(self)["byteLength"]; + let ret = swift.memory.getObject(self).byteLength; return ret; } catch (error) { setException(error); @@ -230,7 +230,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_normalProperty_get"] = function bjs_WeirdNaming_normalProperty_get(self) { try { - let ret = swift.memory.getObject(self)["normalProperty"]; + let ret = swift.memory.getObject(self).normalProperty; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -275,7 +275,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_constructor_get"] = function bjs_WeirdNaming_constructor_get(self) { try { - let ret = swift.memory.getObject(self)["constructor"]; + let ret = swift.memory.getObject(self).constructor; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -284,7 +284,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_for_get"] = function bjs_WeirdNaming_for_get(self) { try { - let ret = swift.memory.getObject(self)["for"]; + let ret = swift.memory.getObject(self).for; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -293,7 +293,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_WeirdNaming_Any_get"] = function bjs_WeirdNaming_Any_get(self) { try { - let ret = swift.memory.getObject(self)["Any"]; + let ret = swift.memory.getObject(self).Any; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -304,7 +304,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self)["normalProperty"] = newValueObject; + swift.memory.getObject(self).normalProperty = newValueObject; } catch (error) { setException(error); } @@ -343,7 +343,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self)["constructor"] = newValueObject; + swift.memory.getObject(self).constructor = newValueObject; } catch (error) { setException(error); } @@ -352,7 +352,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self)["for"] = newValueObject; + swift.memory.getObject(self).for = newValueObject; } catch (error) { setException(error); } @@ -361,7 +361,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self)["Any"] = newValueObject; + swift.memory.getObject(self).Any = newValueObject; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 59457a1a2..40a3f4e3f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -223,7 +223,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_isConnected_get"] = function bjs_DatabaseConnection_isConnected_get(self) { try { - let ret = swift.memory.getObject(self)["isConnected"]; + let ret = swift.memory.getObject(self).isConnected; return ret ? 1 : 0; } catch (error) { setException(error); @@ -232,7 +232,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_connectionTimeout_get"] = function bjs_DatabaseConnection_connectionTimeout_get(self) { try { - let ret = swift.memory.getObject(self)["connectionTimeout"]; + let ret = swift.memory.getObject(self).connectionTimeout; return ret; } catch (error) { setException(error); @@ -241,7 +241,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_DatabaseConnection_connectionTimeout_set"] = function bjs_DatabaseConnection_connectionTimeout_set(self, newValue) { try { - swift.memory.getObject(self)["connectionTimeout"] = newValue; + swift.memory.getObject(self).connectionTimeout = newValue; } catch (error) { setException(error); } @@ -268,7 +268,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Logger_level_get"] = function bjs_Logger_level_get(self) { try { - let ret = swift.memory.getObject(self)["level"]; + let ret = swift.memory.getObject(self).level; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -295,7 +295,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_ConfigManager_configPath_get"] = function bjs_ConfigManager_configPath_get(self) { try { - let ret = swift.memory.getObject(self)["configPath"]; + let ret = swift.memory.getObject(self).configPath; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index ee2212bbe..d6b9a4f01 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -269,7 +269,7 @@ export async function createInstantiator(options, swift) { const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_MyViewControllerDelegate_eventCount_get"] = function bjs_MyViewControllerDelegate_eventCount_get(self) { try { - let ret = swift.memory.getObject(self)["eventCount"]; + let ret = swift.memory.getObject(self).eventCount; return ret; } catch (error) { setException(error); @@ -278,14 +278,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_eventCount_set"] = function bjs_MyViewControllerDelegate_eventCount_set(self, value) { try { - swift.memory.getObject(self)["eventCount"] = value; + swift.memory.getObject(self).eventCount = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_delegateName_get"] = function bjs_MyViewControllerDelegate_delegateName_get(self) { try { - let ret = swift.memory.getObject(self)["delegateName"]; + let ret = swift.memory.getObject(self).delegateName; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -294,7 +294,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_optionalName_get"] = function bjs_MyViewControllerDelegate_optionalName_get(self) { try { - let ret = swift.memory.getObject(self)["optionalName"]; + let ret = swift.memory.getObject(self).optionalName; tmpRetString = ret; } catch (error) { setException(error); @@ -307,14 +307,14 @@ export async function createInstantiator(options, swift) { obj = swift.memory.getObject(valueWrappedValue); swift.memory.release(valueWrappedValue); } - swift.memory.getObject(self)["optionalName"] = valueIsSome ? obj : null; + swift.memory.getObject(self).optionalName = valueIsSome ? obj : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_get"] = function bjs_MyViewControllerDelegate_optionalRawEnum_get(self) { try { - let ret = swift.memory.getObject(self)["optionalRawEnum"]; + let ret = swift.memory.getObject(self).optionalRawEnum; tmpRetString = ret; } catch (error) { setException(error); @@ -327,14 +327,14 @@ export async function createInstantiator(options, swift) { obj = swift.memory.getObject(valueWrappedValue); swift.memory.release(valueWrappedValue); } - swift.memory.getObject(self)["optionalRawEnum"] = valueIsSome ? obj : null; + swift.memory.getObject(self).optionalRawEnum = valueIsSome ? obj : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_rawStringEnum_get"] = function bjs_MyViewControllerDelegate_rawStringEnum_get(self) { try { - let ret = swift.memory.getObject(self)["rawStringEnum"]; + let ret = swift.memory.getObject(self).rawStringEnum; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -345,14 +345,14 @@ export async function createInstantiator(options, swift) { try { const valueObject = swift.memory.getObject(value); swift.memory.release(value); - swift.memory.getObject(self)["rawStringEnum"] = valueObject; + swift.memory.getObject(self).rawStringEnum = valueObject; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) { try { - let ret = swift.memory.getObject(self)["result"]; + let ret = swift.memory.getObject(self).result; const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); return caseId; } catch (error) { @@ -362,14 +362,14 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { try { const enumValue = enumHelpers.Result.raise(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); - swift.memory.getObject(self)["result"] = enumValue; + swift.memory.getObject(self).result = enumValue; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_optionalResult_get"] = function bjs_MyViewControllerDelegate_optionalResult_get(self) { try { - let ret = swift.memory.getObject(self)["optionalResult"]; + let ret = swift.memory.getObject(self).optionalResult; const isSome = ret != null; if (isSome) { const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); @@ -387,14 +387,14 @@ export async function createInstantiator(options, swift) { if (valueIsSome) { enumValue = enumHelpers.Result.raise(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } - swift.memory.getObject(self)["optionalResult"] = valueIsSome ? enumValue : null; + swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_direction_get"] = function bjs_MyViewControllerDelegate_direction_get(self) { try { - let ret = swift.memory.getObject(self)["direction"]; + let ret = swift.memory.getObject(self).direction; return ret; } catch (error) { setException(error); @@ -403,14 +403,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_direction_set"] = function bjs_MyViewControllerDelegate_direction_set(self, value) { try { - swift.memory.getObject(self)["direction"] = value; + swift.memory.getObject(self).direction = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_directionOptional_get"] = function bjs_MyViewControllerDelegate_directionOptional_get(self) { try { - let ret = swift.memory.getObject(self)["directionOptional"]; + let ret = swift.memory.getObject(self).directionOptional; const isSome = ret != null; return isSome ? (ret | 0) : -1; } catch (error) { @@ -419,14 +419,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_directionOptional_set"] = function bjs_MyViewControllerDelegate_directionOptional_set(self, valueIsSome, valueWrappedValue) { try { - swift.memory.getObject(self)["directionOptional"] = valueIsSome ? valueWrappedValue : null; + swift.memory.getObject(self).directionOptional = valueIsSome ? valueWrappedValue : null; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_priority_get"] = function bjs_MyViewControllerDelegate_priority_get(self) { try { - let ret = swift.memory.getObject(self)["priority"]; + let ret = swift.memory.getObject(self).priority; return ret; } catch (error) { setException(error); @@ -435,14 +435,14 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_priority_set"] = function bjs_MyViewControllerDelegate_priority_set(self, value) { try { - swift.memory.getObject(self)["priority"] = value; + swift.memory.getObject(self).priority = value; } catch (error) { setException(error); } } TestModule["bjs_MyViewControllerDelegate_priorityOptional_get"] = function bjs_MyViewControllerDelegate_priorityOptional_get(self) { try { - let ret = swift.memory.getObject(self)["priorityOptional"]; + let ret = swift.memory.getObject(self).priorityOptional; tmpRetOptionalInt = ret; } catch (error) { setException(error); @@ -450,7 +450,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_priorityOptional_set"] = function bjs_MyViewControllerDelegate_priorityOptional_set(self, valueIsSome, valueWrappedValue) { try { - swift.memory.getObject(self)["priorityOptional"] = valueIsSome ? valueWrappedValue : null; + swift.memory.getObject(self).priorityOptional = valueIsSome ? valueWrappedValue : null; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 7c11cb01c..2bbae4fec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -214,7 +214,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_TypeScriptProcessor_version_get"] = function bjs_TypeScriptProcessor_version_get(self) { try { - let ret = swift.memory.getObject(self)["version"]; + let ret = swift.memory.getObject(self).version; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -245,7 +245,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_CodeGenerator_outputFormat_get"] = function bjs_CodeGenerator_outputFormat_get(self) { try { - let ret = swift.memory.getObject(self)["outputFormat"]; + let ret = swift.memory.getObject(self).outputFormat; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 0209bd3fd..6c44fd008 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -204,7 +204,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Greeter_name_get"] = function bjs_Greeter_name_get(self) { try { - let ret = swift.memory.getObject(self)["name"]; + let ret = swift.memory.getObject(self).name; tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { @@ -213,7 +213,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_Greeter_age_get"] = function bjs_Greeter_age_get(self) { try { - let ret = swift.memory.getObject(self)["age"]; + let ret = swift.memory.getObject(self).age; return ret; } catch (error) { setException(error); @@ -224,7 +224,7 @@ export async function createInstantiator(options, swift) { try { const newValueObject = swift.memory.getObject(newValue); swift.memory.release(newValue); - swift.memory.getObject(self)["name"] = newValueObject; + swift.memory.getObject(self).name = newValueObject; } catch (error) { setException(error); } From 0497d2611205389840156fe1d189b2cf1ca39cf0 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 08:39:17 +0900 Subject: [PATCH 096/252] Added `jsName` support to `@JSFunction` and `@JSClass`, end-to-end. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated macro APIs: `Sources/JavaScriptKit/Macros.swift` - Plumbed `jsName` through the imported skeleton + Swift parser: `Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift`, `Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift` - Updated JS glue + generated `.d.ts` to use the JS names (dot access when possible, bracket access when needed): `Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift` - Updated TS→Swift generator to emit `@JSClass(jsName: ...)` / `@JSFunction(jsName: ...)` when it has to sanitize names: `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js` - Added coverage for a renamed class + quoted method name: `Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts` (snapshots refreshed; `swift test --package-path ./Plugins/BridgeJS` passes) --- .../BridgeJSCore/SwiftToSkeleton.swift | 44 +++++++--- .../Sources/BridgeJSLink/BridgeJSLink.swift | 26 +++--- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 15 +++- .../TS2Swift/JavaScript/src/processor.js | 81 +++++++++++++++---- .../Inputs/InvalidPropertyNames.d.ts | 7 ++ .../InvalidPropertyNames.Import.d.ts | 10 +++ .../InvalidPropertyNames.Import.js | 31 +++++++ .../InvalidPropertyNames.Macros.swift | 11 +++ .../ImportTSTests/InvalidPropertyNames.swift | 68 ++++++++++++++++ Sources/JavaScriptKit/Macros.swift | 7 +- 10 files changed, 260 insertions(+), 40 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index f09a9140a..b1dced37e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1743,6 +1743,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { // Current type being collected (when in jsClassBody state) private struct CurrentType { let name: String + let jsName: String? var constructor: ImportedConstructorSkeleton? var methods: [ImportedFunctionSkeleton] var getters: [ImportedGetterSkeleton] @@ -1758,6 +1759,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { hasAttribute(attributes, name: "JSFunction") } + static func firstJSFunctionAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { + attributes?.first { attribute in + attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSFunction" + }?.as(AttributeSyntax.self) + } + static func hasJSGetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { hasAttribute(attributes, name: "JSGetter") } @@ -1782,6 +1789,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { hasAttribute(attributes, name: "JSClass") } + static func firstJSClassAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { + attributes?.first { attribute in + attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSClass" + }?.as(AttributeSyntax.self) + } + static func hasAttribute(_ attributes: AttributeListSyntax?, name: String) -> Bool { guard let attributes else { return false } return attributes.contains { attribute in @@ -1929,7 +1942,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func enterJSClass(_ typeName: String) { stateStack.append(.jsClassBody(name: typeName)) - currentType = CurrentType(name: typeName, constructor: nil, methods: [], getters: [], setters: []) + currentType = CurrentType(name: typeName, jsName: nil, constructor: nil, methods: [], getters: [], setters: []) + } + + private func enterJSClass(_ typeName: String, jsName: String?) { + stateStack.append(.jsClassBody(name: typeName)) + currentType = CurrentType(name: typeName, jsName: jsName, constructor: nil, methods: [], getters: [], setters: []) } private func exitJSClass() { @@ -1937,6 +1955,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { importedTypes.append( ImportedTypeSkeleton( name: type.name, + jsName: type.jsName, constructor: type.constructor, methods: type.methods, getters: type.getters, @@ -1951,7 +1970,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { if AttributeChecker.hasJSClassAttribute(node.attributes) { - enterJSClass(node.name.text) + let jsName = AttributeChecker.firstJSClassAttribute(node.attributes).flatMap(AttributeChecker.extractJSName) + enterJSClass(node.name.text, jsName: jsName) } return .visitChildren } @@ -1964,7 +1984,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { if AttributeChecker.hasJSClassAttribute(node.attributes) { - enterJSClass(node.name.text) + let jsName = AttributeChecker.firstJSClassAttribute(node.attributes).flatMap(AttributeChecker.extractJSName) + enterJSClass(node.name.text, jsName: jsName) } return .visitChildren } @@ -2002,8 +2023,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { - if AttributeChecker.hasJSFunctionAttribute(node.attributes), - let function = parseFunction(node, enclosingTypeName: nil, isStaticMember: true) + if let jsFunction = AttributeChecker.firstJSFunctionAttribute(node.attributes), + let function = parseFunction(jsFunction, node, enclosingTypeName: nil, isStaticMember: true) { importedFunctions.append(function) return .skipChildren @@ -2027,13 +2048,13 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { isStaticMember: Bool, type: inout CurrentType ) -> Bool { - if AttributeChecker.hasJSFunctionAttribute(node.attributes) { + if let jsFunction = AttributeChecker.firstJSFunctionAttribute(node.attributes) { if isStaticMember { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: true).map { + parseFunction(jsFunction, node, enclosingTypeName: typeName, isStaticMember: true).map { importedFunctions.append($0) } } else { - parseFunction(node, enclosingTypeName: typeName, isStaticMember: false).map { + parseFunction(jsFunction, node, enclosingTypeName: typeName, isStaticMember: false).map { type.methods.append($0) } } @@ -2130,8 +2151,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { for member in members { if let function = member.decl.as(FunctionDeclSyntax.self) { - if AttributeChecker.hasJSFunctionAttribute(function.attributes), - let parsed = parseFunction(function, enclosingTypeName: typeName, isStaticMember: true) + if let jsFunction = AttributeChecker.firstJSFunctionAttribute(function.attributes), + let parsed = parseFunction(jsFunction, function, enclosingTypeName: typeName, isStaticMember: true) { importedFunctions.append(parsed) } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { @@ -2175,6 +2196,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } private func parseFunction( + _ jsFunction: AttributeSyntax, _ node: FunctionDeclSyntax, enclosingTypeName: String?, isStaticMember: Bool @@ -2185,6 +2207,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text) + let jsName = AttributeChecker.extractJSName(from: jsFunction) let name: String if isStaticMember, let enclosingTypeName { name = "\(enclosingTypeName)_\(baseName)" @@ -2204,6 +2227,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } return ImportedFunctionSkeleton( name: name, + jsName: jsName, parameters: parameters, returnType: returnType, documentation: nil diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 4dce2f0ef..c42437dbe 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1194,8 +1194,9 @@ public struct BridgeJSLink { // Add methods for method in type.methods { + let methodName = method.jsName ?? method.name let methodSignature = - "\(method.name)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));" + "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));" printer.write(methodSignature) } @@ -2127,7 +2128,8 @@ extension BridgeJSLink { } func call(name: String, returnType: BridgeType) throws -> String? { - return try self.call(calleeExpr: "imports.\(name)", returnType: returnType) + let calleeExpr = Self.propertyAccessExpr(objectExpr: "imports", propertyName: name) + return try self.call(calleeExpr: calleeExpr, returnType: returnType) } private func call(calleeExpr: String, returnType: BridgeType) throws -> String? { @@ -2153,16 +2155,19 @@ extension BridgeJSLink { ) } - func callConstructor(name: String) throws -> String? { - let call = "new imports.\(name)(\(parameterForwardings.joined(separator: ", ")))" - let type: BridgeType = .jsObject(name) + func callConstructor(jsName: String, swiftTypeName: String) throws -> String? { + let ctorExpr = Self.propertyAccessExpr(objectExpr: "imports", propertyName: jsName) + let call = "new \(ctorExpr)(\(parameterForwardings.joined(separator: ", ")))" + let type: BridgeType = .jsObject(swiftTypeName) let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: type, context: context) return try lowerReturnValue(returnType: type, returnExpr: call, loweringFragment: loweringFragment) } func callMethod(name: String, returnType: BridgeType) throws -> String? { + let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" + let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) return try call( - calleeExpr: "\(JSGlueVariableScope.reservedSwift).memory.getObject(self).\(name)", + calleeExpr: calleeExpr, returnType: returnType ) } @@ -2957,7 +2962,8 @@ extension BridgeJSLink { for param in function.parameters { try thunkBuilder.liftParameter(param: param) } - let returnExpr = try thunkBuilder.call(name: function.name, returnType: function.returnType) + let jsName = function.jsName ?? function.name + let returnExpr = try thunkBuilder.call(name: jsName, returnType: function.returnType) let funcLines = thunkBuilder.renderFunction( name: function.abiName(context: nil), returnExpr: returnExpr, @@ -2966,7 +2972,7 @@ extension BridgeJSLink { let effects = Effects(isAsync: false, isThrows: false) importObjectBuilder.appendDts( [ - "\(function.name)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: effects));" + "\(renderTSPropertyName(jsName))\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: effects));" ] ) importObjectBuilder.assignToImportObject(name: function.abiName(context: nil), function: funcLines) @@ -3049,7 +3055,7 @@ extension BridgeJSLink { try thunkBuilder.liftParameter(param: param) } let returnType = BridgeType.jsObject(type.name) - let returnExpr = try thunkBuilder.callConstructor(name: type.name) + let returnExpr = try thunkBuilder.callConstructor(jsName: type.jsName ?? type.name, swiftTypeName: type.name) let abiName = constructor.abiName(context: type) let funcLines = thunkBuilder.renderFunction( name: abiName, @@ -3111,7 +3117,7 @@ extension BridgeJSLink { for param in method.parameters { try thunkBuilder.liftParameter(param: param) } - let returnExpr = try thunkBuilder.callMethod(name: method.name, returnType: method.returnType) + let returnExpr = try thunkBuilder.callMethod(name: method.jsName ?? method.name, returnType: method.returnType) let funcLines = thunkBuilder.renderFunction( name: method.abiName(context: context), returnExpr: returnExpr, diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 7040d607d..3baebe6da 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -590,12 +590,21 @@ public struct ExportedSkeleton: Codable { public struct ImportedFunctionSkeleton: Codable { public let name: String + /// The JavaScript function/method name to call, if different from `name`. + public let jsName: String? public let parameters: [Parameter] public let returnType: BridgeType public let documentation: String? - public init(name: String, parameters: [Parameter], returnType: BridgeType, documentation: String? = nil) { + public init( + name: String, + jsName: String? = nil, + parameters: [Parameter], + returnType: BridgeType, + documentation: String? = nil + ) { self.name = name + self.jsName = jsName self.parameters = parameters self.returnType = returnType self.documentation = documentation @@ -704,6 +713,8 @@ public struct ImportedSetterSkeleton: Codable { public struct ImportedTypeSkeleton: Codable { public let name: String + /// The JavaScript constructor name to use for `init(...)`, if different from `name`. + public let jsName: String? public let constructor: ImportedConstructorSkeleton? public let methods: [ImportedFunctionSkeleton] public let getters: [ImportedGetterSkeleton] @@ -712,6 +723,7 @@ public struct ImportedTypeSkeleton: Codable { public init( name: String, + jsName: String? = nil, constructor: ImportedConstructorSkeleton? = nil, methods: [ImportedFunctionSkeleton], getters: [ImportedGetterSkeleton] = [], @@ -719,6 +731,7 @@ public struct ImportedTypeSkeleton: Codable { documentation: String? = nil ) { self.name = name + self.jsName = jsName self.constructor = constructor self.methods = methods self.getters = getters diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 87663cb88..615cffa25 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -60,6 +60,33 @@ export class TypeProcessor { /** @type {Set} */ this.visitedDeclarationKeys = new Set(); + + /** @type {Map} */ + this.swiftTypeNameByJSTypeName = new Map(); + } + + /** + * Convert a TypeScript type name to a valid Swift type identifier. + * @param {string} jsTypeName + * @returns {string} + * @private + */ + swiftTypeName(jsTypeName) { + const cached = this.swiftTypeNameByJSTypeName.get(jsTypeName); + if (cached) return cached; + const swiftName = isValidSwiftDeclName(jsTypeName) ? jsTypeName : makeValidSwiftIdentifier(jsTypeName, { emptyFallback: "_" }); + this.swiftTypeNameByJSTypeName.set(jsTypeName, swiftName); + return swiftName; + } + + /** + * Render a Swift type identifier from a TypeScript type name. + * @param {string} jsTypeName + * @returns {string} + * @private + */ + renderTypeIdentifier(jsTypeName) { + return this.renderIdentifier(this.swiftTypeName(jsTypeName)); } /** @@ -292,7 +319,7 @@ export class TypeProcessor { canBeStringEnum = false; canBeIntEnum = false; } - const swiftEnumName = this.renderIdentifier(enumName); + const swiftEnumName = this.renderTypeIdentifier(enumName); const dedupeNames = (items) => { const seen = new Map(); return items.map(item => { @@ -341,10 +368,10 @@ export class TypeProcessor { */ visitFunctionDeclaration(node) { if (!node.name) return; - const name = node.name.getText(); - if (!isValidSwiftDeclName(name)) { - return; - } + const jsName = node.name.text; + const swiftName = this.swiftTypeName(jsName); + const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + const annotation = jsName !== swiftName ? `@JSFunction(jsName: "${escapedJSName}")` : "@JSFunction"; const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; @@ -352,9 +379,9 @@ export class TypeProcessor { const params = this.renderParameters(signature.getParameters(), node); const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); - const swiftName = this.renderIdentifier(name); + const swiftFuncName = this.renderIdentifier(swiftName); - this.swiftLines.push(`@JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); + this.swiftLines.push(`${annotation} func ${swiftFuncName}(${params}) ${effects} -> ${returnType}`); this.swiftLines.push(""); } @@ -433,8 +460,12 @@ export class TypeProcessor { visitClassDecl(node) { if (!node.name) return; - const className = this.renderIdentifier(node.name.text); - this.swiftLines.push(`@JSClass struct ${className} {`); + const jsName = node.name.text; + const swiftName = this.swiftTypeName(jsName); + const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + const annotation = jsName !== swiftName ? `@JSClass(jsName: "${escapedJSName}")` : "@JSClass"; + const className = this.renderIdentifier(swiftName); + this.swiftLines.push(`${annotation} struct ${className} {`); // Process members in declaration order for (const member of node.members) { @@ -491,8 +522,11 @@ export class TypeProcessor { if (this.emittedStructuredTypeNames.has(name)) return; this.emittedStructuredTypeNames.add(name); - const typeName = this.renderIdentifier(name); - this.swiftLines.push(`@JSClass struct ${typeName} {`); + const swiftName = this.swiftTypeName(name); + const escapedJSName = name.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + const annotation = name !== swiftName ? `@JSClass(jsName: "${escapedJSName}")` : "@JSClass"; + const typeName = this.renderIdentifier(swiftName); + this.swiftLines.push(`${annotation} struct ${typeName} {`); // Collect all declarations with their positions to preserve order /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */ @@ -578,7 +612,7 @@ export class TypeProcessor { if (symbol && (symbol.flags & ts.SymbolFlags.Enum) !== 0) { const typeName = symbol.name; this.seenTypes.set(type, node); - return this.renderIdentifier(typeName); + return this.renderTypeIdentifier(typeName); } if (this.checker.isArrayType(type) || this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { @@ -598,7 +632,7 @@ export class TypeProcessor { return "JSObject"; } this.seenTypes.set(type, node); - return this.renderIdentifier(typeName); + return this.renderTypeIdentifier(typeName); } const swiftType = convert(type); this.processedTypes.set(type, swiftType); @@ -659,8 +693,21 @@ export class TypeProcessor { */ renderMethod(node) { if (!node.name) return; - const name = node.name.getText(); - if (!isValidSwiftDeclName(name)) return; + /** @type {string | null} */ + let jsName = null; + if (ts.isIdentifier(node.name)) { + jsName = node.name.text; + } else if (ts.isStringLiteral(node.name) || ts.isNumericLiteral(node.name)) { + jsName = node.name.text; + } else { + // Computed property names like `[Symbol.iterator]` are not supported yet. + return; + } + + const swiftName = this.swiftTypeName(jsName); + const needsJSNameField = jsName !== swiftName; + const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + const annotation = needsJSNameField ? `@JSFunction(jsName: "${escapedJSName}")` : "@JSFunction"; const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; @@ -668,9 +715,9 @@ export class TypeProcessor { const params = this.renderParameters(signature.getParameters(), node); const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); - const swiftName = this.renderIdentifier(name); + const swiftMethodName = this.renderIdentifier(swiftName); - this.swiftLines.push(` @JSFunction func ${swiftName}(${params}) ${effects} -> ${returnType}`); + this.swiftLines.push(` ${annotation} func ${swiftMethodName}(${params}) ${effects} -> ${returnType}`); } /** diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts index d21f3c207..b9d3722b8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts @@ -21,3 +21,10 @@ interface WeirdNaming { export function createArrayBuffer(): ArrayBufferLike; export function createWeirdObject(): WeirdNaming; + +export class $Weird { + constructor(); + "method-with-dashes"(): void; +} + +export function createWeirdClass(): $Weird; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts index bcd4c7392..42d0d4123 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts @@ -10,6 +10,7 @@ export interface ArrayBufferLike { } export interface WeirdNaming { as(): void; + try(): void; normalProperty: string; "property-with-dashes": number; "123invalidStart": boolean; @@ -19,11 +20,20 @@ export interface WeirdNaming { for: string; Any: string; } +export interface _Weird { + "method-with-dashes"(): void; +} +export interface _Weird { +} export type Exports = { } export type Imports = { createArrayBuffer(): ArrayBufferLike; createWeirdObject(): WeirdNaming; + createWeirdClass(): _Weird; + _Weird: { + new(): _Weird; + } } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 022b14e0e..66cbe7937 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -210,6 +210,15 @@ export async function createInstantiator(options, swift) { return 0 } } + TestModule["bjs_createWeirdClass"] = function bjs_createWeirdClass() { + try { + let ret = imports.createWeirdClass(); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } TestModule["bjs_ArrayBufferLike_byteLength_get"] = function bjs_ArrayBufferLike_byteLength_get(self) { try { let ret = swift.memory.getObject(self).byteLength; @@ -373,6 +382,28 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_WeirdNaming_try"] = function bjs_WeirdNaming_try(self) { + try { + swift.memory.getObject(self).try(); + } catch (error) { + setException(error); + } + } + TestModule["bjs__Weird_init"] = function bjs__Weird_init() { + try { + return swift.memory.retain(new imports.$Weird()); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs__Weird_method_with_dashes"] = function bjs__Weird_method_with_dashes(self) { + try { + swift.memory.getObject(self)["method-with-dashes"](); + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index 73cd7cf45..bfd8589e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -33,4 +33,15 @@ @JSGetter var `Any`: String @JSSetter(jsName: "Any") func setAny(_ value: String) throws (JSException) @JSFunction func `as`() throws (JSException) -> Void + @JSFunction func `try`() throws (JSException) -> Void +} + +@JSClass(jsName: "$Weird") struct _Weird { + @JSFunction init() throws (JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> Void +} + +@JSFunction func createWeirdClass() throws (JSException) -> _Weird + +@JSClass(jsName: "$Weird") struct _Weird { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift index 2922a23f5..0ef52d4d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift @@ -32,6 +32,23 @@ func _$createWeirdObject() throws(JSException) -> WeirdNaming { return WeirdNaming.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_createWeirdClass") +fileprivate func bjs_createWeirdClass() -> Int32 +#else +fileprivate func bjs_createWeirdClass() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$createWeirdClass() throws(JSException) -> _Weird { + let ret = bjs_createWeirdClass() + if let error = _swift_js_take_exception() { + throw error + } + return _Weird.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_byteLength_get") fileprivate func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 @@ -223,6 +240,15 @@ fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { } #endif +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_try") +fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void +#else +fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + func _$WeirdNaming_normalProperty_get(_ self: JSObject) throws(JSException) -> String { let selfValue = self.bridgeJSLowerParameter() let ret = bjs_WeirdNaming_normalProperty_get(selfValue) @@ -373,4 +399,46 @@ func _$WeirdNaming_as(_ self: JSObject) throws(JSException) -> Void { if let error = _swift_js_take_exception() { throw error } +} + +func _$WeirdNaming_try(_ self: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + bjs_WeirdNaming_try(selfValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs__Weird_init") +fileprivate func bjs__Weird_init() -> Int32 +#else +fileprivate func bjs__Weird_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs__Weird_method_with_dashes") +fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void +#else +fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$_Weird_init() throws(JSException) -> JSObject { + let ret = bjs__Weird_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$_Weird_method_with_dashes(_ self: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + bjs__Weird_method_with_dashes(selfValue) + if let error = _swift_js_take_exception() { + throw error + } } \ No newline at end of file diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 5a0571ab5..61797a58e 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -162,9 +162,12 @@ public macro JSSetter(jsName: String? = nil) = /// @JSFunction func greet() throws (JSException) -> String /// @JSFunction init(_ name: String) throws (JSException) /// ``` +/// +/// - Parameter jsName: An optional string that specifies the name of the JavaScript function or method to call. +/// If not provided, the Swift function name is used. @attached(body) @_spi(Experimental) -public macro JSFunction() = +public macro JSFunction(jsName: String? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSFunctionMacro") /// A macro that adds bridging members for a Swift type that represents a JavaScript class. @@ -187,5 +190,5 @@ public macro JSFunction() = @attached(member, names: arbitrary) @attached(extension, conformances: _JSBridgedClass) @_spi(Experimental) -public macro JSClass() = +public macro JSClass(jsName: String? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro") From e3a10d727129f7bd5111cd9582cbcca387af2230 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 08:47:11 +0900 Subject: [PATCH 097/252] Fixed: TS2Swift was emitting class types twice (once via `visitClassDecl`, then again via `visitStructuredType` when the same type showed up in `seenTypes`), which caused the duplicate `_Weird` interface in `InvalidPropertyNames.Import.d.ts`. - Change: `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js` now records emitted class names in `emittedStructuredTypeNames` so the structured-type pass skips them. - Snapshots refreshed; `swift test --package-path ./Plugins/BridgeJS` passes. --- Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js | 3 +++ .../BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts | 2 -- .../ImportTSTests/InvalidPropertyNames.Macros.swift | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 615cffa25..1992b49f2 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -461,6 +461,9 @@ export class TypeProcessor { if (!node.name) return; const jsName = node.name.text; + if (this.emittedStructuredTypeNames.has(jsName)) return; + this.emittedStructuredTypeNames.add(jsName); + const swiftName = this.swiftTypeName(jsName); const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); const annotation = jsName !== swiftName ? `@JSClass(jsName: "${escapedJSName}")` : "@JSClass"; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts index 42d0d4123..2efd24317 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts @@ -23,8 +23,6 @@ export interface WeirdNaming { export interface _Weird { "method-with-dashes"(): void; } -export interface _Weird { -} export type Exports = { } export type Imports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index bfd8589e4..43d6a3eb9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -42,6 +42,3 @@ } @JSFunction func createWeirdClass() throws (JSException) -> _Weird - -@JSClass(jsName: "$Weird") struct _Weird { -} From 64e7febac8e73a1d8b2ca05489ea170e983f9be7 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 09:02:59 +0900 Subject: [PATCH 098/252] Implemented runtime coverage for `jsName` on `@JSFunction` and `@JSClass`. - Added new import API + XCTest: `Tests/BridgeJSRuntimeTests/bridge-js.d.ts`, `Tests/BridgeJSRuntimeTests/ImportAPITests.swift` - Wired JS-side implementations: `Tests/prelude.mjs` - Regenerated pre-generated files: `./Utilities/bridge-js-generate.sh` (updated `Tests/BridgeJSRuntimeTests/Generated/*`) - Verified: `SWIFT_SDK_ID=DEVELOPMENT-SNAPSHOT-2025-11-03-a-wasm32-unknown-wasip1 make unittest` passes --- .../Generated/BridgeJS.Macros.swift | 7 +++ .../Generated/BridgeJS.swift | 52 +++++++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 41 +++++++++++++++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 7 +++ Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 8 +++ Tests/prelude.mjs | 10 ++++ 6 files changed, 125 insertions(+) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 65a46a3f2..ffcfca8dd 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -40,3 +40,10 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload {} } @JSFunction func runAsyncWorks() throws (JSException) -> JSPromise + +@JSFunction(jsName: "$jsWeirdFunction") func _jsWeirdFunction() throws (JSException) -> Double + +@JSClass(jsName: "$WeirdClass") struct _WeirdClass { + @JSFunction init() throws (JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> String +} diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 5195bee1e..ed2e5240f 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -6449,6 +6449,23 @@ func _$runAsyncWorks() throws(JSException) -> JSPromise { return JSPromise.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__jsWeirdFunction") +fileprivate func bjs__jsWeirdFunction() -> Float64 +#else +fileprivate func bjs__jsWeirdFunction() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$_jsWeirdFunction() throws(JSException) -> Double { + let ret = bjs__jsWeirdFunction() + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 @@ -6558,6 +6575,41 @@ func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_init") +fileprivate func bjs__WeirdClass_init() -> Int32 +#else +fileprivate func bjs__WeirdClass_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_method_with_dashes") +fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 +#else +fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$_WeirdClass_init() throws(JSException) -> JSObject { + let ret = bjs__WeirdClass_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs__WeirdClass_method_with_dashes(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsApplyInt") fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 66a87b063..fb2770ae6 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9155,6 +9155,18 @@ "_0" : "JSPromise" } } + }, + { + "jsName" : "$jsWeirdFunction", + "name" : "_jsWeirdFunction", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } } ], "types" : [ @@ -9240,6 +9252,35 @@ } } ] + }, + { + "constructor" : { + "parameters" : [ + + ] + }, + "getters" : [ + + ], + "jsName" : "$WeirdClass", + "methods" : [ + { + "jsName" : "method-with-dashes", + "name" : "method_with_dashes", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "_WeirdClass", + "setters" : [ + + ] } ] }, diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index 5ceca3bf0..ea9f8c68f 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -120,4 +120,11 @@ class ImportAPITests: XCTestCase { XCTAssertEqual(ret, 5) XCTAssertEqual(total, 10) } + + func testJSNameFunctionAndClass() throws { + XCTAssertEqual(try _jsWeirdFunction(), 42) + + let obj = try _WeirdClass() + XCTAssertEqual(try obj.method_with_dashes(), "ok") + } } diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 87de440d8..983d6052d 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -23,3 +23,11 @@ export class JsGreeter { } export function runAsyncWorks(): Promise; + +// jsName tests +export function $jsWeirdFunction(): number; + +export class $WeirdClass { + constructor(); + "method-with-dashes"(): string; +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 66283b723..47f30a926 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -50,6 +50,9 @@ export async function setupOptions(options, context) { "jsRoundTripFeatureFlag": (flag) => { return flag; }, + "$jsWeirdFunction": () => { + return 42; + }, JsGreeter: class { /** * @param {string} name @@ -67,6 +70,13 @@ export async function setupOptions(options, context) { this.name = name; } }, + $WeirdClass: class { + constructor() { + } + ["method-with-dashes"]() { + return "ok"; + } + }, Foo: ImportedFoo, runAsyncWorks: async () => { const exports = importsContext.getExports(); From 374d796e9bf759b3f17b46fd375d66b99c25c414 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 09:06:48 +0900 Subject: [PATCH 099/252] Format BridgeJS generator sources --- .../BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift | 9 ++++++++- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index b1dced37e..e2f1c3cf4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1947,7 +1947,14 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func enterJSClass(_ typeName: String, jsName: String?) { stateStack.append(.jsClassBody(name: typeName)) - currentType = CurrentType(name: typeName, jsName: jsName, constructor: nil, methods: [], getters: [], setters: []) + currentType = CurrentType( + name: typeName, + jsName: jsName, + constructor: nil, + methods: [], + getters: [], + setters: [] + ) } private func exitJSClass() { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index c42437dbe..ab4251c2c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -2242,7 +2242,8 @@ extension BridgeJSLink { } private static func propertyAccessExpr(objectExpr: String, propertyName: String) -> String { - if propertyName.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil { + if propertyName.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil + { return "\(objectExpr).\(propertyName)" } let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(propertyName) From da51c40f8370f9b21029e0c9c4e5490336ee7abb Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 09:32:17 +0900 Subject: [PATCH 100/252] BridgeJS: allow @JS structs to copy from JSObject Add struct-level helpers for copying values out of a backing JS object and raising a new JS object from a Swift struct. This makes it possible to round-trip JSON-style plain objects without manual field mapping, while keeping the default value semantics of exported structs. --- Benchmarks/Sources/Generated/BridgeJS.swift | 168 ++++++ .../Sources/BridgeJSCore/ExportSwift.swift | 88 ++- .../Sources/BridgeJSLink/BridgeJSLink.swift | 49 ++ .../Sources/BridgeJSLink/JSGlueGen.swift | 2 + .../ArrayParameter.Import.js | 11 + .../BridgeJSLinkTests/Async.Export.js | 11 + .../BridgeJSLinkTests/Async.Import.js | 11 + .../DefaultParameters.Export.js | 33 ++ .../EnumAssociatedValue.Export.js | 11 + .../BridgeJSLinkTests/EnumCase.Export.js | 11 + .../BridgeJSLinkTests/EnumNamespace.Export.js | 11 + .../EnumNamespace.Global.Export.js | 11 + .../BridgeJSLinkTests/EnumRawType.Export.js | 11 + .../GlobalGetter.ImportMacros.js | 11 + .../ImportedTypeInExportedInterface.Export.js | 11 + .../BridgeJSLinkTests/Interface.Import.js | 11 + .../InvalidPropertyNames.Import.js | 11 + .../BridgeJSLinkTests/MixedGlobal.Export.js | 11 + .../BridgeJSLinkTests/MixedModules.Export.js | 11 + .../BridgeJSLinkTests/MixedPrivate.Export.js | 11 + .../MultipleImportedTypes.Import.js | 11 + .../BridgeJSLinkTests/Namespaces.Export.js | 11 + .../Namespaces.Global.Export.js | 11 + .../BridgeJSLinkTests/Optionals.Export.js | 11 + .../PrimitiveParameters.Export.js | 11 + .../PrimitiveParameters.Import.js | 11 + .../PrimitiveReturn.Export.js | 11 + .../PrimitiveReturn.Import.js | 11 + .../BridgeJSLinkTests/PropertyTypes.Export.js | 11 + .../BridgeJSLinkTests/Protocol.Export.js | 11 + .../BridgeJSLinkTests/ReExportFrom.Import.js | 11 + .../StaticFunctions.Export.js | 11 + .../StaticFunctions.Global.Export.js | 11 + .../StaticProperties.Export.js | 11 + .../StaticProperties.Global.Export.js | 11 + .../BridgeJSLinkTests/StringEnum.Import.js | 11 + .../StringParameter.Export.js | 11 + .../StringParameter.Import.js | 11 + .../BridgeJSLinkTests/StringReturn.Export.js | 11 + .../BridgeJSLinkTests/StringReturn.Import.js | 11 + .../BridgeJSLinkTests/SwiftClass.Export.js | 11 + .../BridgeJSLinkTests/SwiftClosure.Export.js | 11 + .../SwiftClosureImports.ImportMacros.js | 11 + .../BridgeJSLinkTests/SwiftStruct.Export.js | 66 +++ .../TS2SkeletonLike.Import.js | 11 + .../BridgeJSLinkTests/Throws.Export.js | 11 + .../BridgeJSLinkTests/TypeAlias.Import.js | 11 + .../TypeScriptClass.Import.js | 11 + .../VoidParameterVoidReturn.Export.js | 11 + .../VoidParameterVoidReturn.Import.js | 11 + .../ExportSwiftTests/DefaultParameters.swift | 84 +++ .../ExportSwiftTests/SwiftStruct.swift | 210 +++++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 11 + .../BridgeJSRuntimeTests/ExportAPITests.swift | 32 + .../Generated/BridgeJS.swift | 561 ++++++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 213 +++++++ Tests/prelude.mjs | 25 + 57 files changed, 2023 insertions(+), 3 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 85d81f4a2..7d90eb82b 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -267,7 +267,49 @@ extension SimpleStruct: _BridgedSwiftStruct { _swift_js_push_f32(self.rate) _swift_js_push_f64(self.precise) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _SimpleStructHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _SimpleStructHelpers.raise() + } +} + +fileprivate enum _SimpleStructHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SimpleStruct())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SimpleStruct") +fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_SimpleStruct") +fileprivate func _bjs_struct_raise_SimpleStruct() -> Int32 +#else +fileprivate func _bjs_struct_raise_SimpleStruct() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { @@ -288,7 +330,49 @@ extension Address: _BridgedSwiftStruct { } _swift_js_push_int(Int32(self.zipCode)) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _AddressHelpers.raise() + } +} + +fileprivate enum _AddressHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") +fileprivate func _bjs_struct_raise_Address() -> Int32 +#else +fileprivate func _bjs_struct_raise_Address() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { @@ -315,7 +399,49 @@ extension Person: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_email ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _PersonHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _PersonHelpers.raise() + } +} + +fileprivate enum _PersonHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Person") +fileprivate func _bjs_struct_raise_Person() -> Int32 +#else +fileprivate func _bjs_struct_raise_Person() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension ComplexStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ComplexStruct { @@ -345,7 +471,49 @@ extension ComplexStruct: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ComplexStructHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ComplexStructHelpers.raise() + } +} + +fileprivate enum _ComplexStructHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ComplexStruct())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ComplexStruct") +fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ComplexStruct") +fileprivate func _bjs_struct_raise_ComplexStruct() -> Int32 +#else +fileprivate func _bjs_struct_raise_ComplexStruct() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif @_expose(wasm, "bjs_run") @_cdecl("bjs_run") diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index a40f9c2b6..d89d426ee 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -74,7 +74,7 @@ public class ExportSwift { let structCodegen = StructCodegen() for structDef in skeleton.structs { - decls.append(structCodegen.renderStructHelpers(structDef)) + decls.append(contentsOf: structCodegen.renderStructHelpers(structDef)) decls.append(contentsOf: try renderSingleExportedStruct(struct: structDef)) } @@ -1147,12 +1147,19 @@ struct EnumCodegen { struct StructCodegen { private let stackCodegen = StackCodegen() - func renderStructHelpers(_ structDef: ExportedStruct) -> DeclSyntax { + func renderStructHelpers(_ structDef: ExportedStruct) -> [DeclSyntax] { let typeName = structDef.swiftCallName let liftCode = generateStructLiftCode(structDef: structDef) let lowerCode = generateStructLowerCode(structDef: structDef) + let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? "" - return """ + let helpersTypeName = "_\(structDef.name)Helpers" + let lowerExternName = "swift_js_struct_lower_\(structDef.name)" + let raiseExternName = "swift_js_struct_raise_\(structDef.name)" + let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)" + let raiseFunctionName = "_bjs_struct_raise_\(structDef.name)" + + let bridgedStructExtension: DeclSyntax = """ extension \(raw: typeName): _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(raw: typeName) { \(raw: liftCode.joined(separator: "\n")) @@ -1161,8 +1168,83 @@ struct StructCodegen { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { \(raw: lowerCode.joined(separator: "\n")) } + + \(raw: accessControl)init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = \(raw: helpersTypeName).lower(jsObject) + defer { _swift_js_struct_cleanup(__bjs_cleanupId) } + self = Self.bridgeJSLiftParameter() + } + + \(raw: accessControl)func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return \(raw: helpersTypeName).raise() + } } """ + + let helpersType: DeclSyntax = """ + fileprivate enum \(raw: helpersTypeName) { + static func lower(_ jsObject: JSObject) -> Int32 { + return \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: \(raw: raiseFunctionName)())) + } + } + """ + + let lowerExternDecl = Self.renderStructExtern( + externName: lowerExternName, + functionName: lowerFunctionName, + signature: SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: [("objectId", .i32)], + returnType: .i32 + ) + ) + let raiseExternDecl = Self.renderStructExtern( + externName: raiseExternName, + functionName: raiseFunctionName, + signature: SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: [], + returnType: .i32 + ) + ) + + return [bridgedStructExtension, helpersType, lowerExternDecl, raiseExternDecl] + } + + private static func renderStructExtern( + externName: String, + functionName: String, + signature: FunctionSignatureSyntax + ) -> DeclSyntax { + let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( + moduleName: "bjs", + abiName: externName, + functionName: functionName, + signature: signature + ) + + let stubFuncDecl = FunctionDeclSyntax( + modifiers: DeclModifierListSyntax { + DeclModifierSyntax(name: .keyword(.fileprivate)) + }, + funcKeyword: .keyword(.func), + name: .identifier(functionName), + signature: signature, + body: CodeBlockSyntax { + "fatalError(\"Only available on WebAssembly\")" + } + ) + + return DeclSyntax( + SwiftCodePattern.buildWasmConditionalCompilationDecls( + wasmDecl: DeclSyntax(externFuncDecl), + elseDecl: DeclSyntax(stubFuncDecl) + ) + ) } private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 929e6e4cd..72cd7b020 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -245,6 +245,7 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpParamF64s) = [];", "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", + "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", "", @@ -295,6 +296,7 @@ public struct BridgeJSLink { private func generateAddImports() -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() + let allStructs = skeletons.compactMap { $0.exported?.structs }.flatMap { $0 } printer.write("return {") printer.indent { printer.write(lines: [ @@ -427,6 +429,53 @@ public struct BridgeJSLink { printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") } printer.write("}") + + printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") + printer.indent { + printer.write("if (cleanupId === 0) { return; }") + printer.write("const index = (cleanupId | 0) - 1;") + printer.write("const cleanup = \(JSGlueVariableScope.reservedTmpStructCleanups)[index];") + printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups)[index] = null;") + printer.write("if (cleanup) { cleanup(); }") + printer.write( + "while (\(JSGlueVariableScope.reservedTmpStructCleanups).length > 0 && \(JSGlueVariableScope.reservedTmpStructCleanups)[\(JSGlueVariableScope.reservedTmpStructCleanups).length - 1] == null) {" + ) + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups).pop();") + } + printer.write("}") + } + printer.write("}") + + if !allStructs.isEmpty { + for structDef in allStructs { + printer.write("bjs[\"swift_js_struct_lower_\(structDef.name)\"] = function(objectId) {") + printer.indent { + printer.write( + "const { cleanup: cleanup } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));" + ) + printer.write("if (cleanup) {") + printer.indent { + printer.write( + "return \(JSGlueVariableScope.reservedTmpStructCleanups).push(cleanup);" + ) + } + printer.write("}") + printer.write("return 0;") + } + printer.write("}") + + printer.write("bjs[\"swift_js_struct_raise_\(structDef.name)\"] = function() {") + printer.indent { + printer.write( + "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + printer.write("return \(JSGlueVariableScope.reservedSwift).memory.retain(value);") + } + printer.write("}") + } + } + printer.write("bjs[\"swift_js_return_optional_bool\"] = function(isSome, value) {") printer.indent { printer.write("if (isSome === 0) {") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index d9223faf8..20257f749 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -30,6 +30,7 @@ final class JSGlueVariableScope { static let reservedTmpParamF64s = "tmpParamF64s" static let reservedTmpRetPointers = "tmpRetPointers" static let reservedTmpParamPointers = "tmpParamPointers" + static let reservedTmpStructCleanups = "tmpStructCleanups" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" @@ -58,6 +59,7 @@ final class JSGlueVariableScope { reservedTmpParamF64s, reservedTmpRetPointers, reservedTmpParamPointers, + reservedTmpStructCleanups, reservedEnumHelpers, reservedStructHelpers, ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index d477487e5..84af4bccb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index c01eac976..916eafb1f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 15b2a9742..4e47329f0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 48dfc0994..6923db749 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -34,6 +34,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -153,6 +154,38 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_struct_lower_Config"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Config.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Config"] = function() { + const value = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_struct_lower_MathOperations"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.MathOperations.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_MathOperations"] = function() { + const value = structHelpers.MathOperations.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index a15e386e8..bbceab383 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -503,6 +503,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -575,6 +576,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 9cd3e1f3b..79fba73b0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -52,6 +52,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -124,6 +125,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 34a2e0540..4c09e3bd9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -53,6 +53,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -125,6 +126,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 074380d00..584788f20 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -72,6 +72,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -144,6 +145,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 00b542e30..63f18d4d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -103,6 +103,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -175,6 +176,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index 89aa3af9d..32593d2ae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index 93c23a0db..3cfc76bb3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 83450b4c5..41b006340 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 60435e569..f76ad31cb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index ce9475b0c..5e258f47a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index c4a1c2e3a..0b4f1bca0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index d0f00f279..d3f325f74 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 40a3f4e3f..d0fc9931d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 0b6ef40dc..d134a8fff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 6b4d37fc5..554d8d794 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 9770da2db..8b10a7e98 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index 761397287..faca8ce39 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index a0f2c8b08..4c628d1db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index ec4dd9cab..135640249 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 871e16a30..9621baf26 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 240ee9cd5..35d68c047 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index d6b9a4f01..0cf44ffdc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -92,6 +92,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -164,6 +165,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index 4a13f2d7d..de20a1194 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 9d69f4183..201d0fd6b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -79,6 +79,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -151,6 +152,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index a7e6c44cc..e971c0161 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -79,6 +79,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -151,6 +152,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 8019f2a44..352d1a2c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -33,6 +33,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -105,6 +106,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 7c4c11f69..98f4cfdf8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -33,6 +33,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -105,6 +106,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index 7c30768f5..5b399b276 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 891f4bb01..4d76cbb7e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 03a65cc47..82b4068ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 489fbe092..2d3679926 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index 49fafc92e..b4ba16cf9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index f95ee4367..87773621d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 8bdbfa4be..b4a073d7a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -130,6 +130,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -202,6 +203,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index db434c2ab..461d55aff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 07a2f320f..abcd9500d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -260,6 +261,71 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_struct_lower_DataPoint"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.DataPoint.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_DataPoint"] = function() { + const value = structHelpers.DataPoint.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_struct_lower_Address"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Address.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Address"] = function() { + const value = structHelpers.Address.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_struct_lower_Person"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Person.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Person"] = function() { + const value = structHelpers.Person.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_struct_lower_Session"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Session.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Session"] = function() { + const value = structHelpers.Session.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.ConfigStruct.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_ConfigStruct"] = function() { + const value = structHelpers.ConfigStruct.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 2bbae4fec..0b0de98cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 016ebaa53..820a221a2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 8b46062c4..1b2485296 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 6c44fd008..e0ae6c7a7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index 148418657..8564697d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -100,6 +101,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index c22ff8c5a..16e42865c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +102,16 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index d5e5bdc48..cd305f407 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -53,7 +53,49 @@ extension Config: _BridgedSwiftStruct { _swift_js_push_int(Int32(self.value)) _swift_js_push_int(self.enabled ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ConfigHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ConfigHelpers.raise() + } +} + +fileprivate enum _ConfigHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Config") +fileprivate func _bjs_struct_raise_Config() -> Int32 +#else +fileprivate func _bjs_struct_raise_Config() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { @@ -64,7 +106,49 @@ extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { _swift_js_push_f64(self.baseValue) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _MathOperationsHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _MathOperationsHelpers.raise() + } +} + +fileprivate enum _MathOperationsHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MathOperations") +fileprivate func _bjs_struct_raise_MathOperations() -> Int32 +#else +fileprivate func _bjs_struct_raise_MathOperations() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index a09d312d3..fa094a1b8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -26,8 +26,50 @@ extension DataPoint: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _DataPointHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _DataPointHelpers.raise() + } } +fileprivate enum _DataPointHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_DataPoint") +fileprivate func _bjs_struct_raise_DataPoint() -> Int32 +#else +fileprivate func _bjs_struct_raise_DataPoint() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { @@ -62,8 +104,50 @@ extension Address: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _AddressHelpers.raise() + } } +fileprivate enum _AddressHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") +fileprivate func _bjs_struct_raise_Address() -> Int32 +#else +fileprivate func _bjs_struct_raise_Address() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) @@ -89,8 +173,50 @@ extension Person: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_email ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _PersonHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _PersonHelpers.raise() + } +} + +fileprivate enum _PersonHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) + } } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Person") +fileprivate func _bjs_struct_raise_Person() -> Int32 +#else +fileprivate func _bjs_struct_raise_Person() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension Session: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Session { let owner = Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) @@ -102,7 +228,49 @@ extension Session: _BridgedSwiftStruct { _swift_js_push_int(Int32(self.id)) _swift_js_push_pointer(self.owner.bridgeJSLowerReturn()) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _SessionHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _SessionHelpers.raise() + } +} + +fileprivate enum _SessionHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Session())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Session") +fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Session") +fileprivate func _bjs_struct_raise_Session() -> Int32 +#else +fileprivate func _bjs_struct_raise_Session() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { @@ -112,7 +280,49 @@ extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ConfigStructHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ConfigStructHelpers.raise() + } +} + +fileprivate enum _ConfigStructHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ConfigStruct") +fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 +#else +fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 { + fatalError("Only available on WebAssembly") } +#endif @_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get") @_cdecl("bjs_ConfigStruct_static_maxRetries_get") diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 92ab52f04..9f74cfdc7 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -441,6 +441,17 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif +// MARK: Struct bridging helpers (JS-side lowering/raising) + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_cleanup") +@_spi(BridgeJS) public func _swift_js_struct_cleanup(_ cleanupId: Int32) +#else +@_spi(BridgeJS) public func _swift_js_struct_cleanup(_ cleanupId: Int32) { + _onlyAvailableOnWasm() +} +#endif + // MARK: Wasm externs used by type lowering/lifting #if arch(wasm32) diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 0df421df6..59f48aed4 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1318,6 +1318,38 @@ enum APIOptionalResult { return "\(point.x),\(point.y),\(point.label)" } +@JS struct CopyableCart { + var x: Int + var note: String? + + @JS static func fromJSObject(_ object: JSObject) -> CopyableCart { + CopyableCart(unsafelyCopying: object) + } +} + +@JS func cartToJSObject(_ cart: CopyableCart) -> JSObject { + cart.toJSObject() +} + +@JS struct CopyableCartItem { + var sku: String + var quantity: Int +} + +@JS struct CopyableNestedCart { + var id: Int + var item: CopyableCartItem + var shippingAddress: Address? + + @JS static func fromJSObject(_ object: JSObject) -> CopyableNestedCart { + CopyableNestedCart(unsafelyCopying: object) + } +} + +@JS func nestedCartToJSObject(_ cart: CopyableNestedCart) -> JSObject { + cart.toJSObject() +} + @JS struct ConfigStruct { var name: String var value: Int diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 5195bee1e..616cc7195 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2240,8 +2240,50 @@ extension DataPoint: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _DataPointHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _DataPointHelpers.raise() + } +} + +fileprivate enum _DataPointHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) + } } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_DataPoint") +fileprivate func _bjs_struct_raise_DataPoint() -> Int32 +#else +fileprivate func _bjs_struct_raise_DataPoint() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { @@ -2276,7 +2318,49 @@ extension Address: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _AddressHelpers.raise() + } +} + +fileprivate enum _AddressHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") +fileprivate func _bjs_struct_raise_Address() -> Int32 +#else +fileprivate func _bjs_struct_raise_Address() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension Contact: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Contact { @@ -2309,8 +2393,50 @@ extension Contact: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_secondaryAddress ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ContactHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ContactHelpers.raise() + } } +fileprivate enum _ContactHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Contact())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Contact") +fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Contact") +fileprivate func _bjs_struct_raise_Contact() -> Int32 +#else +fileprivate func _bjs_struct_raise_Contact() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { let status = Status.bridgeJSLiftParameter(_swift_js_pop_param_int32()) @@ -2340,7 +2466,49 @@ extension Config: _BridgedSwiftStruct { _swift_js_push_int(__bjs_isSome_direction ? 1 : 0) _swift_js_push_int(Int32(self.status.bridgeJSLowerParameter())) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ConfigHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ConfigHelpers.raise() + } +} + +fileprivate enum _ConfigHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Config") +fileprivate func _bjs_struct_raise_Config() -> Int32 +#else +fileprivate func _bjs_struct_raise_Config() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif extension SessionData: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SessionData { @@ -2357,8 +2525,50 @@ extension SessionData: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_owner ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _SessionDataHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _SessionDataHelpers.raise() + } } +fileprivate enum _SessionDataHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SessionData())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SessionData") +fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_SessionData") +fileprivate func _bjs_struct_raise_SessionData() -> Int32 +#else +fileprivate func _bjs_struct_raise_SessionData() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension ValidationReport: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { let outcome = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) @@ -2382,8 +2592,50 @@ extension ValidationReport: _BridgedSwiftStruct { } _swift_js_push_int(__bjs_isSome_outcome ? 1 : 0) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ValidationReportHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ValidationReportHelpers.raise() + } +} + +fileprivate enum _ValidationReportHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ValidationReport())) + } } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ValidationReport") +fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ValidationReport") +fileprivate func _bjs_struct_raise_ValidationReport() -> Int32 +#else +fileprivate func _bjs_struct_raise_ValidationReport() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) @@ -2393,7 +2645,49 @@ extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { _swift_js_push_f64(self.baseValue) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _MathOperationsHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _MathOperationsHelpers.raise() + } +} + +fileprivate enum _MathOperationsHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MathOperations") +fileprivate func _bjs_struct_raise_MathOperations() -> Int32 +#else +fileprivate func _bjs_struct_raise_MathOperations() -> Int32 { + fatalError("Only available on WebAssembly") } +#endif @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") @@ -2439,6 +2733,209 @@ public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> F #endif } +extension CopyableCart: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCart { + let note = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let x = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return CopyableCart(x: x, note: note) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.x)) + let __bjs_isSome_note = self.note != nil + if let __bjs_unwrapped_note = self.note { + var __bjs_str_note = __bjs_unwrapped_note + __bjs_str_note.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } + _swift_js_push_int(__bjs_isSome_note ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _CopyableCartHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _CopyableCartHelpers.raise() + } +} + +fileprivate enum _CopyableCartHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCart())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCart") +fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableCart") +fileprivate func _bjs_struct_raise_CopyableCart() -> Int32 +#else +fileprivate func _bjs_struct_raise_CopyableCart() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_CopyableCart_static_fromJSObject") +@_cdecl("bjs_CopyableCart_static_fromJSObject") +public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void { + #if arch(wasm32) + let ret = CopyableCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension CopyableCartItem: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCartItem { + let quantity = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let sku = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + return CopyableCartItem(sku: sku, quantity: quantity) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + var __bjs_sku = self.sku + __bjs_sku.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.quantity)) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _CopyableCartItemHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _CopyableCartItemHelpers.raise() + } +} + +fileprivate enum _CopyableCartItemHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCartItem())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCartItem") +fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableCartItem") +fileprivate func _bjs_struct_raise_CopyableCartItem() -> Int32 +#else +fileprivate func _bjs_struct_raise_CopyableCartItem() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension CopyableNestedCart: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableNestedCart { + let shippingAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let item = CopyableCartItem.bridgeJSLiftParameter() + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + self.item.bridgeJSLowerReturn() + let __bjs_isSome_shippingAddress = self.shippingAddress != nil + if let __bjs_unwrapped_shippingAddress = self.shippingAddress { + __bjs_unwrapped_shippingAddress.bridgeJSLowerReturn() + } + _swift_js_push_int(__bjs_isSome_shippingAddress ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _CopyableNestedCartHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _CopyableNestedCartHelpers.raise() + } +} + +fileprivate enum _CopyableNestedCartHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableNestedCart())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableNestedCart") +fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableNestedCart") +fileprivate func _bjs_struct_raise_CopyableNestedCart() -> Int32 +#else +fileprivate func _bjs_struct_raise_CopyableNestedCart() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_CopyableNestedCart_static_fromJSObject") +@_cdecl("bjs_CopyableNestedCart_static_fromJSObject") +public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void { + #if arch(wasm32) + let ret = CopyableNestedCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) @@ -2453,8 +2950,50 @@ extension ConfigStruct: _BridgedSwiftStruct { } _swift_js_push_int(Int32(self.value)) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _ConfigStructHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _ConfigStructHelpers.raise() + } } +fileprivate enum _ConfigStructHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ConfigStruct") +fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 +#else +fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get") @_cdecl("bjs_ConfigStruct_static_defaultConfig_get") public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { @@ -3858,6 +4397,28 @@ public func _bjs_testStructDefault() -> Void { #endif } +@_expose(wasm, "bjs_cartToJSObject") +@_cdecl("bjs_cartToJSObject") +public func _bjs_cartToJSObject() -> Int32 { + #if arch(wasm32) + let ret = cartToJSObject(_: CopyableCart.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_nestedCartToJSObject") +@_cdecl("bjs_nestedCartToJSObject") +public func _bjs_nestedCartToJSObject() -> Int32 { + #if arch(wasm32) + let ret = nestedCartToJSObject(_: CopyableNestedCart.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripDataPoint") @_cdecl("bjs_roundTripDataPoint") public func _bjs_roundTripDataPoint() -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 66a87b063..c16b65a00 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -7742,6 +7742,56 @@ } } }, + { + "abiName" : "bjs_cartToJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "cartToJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "cart", + "type" : { + "swiftStruct" : { + "_0" : "CopyableCart" + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_nestedCartToJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "nestedCartToJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "cart", + "type" : { + "swiftStruct" : { + "_0" : "CopyableNestedCart" + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, { "abiName" : "bjs_roundTripDataPoint", "effects" : { @@ -8855,6 +8905,169 @@ ], "swiftCallName" : "MathOperations" }, + { + "methods" : [ + { + "abiName" : "bjs_CopyableCart_static_fromJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "fromJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "object", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "CopyableCart" + } + }, + "staticContext" : { + "structName" : { + "_0" : "CopyableCart" + } + } + } + ], + "name" : "CopyableCart", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "note", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "CopyableCart" + }, + { + "methods" : [ + + ], + "name" : "CopyableCartItem", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "sku", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "quantity", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "CopyableCartItem" + }, + { + "methods" : [ + { + "abiName" : "bjs_CopyableNestedCart_static_fromJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "fromJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "object", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "CopyableNestedCart" + } + }, + "staticContext" : { + "structName" : { + "_0" : "CopyableNestedCart" + } + } + } + ], + "name" : "CopyableNestedCart", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "item", + "type" : { + "swiftStruct" : { + "_0" : "CopyableCartItem" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "shippingAddress", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + } + } + ], + "swiftCallName" : "CopyableNestedCart" + }, { "methods" : [ diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 66283b723..e7441d537 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -1032,6 +1032,31 @@ function testStructSupport(exports) { const customPoint = { x: 10.0, y: 20.0, label: "custom", optCount: null, optFlag: null }; assert.equal(exports.testStructDefault(customPoint), "10.0,20.0,custom"); + // Test @JS struct init(unsafelyCopying:) + toJSObject() + const cart1 = { x: 123, note: "hello" }; + assert.deepEqual(exports.CopyableCart.fromJSObject(cart1), cart1); + assert.deepEqual(exports.cartToJSObject(cart1), cart1); + + const cart2 = { x: 1 }; + assert.deepEqual(exports.CopyableCart.fromJSObject(cart2), { x: 1, note: null }); + assert.deepEqual(exports.cartToJSObject(cart2), { x: 1, note: null }); + + const nestedCart1 = { + id: 7, + item: { sku: "ABC-123", quantity: 2 }, + shippingAddress: { street: "1 Swift Way", city: "WasmCity", zipCode: 12345 }, + }; + assert.deepEqual(exports.CopyableNestedCart.fromJSObject(nestedCart1), nestedCart1); + assert.deepEqual(exports.nestedCartToJSObject(nestedCart1), nestedCart1); + + const nestedCart2 = { + id: 8, + item: { sku: "XYZ-999", quantity: 0 }, + shippingAddress: null, + }; + assert.deepEqual(exports.CopyableNestedCart.fromJSObject(nestedCart2), nestedCart2); + assert.deepEqual(exports.nestedCartToJSObject(nestedCart2), nestedCart2); + const container = exports.testContainerWithStruct({ x: 5.0, y: 10.0, label: "test", optCount: null, optFlag: true }); assert.equal(container.location.x, 5.0); assert.equal(container.config, null); From 89e3532f8a8c75b36b09ed67c5f9869ad04b4755 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 11:05:27 +0900 Subject: [PATCH 101/252] BridgeJS: support UnsafePointer-family types (#525) * BridgeJS: support UnsafePointer-family types Allow UnsafePointer/UnsafeRawPointer/OpaquePointer as BridgeJS parameter/return and struct field types by lowering them to WASM pointers. Updates codegen/runtime intrinsics and adds coverage in generator snapshots + runtime exports. * Format --- .../Sources/BridgeJSCore/ExportSwift.swift | 26 ++ .../Sources/BridgeJSCore/ImportTS.swift | 4 + .../BridgeJSCore/SwiftToSkeleton.swift | 54 +++ .../Sources/BridgeJSLink/BridgeJSLink.swift | 2 + .../Sources/BridgeJSLink/JSGlueGen.swift | 22 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 45 ++ .../Inputs/UnsafePointer.swift | 39 ++ .../UnsafePointer.Export.d.ts | 38 ++ .../BridgeJSLinkTests/UnsafePointer.Export.js | 283 ++++++++++++ .../ExportSwiftTests/UnsafePointer.json | 413 ++++++++++++++++++ .../ExportSwiftTests/UnsafePointer.swift | 145 ++++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 128 ++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 40 ++ .../Generated/BridgeJS.swift | 96 ++++ .../Generated/JavaScript/BridgeJS.json | 312 +++++++++++++ Tests/prelude.mjs | 11 + 16 files changed, 1657 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index a40f9c2b6..0718a1a73 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -772,6 +772,8 @@ struct StackCodegen { return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" case .swiftHeapObject(let className): return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" + case .unsafePointer: + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" case .swiftProtocol: // Protocols are handled via JSObject return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" @@ -872,6 +874,8 @@ struct StackCodegen { return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] case .swiftHeapObject: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + case .unsafePointer: + return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .swiftProtocol: return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] case .caseEnum: @@ -1421,6 +1425,23 @@ extension WasmCoreType { } } +extension UnsafePointerType { + var swiftType: String { + switch kind { + case .unsafePointer: + return "UnsafePointer<\(pointee ?? "Never")>" + case .unsafeMutablePointer: + return "UnsafeMutablePointer<\(pointee ?? "Never")>" + case .unsafeRawPointer: + return "UnsafeRawPointer" + case .unsafeMutableRawPointer: + return "UnsafeMutableRawPointer" + case .opaquePointer: + return "OpaquePointer" + } + } +} + extension BridgeType { var swiftType: String { switch self { @@ -1432,6 +1453,7 @@ extension BridgeType { case .jsObject(nil): return "JSObject" case .jsObject(let name?): return name case .swiftHeapObject(let name): return name + case .unsafePointer(let ptr): return ptr.swiftType case .swiftProtocol(let name): return "Any\(name)" case .void: return "Void" case .optional(let wrappedType): return "Optional<\(wrappedType.swiftType)>" @@ -1457,6 +1479,7 @@ extension BridgeType { static let string = LiftingIntrinsicInfo(parameters: [("bytes", .i32), ("length", .i32)]) static let jsObject = LiftingIntrinsicInfo(parameters: [("value", .i32)]) static let swiftHeapObject = LiftingIntrinsicInfo(parameters: [("value", .pointer)]) + static let unsafePointer = LiftingIntrinsicInfo(parameters: [("pointer", .pointer)]) static let void = LiftingIntrinsicInfo(parameters: []) static let caseEnum = LiftingIntrinsicInfo(parameters: [("value", .i32)]) static let associatedValueEnum = LiftingIntrinsicInfo(parameters: [ @@ -1473,6 +1496,7 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .swiftHeapObject: return .swiftHeapObject + case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject case .void: return .void case .optional(let wrappedType): @@ -1503,6 +1527,7 @@ extension BridgeType { static let string = LoweringIntrinsicInfo(returnType: nil) static let jsObject = LoweringIntrinsicInfo(returnType: .i32) static let swiftHeapObject = LoweringIntrinsicInfo(returnType: .pointer) + static let unsafePointer = LoweringIntrinsicInfo(returnType: .pointer) static let void = LoweringIntrinsicInfo(returnType: nil) static let caseEnum = LoweringIntrinsicInfo(returnType: .i32) static let rawValueEnum = LoweringIntrinsicInfo(returnType: .i32) @@ -1520,6 +1545,7 @@ extension BridgeType { case .string: return .string case .jsObject: return .jsObject case .swiftHeapObject: return .swiftHeapObject + case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject case .void: return .void case .optional: return .optional diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index dd6c9d27a..ad5cdaf06 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -875,6 +875,8 @@ extension BridgeType { case .closure: // Swift closure is boxed and passed to JS as a pointer. return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) + case .unsafePointer: + return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) case .swiftHeapObject(let className): switch context { case .importTS: @@ -959,6 +961,8 @@ extension BridgeType { case .closure: // JS returns a callback ID for closures, which Swift lifts to a typed closure. return LiftingReturnInfo(valueToLift: .i32) + case .unsafePointer: + return LiftingReturnInfo(valueToLift: .pointer) case .swiftHeapObject(let className): switch context { case .importTS: diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index e2f1c3cf4..321dbd6df 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -163,6 +163,11 @@ public final class SwiftToSkeleton { } } + // UnsafePointer family + if let unsafePointerType = Self.parseUnsafePointerType(type) { + return .unsafePointer(unsafePointerType) + } + let typeName: String if let identifier = type.as(IdentifierTypeSyntax.self) { typeName = Self.normalizeIdentifier(identifier.name.text) @@ -248,6 +253,55 @@ public final class SwiftToSkeleton { return .swiftHeapObject(swiftCallName) } + fileprivate static func parseUnsafePointerType(_ type: TypeSyntax) -> UnsafePointerType? { + func parse(baseName: String, genericArg: TypeSyntax?) -> UnsafePointerType? { + let pointee = genericArg?.trimmedDescription + switch baseName { + case "UnsafePointer": + return .init(kind: .unsafePointer, pointee: pointee) + case "UnsafeMutablePointer": + return .init(kind: .unsafeMutablePointer, pointee: pointee) + case "UnsafeRawPointer": + return .init(kind: .unsafeRawPointer) + case "UnsafeMutableRawPointer": + return .init(kind: .unsafeMutableRawPointer) + case "OpaquePointer": + return .init(kind: .opaquePointer) + default: + return nil + } + } + + if let identifier = type.as(IdentifierTypeSyntax.self) { + let baseName = identifier.name.text + if (baseName == "UnsafePointer" || baseName == "UnsafeMutablePointer"), + let genericArgs = identifier.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + return parse(baseName: baseName, genericArg: argType) + } + return parse(baseName: baseName, genericArg: nil) + } + + if let member = type.as(MemberTypeSyntax.self), + let base = member.baseType.as(IdentifierTypeSyntax.self), + base.name.text == "Swift" + { + let baseName = member.name.text + if (baseName == "UnsafePointer" || baseName == "UnsafeMutablePointer"), + let genericArgs = member.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + return parse(baseName: baseName, genericArg: argType) + } + return parse(baseName: baseName, genericArg: nil) + } + + return nil + } + /// Computes the full Swift call name by walking up the AST hierarchy to find all parent enums /// This generates the qualified name needed for Swift code generation (e.g., "Networking.API.HTTPServer") fileprivate static func computeSwiftCallName(for node: some SyntaxProtocol, itemName: String) -> String { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index ab4251c2c..16224ba50 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3298,6 +3298,8 @@ extension BridgeType { return name ?? "any" case .swiftHeapObject(let name): return name + case .unsafePointer: + return "number" case .optional(let wrappedType): return "\(wrappedType.tsType) | null" case .caseEnum(let name): diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index d9223faf8..e14eb4ee0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1300,7 +1300,7 @@ struct IntrinsicJSFragment: Sendable { /// Returns a fragment that lowers a JS value to Wasm core values for parameters static func lowerParameter(type: BridgeType) throws -> IntrinsicJSFragment { switch type { - case .int, .float, .double, .bool: return .identity + case .int, .float, .double, .bool, .unsafePointer: return .identity case .string: return .stringLowerParameter case .jsObject: return .jsObjectLowerParameter case .swiftHeapObject: @@ -1346,6 +1346,7 @@ struct IntrinsicJSFragment: Sendable { case .string: return .stringLiftReturn case .jsObject: return .jsObjectLiftReturn case .swiftHeapObject(let name): return .swiftHeapObjectLiftReturn(name) + case .unsafePointer: return .identity case .swiftProtocol: return .jsObjectLiftReturn case .void: return .void case .optional(let wrappedType): return .optionalLiftReturn(wrappedType: wrappedType) @@ -1388,6 +1389,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLiftParameter case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter + case .unsafePointer: return .identity case .swiftHeapObject(let name): switch context { case .importTS: @@ -1482,6 +1484,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLowerReturn case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn + case .unsafePointer: return .identity case .swiftHeapObject(let name): switch context { case .importTS: @@ -2266,6 +2269,14 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .unsafePointer: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push((\(arguments[0]) | 0));") + return [] + } + ) case .jsObject: return IntrinsicJSFragment( parameters: ["value"], @@ -2698,6 +2709,15 @@ struct IntrinsicJSFragment: Sendable { return [dVar] } ) + case .unsafePointer: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let pVar = scope.variable("pointer") + printer.write("const \(pVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + return [pVar] + } + ) case .optional(let wrappedType): return IntrinsicJSFragment( parameters: [], diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 3baebe6da..dcb819fef 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -107,8 +107,28 @@ public struct ClosureSignature: Codable, Equatable, Hashable, Sendable { } } +public enum UnsafePointerKind: String, Codable, Equatable, Hashable, Sendable { + case unsafePointer + case unsafeMutablePointer + case unsafeRawPointer + case unsafeMutableRawPointer + case opaquePointer +} + +public struct UnsafePointerType: Codable, Equatable, Hashable, Sendable { + public let kind: UnsafePointerKind + /// The pointee type name for generic pointer types (e.g. `UInt8` for `UnsafePointer`). + public let pointee: String? + + public init(kind: UnsafePointerKind, pointee: String? = nil) { + self.kind = kind + self.pointee = pointee + } +} + public enum BridgeType: Codable, Equatable, Hashable, Sendable { case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void + case unsafePointer(UnsafePointerType) indirect case optional(BridgeType) case caseEnum(String) case rawValueEnum(String, SwiftEnumRawType) @@ -831,6 +851,12 @@ extension BridgeType { self = .void case "JSObject": self = .jsObject(nil) + case "UnsafeRawPointer": + self = .unsafePointer(.init(kind: .unsafeRawPointer)) + case "UnsafeMutableRawPointer": + self = .unsafePointer(.init(kind: .unsafeMutableRawPointer)) + case "OpaquePointer": + self = .unsafePointer(.init(kind: .opaquePointer)) default: return nil } @@ -848,6 +874,8 @@ extension BridgeType { case .swiftHeapObject: // UnsafeMutableRawPointer is returned as an i32 pointer return .pointer + case .unsafePointer: + return .pointer case .optional(_): return nil case .caseEnum: @@ -891,6 +919,23 @@ extension BridgeType { return "\(typeName.count)\(typeName)C" case .swiftHeapObject(let name): return "\(name.count)\(name)C" + case .unsafePointer(let ptr): + func sanitize(_ s: String) -> String { + s.filter { $0.isNumber || $0.isLetter } + } + let kindCode: String = + switch ptr.kind { + case .unsafePointer: "Sup" + case .unsafeMutablePointer: "Sump" + case .unsafeRawPointer: "Surp" + case .unsafeMutableRawPointer: "Sumrp" + case .opaquePointer: "Sop" + } + if let pointee = ptr.pointee, !pointee.isEmpty { + let p = sanitize(pointee) + return "\(kindCode)\(p.count)\(p)" + } + return kindCode case .optional(let wrapped): return "Sq\(wrapped.mangleTypeName)" case .caseEnum(let name), diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift new file mode 100644 index 000000000..eb6ca0071 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift @@ -0,0 +1,39 @@ +@JS func takeUnsafeRawPointer(_ p: UnsafeRawPointer) {} +@JS func takeUnsafeMutableRawPointer(_ p: UnsafeMutableRawPointer) {} +@JS func takeOpaquePointer(_ p: OpaquePointer) {} +@JS func takeUnsafePointer(_ p: UnsafePointer) {} +@JS func takeUnsafeMutablePointer(_ p: UnsafeMutablePointer) {} + +@JS func returnUnsafeRawPointer() -> UnsafeRawPointer { UnsafeRawPointer(bitPattern: 1)! } +@JS func returnUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(bitPattern: 1)! } +@JS func returnOpaquePointer() -> OpaquePointer { OpaquePointer(bitPattern: 1)! } +@JS func returnUnsafePointer() -> UnsafePointer { + UnsafeRawPointer(bitPattern: 1)!.assumingMemoryBound(to: UInt8.self) +} +@JS func returnUnsafeMutablePointer() -> UnsafeMutablePointer { + UnsafeMutableRawPointer(bitPattern: 1)!.assumingMemoryBound(to: UInt8.self) +} + +@JS struct PointerFields { + var raw: UnsafeRawPointer + var mutRaw: UnsafeMutableRawPointer + var opaque: OpaquePointer + var ptr: UnsafePointer + var mutPtr: UnsafeMutablePointer + + @JS init( + raw: UnsafeRawPointer, + mutRaw: UnsafeMutableRawPointer, + opaque: OpaquePointer, + ptr: UnsafePointer, + mutPtr: UnsafeMutablePointer + ) { + self.raw = raw + self.mutRaw = mutRaw + self.opaque = opaque + self.ptr = ptr + self.mutPtr = mutPtr + } +} + +@JS func roundTripPointerFields(_ value: PointerFields) -> PointerFields { value } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts new file mode 100644 index 000000000..4f9aa4e4a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts @@ -0,0 +1,38 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface PointerFields { + raw: number; + mutRaw: number; + opaque: number; + ptr: number; + mutPtr: number; +} +export type Exports = { + takeUnsafeRawPointer(p: number): void; + takeUnsafeMutableRawPointer(p: number): void; + takeOpaquePointer(p: number): void; + takeUnsafePointer(p: number): void; + takeUnsafeMutablePointer(p: number): void; + returnUnsafeRawPointer(): number; + returnUnsafeMutableRawPointer(): number; + returnOpaquePointer(): number; + returnUnsafePointer(): number; + returnUnsafeMutablePointer(): number; + roundTripPointerFields(value: PointerFields): PointerFields; + PointerFields: { + init(raw: number, mutRaw: number, opaque: number, ptr: number, mutPtr: number): PointerFields; + } +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js new file mode 100644 index 000000000..1e1c73492 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -0,0 +1,283 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + const __bjs_createPointerFieldsHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamPointers.push((value.raw | 0)); + tmpParamPointers.push((value.mutRaw | 0)); + tmpParamPointers.push((value.opaque | 0)); + tmpParamPointers.push((value.ptr | 0)); + tmpParamPointers.push((value.mutPtr | 0)); + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const pointer = tmpRetPointers.pop(); + const pointer1 = tmpRetPointers.pop(); + const pointer2 = tmpRetPointers.pop(); + const pointer3 = tmpRetPointers.pop(); + const pointer4 = tmpRetPointers.pop(); + return { raw: pointer4, mutRaw: pointer3, opaque: pointer2, ptr: pointer1, mutPtr: pointer }; + } + }); + }; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.PointerFields = PointerFieldsHelpers; + + const exports = { + takeUnsafeRawPointer: function bjs_takeUnsafeRawPointer(p) { + instance.exports.bjs_takeUnsafeRawPointer(p); + }, + takeUnsafeMutableRawPointer: function bjs_takeUnsafeMutableRawPointer(p) { + instance.exports.bjs_takeUnsafeMutableRawPointer(p); + }, + takeOpaquePointer: function bjs_takeOpaquePointer(p) { + instance.exports.bjs_takeOpaquePointer(p); + }, + takeUnsafePointer: function bjs_takeUnsafePointer(p) { + instance.exports.bjs_takeUnsafePointer(p); + }, + takeUnsafeMutablePointer: function bjs_takeUnsafeMutablePointer(p) { + instance.exports.bjs_takeUnsafeMutablePointer(p); + }, + returnUnsafeRawPointer: function bjs_returnUnsafeRawPointer() { + const ret = instance.exports.bjs_returnUnsafeRawPointer(); + return ret; + }, + returnUnsafeMutableRawPointer: function bjs_returnUnsafeMutableRawPointer() { + const ret = instance.exports.bjs_returnUnsafeMutableRawPointer(); + return ret; + }, + returnOpaquePointer: function bjs_returnOpaquePointer() { + const ret = instance.exports.bjs_returnOpaquePointer(); + return ret; + }, + returnUnsafePointer: function bjs_returnUnsafePointer() { + const ret = instance.exports.bjs_returnUnsafePointer(); + return ret; + }, + returnUnsafeMutablePointer: function bjs_returnUnsafeMutablePointer() { + const ret = instance.exports.bjs_returnUnsafeMutablePointer(); + return ret; + }, + roundTripPointerFields: function bjs_roundTripPointerFields(value) { + const { cleanup: cleanup } = structHelpers.PointerFields.lower(value); + instance.exports.bjs_roundTripPointerFields(); + const structValue = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (cleanup) { cleanup(); } + return structValue; + }, + PointerFields: { + init: function(raw, mutRaw, opaque, ptr, mutPtr) { + instance.exports.bjs_PointerFields_init(raw, mutRaw, opaque, ptr, mutPtr); + const structValue = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return structValue; + }, + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json new file mode 100644 index 000000000..f38cd9440 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json @@ -0,0 +1,413 @@ +{ + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_takeUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeRawPointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeMutableRawPointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOpaquePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafeMutablePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeMutablePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_returnUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeRawPointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeMutableRawPointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "abiName" : "bjs_returnOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnOpaquePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafeMutablePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeMutablePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "abiName" : "bjs_roundTripPointerFields", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPointerFields", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_PointerFields_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "raw", + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "label" : "mutRaw", + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "label" : "opaque", + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "label" : "ptr", + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "label" : "mutPtr", + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "PointerFields", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "swiftCallName" : "PointerFields" + } + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift new file mode 100644 index 000000000..503fed02d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -0,0 +1,145 @@ +extension PointerFields: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_pointer(self.raw.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.mutRaw.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.opaque.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) + } +} + +@_expose(wasm, "bjs_PointerFields_init") +@_cdecl("bjs_PointerFields_init") +public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_takeUnsafeRawPointer") +@_cdecl("bjs_takeUnsafeRawPointer") +public func _bjs_takeUnsafeRawPointer(_ p: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + takeUnsafeRawPointer(_: UnsafeRawPointer.bridgeJSLiftParameter(p)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_takeUnsafeMutableRawPointer") +@_cdecl("bjs_takeUnsafeMutableRawPointer") +public func _bjs_takeUnsafeMutableRawPointer(_ p: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + takeUnsafeMutableRawPointer(_: UnsafeMutableRawPointer.bridgeJSLiftParameter(p)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_takeOpaquePointer") +@_cdecl("bjs_takeOpaquePointer") +public func _bjs_takeOpaquePointer(_ p: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + takeOpaquePointer(_: OpaquePointer.bridgeJSLiftParameter(p)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_takeUnsafePointer") +@_cdecl("bjs_takeUnsafePointer") +public func _bjs_takeUnsafePointer(_ p: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + takeUnsafePointer(_: UnsafePointer.bridgeJSLiftParameter(p)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_takeUnsafeMutablePointer") +@_cdecl("bjs_takeUnsafeMutablePointer") +public func _bjs_takeUnsafeMutablePointer(_ p: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + takeUnsafeMutablePointer(_: UnsafeMutablePointer.bridgeJSLiftParameter(p)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_returnUnsafeRawPointer") +@_cdecl("bjs_returnUnsafeRawPointer") +public func _bjs_returnUnsafeRawPointer() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = returnUnsafeRawPointer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_returnUnsafeMutableRawPointer") +@_cdecl("bjs_returnUnsafeMutableRawPointer") +public func _bjs_returnUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = returnUnsafeMutableRawPointer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_returnOpaquePointer") +@_cdecl("bjs_returnOpaquePointer") +public func _bjs_returnOpaquePointer() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = returnOpaquePointer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_returnUnsafePointer") +@_cdecl("bjs_returnUnsafePointer") +public func _bjs_returnUnsafePointer() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = returnUnsafePointer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_returnUnsafeMutablePointer") +@_cdecl("bjs_returnUnsafeMutablePointer") +public func _bjs_returnUnsafeMutablePointer() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = returnUnsafeMutablePointer() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripPointerFields") +@_cdecl("bjs_roundTripPointerFields") +public func _bjs_roundTripPointerFields() -> Void { + #if arch(wasm32) + let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 92ab52f04..be763b7ac 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -644,6 +644,134 @@ func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { } #endif +// MARK: - UnsafePointer family + +extension UnsafeMutableRawPointer { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { self } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeMutableRawPointer + { + pointer + } + + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeMutableRawPointer + { + pointer + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { self } +} + +extension UnsafeRawPointer { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(mutating: self) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeRawPointer + { + UnsafeRawPointer(pointer) + } + + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeRawPointer + { + UnsafeRawPointer(pointer) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { + bridgeJSLowerParameter() + } +} + +extension OpaquePointer { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + _ pointer: UnsafeMutableRawPointer + ) + -> OpaquePointer + { + OpaquePointer(UnsafeRawPointer(pointer)) + } + + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + _ pointer: UnsafeMutableRawPointer + ) + -> OpaquePointer + { + OpaquePointer(UnsafeRawPointer(pointer)) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { + bridgeJSLowerParameter() + } +} + +extension UnsafePointer { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafePointer + { + UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self) + } + + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafePointer + { + UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { + bridgeJSLowerParameter() + } +} + +extension UnsafeMutablePointer { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(self) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeMutablePointer + { + pointer.assumingMemoryBound(to: Pointee.self) + } + + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + _ pointer: UnsafeMutableRawPointer + ) + -> UnsafeMutablePointer + { + pointer.assumingMemoryBound(to: Pointee.self) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { + bridgeJSLowerParameter() + } +} + extension Optional where Wrapped == Bool { // MARK: ImportTS diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 0df421df6..8edf8a6d2 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -29,10 +29,50 @@ func runJsWorks() -> Void return v } +@JS func roundTripUnsafeRawPointer(v: UnsafeRawPointer) -> UnsafeRawPointer { + return v +} +@JS func roundTripUnsafeMutableRawPointer(v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return v +} +@JS func roundTripOpaquePointer(v: OpaquePointer) -> OpaquePointer { + return v +} +@JS func roundTripUnsafePointer(v: UnsafePointer) -> UnsafePointer { + return v +} +@JS func roundTripUnsafeMutablePointer(v: UnsafeMutablePointer) -> UnsafeMutablePointer { + return v +} + @JS func roundTripJSObject(v: JSObject) -> JSObject { return v } +@JS struct PointerFields { + var raw: UnsafeRawPointer + var mutRaw: UnsafeMutableRawPointer + var opaque: OpaquePointer + var ptr: UnsafePointer + var mutPtr: UnsafeMutablePointer + + @JS init( + raw: UnsafeRawPointer, + mutRaw: UnsafeMutableRawPointer, + opaque: OpaquePointer, + ptr: UnsafePointer, + mutPtr: UnsafeMutablePointer + ) { + self.raw = raw + self.mutRaw = mutRaw + self.opaque = opaque + self.ptr = ptr + self.mutPtr = mutPtr + } +} + +@JS func roundTripPointerFields(_ value: PointerFields) -> PointerFields { value } + @JSClass struct Foo { @JSGetter var value: String @JSFunction init(_ value: String) throws(JSException) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index ed2e5240f..08f3f48aa 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2212,6 +2212,36 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se #endif } +extension PointerFields: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_pointer(self.raw.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.mutRaw.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.opaque.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) + _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) + } +} + +@_expose(wasm, "bjs_PointerFields_init") +@_cdecl("bjs_PointerFields_init") +public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) @@ -2595,6 +2625,61 @@ public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Unsaf #endif } +@_expose(wasm, "bjs_roundTripUnsafeRawPointer") +@_cdecl("bjs_roundTripUnsafeRawPointer") +public func _bjs_roundTripUnsafeRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = roundTripUnsafeRawPointer(v: UnsafeRawPointer.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointer") +@_cdecl("bjs_roundTripUnsafeMutableRawPointer") +public func _bjs_roundTripUnsafeMutableRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = roundTripUnsafeMutableRawPointer(v: UnsafeMutableRawPointer.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOpaquePointer") +@_cdecl("bjs_roundTripOpaquePointer") +public func _bjs_roundTripOpaquePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = roundTripOpaquePointer(v: OpaquePointer.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafePointer") +@_cdecl("bjs_roundTripUnsafePointer") +public func _bjs_roundTripUnsafePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = roundTripUnsafePointer(v: UnsafePointer.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafeMutablePointer") +@_cdecl("bjs_roundTripUnsafeMutablePointer") +public func _bjs_roundTripUnsafeMutablePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = roundTripUnsafeMutablePointer(v: UnsafeMutablePointer.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripJSObject") @_cdecl("bjs_roundTripJSObject") public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { @@ -2606,6 +2691,17 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #endif } +@_expose(wasm, "bjs_roundTripPointerFields") +@_cdecl("bjs_roundTripPointerFields") +public func _bjs_roundTripPointerFields() -> Void { + #if arch(wasm32) + let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_makeImportedFoo") @_cdecl("bjs_makeImportedFoo") public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index fb2770ae6..1dafe7851 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -4704,6 +4704,155 @@ } } }, + { + "abiName" : "bjs_roundTripUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeRawPointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutableRawPointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "abiName" : "bjs_roundTripOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOpaquePointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafePointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutablePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutablePointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + }, { "abiName" : "bjs_roundTripJSObject", "effects" : { @@ -4729,6 +4878,31 @@ } } }, + { + "abiName" : "bjs_roundTripPointerFields", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPointerFields", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + }, { "abiName" : "bjs_makeImportedFoo", "effects" : { @@ -8313,6 +8487,144 @@ } ], "structs" : [ + { + "constructor" : { + "abiName" : "bjs_PointerFields_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "raw", + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "label" : "mutRaw", + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "label" : "opaque", + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "label" : "ptr", + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "label" : "mutPtr", + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "PointerFields", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "swiftCallName" : "PointerFields" + }, { "constructor" : { "abiName" : "bjs_DataPoint_init", diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 47f30a926..df83d41e9 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -176,6 +176,14 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.roundTripString(v), v); } + for (const p of [1, 4, 1024, 65536, 2147483647]) { + assert.equal(exports.roundTripUnsafeRawPointer(p), p); + assert.equal(exports.roundTripUnsafeMutableRawPointer(p), p); + assert.equal(exports.roundTripOpaquePointer(p), p); + assert.equal(exports.roundTripUnsafePointer(p), p); + assert.equal(exports.roundTripUnsafeMutablePointer(p), p); + } + const g = new exports.Greeter("John"); assert.equal(g.greet(), "Hello, John!"); @@ -955,6 +963,9 @@ function testStructSupport(exports) { const data2 = { x: 0.0, y: 0.0, label: "", optCount: null, optFlag: null }; assert.deepEqual(exports.roundTripDataPoint(data2), data2); + const pointerFields1 = { raw: 1, mutRaw: 4, opaque: 1024, ptr: 65536, mutPtr: 2 }; + assert.deepEqual(exports.roundTripPointerFields(pointerFields1), pointerFields1); + const contact1 = { name: "Alice", age: 30, From 7b1ee44d77a3b4432da3ef5b4c86779efe927383 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 12:25:13 +0900 Subject: [PATCH 102/252] Turn JSValue from enum to struct to have flexibility for future changes (#528) --- .../BasicObjects/JSPromise.swift | 2 +- .../JavaScriptKit/ConvertibleToJSValue.swift | 2 +- .../FundamentalObjects/JSObject.swift | 2 +- Sources/JavaScriptKit/JSValue.swift | 87 +++++++++++++------ Sources/JavaScriptKit/JSValueDecoder.swift | 6 +- .../JavaScriptKitTests.swift | 4 +- 6 files changed, 71 insertions(+), 32 deletions(-) diff --git a/Sources/JavaScriptKit/BasicObjects/JSPromise.swift b/Sources/JavaScriptKit/BasicObjects/JSPromise.swift index c83d70673..c02ab44b0 100644 --- a/Sources/JavaScriptKit/BasicObjects/JSPromise.swift +++ b/Sources/JavaScriptKit/BasicObjects/JSPromise.swift @@ -31,7 +31,7 @@ public final class JSPromise: JSBridgedClass { /// is not an object and is not an instance of JavaScript `Promise`, this function will /// return `nil`. public static func construct(from value: JSValue) -> Self? { - guard case .object(let jsObject) = value else { return nil } + guard let jsObject = value.object else { return nil } return Self(jsObject) } diff --git a/Sources/JavaScriptKit/ConvertibleToJSValue.swift b/Sources/JavaScriptKit/ConvertibleToJSValue.swift index 966dbc821..3f548a46c 100644 --- a/Sources/JavaScriptKit/ConvertibleToJSValue.swift +++ b/Sources/JavaScriptKit/ConvertibleToJSValue.swift @@ -222,7 +222,7 @@ extension JSValue { let kind: JavaScriptValueKind let payload1: JavaScriptPayload1 var payload2: JavaScriptPayload2 = 0 - switch self { + switch self.storage { case .boolean(let boolValue): kind = .boolean payload1 = boolValue ? 1 : 0 diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift index 238b88055..101f13a95 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift @@ -249,7 +249,7 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral { } public static func construct(from value: JSValue) -> Self? { - switch value { + switch value.storage { case .boolean, .string, .number, diff --git a/Sources/JavaScriptKit/JSValue.swift b/Sources/JavaScriptKit/JSValue.swift index f469a2f10..6c02e73f6 100644 --- a/Sources/JavaScriptKit/JSValue.swift +++ b/Sources/JavaScriptKit/JSValue.swift @@ -2,20 +2,55 @@ import _CJavaScriptKit /// `JSValue` represents a value in JavaScript. @dynamicMemberLookup -public enum JSValue: Equatable { - case boolean(Bool) - case string(JSString) - case number(Double) - case object(JSObject) - case null - case undefined - case symbol(JSSymbol) - case bigInt(JSBigInt) +public struct JSValue: Equatable { + /// The internal storage of the JSValue, which is intentionally not public + /// to leave the flexibility to change the storage. + internal enum Storage: Equatable { + case boolean(Bool) + case string(JSString) + case number(Double) + case object(JSObject) + case null + case undefined + case symbol(JSSymbol) + case bigInt(JSBigInt) + } + + internal var storage: Storage + + internal init(storage: Storage) { + self.storage = storage + } + + public static func boolean(_ value: Bool) -> JSValue { + .init(storage: .boolean(value)) + } + public static func string(_ value: JSString) -> JSValue { + .init(storage: .string(value)) + } + public static func number(_ value: Double) -> JSValue { + .init(storage: .number(value)) + } + public static func object(_ value: JSObject) -> JSValue { + .init(storage: .object(value)) + } + public static var null: JSValue { + .init(storage: .null) + } + public static var undefined: JSValue { + .init(storage: .undefined) + } + public static func symbol(_ value: JSSymbol) -> JSValue { + .init(storage: .symbol(value)) + } + public static func bigInt(_ value: JSBigInt) -> JSValue { + .init(storage: .bigInt(value)) + } /// Returns the `Bool` value of this JS value if its type is boolean. /// If not, returns `nil`. public var boolean: Bool? { - switch self { + switch storage { case .boolean(let boolean): return boolean default: return nil } @@ -35,7 +70,7 @@ public enum JSValue: Equatable { /// If not, returns `nil`. /// public var jsString: JSString? { - switch self { + switch storage { case .string(let string): return string default: return nil } @@ -44,7 +79,7 @@ public enum JSValue: Equatable { /// Returns the `Double` value of this JS value if the type is number. /// If not, returns `nil`. public var number: Double? { - switch self { + switch storage { case .number(let number): return number default: return nil } @@ -53,7 +88,7 @@ public enum JSValue: Equatable { /// Returns the `JSObject` of this JS value if its type is object. /// If not, returns `nil`. public var object: JSObject? { - switch self { + switch storage { case .object(let object): return object default: return nil } @@ -65,7 +100,7 @@ public enum JSValue: Equatable { /// Returns the `JSSymbol` of this JS value if its type is function. /// If not, returns `nil`. public var symbol: JSSymbol? { - switch self { + switch storage { case .symbol(let symbol): return symbol default: return nil } @@ -74,7 +109,7 @@ public enum JSValue: Equatable { /// Returns the `JSBigInt` of this JS value if its type is function. /// If not, returns `nil`. public var bigInt: JSBigInt? { - switch self { + switch storage { case .bigInt(let bigInt): return bigInt default: return nil } @@ -83,13 +118,13 @@ public enum JSValue: Equatable { /// Returns the `true` if this JS value is null. /// If not, returns `false`. public var isNull: Bool { - return self == .null + return storage == .null } /// Returns the `true` if this JS value is undefined. /// If not, returns `false`. public var isUndefined: Bool { - return self == .undefined + return storage == .undefined } } @@ -132,7 +167,7 @@ extension JSValue { extension JSValue { public static func string(_ value: String) -> JSValue { - .string(JSString(value)) + .init(storage: .string(JSString(value))) } /// Deprecated: Please create `JSClosure` directly and manage its lifetime manually. @@ -161,7 +196,7 @@ extension JSValue { /// ``` @available(*, deprecated, message: "Please create JSClosure directly and manage its lifetime manually.") public static func function(_ body: @escaping ([JSValue]) -> JSValue) -> JSValue { - .object(JSClosure(body)) + .init(storage: .object(JSClosure(body))) } @available( @@ -171,34 +206,34 @@ extension JSValue { message: "JSClosure is no longer a subclass of JSFunction. Use .object(closure) instead." ) public static func function(_ closure: JSClosure) -> JSValue { - .object(closure) + .init(storage: .object(closure)) } @available(*, deprecated, renamed: "object", message: "Use .object(function) instead") - public static func function(_ function: JSObject) -> JSValue { .object(function) } + public static func function(_ function: JSObject) -> JSValue { .init(storage: .object(function)) } } extension JSValue: ExpressibleByStringLiteral { public init(stringLiteral value: String) { - self = .string(JSString(value)) + self = .init(storage: .string(JSString(value))) } } extension JSValue: ExpressibleByIntegerLiteral { public init(integerLiteral value: Int32) { - self = .number(Double(value)) + self = .init(storage: .number(Double(value))) } } extension JSValue: ExpressibleByFloatLiteral { public init(floatLiteral value: Double) { - self = .number(value) + self = .init(storage: .number(value)) } } extension JSValue: ExpressibleByNilLiteral { public init(nilLiteral _: ()) { - self = .null + self = .init(storage: .null) } } @@ -268,7 +303,7 @@ extension JSValue { /// - Parameter constructor: The constructor function to check. /// - Returns: The result of `instanceof` in the JavaScript environment. public func isInstanceOf(_ constructor: JSObject) -> Bool { - switch self { + switch storage { case .boolean, .string, .number, .null, .undefined, .symbol, .bigInt: return false case .object(let ref): diff --git a/Sources/JavaScriptKit/JSValueDecoder.swift b/Sources/JavaScriptKit/JSValueDecoder.swift index 054c6c8da..c2ac4a681 100644 --- a/Sources/JavaScriptKit/JSValueDecoder.swift +++ b/Sources/JavaScriptKit/JSValueDecoder.swift @@ -159,7 +159,11 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer { init(decoder: _Decoder, ref: JSObject) { self.decoder = decoder - count = ref.length.number.map(Int.init) + if let count = ref.length.number { + self.count = Int(count) + } else { + self.count = nil + } self.ref = ref } diff --git a/Tests/JavaScriptKitTests/JavaScriptKitTests.swift b/Tests/JavaScriptKitTests/JavaScriptKitTests.swift index 0a6fc9ce2..b69334ce5 100644 --- a/Tests/JavaScriptKitTests/JavaScriptKitTests.swift +++ b/Tests/JavaScriptKitTests/JavaScriptKitTests.swift @@ -21,8 +21,8 @@ class JavaScriptKitTests: XCTestCase { let prop = JSString("prop_\(index)") setJSValue(this: global, name: prop, value: input) let got = getJSValue(this: global, name: prop) - switch (got, input) { - case (.number(let lhs), .number(let rhs)): + switch (got.number, input.number) { + case (let lhs?, let rhs?): // Compare bitPattern because nan == nan is always false XCTAssertEqual(lhs.bitPattern, rhs.bitPattern) default: From 773254a2ae8e63388bf1aea147d105ec9871697b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 14:47:15 +0900 Subject: [PATCH 103/252] BridgeJS: allow imports from globalThis Add an opt-in from: .global source for @JS* import macros so bindings can resolve values from globalThis without routing through the imports object. Teach ts2swift/BridgeJSTool to accept --global inputs (e.g. bridge-js.global.d.ts) so global declarations are separated cleanly, and update generated artifacts + snapshots. --- Package.swift | 1 + .../BridgeJSCore/SwiftToSkeleton.swift | 47 ++- .../Sources/BridgeJSLink/BridgeJSLink.swift | 98 +++++-- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 19 ++ .../Sources/BridgeJSTool/BridgeJSTool.swift | 10 +- .../Sources/TS2Swift/JavaScript/src/cli.js | 41 ++- .../TS2Swift/JavaScript/src/processor.js | 150 ++++++++-- .../BridgeJS/Sources/TS2Swift/TS2Swift.swift | 4 + .../ImportMacroInputs/GlobalThisImports.swift | 14 + .../GlobalGetter.ImportMacros.js | 2 +- .../GlobalThisImports.ImportMacros.d.ts | 23 ++ .../GlobalThisImports.ImportMacros.js | 269 ++++++++++++++++++ .../BridgeJSLinkTests/UnsafePointer.Export.js | 22 ++ .../ExportSwiftTests/UnsafePointer.swift | 42 +++ .../GlobalThisImports.ImportMacros.swift | 87 ++++++ Sources/JavaScriptKit/Macros.swift | 23 +- .../Generated/BridgeJS.Macros.swift | 16 ++ .../Generated/BridgeJS.swift | 241 ++++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 149 ++++++++++ .../GlobalThisImportTests.swift | 19 ++ .../bridge-js.global.d.ts | 15 + 21 files changed, 1221 insertions(+), 71 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift create mode 100644 Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift create mode 100644 Tests/BridgeJSRuntimeTests/bridge-js.global.d.ts diff --git a/Package.swift b/Package.swift index a513ec406..1d4c8fb06 100644 --- a/Package.swift +++ b/Package.swift @@ -181,6 +181,7 @@ let package = Package( exclude: [ "bridge-js.config.json", "bridge-js.d.ts", + "bridge-js.global.d.ts", "Generated/JavaScript", ], swiftSettings: [ diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 321dbd6df..e489a711a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1798,6 +1798,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private struct CurrentType { let name: String let jsName: String? + let from: JSImportFrom? var constructor: ImportedConstructorSkeleton? var methods: [ImportedFunctionSkeleton] var getters: [ImportedGetterSkeleton] @@ -1872,6 +1873,22 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } return nil } + + /// Extracts the `from` argument value from an attribute, if present. + static func extractJSImportFrom(from attribute: AttributeSyntax) -> JSImportFrom? { + guard let arguments = attribute.arguments?.as(LabeledExprListSyntax.self) else { + return nil + } + for argument in arguments { + guard argument.label?.text == "from" else { continue } + + // Accept `.global`, `JSImportFrom.global`, etc. + let description = argument.expression.trimmedDescription + let caseName = description.split(separator: ".").last.map(String.init) ?? description + return JSImportFrom(rawValue: caseName) + } + return nil + } } // MARK: - Validation Helpers @@ -1996,14 +2013,23 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func enterJSClass(_ typeName: String) { stateStack.append(.jsClassBody(name: typeName)) - currentType = CurrentType(name: typeName, jsName: nil, constructor: nil, methods: [], getters: [], setters: []) + currentType = CurrentType( + name: typeName, + jsName: nil, + from: nil, + constructor: nil, + methods: [], + getters: [], + setters: [] + ) } - private func enterJSClass(_ typeName: String, jsName: String?) { + private func enterJSClass(_ typeName: String, jsName: String?, from: JSImportFrom?) { stateStack.append(.jsClassBody(name: typeName)) currentType = CurrentType( name: typeName, jsName: jsName, + from: from, constructor: nil, methods: [], getters: [], @@ -2017,6 +2043,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { ImportedTypeSkeleton( name: type.name, jsName: type.jsName, + from: type.from, constructor: type.constructor, methods: type.methods, getters: type.getters, @@ -2031,8 +2058,10 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind { if AttributeChecker.hasJSClassAttribute(node.attributes) { - let jsName = AttributeChecker.firstJSClassAttribute(node.attributes).flatMap(AttributeChecker.extractJSName) - enterJSClass(node.name.text, jsName: jsName) + let attribute = AttributeChecker.firstJSClassAttribute(node.attributes) + let jsName = attribute.flatMap(AttributeChecker.extractJSName) + let from = attribute.flatMap(AttributeChecker.extractJSImportFrom) + enterJSClass(node.name.text, jsName: jsName, from: from) } return .visitChildren } @@ -2045,8 +2074,10 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind { if AttributeChecker.hasJSClassAttribute(node.attributes) { - let jsName = AttributeChecker.firstJSClassAttribute(node.attributes).flatMap(AttributeChecker.extractJSName) - enterJSClass(node.name.text, jsName: jsName) + let attribute = AttributeChecker.firstJSClassAttribute(node.attributes) + let jsName = attribute.flatMap(AttributeChecker.extractJSName) + let from = attribute.flatMap(AttributeChecker.extractJSImportFrom) + enterJSClass(node.name.text, jsName: jsName, from: from) } return .visitChildren } @@ -2269,6 +2300,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text) let jsName = AttributeChecker.extractJSName(from: jsFunction) + let from = AttributeChecker.extractJSImportFrom(from: jsFunction) let name: String if isStaticMember, let enclosingTypeName { name = "\(enclosingTypeName)_\(baseName)" @@ -2289,6 +2321,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return ImportedFunctionSkeleton( name: name, jsName: jsName, + from: from, parameters: parameters, returnType: returnType, documentation: nil @@ -2322,9 +2355,11 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } let propertyName = SwiftToSkeleton.normalizeIdentifier(identifier.identifier.text) let jsName = AttributeChecker.extractJSName(from: jsGetter) + let from = AttributeChecker.extractJSImportFrom(from: jsGetter) return ImportedGetterSkeleton( name: propertyName, jsName: jsName, + from: from, type: propertyType, documentation: nil, functionName: nil diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 2fc5d9523..2cfaef11e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -80,6 +80,7 @@ public struct BridgeJSLink { var topLevelDtsTypeLines: [String] = [] var importObjectBuilders: [ImportObjectBuilder] = [] var enumStaticAssignments: [String] = [] + var needsImportsObject: Bool = false } private func collectLinkData() throws -> LinkData { @@ -173,12 +174,21 @@ public struct BridgeJSLink { let importObjectBuilder = ImportObjectBuilder(moduleName: unified.moduleName) for fileSkeleton in imported.children { for getter in fileSkeleton.globalGetters { + if getter.from == nil { + data.needsImportsObject = true + } try renderImportedGlobalGetter(importObjectBuilder: importObjectBuilder, getter: getter) } for function in fileSkeleton.functions { + if function.from == nil { + data.needsImportsObject = true + } try renderImportedFunction(importObjectBuilder: importObjectBuilder, function: function) } for type in fileSkeleton.types { + if type.constructor != nil, type.from == nil { + data.needsImportsObject = true + } try renderImportedType(importObjectBuilder: importObjectBuilder, type: type) } } @@ -294,7 +304,7 @@ public struct BridgeJSLink { } } - private func generateAddImports() -> CodeFragmentPrinter { + private func generateAddImports(needsImportsObject: Bool) -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() let allStructs = skeletons.compactMap { $0.exported?.structs }.flatMap { $0 } printer.write("return {") @@ -311,7 +321,7 @@ public struct BridgeJSLink { "bjs = {};", "importObject[\"bjs\"] = bjs;", ]) - if skeletons.contains(where: { $0.imported != nil }) { + if needsImportsObject { printer.write(lines: [ "const imports = options.getImports(importsContext);" ]) @@ -1043,7 +1053,7 @@ public struct BridgeJSLink { printer.write(lines: structPrinter.lines) } printer.nextLine() - printer.write(contentsOf: generateAddImports()) + printer.write(contentsOf: generateAddImports(needsImportsObject: data.needsImportsObject)) } printer.indent() @@ -2176,11 +2186,15 @@ extension BridgeJSLink { return printer.lines } - func call(name: String, returnType: BridgeType) throws -> String? { - let calleeExpr = Self.propertyAccessExpr(objectExpr: "imports", propertyName: name) + func call(name: String, fromObjectExpr: String, returnType: BridgeType) throws -> String? { + let calleeExpr = Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: name) return try self.call(calleeExpr: calleeExpr, returnType: returnType) } + func call(name: String, returnType: BridgeType) throws -> String? { + return try call(name: name, fromObjectExpr: "imports", returnType: returnType) + } + private func call(calleeExpr: String, returnType: BridgeType) throws -> String? { let callExpr = "\(calleeExpr)(\(parameterForwardings.joined(separator: ", ")))" return try self.call(callExpr: callExpr, returnType: returnType) @@ -2204,14 +2218,18 @@ extension BridgeJSLink { ) } - func callConstructor(jsName: String, swiftTypeName: String) throws -> String? { - let ctorExpr = Self.propertyAccessExpr(objectExpr: "imports", propertyName: jsName) + func callConstructor(jsName: String, swiftTypeName: String, fromObjectExpr: String) throws -> String? { + let ctorExpr = Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: jsName) let call = "new \(ctorExpr)(\(parameterForwardings.joined(separator: ", ")))" let type: BridgeType = .jsObject(swiftTypeName) let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: type, context: context) return try lowerReturnValue(returnType: type, returnExpr: call, loweringFragment: loweringFragment) } + func callConstructor(jsName: String, swiftTypeName: String) throws -> String? { + return try callConstructor(jsName: jsName, swiftTypeName: swiftTypeName, fromObjectExpr: "imports") + } + func callMethod(name: String, returnType: BridgeType) throws -> String? { let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) @@ -2253,14 +2271,13 @@ extension BridgeJSLink { body.write("\(call);") } - func getImportProperty(name: String, returnType: BridgeType) throws -> String? { + func getImportProperty(name: String, fromObjectExpr: String, returnType: BridgeType) throws -> String? { if returnType == .void { throw BridgeJSLinkError(message: "Void is not supported for imported JS properties") } let loweringFragment = try IntrinsicJSFragment.lowerReturn(type: returnType, context: context) - let escapedName = BridgeJSLink.escapeForJavaScriptStringLiteral(name) - let expr = "imports[\"\(escapedName)\"]" + let expr = Self.propertyAccessExpr(objectExpr: fromObjectExpr, propertyName: name) let returnExpr: String? if loweringFragment.parameters.count == 0 { @@ -2279,6 +2296,10 @@ extension BridgeJSLink { ) } + func getImportProperty(name: String, returnType: BridgeType) throws -> String? { + return try getImportProperty(name: name, fromObjectExpr: "imports", returnType: returnType) + } + private func lowerReturnValue( returnType: BridgeType, returnExpr: String?, @@ -3013,18 +3034,25 @@ extension BridgeJSLink { try thunkBuilder.liftParameter(param: param) } let jsName = function.jsName ?? function.name - let returnExpr = try thunkBuilder.call(name: jsName, returnType: function.returnType) + let importRootExpr = function.from == .global ? "globalThis" : "imports" + let returnExpr = try thunkBuilder.call( + name: jsName, + fromObjectExpr: importRootExpr, + returnType: function.returnType + ) let funcLines = thunkBuilder.renderFunction( name: function.abiName(context: nil), returnExpr: returnExpr, returnType: function.returnType ) let effects = Effects(isAsync: false, isThrows: false) - importObjectBuilder.appendDts( - [ - "\(renderTSPropertyName(jsName))\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: effects));" - ] - ) + if function.from == nil { + importObjectBuilder.appendDts( + [ + "\(renderTSPropertyName(jsName))\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: effects));" + ] + ) + } importObjectBuilder.assignToImportObject(name: function.abiName(context: nil), function: funcLines) } @@ -3034,14 +3062,21 @@ extension BridgeJSLink { ) throws { let thunkBuilder = ImportedThunkBuilder() let jsName = getter.jsName ?? getter.name - let returnExpr = try thunkBuilder.getImportProperty(name: jsName, returnType: getter.type) + let importRootExpr = getter.from == .global ? "globalThis" : "imports" + let returnExpr = try thunkBuilder.getImportProperty( + name: jsName, + fromObjectExpr: importRootExpr, + returnType: getter.type + ) let abiName = getter.abiName(context: nil) let funcLines = thunkBuilder.renderFunction( name: abiName, returnExpr: returnExpr, returnType: getter.type ) - importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"]) + if getter.from == nil { + importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"]) + } importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) } @@ -3105,7 +3140,12 @@ extension BridgeJSLink { try thunkBuilder.liftParameter(param: param) } let returnType = BridgeType.jsObject(type.name) - let returnExpr = try thunkBuilder.callConstructor(jsName: type.jsName ?? type.name, swiftTypeName: type.name) + let importRootExpr = type.from == .global ? "globalThis" : "imports" + let returnExpr = try thunkBuilder.callConstructor( + jsName: type.jsName ?? type.name, + swiftTypeName: type.name, + fromObjectExpr: importRootExpr + ) let abiName = constructor.abiName(context: type) let funcLines = thunkBuilder.renderFunction( name: abiName, @@ -3114,16 +3154,18 @@ extension BridgeJSLink { ) importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) - let dtsPrinter = CodeFragmentPrinter() - dtsPrinter.write("\(type.name): {") - dtsPrinter.indent { - dtsPrinter.write( - "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));" - ) - } - dtsPrinter.write("}") + if type.from == nil { + let dtsPrinter = CodeFragmentPrinter() + dtsPrinter.write("\(type.name): {") + dtsPrinter.indent { + dtsPrinter.write( + "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));" + ) + } + dtsPrinter.write("}") - importObjectBuilder.appendDts(dtsPrinter.lines) + importObjectBuilder.appendDts(dtsPrinter.lines) + } } func renderImportedGetter( diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index dcb819fef..c8fc84ec4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -608,10 +608,19 @@ public struct ExportedSkeleton: Codable { // MARK: - Imported Skeleton +/// Controls where BridgeJS reads imported JS values from. +/// +/// - `global`: Read from `globalThis`. +public enum JSImportFrom: String, Codable { + case global +} + public struct ImportedFunctionSkeleton: Codable { public let name: String /// The JavaScript function/method name to call, if different from `name`. public let jsName: String? + /// Where this function is looked up from in JavaScript. + public let from: JSImportFrom? public let parameters: [Parameter] public let returnType: BridgeType public let documentation: String? @@ -619,12 +628,14 @@ public struct ImportedFunctionSkeleton: Codable { public init( name: String, jsName: String? = nil, + from: JSImportFrom? = nil, parameters: [Parameter], returnType: BridgeType, documentation: String? = nil ) { self.name = name self.jsName = jsName + self.from = from self.parameters = parameters self.returnType = returnType self.documentation = documentation @@ -657,6 +668,8 @@ public struct ImportedGetterSkeleton: Codable { public let name: String /// The JavaScript property name to read from, if different from `name`. public let jsName: String? + /// Where this property is looked up from in JavaScript (only used for global getters). + public let from: JSImportFrom? public let type: BridgeType public let documentation: String? /// Name of the getter function if it's a separate function (from @JSGetter) @@ -665,12 +678,14 @@ public struct ImportedGetterSkeleton: Codable { public init( name: String, jsName: String? = nil, + from: JSImportFrom? = nil, type: BridgeType, documentation: String? = nil, functionName: String? = nil ) { self.name = name self.jsName = jsName + self.from = from self.type = type self.documentation = documentation self.functionName = functionName @@ -735,6 +750,8 @@ public struct ImportedTypeSkeleton: Codable { public let name: String /// The JavaScript constructor name to use for `init(...)`, if different from `name`. public let jsName: String? + /// Where this constructor is looked up from in JavaScript. + public let from: JSImportFrom? public let constructor: ImportedConstructorSkeleton? public let methods: [ImportedFunctionSkeleton] public let getters: [ImportedGetterSkeleton] @@ -744,6 +761,7 @@ public struct ImportedTypeSkeleton: Codable { public init( name: String, jsName: String? = nil, + from: JSImportFrom? = nil, constructor: ImportedConstructorSkeleton? = nil, methods: [ImportedFunctionSkeleton], getters: [ImportedGetterSkeleton] = [], @@ -752,6 +770,7 @@ public struct ImportedTypeSkeleton: Codable { ) { self.name = name self.jsName = jsName + self.from = from self.constructor = constructor self.methods = methods self.getters = getters diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 3fb7f8114..f75619489 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -110,13 +110,19 @@ import BridgeJSUtilities let nodePath: URL = try config.findTool("node", targetDirectory: targetDirectory) let bridgeJsDtsPath = targetDirectory.appending(path: "bridge-js.d.ts") - if FileManager.default.fileExists(atPath: bridgeJsDtsPath.path) { + let bridgeJsGlobalDtsPath = targetDirectory.appending(path: "bridge-js.global.d.ts") + let hasDts = FileManager.default.fileExists(atPath: bridgeJsDtsPath.path) + let hasGlobalDts = FileManager.default.fileExists(atPath: bridgeJsGlobalDtsPath.path) + if hasDts || hasGlobalDts { guard let tsconfigPath = doubleDashOptions["project"] else { throw BridgeJSToolError("--project option is required when processing .d.ts files") } let bridgeJSMacrosPath = outputDirectory.appending(path: "BridgeJS.Macros.swift") + let primaryDtsPath = hasDts ? bridgeJsDtsPath.path : bridgeJsGlobalDtsPath.path + let globalDtsFiles = (hasDts && hasGlobalDts) ? [bridgeJsGlobalDtsPath.path] : [] _ = try invokeTS2Swift( - dtsFile: bridgeJsDtsPath.path, + dtsFile: primaryDtsPath, + globalDtsFiles: globalDtsFiles, tsconfigPath: tsconfigPath, nodePath: nodePath, progress: progress, diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 28f37e0ec..645be1f5a 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -73,7 +73,7 @@ class DiagnosticEngine { } function printUsage() { - console.error('Usage: ts2swift -p [-o output.swift]'); + console.error('Usage: ts2swift -p [--global ]... [-o output.swift]'); } /** @@ -94,6 +94,10 @@ export function main(args) { type: 'string', short: 'p', }, + global: { + type: 'string', + multiple: true, + }, "log-level": { type: 'string', default: 'info', @@ -131,15 +135,44 @@ export function main(args) { process.exit(1); } - const program = TypeProcessor.createProgram(filePath, configParseResult.options); + /** @type {string[]} */ + const globalFiles = Array.isArray(options.values.global) + ? options.values.global + : (options.values.global ? [options.values.global] : []); + + const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options); const diagnostics = program.getSemanticDiagnostics(); if (diagnostics.length > 0) { diagnosticEngine.tsDiagnose(diagnostics); process.exit(1); } - const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine); - const { content: swiftOutput, hasAny } = processor.processTypeDeclarations(program, filePath); + const prelude = [ + "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,", + "// DO NOT EDIT.", + "//", + "// To update this file, just rebuild your project or run", + "// `swift package bridge-js`.", + "", + "@_spi(Experimental) import JavaScriptKit", + "", + "", + ].join("\n"); + + /** @type {string[]} */ + const bodies = []; + const globalFileSet = new Set(globalFiles); + for (const inputPath of [filePath, ...globalFiles]) { + const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, { + defaultImportFromGlobal: globalFileSet.has(inputPath), + }); + const result = processor.processTypeDeclarations(program, inputPath); + const body = result.content.trim(); + if (body.length > 0) bodies.push(body); + } + + const hasAny = bodies.length > 0; + const swiftOutput = hasAny ? prelude + bodies.join("\n\n") + "\n" : ""; if (options.values.output) { if (hasAny) { diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 1992b49f2..e48510466 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -24,9 +24,10 @@ export class TypeProcessor { * @param {ts.CompilerOptions} options - Compiler options * @returns {ts.Program} TypeScript program object */ - static createProgram(filePath, options) { + static createProgram(filePaths, options) { const host = ts.createCompilerHost(options); - return ts.createProgram([filePath], options, host); + const roots = Array.isArray(filePaths) ? filePaths : [filePaths]; + return ts.createProgram(roots, options, host); } /** @@ -63,6 +64,43 @@ export class TypeProcessor { /** @type {Map} */ this.swiftTypeNameByJSTypeName = new Map(); + + /** @type {boolean} */ + this.defaultImportFromGlobal = options.defaultImportFromGlobal ?? false; + } + + /** + * Escape a string for a Swift string literal inside macro arguments. + * @param {string} value + * @returns {string} + * @private + */ + escapeForSwiftStringLiteral(value) { + return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); + } + + /** + * Render a `jsName:` macro argument if the JS name differs from the default. + * @param {string} jsName + * @param {string} defaultName + * @returns {string | null} + * @private + */ + renderOptionalJSNameArg(jsName, defaultName) { + if (jsName === defaultName) return null; + return `jsName: "${this.escapeForSwiftStringLiteral(jsName)}"`; + } + + /** + * Render a macro annotation with optional labeled arguments. + * @param {string} macroName + * @param {string[]} args + * @returns {string} + * @private + */ + renderMacroAnnotation(macroName, args) { + if (!args.length) return `@${macroName}`; + return `@${macroName}(${args.join(", ")})`; } /** @@ -100,18 +138,6 @@ export class TypeProcessor { sf => !sf.isDeclarationFile || sf.fileName === inputFilePath ); - // Add prelude - this.swiftLines.push( - "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,", - "// DO NOT EDIT.", - "//", - "// To update this file, just rebuild your project or run", - "// `swift package bridge-js`.", - "", - "@_spi(Experimental) import JavaScriptKit", - "" - ); - for (const sourceFile of sourceFiles) { if (sourceFile.fileName.includes('node_modules/typescript/lib')) continue; @@ -140,7 +166,7 @@ export class TypeProcessor { } const content = this.swiftLines.join("\n").trimEnd() + "\n"; - const hasAny = this.swiftLines.length > 9; // More than just the prelude + const hasAny = content.trim().length > 0; return { content, hasAny }; } @@ -154,6 +180,8 @@ export class TypeProcessor { this.visitFunctionDeclaration(node); } else if (ts.isClassDeclaration(node)) { this.visitClassDecl(node); + } else if (ts.isVariableStatement(node)) { + this.visitVariableStatement(node); } else if (ts.isEnumDeclaration(node)) { this.visitEnumDeclaration(node); } else if (ts.isExportDeclaration(node)) { @@ -222,6 +250,41 @@ export class TypeProcessor { } } + /** + * Visit an exported variable statement and render Swift global getter(s). + * Supports simple `export const foo: T` / `export let foo: T` declarations. + * + * @param {ts.VariableStatement} node + * @private + */ + visitVariableStatement(node) { + const isExported = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ExportKeyword) ?? false; + if (!isExported) return; + + const fromArg = this.renderDefaultJSImportFromArgument(); + + for (const decl of node.declarationList.declarations) { + if (!ts.isIdentifier(decl.name)) continue; + + const jsName = decl.name.text; + const swiftName = this.swiftTypeName(jsName); + const swiftVarName = this.renderIdentifier(swiftName); + + const type = this.checker.getTypeAtLocation(decl); + const swiftType = this.visitType(type, decl); + + /** @type {string[]} */ + const args = []; + const jsNameArg = this.renderOptionalJSNameArg(jsName, swiftName); + if (jsNameArg) args.push(jsNameArg); + if (fromArg) args.push(fromArg); + const annotation = this.renderMacroAnnotation("JSGetter", args); + + this.swiftLines.push(`${annotation} var ${swiftVarName}: ${swiftType}`); + this.swiftLines.push(""); + } + } + /** * @param {ts.Type} type * @returns {boolean} @@ -370,8 +433,13 @@ export class TypeProcessor { if (!node.name) return; const jsName = node.name.text; const swiftName = this.swiftTypeName(jsName); - const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); - const annotation = jsName !== swiftName ? `@JSFunction(jsName: "${escapedJSName}")` : "@JSFunction"; + const fromArg = this.renderDefaultJSImportFromArgument(); + /** @type {string[]} */ + const args = []; + const jsNameArg = this.renderOptionalJSNameArg(jsName, swiftName); + if (jsNameArg) args.push(jsNameArg); + if (fromArg) args.push(fromArg); + const annotation = this.renderMacroAnnotation("JSFunction", args); const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; @@ -402,6 +470,12 @@ export class TypeProcessor { return parts.join("\n"); } + /** @returns {string} */ + renderDefaultJSImportFromArgument() { + if (this.defaultImportFromGlobal) return "from: .global"; + return ""; + } + /** * Render constructor parameters * @param {ts.ConstructorDeclaration} node @@ -465,8 +539,13 @@ export class TypeProcessor { this.emittedStructuredTypeNames.add(jsName); const swiftName = this.swiftTypeName(jsName); - const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); - const annotation = jsName !== swiftName ? `@JSClass(jsName: "${escapedJSName}")` : "@JSClass"; + const fromArg = this.renderDefaultJSImportFromArgument(); + /** @type {string[]} */ + const args = []; + const jsNameArg = this.renderOptionalJSNameArg(jsName, swiftName); + if (jsNameArg) args.push(jsNameArg); + if (fromArg) args.push(fromArg); + const annotation = this.renderMacroAnnotation("JSClass", args); const className = this.renderIdentifier(swiftName); this.swiftLines.push(`${annotation} struct ${className} {`); @@ -526,8 +605,11 @@ export class TypeProcessor { this.emittedStructuredTypeNames.add(name); const swiftName = this.swiftTypeName(name); - const escapedJSName = name.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); - const annotation = name !== swiftName ? `@JSClass(jsName: "${escapedJSName}")` : "@JSClass"; + /** @type {string[]} */ + const args = []; + const jsNameArg = this.renderOptionalJSNameArg(name, swiftName); + if (jsNameArg) args.push(jsNameArg); + const annotation = this.renderMacroAnnotation("JSClass", args); const typeName = this.renderIdentifier(swiftName); this.swiftLines.push(`${annotation} struct ${typeName} {`); @@ -672,8 +754,14 @@ export class TypeProcessor { const type = property.type; const swiftName = this.renderIdentifier(property.swiftName); const needsJSGetterName = property.jsName !== property.swiftName; - const escapedJSName = property.jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); - const getterAnnotation = needsJSGetterName ? `@JSGetter(jsName: "${escapedJSName}")` : "@JSGetter"; + // Note: `from: .global` is only meaningful for top-level imports and constructors. + // Instance member access always comes from the JS object itself. + const fromArg = ""; + /** @type {string[]} */ + const getterArgs = []; + if (needsJSGetterName) getterArgs.push(`jsName: "${this.escapeForSwiftStringLiteral(property.jsName)}"`); + if (fromArg) getterArgs.push(fromArg); + const getterAnnotation = this.renderMacroAnnotation("JSGetter", getterArgs); // Always render getter this.swiftLines.push(` ${getterAnnotation} var ${swiftName}: ${type}`); @@ -684,7 +772,11 @@ export class TypeProcessor { const derivedPropertyName = property.swiftName.charAt(0).toLowerCase() + property.swiftName.slice(1); const needsJSNameField = property.jsName !== derivedPropertyName; const setterName = `set${capitalizedSwiftName}`; - const annotation = needsJSNameField ? `@JSSetter(jsName: "${escapedJSName}")` : "@JSSetter"; + /** @type {string[]} */ + const setterArgs = []; + if (needsJSNameField) setterArgs.push(`jsName: "${this.escapeForSwiftStringLiteral(property.jsName)}"`); + if (fromArg) setterArgs.push(fromArg); + const annotation = this.renderMacroAnnotation("JSSetter", setterArgs); this.swiftLines.push(` ${annotation} func ${this.renderIdentifier(setterName)}(_ value: ${type}) ${this.renderEffects({ isAsync: false })}`); } } @@ -709,8 +801,14 @@ export class TypeProcessor { const swiftName = this.swiftTypeName(jsName); const needsJSNameField = jsName !== swiftName; - const escapedJSName = jsName.replaceAll("\\", "\\\\").replaceAll("\"", "\\\\\""); - const annotation = needsJSNameField ? `@JSFunction(jsName: "${escapedJSName}")` : "@JSFunction"; + // Note: `from: .global` is only meaningful for top-level imports and constructors. + // Instance member calls always come from the JS object itself. + const fromArg = ""; + /** @type {string[]} */ + const args = []; + if (needsJSNameField) args.push(`jsName: "${this.escapeForSwiftStringLiteral(jsName)}"`); + if (fromArg) args.push(fromArg); + const annotation = this.renderMacroAnnotation("JSFunction", args); const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift index 0a69eb702..795b7b390 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift +++ b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift @@ -87,6 +87,7 @@ extension BridgeJSConfig { /// - Returns: The generated Swift source code (always collected from stdout for return value) public func invokeTS2Swift( dtsFile: String, + globalDtsFiles: [String] = [], tsconfigPath: String, nodePath: URL, progress: ProgressReporting, @@ -98,6 +99,9 @@ public func invokeTS2Swift( .appendingPathComponent("bin") .appendingPathComponent("ts2swift.js") var arguments = [ts2swiftPath.path, dtsFile, "--project", tsconfigPath] + for global in globalDtsFiles { + arguments.append(contentsOf: ["--global", global]) + } if let outputPath = outputPath { arguments.append(contentsOf: ["--output", outputPath]) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift new file mode 100644 index 000000000..fbf77adf1 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift @@ -0,0 +1,14 @@ +@JSClass +struct JSConsole { + @JSFunction func log(_ message: String) throws(JSException) +} + +@JSGetter(from: .global) var console: JSConsole + +@JSFunction(jsName: "parseInt", from: .global) func parseInt(_ string: String) throws(JSException) -> Double + +@JSClass(from: .global) +struct WebSocket { + @JSFunction init(_ url: String) throws(JSException) + @JSFunction func close() throws(JSException) +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index 32593d2ae..afcdddbd4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -205,7 +205,7 @@ export async function createInstantiator(options, swift) { const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_console_get"] = function bjs_console_get() { try { - let ret = imports["console"]; + let ret = imports.console; return swift.memory.retain(ret); } catch (error) { setException(error); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts new file mode 100644 index 000000000..ae1152016 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts @@ -0,0 +1,23 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface JSConsole { + log(message: string): void; +} +export interface WebSocket { + close(): void; +} +export type Exports = { +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js new file mode 100644 index 000000000..b671728af --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -0,0 +1,269 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_console_get"] = function bjs_console_get() { + try { + let ret = globalThis.console; + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_parseInt"] = function bjs_parseInt(string) { + try { + const stringObject = swift.memory.getObject(string); + swift.memory.release(string); + let ret = globalThis.parseInt(stringObject); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, message) { + try { + const messageObject = swift.memory.getObject(message); + swift.memory.release(message); + swift.memory.getObject(self).log(messageObject); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WebSocket_init"] = function bjs_WebSocket_init(url) { + try { + const urlObject = swift.memory.getObject(url); + swift.memory.release(url); + return swift.memory.retain(new globalThis.WebSocket(urlObject)); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WebSocket_close"] = function bjs_WebSocket_close(self) { + try { + swift.memory.getObject(self).close(); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index 1e1c73492..4eb09bb27 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -28,6 +28,7 @@ export async function createInstantiator(options, swift) { let tmpParamF64s = []; let tmpRetPointers = []; let tmpParamPointers = []; + let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -120,6 +121,27 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_struct_lower_PointerFields"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.PointerFields.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_PointerFields"] = function() { + const value = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 503fed02d..3954f3feb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -15,7 +15,49 @@ extension PointerFields: _BridgedSwiftStruct { _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _PointerFieldsHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _PointerFieldsHelpers.raise() + } +} + +fileprivate enum _PointerFieldsHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_PointerFields") +fileprivate func _bjs_struct_raise_PointerFields() -> Int32 +#else +fileprivate func _bjs_struct_raise_PointerFields() -> Int32 { + fatalError("Only available on WebAssembly") } +#endif @_expose(wasm, "bjs_PointerFields_init") @_cdecl("bjs_PointerFields_init") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift new file mode 100644 index 000000000..503da6189 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift @@ -0,0 +1,87 @@ +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_console_get") +fileprivate func bjs_console_get() -> Int32 +#else +fileprivate func bjs_console_get() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$console_get() throws(JSException) -> JSConsole { + let ret = bjs_console_get() + if let error = _swift_js_take_exception() { + throw error + } + return JSConsole.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_parseInt") +fileprivate func bjs_parseInt(_ string: Int32) -> Float64 +#else +fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$parseInt(_ string: String) throws(JSException) -> Double { + let stringValue = string.bridgeJSLowerParameter() + let ret = bjs_parseInt(stringValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_JSConsole_log") +fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void +#else +fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let messageValue = message.bridgeJSLowerParameter() + bjs_JSConsole_log(selfValue, messageValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WebSocket_init") +fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 +#else +fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_WebSocket_close") +fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void +#else +fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$WebSocket_init(_ url: String) throws(JSException) -> JSObject { + let urlValue = url.bridgeJSLowerParameter() + let ret = bjs_WebSocket_init(urlValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$WebSocket_close(_ self: JSObject) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + bjs_WebSocket_close(selfValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 61797a58e..329945f2f 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -6,6 +6,13 @@ public enum JSEnumStyle: String { case tsEnum } +/// Controls where BridgeJS reads imported JS values from. +/// +/// - `global`: Read from `globalThis`. +public enum JSImportFrom: String { + case global +} + /// A macro that exposes Swift functions, classes, and methods to JavaScript. /// /// Apply this macro to Swift declarations that you want to make callable from JavaScript: @@ -126,9 +133,12 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Bui /// @JSGetter var name: String /// } /// ``` +/// +/// - Parameter from: Selects where the property is read from. +/// Use `.global` to read from `globalThis` (e.g. `console`, `document`). @attached(accessor) @_spi(Experimental) -public macro JSGetter(jsName: String? = nil) = +public macro JSGetter(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSGetterMacro") /// A macro that generates a Swift function body that writes a value to JavaScript. @@ -147,7 +157,7 @@ public macro JSGetter(jsName: String? = nil) = /// ``` @attached(body) @_spi(Experimental) -public macro JSSetter(jsName: String? = nil) = +public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSSetterMacro") /// A macro that generates a Swift function body that calls a JavaScript function. @@ -165,9 +175,11 @@ public macro JSSetter(jsName: String? = nil) = /// /// - Parameter jsName: An optional string that specifies the name of the JavaScript function or method to call. /// If not provided, the Swift function name is used. +/// - Parameter from: Selects where the function is looked up from. +/// Use `.global` to call a function on `globalThis` (e.g. `setTimeout`). @attached(body) @_spi(Experimental) -public macro JSFunction(jsName: String? = nil) = +public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSFunctionMacro") /// A macro that adds bridging members for a Swift type that represents a JavaScript class. @@ -187,8 +199,11 @@ public macro JSFunction(jsName: String? = nil) = /// @JSFunction func greet() throws (JSException) -> String /// } /// ``` +/// +/// - Parameter from: Selects where the constructor is looked up from. +/// Use `.global` to construct globals like `WebSocket` via `globalThis`. @attached(member, names: arbitrary) @attached(extension, conformances: _JSBridgedClass) @_spi(Experimental) -public macro JSClass(jsName: String? = nil) = +public macro JSClass(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro") diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index ffcfca8dd..b0b24137a 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -47,3 +47,19 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload {} @JSFunction init() throws (JSException) @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> String } + +@JSFunction(from: .global) func parseInt(_ string: String) throws (JSException) -> Double + +@JSClass(from: .global) struct Animal { + @JSGetter var name: String + @JSSetter func setName(_ value: String) throws (JSException) + @JSGetter var age: Double + @JSSetter func setAge(_ value: Double) throws (JSException) + @JSGetter var isCat: Bool + @JSSetter func setIsCat(_ value: Bool) throws (JSException) + @JSFunction init(_ name: String, _ age: Double, _ isCat: Bool) throws (JSException) + @JSFunction func bark() throws (JSException) -> String + @JSFunction func getIsCat() throws (JSException) -> Bool +} + +@JSGetter(from: .global) var globalObject1: JSObject diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index c4fd3a722..b47bf062b 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2229,8 +2229,50 @@ extension PointerFields: _BridgedSwiftStruct { _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _PointerFieldsHelpers.lower(jsObject) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return _PointerFieldsHelpers.raise() + } } +fileprivate enum _PointerFieldsHelpers { + static func lower(_ jsObject: JSObject) -> Int32 { + return _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) + } + + static func raise() -> JSObject { + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_PointerFields") +fileprivate func _bjs_struct_raise_PointerFields() -> Int32 +#else +fileprivate func _bjs_struct_raise_PointerFields() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PointerFields_init") @_cdecl("bjs_PointerFields_init") public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { @@ -6930,6 +6972,23 @@ func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_globalObject1_get") +fileprivate func bjs_globalObject1_get() -> Int32 +#else +fileprivate func bjs_globalObject1_get() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$globalObject1_get() throws(JSException) -> JSObject { + let ret = bjs_globalObject1_get() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") fileprivate func bjs_jsRoundTripVoid() -> Void @@ -7123,6 +7182,24 @@ func _$_jsWeirdFunction() throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt") +fileprivate func bjs_parseInt(_ string: Int32) -> Float64 +#else +fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$parseInt(_ string: String) throws(JSException) -> Double { + let stringValue = string.bridgeJSLowerParameter() + let ret = bjs_parseInt(stringValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 @@ -7267,6 +7344,170 @@ func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> S return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init") +fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 +#else +fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_get") +fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_get") +fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 +#else +fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_get") +fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_set") +fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_set") +fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void +#else +fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_set") +fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_bark") +fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 +#else +fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_getIsCat") +fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 +#else +fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$Animal_init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) -> JSObject { + let nameValue = name.bridgeJSLowerParameter() + let ageValue = age.bridgeJSLowerParameter() + let isCatValue = isCat.bridgeJSLowerParameter() + let ret = bjs_Animal_init(nameValue, ageValue, isCatValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$Animal_name_get(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Animal_name_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$Animal_age_get(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Animal_age_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +func _$Animal_isCat_get(_ self: JSObject) throws(JSException) -> Bool { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Animal_isCat_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + +func _$Animal_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_Animal_name_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$Animal_age_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_Animal_age_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$Animal_isCat_set(_ self: JSObject, _ newValue: Bool) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let newValueValue = newValue.bridgeJSLowerParameter() + bjs_Animal_isCat_set(selfValue, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$Animal_bark(_ self: JSObject) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Animal_bark(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$Animal_getIsCat(_ self: JSObject) throws(JSException) -> Bool { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_Animal_getIsCat(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsApplyInt") fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 63c403bcf..82c394a93 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9690,6 +9690,36 @@ "returnType" : { "double" : { + } + } + }, + { + "from" : "global", + "name" : "parseInt", + "parameters" : [ + { + "name" : "string", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + } + ], + "globalGetters" : [ + { + "from" : "global", + "name" : "globalObject1", + "type" : { + "jsObject" : { + } } } @@ -9806,6 +9836,117 @@ "setters" : [ ] + }, + { + "constructor" : { + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "age", + "type" : { + "double" : { + + } + } + }, + { + "name" : "isCat", + "type" : { + "bool" : { + + } + } + } + ] + }, + "from" : "global", + "getters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "age", + "type" : { + "double" : { + + } + } + }, + { + "name" : "isCat", + "type" : { + "bool" : { + + } + } + } + ], + "methods" : [ + { + "name" : "bark", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "getIsCat", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "name" : "Animal", + "setters" : [ + { + "functionName" : "name_set", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "functionName" : "age_set", + "name" : "age", + "type" : { + "double" : { + + } + } + }, + { + "functionName" : "isCat_set", + "name" : "isCat", + "type" : { + "bool" : { + + } + } + } + ] } ] }, @@ -9817,6 +9958,14 @@ ] }, + { + "functions" : [ + + ], + "types" : [ + + ] + }, { "functions" : [ { diff --git a/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift b/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift new file mode 100644 index 000000000..2f6251341 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift @@ -0,0 +1,19 @@ +import XCTest +import JavaScriptKit + +final class GlobalThisImportTests: XCTestCase { + func testGlobalFunctionImport() throws { + XCTAssertEqual(try parseInt("42"), 42) + } + + func testGlobalClassImport() throws { + let cat = try Animal("Mimi", 3, true) + XCTAssertEqual(try cat.bark(), "nyan") + XCTAssertEqual(try cat.getIsCat(), true) + } + + func testGlobalGetterImport() throws { + let value = try globalObject1["prop_2"].number + XCTAssertEqual(value, 2) + } +} diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.global.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.global.d.ts new file mode 100644 index 000000000..b856ce8bd --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/bridge-js.global.d.ts @@ -0,0 +1,15 @@ +// Declarations in this file are imported from `globalThis`. + +export function parseInt(string: string): number; + +export class Animal { + name: string; + age: number; + isCat: boolean; + constructor(name: string, age: number, isCat: boolean); + bark(): string; + getIsCat(): boolean; +} + +export const globalObject1: any; + From 9c8d67d161deea5eaf80262acca2948a2fa40fcf Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 19:16:37 +0900 Subject: [PATCH 104/252] Benchmarks: optional-return cases and runner tweaks (#529) * Benchmarks: add optional-return cases and improve runner * Benchmarks: pass iterations without globals * Run ./Utilities/bridge-js-generate.sh --------- Co-authored-by: Krzysztof Rodak --- Benchmarks/Sources/Benchmarks.swift | 16 ++ Benchmarks/Sources/Generated/BridgeJS.swift | 124 ++++++++++++ .../Generated/JavaScript/BridgeJS.json | 188 ++++++++++++++++++ Benchmarks/run.js | 83 +++++++- 4 files changed, 402 insertions(+), 9 deletions(-) diff --git a/Benchmarks/Sources/Benchmarks.swift b/Benchmarks/Sources/Benchmarks.swift index 661aba63e..921db50ea 100644 --- a/Benchmarks/Sources/Benchmarks.swift +++ b/Benchmarks/Sources/Benchmarks.swift @@ -111,6 +111,22 @@ enum ComplexResult { } } +@JS class OptionalReturnRoundtrip { + @JS init() {} + + @JS func makeIntSome() -> Int? { 42 } + @JS func makeIntNone() -> Int? { nil } + + @JS func makeBoolSome() -> Bool? { true } + @JS func makeBoolNone() -> Bool? { nil } + + @JS func makeDoubleSome() -> Double? { 0.5 } + @JS func makeDoubleNone() -> Double? { nil } + + @JS func makeStringSome() -> String? { "Hello, world" } + @JS func makeStringNone() -> String? { nil } +} + // MARK: - Struct Performance Tests @JS struct SimpleStruct { diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 7d90eb82b..0bbc68bb2 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -839,6 +839,130 @@ fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) - } #endif +@_expose(wasm, "bjs_OptionalReturnRoundtrip_init") +@_cdecl("bjs_OptionalReturnRoundtrip_init") +public func _bjs_OptionalReturnRoundtrip_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeIntSome") +@_cdecl("bjs_OptionalReturnRoundtrip_makeIntSome") +public func _bjs_OptionalReturnRoundtrip_makeIntSome(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeIntSome() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeIntNone") +@_cdecl("bjs_OptionalReturnRoundtrip_makeIntNone") +public func _bjs_OptionalReturnRoundtrip_makeIntNone(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeIntNone() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeBoolSome") +@_cdecl("bjs_OptionalReturnRoundtrip_makeBoolSome") +public func _bjs_OptionalReturnRoundtrip_makeBoolSome(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeBoolSome() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeBoolNone") +@_cdecl("bjs_OptionalReturnRoundtrip_makeBoolNone") +public func _bjs_OptionalReturnRoundtrip_makeBoolNone(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeBoolNone() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeDoubleSome") +@_cdecl("bjs_OptionalReturnRoundtrip_makeDoubleSome") +public func _bjs_OptionalReturnRoundtrip_makeDoubleSome(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeDoubleSome() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeDoubleNone") +@_cdecl("bjs_OptionalReturnRoundtrip_makeDoubleNone") +public func _bjs_OptionalReturnRoundtrip_makeDoubleNone(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeDoubleNone() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeStringSome") +@_cdecl("bjs_OptionalReturnRoundtrip_makeStringSome") +public func _bjs_OptionalReturnRoundtrip_makeStringSome(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeStringSome() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_makeStringNone") +@_cdecl("bjs_OptionalReturnRoundtrip_makeStringNone") +public func _bjs_OptionalReturnRoundtrip_makeStringNone(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeStringNone() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalReturnRoundtrip_deinit") +@_cdecl("bjs_OptionalReturnRoundtrip_deinit") +public func _bjs_OptionalReturnRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension OptionalReturnRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalReturnRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_OptionalReturnRoundtrip_wrap") +fileprivate func _bjs_OptionalReturnRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalReturnRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_StructRoundtrip_init") @_cdecl("bjs_StructRoundtrip_init") public func _bjs_StructRoundtrip_init() -> UnsafeMutableRawPointer { diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json index 27a245f56..42cbcb707 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json @@ -424,6 +424,194 @@ ], "swiftCallName" : "StringRoundtrip" }, + { + "constructor" : { + "abiName" : "bjs_OptionalReturnRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeIntSome", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeIntSome", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeIntNone", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeIntNone", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeBoolSome", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeBoolSome", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeBoolNone", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeBoolNone", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeDoubleSome", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDoubleSome", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeDoubleNone", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDoubleNone", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeStringSome", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStringSome", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_OptionalReturnRoundtrip_makeStringNone", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStringNone", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "name" : "OptionalReturnRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "OptionalReturnRoundtrip" + }, { "constructor" : { "abiName" : "bjs_StructRoundtrip_init", diff --git a/Benchmarks/run.js b/Benchmarks/run.js index 5c27e6fff..7771887c5 100644 --- a/Benchmarks/run.js +++ b/Benchmarks/run.js @@ -17,9 +17,17 @@ function updateProgress(current, total, label = '', width) { const completed = Math.round(width * (percent / 100)); const remaining = width - completed; const bar = '█'.repeat(completed) + '░'.repeat(remaining); - process.stdout.clearLine(); - process.stdout.cursorTo(0); - process.stdout.write(`${label} [${bar}] ${current}/${total}`); + const canUpdateLine = + process.stdout.isTTY && + typeof process.stdout.clearLine === "function" && + typeof process.stdout.cursorTo === "function"; + if (canUpdateLine) { + process.stdout.clearLine(); + process.stdout.cursorTo(0); + process.stdout.write(`${label} [${bar}] ${current}/${total}`); + } else if (current === 0 || current === total) { + console.log(`${label} [${bar}] ${current}/${total}`); + } } /** @@ -263,14 +271,21 @@ function saveJsonResults(filePath, data) { /** * Run a single benchmark iteration * @param {Object} results - Results object to store benchmark data + * @param {(name: string) => boolean} nameFilter - Name filter + * @param {number} iterations - Loop iterations per JS benchmark * @returns {Promise} */ -async function singleRun(results, nameFilter) { +async function singleRun(results, nameFilter, iterations) { const options = await defaultNodeSetup({}) const benchmarkRunner = (name, body) => { if (nameFilter && !nameFilter(name)) { return; } + // Warmup to reduce JIT/IC noise. + body(); + if (typeof globalThis.gc === "function") { + globalThis.gc(); + } const startTime = performance.now(); body(); const endTime = performance.now(); @@ -291,7 +306,6 @@ async function singleRun(results, nameFilter) { exports.run(); const enumRoundtrip = new exports.EnumRoundtrip(); - const iterations = 100_000; benchmarkRunner("EnumRoundtrip/takeEnum success", () => { for (let i = 0; i < iterations; i++) { enumRoundtrip.take({ tag: APIResult.Tag.Success, param0: "Hello, world" }) @@ -455,6 +469,48 @@ async function singleRun(results, nameFilter) { } }) + const optionalReturnRoundtrip = new exports.OptionalReturnRoundtrip(); + benchmarkRunner("OptionalReturnRoundtrip/makeIntSome", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeIntSome() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeIntNone", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeIntNone() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeBoolSome", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeBoolSome() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeBoolNone", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeBoolNone() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeDoubleSome", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeDoubleSome() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeDoubleNone", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeDoubleNone() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeStringSome", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeStringSome() + } + }) + benchmarkRunner("OptionalReturnRoundtrip/makeStringNone", () => { + for (let i = 0; i < iterations; i++) { + optionalReturnRoundtrip.makeStringNone() + } + }) + // Struct performance tests const structRoundtrip = new exports.StructRoundtrip(); @@ -590,9 +646,10 @@ async function singleRun(results, nameFilter) { * Run until the coefficient of variation of measurements is below the threshold * @param {Object} results - Benchmark results object * @param {Object} options - Adaptive sampling options + * @param {number} iterations - Loop iterations per JS benchmark * @returns {Promise} */ -async function runUntilStable(results, options, width, nameFilter, filterArg) { +async function runUntilStable(results, options, width, nameFilter, filterArg, iterations) { const { minRuns = 5, maxRuns = 50, @@ -611,7 +668,7 @@ async function runUntilStable(results, options, width, nameFilter, filterArg) { // Update progress with estimated completion updateProgress(runs, maxRuns, "Benchmark Progress:", width); - await singleRun(results, nameFilter); + await singleRun(results, nameFilter, iterations); runs++; if (runs === 1 && Object.keys(results).length === 0) { @@ -674,6 +731,7 @@ Usage: node run.js [options] Options: --runs=NUMBER Number of benchmark runs (default: 10) + --iterations=NUMBER Loop iterations per JS benchmark (default: 100000) --output=FILENAME Save JSON results to specified file --baseline=FILENAME Compare results with baseline JSON file --adaptive Enable adaptive sampling (run until stable) @@ -689,6 +747,7 @@ async function main() { const args = parseArgs({ options: { runs: { type: 'string', default: '10' }, + iterations: { type: 'string', default: '100000' }, output: { type: 'string' }, baseline: { type: 'string' }, help: { type: 'boolean', default: false }, @@ -710,6 +769,12 @@ async function main() { const filterArg = args.values.filter; const nameFilter = createNameFilter(filterArg); + const iterations = parseInt(args.values.iterations, 10); + if (isNaN(iterations) || iterations <= 0) { + console.error('Invalid --iterations value:', args.values.iterations); + process.exit(1); + } + if (args.values.adaptive) { // Adaptive sampling mode const options = { @@ -723,7 +788,7 @@ async function main() { console.log(`Results will be saved to: ${args.values.output}`); } - await runUntilStable(results, options, width, nameFilter, filterArg); + await runUntilStable(results, options, width, nameFilter, filterArg, iterations); } else { // Fixed number of runs mode const runs = parseInt(args.values.runs, 10); @@ -745,7 +810,7 @@ async function main() { console.log("\nOverall Progress:"); for (let i = 0; i < runs; i++) { updateProgress(i, runs, "Benchmark Runs:", width); - await singleRun(results, nameFilter); + await singleRun(results, nameFilter, iterations); if (i === 0 && Object.keys(results).length === 0) { process.stdout.write("\n"); console.error(`No benchmarks matched filter: ${filterArg}`); From 57160fe5c403822a3bc07217f931e05d12fe41ea Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 22:44:19 +0900 Subject: [PATCH 105/252] BridgeJS: Remove unnecessary helper enums for struct bridging (#532) --- Benchmarks/Sources/Generated/BridgeJS.swift | 48 +----- .../Sources/BridgeJSCore/ExportSwift.swift | 17 +-- .../ExportSwiftTests/DefaultParameters.swift | 24 +-- .../ExportSwiftTests/SwiftStruct.swift | 60 +------- .../ExportSwiftTests/UnsafePointer.swift | 12 +- .../Generated/BridgeJS.swift | 144 ++---------------- 6 files changed, 26 insertions(+), 279 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 0bbc68bb2..84b466331 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -269,7 +269,7 @@ extension SimpleStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _SimpleStructHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -279,16 +279,6 @@ extension SimpleStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _SimpleStructHelpers.raise() - } -} - -fileprivate enum _SimpleStructHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SimpleStruct())) } } @@ -332,7 +322,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -342,16 +332,6 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _AddressHelpers.raise() - } -} - -fileprivate enum _AddressHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } } @@ -401,7 +381,7 @@ extension Person: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _PersonHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -411,16 +391,6 @@ extension Person: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _PersonHelpers.raise() - } -} - -fileprivate enum _PersonHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) } } @@ -473,7 +443,7 @@ extension ComplexStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ComplexStructHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -483,16 +453,6 @@ extension ComplexStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ComplexStructHelpers.raise() - } -} - -fileprivate enum _ComplexStructHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ComplexStruct())) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 81042b2e7..11951e7d9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1157,7 +1157,6 @@ struct StructCodegen { let lowerCode = generateStructLowerCode(structDef: structDef) let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? "" - let helpersTypeName = "_\(structDef.name)Helpers" let lowerExternName = "swift_js_struct_lower_\(structDef.name)" let raiseExternName = "swift_js_struct_raise_\(structDef.name)" let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)" @@ -1174,7 +1173,7 @@ struct StructCodegen { } \(raw: accessControl)init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = \(raw: helpersTypeName).lower(jsObject) + let __bjs_cleanupId = \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } self = Self.bridgeJSLiftParameter() } @@ -1182,18 +1181,6 @@ struct StructCodegen { \(raw: accessControl)func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return \(raw: helpersTypeName).raise() - } - } - """ - - let helpersType: DeclSyntax = """ - fileprivate enum \(raw: helpersTypeName) { - static func lower(_ jsObject: JSObject) -> Int32 { - return \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: \(raw: raiseFunctionName)())) } } @@ -1216,7 +1203,7 @@ struct StructCodegen { ) ) - return [bridgedStructExtension, helpersType, lowerExternDecl, raiseExternDecl] + return [bridgedStructExtension, lowerExternDecl, raiseExternDecl] } private static func renderStructExtern( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index cd305f407..7db06add2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -55,7 +55,7 @@ extension Config: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ConfigHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -65,16 +65,6 @@ extension Config: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ConfigHelpers.raise() - } -} - -fileprivate enum _ConfigHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) } } @@ -108,7 +98,7 @@ extension MathOperations: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _MathOperationsHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -118,16 +108,6 @@ extension MathOperations: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _MathOperationsHelpers.raise() - } -} - -fileprivate enum _MathOperationsHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index fa094a1b8..001f3e4c8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -28,7 +28,7 @@ extension DataPoint: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _DataPointHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -38,16 +38,6 @@ extension DataPoint: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _DataPointHelpers.raise() - } -} - -fileprivate enum _DataPointHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) } } @@ -106,7 +96,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -116,16 +106,6 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _AddressHelpers.raise() - } -} - -fileprivate enum _AddressHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } } @@ -175,7 +155,7 @@ extension Person: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _PersonHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -185,16 +165,6 @@ extension Person: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _PersonHelpers.raise() - } -} - -fileprivate enum _PersonHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) } } @@ -230,7 +200,7 @@ extension Session: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _SessionHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -240,16 +210,6 @@ extension Session: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _SessionHelpers.raise() - } -} - -fileprivate enum _SessionHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Session())) } } @@ -282,7 +242,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ConfigStructHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -292,16 +252,6 @@ extension ConfigStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ConfigStructHelpers.raise() - } -} - -fileprivate enum _ConfigStructHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 3954f3feb..5362e862a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -17,7 +17,7 @@ extension PointerFields: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _PointerFieldsHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -27,16 +27,6 @@ extension PointerFields: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _PointerFieldsHelpers.raise() - } -} - -fileprivate enum _PointerFieldsHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index b47bf062b..f46a6d40e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2231,7 +2231,7 @@ extension PointerFields: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _PointerFieldsHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2241,16 +2241,6 @@ extension PointerFields: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _PointerFieldsHelpers.raise() - } -} - -fileprivate enum _PointerFieldsHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) } } @@ -2314,7 +2304,7 @@ extension DataPoint: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _DataPointHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2324,16 +2314,6 @@ extension DataPoint: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _DataPointHelpers.raise() - } -} - -fileprivate enum _DataPointHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) } } @@ -2392,7 +2372,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _AddressHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2402,16 +2382,6 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _AddressHelpers.raise() - } -} - -fileprivate enum _AddressHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } } @@ -2467,7 +2437,7 @@ extension Contact: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ContactHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2477,16 +2447,6 @@ extension Contact: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ContactHelpers.raise() - } -} - -fileprivate enum _ContactHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Contact())) } } @@ -2540,7 +2500,7 @@ extension Config: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ConfigHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2550,16 +2510,6 @@ extension Config: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ConfigHelpers.raise() - } -} - -fileprivate enum _ConfigHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) } } @@ -2599,7 +2549,7 @@ extension SessionData: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _SessionDataHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2609,16 +2559,6 @@ extension SessionData: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _SessionDataHelpers.raise() - } -} - -fileprivate enum _SessionDataHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SessionData())) } } @@ -2666,7 +2606,7 @@ extension ValidationReport: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ValidationReportHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2676,16 +2616,6 @@ extension ValidationReport: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ValidationReportHelpers.raise() - } -} - -fileprivate enum _ValidationReportHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ValidationReport())) } } @@ -2719,7 +2649,7 @@ extension MathOperations: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _MathOperationsHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2729,16 +2659,6 @@ extension MathOperations: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _MathOperationsHelpers.raise() - } -} - -fileprivate enum _MathOperationsHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) } } @@ -2825,7 +2745,7 @@ extension CopyableCart: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _CopyableCartHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2835,16 +2755,6 @@ extension CopyableCart: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _CopyableCartHelpers.raise() - } -} - -fileprivate enum _CopyableCartHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCart())) } } @@ -2894,7 +2804,7 @@ extension CopyableCartItem: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _CopyableCartItemHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2904,16 +2814,6 @@ extension CopyableCartItem: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _CopyableCartItemHelpers.raise() - } -} - -fileprivate enum _CopyableCartItemHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCartItem())) } } @@ -2955,7 +2855,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _CopyableNestedCartHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -2965,16 +2865,6 @@ extension CopyableNestedCart: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _CopyableNestedCartHelpers.raise() - } -} - -fileprivate enum _CopyableNestedCartHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableNestedCart())) } } @@ -3024,7 +2914,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _ConfigStructHelpers.lower(jsObject) + let __bjs_cleanupId = _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) defer { _swift_js_struct_cleanup(__bjs_cleanupId) } @@ -3034,16 +2924,6 @@ extension ConfigStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { var __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return _ConfigStructHelpers.raise() - } -} - -fileprivate enum _ConfigStructHelpers { - static func lower(_ jsObject: JSObject) -> Int32 { - return _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) - } - - static func raise() -> JSObject { return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) } } From d3c6d532de15ad852d7f7fc4341d62ed415e3baa Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 27 Jan 2026 18:42:05 +0700 Subject: [PATCH 106/252] BridgeJS: Remove warnings from toJSObject() --- Benchmarks/Sources/Generated/BridgeJS.swift | 8 +++---- .../Sources/BridgeJSCore/ExportSwift.swift | 2 +- .../ExportSwiftTests/DefaultParameters.swift | 4 ++-- .../ExportSwiftTests/SwiftStruct.swift | 10 ++++---- .../ExportSwiftTests/UnsafePointer.swift | 2 +- .../Generated/BridgeJS.swift | 24 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 84b466331..90558ff7b 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -277,7 +277,7 @@ extension SimpleStruct: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SimpleStruct())) } @@ -330,7 +330,7 @@ extension Address: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } @@ -389,7 +389,7 @@ extension Person: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) } @@ -451,7 +451,7 @@ extension ComplexStruct: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ComplexStruct())) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 11951e7d9..2b301e822 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1179,7 +1179,7 @@ struct StructCodegen { } \(raw: accessControl)func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: \(raw: raiseFunctionName)())) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 7db06add2..d80d78d85 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -63,7 +63,7 @@ extension Config: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) } @@ -106,7 +106,7 @@ extension MathOperations: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index 001f3e4c8..1b753e47d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -36,7 +36,7 @@ extension DataPoint: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) } @@ -104,7 +104,7 @@ extension Address: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } @@ -163,7 +163,7 @@ extension Person: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) } @@ -208,7 +208,7 @@ extension Session: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Session())) } @@ -250,7 +250,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 5362e862a..3e9fad511 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -25,7 +25,7 @@ extension PointerFields: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index f46a6d40e..e3b139c4a 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2239,7 +2239,7 @@ extension PointerFields: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) } @@ -2312,7 +2312,7 @@ extension DataPoint: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) } @@ -2380,7 +2380,7 @@ extension Address: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) } @@ -2445,7 +2445,7 @@ extension Contact: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Contact())) } @@ -2508,7 +2508,7 @@ extension Config: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) } @@ -2557,7 +2557,7 @@ extension SessionData: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SessionData())) } @@ -2614,7 +2614,7 @@ extension ValidationReport: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ValidationReport())) } @@ -2657,7 +2657,7 @@ extension MathOperations: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) } @@ -2753,7 +2753,7 @@ extension CopyableCart: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCart())) } @@ -2812,7 +2812,7 @@ extension CopyableCartItem: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCartItem())) } @@ -2863,7 +2863,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableNestedCart())) } @@ -2922,7 +2922,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) } From 61659cbc779d1298afee4414757e7fcd87c0f0bb Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 28 Jan 2026 07:08:49 +0700 Subject: [PATCH 107/252] BridgeJS: Fix codegen for Float/Double raw value enums in struct fields and optional context (#533) --- .../Sources/BridgeJSCore/ExportSwift.swift | 34 +++- .../Sources/BridgeJSLink/JSGlueGen.swift | 60 +++++++ .../Inputs/SwiftStruct.swift | 11 ++ .../BridgeJSLinkTests/SwiftStruct.Export.d.ts | 14 ++ .../BridgeJSLinkTests/SwiftStruct.Export.js | 49 ++++++ .../ExportSwiftTests/SwiftStruct.json | 73 ++++++++ .../ExportSwiftTests/SwiftStruct.swift | 54 ++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 23 +++ .../Generated/BridgeJS.swift | 74 ++++++++ .../Generated/JavaScript/BridgeJS.json | 158 ++++++++++++++++++ Tests/prelude.mjs | 23 +++ 11 files changed, 569 insertions(+), 4 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 2b301e822..67b6df55f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -784,7 +784,11 @@ struct StackCodegen { case .string: return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool, .int, .int32, .int64, .uint, .uint32, .uint64, .float, .double: + case .float: + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f32())" + case .double: + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f64())" + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" } case .associatedValueEnum(let enumName): @@ -825,7 +829,13 @@ struct StackCodegen { case .string: return "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .bool, .int, .float, .double, .int32, .int64, .uint, .uint32, .uint64: + case .float: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" + case .double: + return + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: return "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" } @@ -880,8 +890,20 @@ struct StackCodegen { return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] case .caseEnum: return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] - case .rawValueEnum: - return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return [ + "var __bjs_\(raw: varPrefix) = \(raw: accessor).rawValue", + "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", + ] + case .float: + return ["_swift_js_push_f32(\(raw: accessor).bridgeJSLowerParameter())"] + case .double: + return ["_swift_js_push_f64(\(raw: accessor).bridgeJSLowerParameter())"] + default: + return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + } case .associatedValueEnum: return ["\(raw: accessor).bridgeJSLowerReturn()"] case .swiftStruct: @@ -948,6 +970,10 @@ struct StackCodegen { "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar).rawValue", "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", ] + case .float: + return ["_swift_js_push_f32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + case .double: + return ["_swift_js_push_f64(\(raw: unwrappedVar).bridgeJSLowerParameter())"] default: return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 6b45f6778..ef5c5eb2e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2357,6 +2357,32 @@ struct IntrinsicJSFragment: Sendable { "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" ) return [idVar] + case .float: + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(value)));" + ) + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(0.0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + return [] + case .double: + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(value));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(0.0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + return [] default: printer.write("if (\(isSomeVar)) {") printer.indent { @@ -2596,6 +2622,22 @@ struct IntrinsicJSFragment: Sendable { return [idVar] } ) + case .float: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + return [] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + return [] + } + ) default: return IntrinsicJSFragment( parameters: ["value"], @@ -2795,6 +2837,24 @@ struct IntrinsicJSFragment: Sendable { return [varName] } ) + case .float: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + return [varName] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("value") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + return [varName] + } + ) default: return IntrinsicJSFragment( parameters: [], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift index 3415f54a9..ac316a05a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift @@ -35,6 +35,17 @@ @JS func roundtrip(_ session: Person) -> Person +@JS enum Precision: Float { + case rough = 0.1 + case fine = 0.001 +} + +@JS struct Measurement { + var value: Double + var precision: Precision + var optionalPrecision: Precision? +} + @JS struct ConfigStruct { @JS static let maxRetries: Int = 3 @JS nonisolated(unsafe) static var defaultConfig: String = "production" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts index 1d1474510..7769ebcbe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts @@ -4,6 +4,12 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export const PrecisionValues: { + readonly Rough: 0.1; + readonly Fine: 0.001; +}; +export type PrecisionTag = typeof PrecisionValues[keyof typeof PrecisionValues]; + export interface DataPoint { x: number; y: number; @@ -26,8 +32,15 @@ export interface Session { id: number; owner: Greeter; } +export interface Measurement { + value: number; + precision: PrecisionTag; + optionalPrecision: PrecisionTag | null; +} export interface ConfigStruct { } +export type PrecisionObject = typeof PrecisionValues; + /// Represents a Swift heap object like a class instance or an actor instance. export interface SwiftHeapObject { /// Release the heap object. @@ -44,6 +57,7 @@ export type Exports = { new(name: string): Greeter; } roundtrip(session: Person): Person; + Precision: PrecisionObject DataPoint: { init(x: number, y: number, label: string, optCount: number | null, optFlag: boolean | null): DataPoint; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index abcd9500d..91968b77a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -4,6 +4,11 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export const PrecisionValues = { + Rough: 0.1, + Fine: 0.001, +}; + export async function createInstantiator(options, swift) { let instance; let memory; @@ -184,6 +189,35 @@ export async function createInstantiator(options, swift) { } }); }; + const __bjs_createMeasurementHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamF64s.push(value.value); + tmpParamF32s.push(Math.fround(value.precision)); + const isSome = value.optionalPrecision != null; + if (isSome) { + tmpParamF32s.push(Math.fround(value.optionalPrecision)); + } else { + tmpParamF32s.push(0.0); + } + tmpParamInts.push(isSome ? 1 : 0); + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const value = tmpRetF32s.pop(); + optional = value; + } else { + optional = null; + } + const value1 = tmpRetF32s.pop(); + const f64 = tmpRetF64s.pop(); + return { value: f64, precision: value1, optionalPrecision: optional }; + } + }); + }; const __bjs_createConfigStructHelpers = () => { return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ lower: (value) => { @@ -315,6 +349,17 @@ export async function createInstantiator(options, swift) { const value = structHelpers.Session.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } + bjs["swift_js_struct_lower_Measurement"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Measurement.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Measurement"] = function() { + const value = structHelpers.Measurement.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) { const { cleanup: cleanup } = structHelpers.ConfigStruct.lower(swift.memory.getObject(objectId)); if (cleanup) { @@ -498,6 +543,9 @@ export async function createInstantiator(options, swift) { const SessionHelpers = __bjs_createSessionHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Session = SessionHelpers; + const MeasurementHelpers = __bjs_createMeasurementHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Measurement = MeasurementHelpers; + const ConfigStructHelpers = __bjs_createConfigStructHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.ConfigStruct = ConfigStructHelpers; @@ -510,6 +558,7 @@ export async function createInstantiator(options, swift) { if (cleanup) { cleanup(); } return structValue; }, + Precision: PrecisionValues, DataPoint: { init: function(x, y, label, optCount, optFlag) { const labelBytes = textEncoder.encode(label); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json index c6e430edf..ca8f7c625 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json @@ -56,7 +56,35 @@ } ], "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "rough", + "rawValue" : "0.1" + }, + { + "associatedValues" : [ + + ], + "name" : "fine", + "rawValue" : "0.001" + } + ], + "emitStyle" : "const", + "name" : "Precision", + "rawType" : "Float", + "staticMethods" : [ + + ], + "staticProperties" : [ + ], + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" + } ], "exposeToGlobal" : false, "functions" : [ @@ -345,6 +373,51 @@ ], "swiftCallName" : "Session" }, + { + "methods" : [ + + ], + "name" : "Measurement", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precision", + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalPrecision", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + } + ], + "swiftCallName" : "Measurement" + }, { "methods" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index 1b753e47d..ea3ae2469 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -1,3 +1,6 @@ +extension Precision: _BridgedSwiftEnumNoPayload { +} + extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) @@ -232,6 +235,57 @@ fileprivate func _bjs_struct_raise_Session() -> Int32 { } #endif +extension Measurement: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Measurement { + let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) + let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) + let value = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return Measurement(value: value, precision: precision, optionalPrecision: optionalPrecision) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.value) + _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) + let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil + if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { + _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Measurement(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Measurement())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Measurement") +fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Measurement") +fileprivate func _bjs_struct_raise_Measurement() -> Int32 +#else +fileprivate func _bjs_struct_raise_Measurement() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { return ConfigStruct() diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index fe4a44de2..411b01024 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -226,6 +226,18 @@ struct TestError: Error { case unknown = -1 } +@JS enum Precision: Float { + case rough = 0.1 + case normal = 0.01 + case fine = 0.001 +} + +@JS enum Ratio: Double { + case quarter = 0.25 + case half = 0.5 + case golden = 1.618 +} + @JS(enumStyle: .tsEnum) enum TSDirection { case north case south @@ -1390,6 +1402,17 @@ enum APIOptionalResult { cart.toJSObject() } +@JS struct MeasurementConfig { + var precision: Precision + var ratio: Ratio + var optionalPrecision: Precision? + var optionalRatio: Ratio? +} + +@JS func roundTripMeasurementConfig(_ config: MeasurementConfig) -> MeasurementConfig { + return config +} + @JS struct ConfigStruct { var name: String var value: Int diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index e3b139c4a..96e50d192 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1298,6 +1298,12 @@ extension Theme: _BridgedSwiftEnumNoPayload { extension HttpStatus: _BridgedSwiftEnumNoPayload { } +extension Precision: _BridgedSwiftEnumNoPayload { +} + +extension Ratio: _BridgedSwiftEnumNoPayload { +} + extension TSDirection: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -2898,6 +2904,63 @@ public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void #endif } +extension MeasurementConfig: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { + let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64()) + let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) + let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) + return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) + _swift_js_push_f64(self.ratio.bridgeJSLowerParameter()) + let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil + if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { + _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) + let __bjs_isSome_optionalRatio = self.optionalRatio != nil + if let __bjs_unwrapped_optionalRatio = self.optionalRatio { + _swift_js_push_f64(__bjs_unwrapped_optionalRatio.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_optionalRatio ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + var __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MeasurementConfig())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig") +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MeasurementConfig") +fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 +#else +fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) @@ -4437,6 +4500,17 @@ public func _bjs_nestedCartToJSObject() -> Int32 { #endif } +@_expose(wasm, "bjs_roundTripMeasurementConfig") +@_cdecl("bjs_roundTripMeasurementConfig") +public func _bjs_roundTripMeasurementConfig() -> Void { + #if arch(wasm32) + let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripDataPoint") @_cdecl("bjs_roundTripDataPoint") public func _bjs_roundTripDataPoint() -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 82c394a93..180dc6c1a 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -3341,6 +3341,78 @@ { "associatedValues" : [ + ], + "name" : "rough", + "rawValue" : "0.1" + }, + { + "associatedValues" : [ + + ], + "name" : "normal", + "rawValue" : "0.01" + }, + { + "associatedValues" : [ + + ], + "name" : "fine", + "rawValue" : "0.001" + } + ], + "emitStyle" : "const", + "name" : "Precision", + "rawType" : "Float", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "quarter", + "rawValue" : "0.25" + }, + { + "associatedValues" : [ + + ], + "name" : "half", + "rawValue" : "0.5" + }, + { + "associatedValues" : [ + + ], + "name" : "golden", + "rawValue" : "1.618" + } + ], + "emitStyle" : "const", + "name" : "Ratio", + "rawType" : "Double", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Ratio", + "tsFullPath" : "Ratio" + }, + { + "cases" : [ + { + "associatedValues" : [ + ], "name" : "north" }, @@ -7966,6 +8038,31 @@ } } }, + { + "abiName" : "bjs_roundTripMeasurementConfig", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripMeasurementConfig", + "parameters" : [ + { + "label" : "_", + "name" : "config", + "type" : { + "swiftStruct" : { + "_0" : "MeasurementConfig" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "MeasurementConfig" + } + } + }, { "abiName" : "bjs_roundTripDataPoint", "effects" : { @@ -9383,6 +9480,67 @@ { "methods" : [ + ], + "name" : "MeasurementConfig", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precision", + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ratio", + "type" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalPrecision", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalRatio", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + } + } + } + ], + "swiftCallName" : "MeasurementConfig" + }, + { + "methods" : [ + ], "name" : "ConfigStruct", "properties" : [ diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index d95605078..65bb7d607 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -458,6 +458,13 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(HttpStatusValues.ServerError, 500); assert.equal(HttpStatusValues.Unknown, -1); + assert.equal(exports.Precision.Rough, 0.1); + assert.equal(exports.Precision.Normal, 0.01); + assert.equal(exports.Precision.Fine, 0.001); + assert.equal(exports.Ratio.Quarter, 0.25); + assert.equal(exports.Ratio.Half, 0.5); + assert.equal(exports.Ratio.Golden, 1.618); + assert.equal(exports.setTheme(exports.Theme.Light), exports.Theme.Light); assert.equal(exports.setTheme(exports.Theme.Dark), exports.Theme.Dark); assert.equal(exports.getTheme(), ThemeValues.Light); @@ -1089,6 +1096,22 @@ function testStructSupport(exports) { exports.ConfigStruct.defaultConfig = "staging"; assert.equal(exports.ConfigStruct.computedSetting, "Config: staging"); exports.ConfigStruct.defaultConfig = "production"; + + const { Precision, Ratio } = exports; + const mc1 = { + precision: Math.fround(Precision.Rough), + ratio: Ratio.Golden, + optionalPrecision: Math.fround(Precision.Fine), + optionalRatio: Ratio.Half + }; + assert.deepEqual(exports.roundTripMeasurementConfig(mc1), mc1); + const mc2 = { + precision: Math.fround(Precision.Normal), + ratio: Ratio.Quarter, + optionalPrecision: null, + optionalRatio: null + }; + assert.deepEqual(exports.roundTripMeasurementConfig(mc2), mc2); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ From 5931e7c2109657dce02ebe9d60f8285da75be875 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 27 Jan 2026 15:29:36 +0900 Subject: [PATCH 108/252] BridgeJS: Support `@JS` Swift struct types in imported JS signatures They are cloned via stack ABI --- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../Sources/BridgeJSCore/ImportTS.swift | 6 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 23 +- .../SwiftStructImports.swift | 7 + .../SwiftStructImports.ImportMacros.d.ts | 22 + .../SwiftStructImports.ImportMacros.js | 262 ++++++++++ .../ExportSwiftTests/SwiftStruct.swift | 2 +- .../SwiftStructImports.ImportMacros.swift | 19 + .../JavaScriptKit/BridgeJSIntrinsics.swift | 16 + .../BridgeJSRuntimeTests/ExportAPITests.swift | 200 -------- .../Generated/BridgeJS.swift | 317 +++++++++--- .../Generated/JavaScript/BridgeJS.json | 459 +++++++++++++----- .../ImportStructAPIs.swift | 9 + Tests/BridgeJSRuntimeTests/StructAPIs.swift | 216 +++++++++ .../SwiftStructTests.swift | 19 + Tests/prelude.mjs | 45 +- 16 files changed, 1222 insertions(+), 404 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift create mode 100644 Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift create mode 100644 Tests/BridgeJSRuntimeTests/StructAPIs.swift create mode 100644 Tests/BridgeJSRuntimeTests/SwiftStructTests.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 67b6df55f..370b5fa2d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -881,7 +881,7 @@ struct StackCodegen { case .double: return ["_swift_js_push_f64(\(raw: accessor))"] case .jsObject: - return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerReturn())"] case .swiftHeapObject: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .unsafePointer: @@ -984,7 +984,7 @@ struct StackCodegen { case .associatedValueEnum: return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .jsObject: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerReturn())"] default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index ad5cdaf06..176b46b66 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -916,7 +916,8 @@ extension BridgeType { case .swiftStruct: switch context { case .importTS: - throw BridgeJSCoreError("Swift structs are not yet supported in TypeScript imports") + // Swift structs are bridged as JS objects (object IDs) in imported signatures. + return LoweringParameterInfo(loweredParameters: [("objectId", .i32)]) case .exportSwift: return LoweringParameterInfo(loweredParameters: []) } @@ -1002,7 +1003,8 @@ extension BridgeType { case .swiftStruct: switch context { case .importTS: - throw BridgeJSCoreError("Swift structs are not yet supported in TypeScript imports") + // Swift structs are bridged as JS objects (object IDs) in imported signatures. + return LiftingReturnInfo(valueToLift: .i32) case .exportSwift: return LiftingReturnInfo(valueToLift: nil) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ef5c5eb2e..05b279c4f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -204,6 +204,18 @@ struct IntrinsicJSFragment: Sendable { return [resultLabel] } ) + static let jsObjectLiftRetainedObjectId = IntrinsicJSFragment( + parameters: ["objectId"], + printCode: { arguments, scope, printer, cleanupCode in + let resultLabel = scope.variable("value") + let objectId = arguments[0] + printer.write( + "const \(resultLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") + return [resultLabel] + } + ) static let jsObjectLiftParameter = IntrinsicJSFragment( parameters: ["objectId"], printCode: { arguments, scope, printer, cleanupCode in @@ -1446,10 +1458,7 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): switch context { case .importTS: - throw BridgeJSLinkError( - message: - "Swift structs are not supported to be passed as parameters to imported JS functions: \(fullName)" - ) + return .jsObjectLiftRetainedObjectId case .exportSwift: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( @@ -1527,10 +1536,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): switch context { case .importTS: - throw BridgeJSLinkError( - message: - "Swift structs are not supported to be returned from imported JS functions: \(fullName)" - ) + // ImportTS expects Swift structs to come back as a retained JS object ID. + return .jsObjectLowerReturn case .exportSwift: return swiftStructLowerReturn(fullName: fullName) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift new file mode 100644 index 000000000..b00fd768a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift @@ -0,0 +1,7 @@ +@JS +struct Point { + var x: Int + var y: Int +} + +@JSFunction func translate(_ point: Point, dx: Int, dy: Int) throws(JSException) -> Point diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts new file mode 100644 index 000000000..3677f1e44 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts @@ -0,0 +1,22 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface Point { + x: number; + y: number; +} +export type Exports = { +} +export type Imports = { + translate(point: Point, dx: number, dy: number): Point; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js new file mode 100644 index 000000000..67a9b98e3 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -0,0 +1,262 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + const __bjs_createPointHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamInts.push((value.x | 0)); + tmpParamInts.push((value.y | 0)); + return { cleanup: undefined }; + }, + raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const int = tmpRetInts.pop(); + const int1 = tmpRetInts.pop(); + return { x: int1, y: int }; + } + }); + }; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_struct_lower_Point"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_raise_Point"] = function() { + const value = structHelpers.Point.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_translate"] = function bjs_translate(point, dx, dy) { + try { + const value = swift.memory.getObject(point); + swift.memory.release(point); + let ret = imports.translate(value, dx, dy); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Point = PointHelpers; + + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index ea3ae2469..12623a344 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -262,7 +262,7 @@ extension Measurement: _BridgedSwiftStruct { } func toJSObject() -> JSObject { - var __bjs_self = self + let __bjs_self = self __bjs_self.bridgeJSLowerReturn() return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Measurement())) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift new file mode 100644 index 000000000..54470e5de --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift @@ -0,0 +1,19 @@ +#if arch(wasm32) +@_extern(wasm, module: "Check", name: "bjs_translate") +fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 +#else +fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$translate(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { + let pointObjectId = point.bridgeJSLowerParameter() + let dxValue = dx.bridgeJSLowerParameter() + let dyValue = dy.bridgeJSLowerParameter() + let ret = bjs_translate(pointObjectId, dxValue, dyValue) + if let error = _swift_js_take_exception() { + throw error + } + return Point.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index fa7c9e4a6..52e05a4f6 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -322,6 +322,22 @@ public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType { // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter() -> Self @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void + + /// Initializes a Swift struct by copying the fields from a bridged JS object. + init(unsafelyCopying jsObject: JSObject) + /// Converts the struct into a bridged JS object by copying its fields. + func toJSObject() -> JSObject +} + +extension _BridgedSwiftStruct { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + return toJSObject().bridgeJSLowerReturn() + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ objectId: Int32) -> Self { + let jsObject = JSObject.bridgeJSLiftReturn(objectId) + return Self(unsafelyCopying: jsObject) + } } extension _BridgedSwiftEnumNoPayload where Self: RawRepresentable, RawValue == String { diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 411b01024..27584d24d 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -49,30 +49,6 @@ func runJsWorks() -> Void return v } -@JS struct PointerFields { - var raw: UnsafeRawPointer - var mutRaw: UnsafeMutableRawPointer - var opaque: OpaquePointer - var ptr: UnsafePointer - var mutPtr: UnsafeMutablePointer - - @JS init( - raw: UnsafeRawPointer, - mutRaw: UnsafeMutableRawPointer, - opaque: OpaquePointer, - ptr: UnsafePointer, - mutPtr: UnsafeMutablePointer - ) { - self.raw = raw - self.mutRaw = mutRaw - self.opaque = opaque - self.ptr = ptr - self.mutPtr = mutPtr - } -} - -@JS func roundTripPointerFields(_ value: PointerFields) -> PointerFields { value } - @JSClass struct Foo { @JSGetter var value: String @JSFunction init(_ value: String) throws(JSException) @@ -1293,182 +1269,6 @@ enum APIOptionalResult { } } -// MARK: - Struct Tests - -@JS struct DataPoint { - let x: Double - let y: Double - var label: String - var optCount: Int? - var optFlag: Bool? - - @JS init(x: Double, y: Double, label: String, optCount: Int?, optFlag: Bool?) { - self.x = x - self.y = y - self.label = label - self.optCount = optCount - self.optFlag = optFlag - } -} - -@JS struct Address { - var street: String - var city: String - var zipCode: Int? -} - -@JS struct Contact { - var name: String - var age: Int - var address: Address - var email: String? - var secondaryAddress: Address? -} - -@JS struct Config { - var name: String - var theme: Theme? - var direction: Direction? - var status: Status -} - -@JS struct SessionData { - var id: Int - var owner: Greeter? -} - -@JS struct ValidationReport { - var id: Int - var result: APIResult - var status: Status? - var outcome: APIResult? -} - -@JS struct MathOperations { - var baseValue: Double - - @JS init(baseValue: Double = 0.0) { - self.baseValue = baseValue - } - - @JS func add(a: Double, b: Double = 10.0) -> Double { - return baseValue + a + b - } - - @JS func multiply(a: Double, b: Double) -> Double { - return a * b - } - - @JS static func subtract(a: Double, b: Double) -> Double { - return a - b - } -} - -@JS func testStructDefault( - point: DataPoint = DataPoint(x: 1.0, y: 2.0, label: "default", optCount: nil, optFlag: nil) -) -> String { - return "\(point.x),\(point.y),\(point.label)" -} - -@JS struct CopyableCart { - var x: Int - var note: String? - - @JS static func fromJSObject(_ object: JSObject) -> CopyableCart { - CopyableCart(unsafelyCopying: object) - } -} - -@JS func cartToJSObject(_ cart: CopyableCart) -> JSObject { - cart.toJSObject() -} - -@JS struct CopyableCartItem { - var sku: String - var quantity: Int -} - -@JS struct CopyableNestedCart { - var id: Int - var item: CopyableCartItem - var shippingAddress: Address? - - @JS static func fromJSObject(_ object: JSObject) -> CopyableNestedCart { - CopyableNestedCart(unsafelyCopying: object) - } -} - -@JS func nestedCartToJSObject(_ cart: CopyableNestedCart) -> JSObject { - cart.toJSObject() -} - -@JS struct MeasurementConfig { - var precision: Precision - var ratio: Ratio - var optionalPrecision: Precision? - var optionalRatio: Ratio? -} - -@JS func roundTripMeasurementConfig(_ config: MeasurementConfig) -> MeasurementConfig { - return config -} - -@JS struct ConfigStruct { - var name: String - var value: Int - - @JS nonisolated(unsafe) static var defaultConfig: String = "production" - @JS static let maxRetries: Int = 3 - @JS nonisolated(unsafe) static var timeout: Double = 30.0 - - @JS static var computedSetting: String { - return "Config: \(defaultConfig)" - } -} - -@JS func roundTripDataPoint(_ data: DataPoint) -> DataPoint { - return data -} - -@JS func roundTripContact(_ contact: Contact) -> Contact { - return contact -} - -@JS func roundTripConfig(_ config: Config) -> Config { - return config -} - -@JS func roundTripSessionData(_ session: SessionData) -> SessionData { - return session -} - -@JS func roundTripValidationReport(_ report: ValidationReport) -> ValidationReport { - return report -} - -@JS func updateValidationReport(_ newResult: APIResult?, _ report: ValidationReport) -> ValidationReport { - return ValidationReport( - id: report.id, - result: newResult ?? report.result, - status: report.status, - outcome: report.outcome - ) -} - -@JS class Container { - @JS var location: DataPoint - @JS var config: Config? - - @JS init(location: DataPoint, config: Config?) { - self.location = location - self.config = config - } -} - -@JS func testContainerWithStruct(_ point: DataPoint) -> Container { - return Container(location: point, config: nil) -} - class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 96e50d192..b9f823d01 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2218,6 +2218,51 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se #endif } +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let x = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.x)) + _swift_js_push_int(Int32(self.y)) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Point") +fileprivate func _bjs_struct_raise_Point() -> Int32 +#else +fileprivate func _bjs_struct_raise_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) @@ -2644,6 +2689,146 @@ fileprivate func _bjs_struct_raise_ValidationReport() -> Int32 { } #endif +extension AdvancedConfig: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> AdvancedConfig { + let overrideDefaults = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let defaults = ConfigStruct.bridgeJSLiftParameter() + let location = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let metadata = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let result = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let status = Status.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let title = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_int(Int32(self.id)) + var __bjs_title = self.title + __bjs_title.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(self.enabled ? 1 : 0) + var __bjs_theme = self.theme.rawValue + __bjs_theme.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + _swift_js_push_int(Int32(self.status.bridgeJSLowerParameter())) + let __bjs_isSome_result = self.result != nil + if let __bjs_unwrapped_result = self.result { + _swift_js_push_int(__bjs_unwrapped_result.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_result ? 1 : 0) + let __bjs_isSome_metadata = self.metadata != nil + if let __bjs_unwrapped_metadata = self.metadata { + _swift_js_push_int(__bjs_unwrapped_metadata.bridgeJSLowerReturn()) + } + _swift_js_push_int(__bjs_isSome_metadata ? 1 : 0) + let __bjs_isSome_location = self.location != nil + if let __bjs_unwrapped_location = self.location { + __bjs_unwrapped_location.bridgeJSLowerReturn() + } + _swift_js_push_int(__bjs_isSome_location ? 1 : 0) + self.defaults.bridgeJSLowerReturn() + let __bjs_isSome_overrideDefaults = self.overrideDefaults != nil + if let __bjs_unwrapped_overrideDefaults = self.overrideDefaults { + __bjs_unwrapped_overrideDefaults.bridgeJSLowerReturn() + } + _swift_js_push_int(__bjs_isSome_overrideDefaults ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_AdvancedConfig(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_AdvancedConfig())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AdvancedConfig") +fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_AdvancedConfig") +fileprivate func _bjs_struct_raise_AdvancedConfig() -> Int32 +#else +fileprivate func _bjs_struct_raise_AdvancedConfig() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension MeasurementConfig: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { + let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64()) + let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) + let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) + return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) + _swift_js_push_f64(self.ratio.bridgeJSLowerParameter()) + let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil + if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { + _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) + let __bjs_isSome_optionalRatio = self.optionalRatio != nil + if let __bjs_unwrapped_optionalRatio = self.optionalRatio { + _swift_js_push_f64(__bjs_unwrapped_optionalRatio.bridgeJSLowerParameter()) + } + _swift_js_push_int(__bjs_isSome_optionalRatio ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MeasurementConfig())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig") +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MeasurementConfig") +fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 +#else +fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) @@ -2904,63 +3089,6 @@ public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void #endif } -extension MeasurementConfig: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { - let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64()) - let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) - let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) - return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) - _swift_js_push_f64(self.ratio.bridgeJSLowerParameter()) - let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil - if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) - } - _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) - let __bjs_isSome_optionalRatio = self.optionalRatio != nil - if let __bjs_unwrapped_optionalRatio = self.optionalRatio { - _swift_js_push_f64(__bjs_unwrapped_optionalRatio.bridgeJSLowerParameter()) - } - _swift_js_push_int(__bjs_isSome_optionalRatio ? 1 : 0) - } - - init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } - self = Self.bridgeJSLiftParameter() - } - - func toJSObject() -> JSObject { - var __bjs_self = self - __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MeasurementConfig())) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig") -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 -#else -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MeasurementConfig") -fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 -#else -fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) @@ -3215,17 +3343,6 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #endif } -@_expose(wasm, "bjs_roundTripPointerFields") -@_cdecl("bjs_roundTripPointerFields") -public func _bjs_roundTripPointerFields() -> Void { - #if arch(wasm32) - let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - @_expose(wasm, "bjs_makeImportedFoo") @_cdecl("bjs_makeImportedFoo") public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { @@ -4467,6 +4584,17 @@ public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { #endif } +@_expose(wasm, "bjs_roundTripPointerFields") +@_cdecl("bjs_roundTripPointerFields") +public func _bjs_roundTripPointerFields() -> Void { + #if arch(wasm32) + let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_testStructDefault") @_cdecl("bjs_testStructDefault") public func _bjs_testStructDefault() -> Void { @@ -4500,17 +4628,6 @@ public func _bjs_nestedCartToJSObject() -> Int32 { #endif } -@_expose(wasm, "bjs_roundTripMeasurementConfig") -@_cdecl("bjs_roundTripMeasurementConfig") -public func _bjs_roundTripMeasurementConfig() -> Void { - #if arch(wasm32) - let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter()) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - @_expose(wasm, "bjs_roundTripDataPoint") @_cdecl("bjs_roundTripDataPoint") public func _bjs_roundTripDataPoint() -> Void { @@ -4566,6 +4683,28 @@ public func _bjs_roundTripValidationReport() -> Void { #endif } +@_expose(wasm, "bjs_roundTripAdvancedConfig") +@_cdecl("bjs_roundTripAdvancedConfig") +public func _bjs_roundTripAdvancedConfig() -> Void { + #if arch(wasm32) + let ret = roundTripAdvancedConfig(_: AdvancedConfig.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripMeasurementConfig") +@_cdecl("bjs_roundTripMeasurementConfig") +public func _bjs_roundTripMeasurementConfig() -> Void { + #if arch(wasm32) + let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_updateValidationReport") @_cdecl("bjs_updateValidationReport") public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCaseId: Int32) -> Void { @@ -7553,4 +7692,24 @@ func _$jsCallTwice(_ value: Int, _ callback: @escaping (Int) -> Void) throws(JSE throw error } return Int.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsTranslatePoint") +fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 +#else +fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { + let pointObjectId = point.bridgeJSLowerParameter() + let dxValue = dx.bridgeJSLowerParameter() + let dyValue = dy.bridgeJSLowerParameter() + let ret = bjs_jsTranslatePoint(pointObjectId, dxValue, dyValue) + if let error = _swift_js_take_exception() { + throw error + } + return Point.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 180dc6c1a..1b70b0b04 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -4950,31 +4950,6 @@ } } }, - { - "abiName" : "bjs_roundTripPointerFields", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripPointerFields", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "PointerFields" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "PointerFields" - } - } - }, { "abiName" : "bjs_makeImportedFoo", "effects" : { @@ -7916,6 +7891,31 @@ } } }, + { + "abiName" : "bjs_roundTripPointerFields", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPointerFields", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + }, { "abiName" : "bjs_testStructDefault", "effects" : { @@ -8038,31 +8038,6 @@ } } }, - { - "abiName" : "bjs_roundTripMeasurementConfig", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripMeasurementConfig", - "parameters" : [ - { - "label" : "_", - "name" : "config", - "type" : { - "swiftStruct" : { - "_0" : "MeasurementConfig" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "MeasurementConfig" - } - } - }, { "abiName" : "bjs_roundTripDataPoint", "effects" : { @@ -8188,6 +8163,56 @@ } } }, + { + "abiName" : "bjs_roundTripAdvancedConfig", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripAdvancedConfig", + "parameters" : [ + { + "label" : "_", + "name" : "config", + "type" : { + "swiftStruct" : { + "_0" : "AdvancedConfig" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "AdvancedConfig" + } + } + }, + { + "abiName" : "bjs_roundTripMeasurementConfig", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripMeasurementConfig", + "parameters" : [ + { + "label" : "_", + "name" : "config", + "type" : { + "swiftStruct" : { + "_0" : "MeasurementConfig" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "MeasurementConfig" + } + } + }, { "abiName" : "bjs_updateValidationReport", "effects" : { @@ -8634,6 +8659,35 @@ } ], "structs" : [ + { + "methods" : [ + + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Point" + }, { "constructor" : { "abiName" : "bjs_PointerFields_init", @@ -9160,6 +9214,193 @@ ], "swiftCallName" : "ValidationReport" }, + { + "methods" : [ + + ], + "name" : "AdvancedConfig", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "title", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "enabled", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "metadata", + "type" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "location", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "defaults", + "type" : { + "swiftStruct" : { + "_0" : "ConfigStruct" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "overrideDefaults", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "ConfigStruct" + } + } + } + } + } + ], + "swiftCallName" : "AdvancedConfig" + }, + { + "methods" : [ + + ], + "name" : "MeasurementConfig", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precision", + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ratio", + "type" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalPrecision", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalRatio", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + } + } + } + ], + "swiftCallName" : "MeasurementConfig" + }, { "constructor" : { "abiName" : "bjs_MathOperations_init", @@ -9480,67 +9721,6 @@ { "methods" : [ - ], - "name" : "MeasurementConfig", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "precision", - "type" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "ratio", - "type" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optionalPrecision", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optionalRatio", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - } - } - } - ], - "swiftCallName" : "MeasurementConfig" - }, - { - "methods" : [ - ], "name" : "ConfigStruct", "properties" : [ @@ -10328,6 +10508,63 @@ ], "types" : [ + ] + }, + { + "functions" : [ + { + "name" : "jsTranslatePoint", + "parameters" : [ + { + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "Point" + } + } + }, + { + "name" : "dx", + "type" : { + "int" : { + + } + } + }, + { + "name" : "dy", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + ], + "types" : [ + + ] + }, + { + "functions" : [ + + ], + "types" : [ + + ] + }, + { + "functions" : [ + + ], + "types" : [ + ] } ] diff --git a/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift new file mode 100644 index 000000000..82908701c --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift @@ -0,0 +1,9 @@ +@_spi(Experimental) import JavaScriptKit + +@JS +struct Point { + var x: Int + var y: Int +} + +@JSFunction func jsTranslatePoint(_ point: Point, dx: Int, dy: Int) throws(JSException) -> Point diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift new file mode 100644 index 000000000..5c9fed511 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -0,0 +1,216 @@ +@_spi(Experimental) import JavaScriptKit + +@JS struct PointerFields { + var raw: UnsafeRawPointer + var mutRaw: UnsafeMutableRawPointer + var opaque: OpaquePointer + var ptr: UnsafePointer + var mutPtr: UnsafeMutablePointer + + @JS init( + raw: UnsafeRawPointer, + mutRaw: UnsafeMutableRawPointer, + opaque: OpaquePointer, + ptr: UnsafePointer, + mutPtr: UnsafeMutablePointer + ) { + self.raw = raw + self.mutRaw = mutRaw + self.opaque = opaque + self.ptr = ptr + self.mutPtr = mutPtr + } +} + +@JS func roundTripPointerFields(_ value: PointerFields) -> PointerFields { value } + +@JS struct DataPoint { + let x: Double + let y: Double + var label: String + var optCount: Int? + var optFlag: Bool? + + @JS init(x: Double, y: Double, label: String, optCount: Int?, optFlag: Bool?) { + self.x = x + self.y = y + self.label = label + self.optCount = optCount + self.optFlag = optFlag + } +} + +@JS struct Address { + var street: String + var city: String + var zipCode: Int? +} + +@JS struct Contact { + var name: String + var age: Int + var address: Address + var email: String? + var secondaryAddress: Address? +} + +@JS struct Config { + var name: String + var theme: Theme? + var direction: Direction? + var status: Status +} + +@JS struct SessionData { + var id: Int + var owner: Greeter? +} + +@JS struct ValidationReport { + var id: Int + var result: APIResult + var status: Status? + var outcome: APIResult? +} + +@JS struct AdvancedConfig { + var id: Int + var title: String + var enabled: Bool + var theme: Theme + var status: Status + var result: APIResult? + var metadata: JSObject? + var location: DataPoint? + var defaults: ConfigStruct + var overrideDefaults: ConfigStruct? +} + +@JS struct MeasurementConfig { + var precision: Precision + var ratio: Ratio + var optionalPrecision: Precision? + var optionalRatio: Ratio? +} + +@JS struct MathOperations { + var baseValue: Double + + @JS init(baseValue: Double = 0.0) { + self.baseValue = baseValue + } + + @JS func add(a: Double, b: Double = 10.0) -> Double { + return baseValue + a + b + } + + @JS func multiply(a: Double, b: Double) -> Double { + return a * b + } + + @JS static func subtract(a: Double, b: Double) -> Double { + return a - b + } +} + +@JS func testStructDefault( + point: DataPoint = DataPoint(x: 1.0, y: 2.0, label: "default", optCount: nil, optFlag: nil) +) -> String { + return "\(point.x),\(point.y),\(point.label)" +} + +@JS struct CopyableCart { + var x: Int + var note: String? + + @JS static func fromJSObject(_ object: JSObject) -> CopyableCart { + CopyableCart(unsafelyCopying: object) + } +} + +@JS func cartToJSObject(_ cart: CopyableCart) -> JSObject { + cart.toJSObject() +} + +@JS struct CopyableCartItem { + var sku: String + var quantity: Int +} + +@JS struct CopyableNestedCart { + var id: Int + var item: CopyableCartItem + var shippingAddress: Address? + + @JS static func fromJSObject(_ object: JSObject) -> CopyableNestedCart { + CopyableNestedCart(unsafelyCopying: object) + } +} + +@JS func nestedCartToJSObject(_ cart: CopyableNestedCart) -> JSObject { + cart.toJSObject() +} + +@JS struct ConfigStruct { + var name: String + var value: Int + + @JS nonisolated(unsafe) static var defaultConfig: String = "production" + @JS static let maxRetries: Int = 3 + @JS nonisolated(unsafe) static var timeout: Double = 30.0 + + @JS static var computedSetting: String { + return "Config: \(defaultConfig)" + } +} + +@JS func roundTripDataPoint(_ data: DataPoint) -> DataPoint { + return data +} + +@JS func roundTripContact(_ contact: Contact) -> Contact { + return contact +} + +@JS func roundTripConfig(_ config: Config) -> Config { + return config +} + +@JS func roundTripSessionData(_ session: SessionData) -> SessionData { + return session +} + +@JS func roundTripValidationReport(_ report: ValidationReport) -> ValidationReport { + return report +} + +@JS func roundTripAdvancedConfig(_ config: AdvancedConfig) -> AdvancedConfig { + return config +} + +@JS func roundTripMeasurementConfig(_ config: MeasurementConfig) -> MeasurementConfig { + return config +} + +@JS func updateValidationReport(_ newResult: APIResult?, _ report: ValidationReport) -> ValidationReport { + return ValidationReport( + id: report.id, + result: newResult ?? report.result, + status: report.status, + outcome: report.outcome + ) +} + +@JS class Container { + @JS var location: DataPoint + @JS var config: Config? + + @JS init(location: DataPoint, config: Config?) { + self.location = location + self.config = config + } +} + +@JS func testContainerWithStruct(_ point: DataPoint) -> Container { + return Container(location: point, config: nil) +} diff --git a/Tests/BridgeJSRuntimeTests/SwiftStructTests.swift b/Tests/BridgeJSRuntimeTests/SwiftStructTests.swift new file mode 100644 index 000000000..3ba9d28d6 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/SwiftStructTests.swift @@ -0,0 +1,19 @@ +import XCTest +import JavaScriptKit + +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "runJsStructWorks") +@_extern(c) +func runJsStructWorks() -> Void + +final class SwiftStructTests: XCTestCase { + func testExportedStructSupport() { + runJsStructWorks() + } + + func testSwiftStructInImportedSignature() throws { + let point = Point(x: 1, y: 2) + let moved = try jsTranslatePoint(point, dx: 3, dy: -1) + XCTAssertEqual(moved.x, 4) + XCTAssertEqual(moved.y, 1) + } +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 65bb7d607..141b87d35 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -8,6 +8,7 @@ import { export async function setupOptions(options, context) { Error.stackTraceLimit = 100; setupTestGlobals(globalThis); + return { ...options, getImports: (importsContext) => { @@ -102,6 +103,9 @@ export async function setupOptions(options, context) { fn(v); fn(v); return v; + }, + jsTranslatePoint: (point, dx, dy) => { + return { x: (point.x | 0) + (dx | 0), y: (point.y | 0) + (dy | 0) }; } }; }, @@ -119,6 +123,13 @@ export async function setupOptions(options, context) { } return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); } + bridgeJSRuntimeTests["runJsStructWorks"] = () => { + const exports = getExports(); + if (!exports) { + throw new Error("No exports!?"); + } + return BridgeJSRuntimeTests_runJsStructWorks(exports); + } const bridgeJSGlobalTests = importObject["BridgeJSGlobalTests"] || {}; bridgeJSGlobalTests["runJsWorksGlobal"] = () => { return BridgeJSGlobalTests_runJsWorksGlobal(); @@ -767,7 +778,6 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { testProtocolSupport(exports); testClosureSupport(exports); - testStructSupport(exports); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testClosureSupport(exports) { @@ -1043,6 +1053,34 @@ function testStructSupport(exports) { assert.deepEqual(updatedReport.result, { tag: exports.APIResult.Tag.Success, param0: "updated" }); assert.deepEqual(exports.updateValidationReport(null, origReport).result, origReport.result); + const advancedConfig1 = { + id: 42, + title: "Primary", + enabled: true, + theme: exports.Theme.Dark, + status: exports.Status.Success, + result: { tag: exports.APIResult.Tag.Success, param0: "ok" }, + metadata: { note: "extra" }, + location: data1, + defaults: { name: "base", value: 10 }, + overrideDefaults: { name: "override", value: 20 }, + }; + assert.deepEqual(exports.roundTripAdvancedConfig(advancedConfig1), advancedConfig1); + + const advancedConfig2 = { + id: 99, + title: "", + enabled: false, + theme: exports.Theme.Light, + status: exports.Status.Loading, + result: null, + metadata: null, + location: null, + defaults: { name: "base", value: 0 }, + overrideDefaults: null, + }; + assert.deepEqual(exports.roundTripAdvancedConfig(advancedConfig2), advancedConfig2); + assert.equal(exports.MathOperations.subtract(10.0, 4.0), 6.0); const mathOps = exports.MathOperations.init(); assert.equal(mathOps.baseValue, 0.0); @@ -1119,6 +1157,11 @@ async function BridgeJSRuntimeTests_runAsyncWorks(exports) { await exports.asyncRoundTripVoid(); } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function BridgeJSRuntimeTests_runJsStructWorks(exports) { + testStructSupport(exports); +} + function BridgeJSGlobalTests_runJsWorksGlobal() { assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Get, 0); assert.equal(globalThis.GlobalNetworking.API.CallMethodValues.Post, 1); From eb1665cdda23c79d2a121b2ef2b1965bc7a5bb72 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 28 Jan 2026 18:50:14 +0700 Subject: [PATCH 109/252] NFC: BridgeJS: Rename raise to lift in struct and enum helpers (#539) BridgeJS: Align naming for stack based types from "raise" to "lift" --- Benchmarks/Sources/Generated/BridgeJS.swift | 32 ++--- .../Sources/BridgeJSCore/ExportSwift.swift | 14 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 4 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 58 ++++----- .../DefaultParameters.Export.js | 18 +-- .../EnumAssociatedValue.Export.js | 30 ++--- .../BridgeJSLinkTests/Protocol.Export.js | 8 +- .../StaticFunctions.Export.js | 4 +- .../StaticFunctions.Global.Export.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.Export.js | 6 +- .../BridgeJSLinkTests/SwiftStruct.Export.js | 42 +++--- .../SwiftStructImports.ImportMacros.js | 6 +- .../BridgeJSLinkTests/UnsafePointer.Export.js | 10 +- .../ExportSwiftTests/DefaultParameters.swift | 16 +-- .../ExportSwiftTests/SwiftStruct.swift | 48 +++---- .../ExportSwiftTests/UnsafePointer.swift | 8 +- .../Generated/BridgeJS.swift | 120 +++++++++--------- 17 files changed, 214 insertions(+), 214 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 90558ff7b..9cf164d6d 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -279,7 +279,7 @@ extension SimpleStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SimpleStruct())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SimpleStruct())) } } @@ -293,10 +293,10 @@ fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_SimpleStruct") -fileprivate func _bjs_struct_raise_SimpleStruct() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SimpleStruct") +fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 #else -fileprivate func _bjs_struct_raise_SimpleStruct() -> Int32 { +fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -332,7 +332,7 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -346,10 +346,10 @@ fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") -fileprivate func _bjs_struct_raise_Address() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") +fileprivate func _bjs_struct_lift_Address() -> Int32 #else -fileprivate func _bjs_struct_raise_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -391,7 +391,7 @@ extension Person: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Person())) } } @@ -405,10 +405,10 @@ fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Person") -fileprivate func _bjs_struct_raise_Person() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Person") +fileprivate func _bjs_struct_lift_Person() -> Int32 #else -fileprivate func _bjs_struct_raise_Person() -> Int32 { +fileprivate func _bjs_struct_lift_Person() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -453,7 +453,7 @@ extension ComplexStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ComplexStruct())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ComplexStruct())) } } @@ -467,10 +467,10 @@ fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ComplexStruct") -fileprivate func _bjs_struct_raise_ComplexStruct() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ComplexStruct") +fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 #else -fileprivate func _bjs_struct_raise_ComplexStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 370b5fa2d..bfe414b76 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1184,9 +1184,9 @@ struct StructCodegen { let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? "" let lowerExternName = "swift_js_struct_lower_\(structDef.name)" - let raiseExternName = "swift_js_struct_raise_\(structDef.name)" + let liftExternName = "swift_js_struct_lift_\(structDef.name)" let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)" - let raiseFunctionName = "_bjs_struct_raise_\(structDef.name)" + let liftFunctionName = "_bjs_struct_lift_\(structDef.name)" let bridgedStructExtension: DeclSyntax = """ extension \(raw: typeName): _BridgedSwiftStruct { @@ -1207,7 +1207,7 @@ struct StructCodegen { \(raw: accessControl)func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: \(raw: raiseFunctionName)())) + return JSObject(id: UInt32(bitPattern: \(raw: liftFunctionName)())) } } """ @@ -1220,16 +1220,16 @@ struct StructCodegen { returnType: .i32 ) ) - let raiseExternDecl = Self.renderStructExtern( - externName: raiseExternName, - functionName: raiseFunctionName, + let liftExternDecl = Self.renderStructExtern( + externName: liftExternName, + functionName: liftFunctionName, signature: SwiftSignatureBuilder.buildABIFunctionSignature( abiParameters: [], returnType: .i32 ) ) - return [bridgedStructExtension, lowerExternDecl, raiseExternDecl] + return [bridgedStructExtension, lowerExternDecl, liftExternDecl] } private static func renderStructExtern( diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 2cfaef11e..743494916 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -475,10 +475,10 @@ public struct BridgeJSLink { } printer.write("}") - printer.write("bjs[\"swift_js_struct_raise_\(structDef.name)\"] = function() {") + printer.write("bjs[\"swift_js_struct_lift_\(structDef.name)\"] = function() {") printer.indent { printer.write( - "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) printer.write("return \(JSGlueVariableScope.reservedSwift).memory.retain(value);") } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 05b279c4f..d5f47234d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -280,7 +280,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [retName] } @@ -343,7 +343,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } printer.write("}") @@ -355,7 +355,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("} else {") @@ -547,7 +547,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("} else {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } printer.write("}") @@ -559,7 +559,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("} else {") @@ -839,7 +839,7 @@ struct IntrinsicJSFragment: Sendable { let targetVar = arguments[1] let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [] } @@ -906,7 +906,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) default: fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") @@ -1234,7 +1234,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) printer.write("return \(resultVar);") return [] @@ -1449,7 +1449,7 @@ struct IntrinsicJSFragment: Sendable { let caseId = arguments[0] let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [resultVar] } @@ -1466,7 +1466,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -1636,25 +1636,25 @@ struct IntrinsicJSFragment: Sendable { } printer.write("},") - // Generate raise function + // Generate lift function printer.write( - "raise: (\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s)) => {" + "lift: (\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s)) => {" ) printer.indent { printer.write("const tag = tmpRetTag | 0;") printer.write("switch (tag) {") printer.indent { - let raisePrinter = CodeFragmentPrinter() + let liftPrinter = CodeFragmentPrinter() for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter let caseScope = JSGlueVariableScope() let caseCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) - _ = fragment.printCode([enumName, caseName], caseScope, raisePrinter, caseCleanup) + _ = fragment.printCode([enumName, caseName], caseScope, liftPrinter, caseCleanup) } - for line in raisePrinter.lines { + for line in liftPrinter.lines { printer.write(line) } @@ -2048,7 +2048,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2081,10 +2081,10 @@ struct IntrinsicJSFragment: Sendable { printer.write("},") printer.write( - "raise: (\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" + "lift: (\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" ) printer.indent { - generateStructRaiseCode( + generateStructLiftCode( structDef: capturedStructDef, allStructs: capturedAllStructs, printer: printer, @@ -2137,21 +2137,21 @@ struct IntrinsicJSFragment: Sendable { } } - private static func generateStructRaiseCode( + private static func generateStructLiftCode( structDef: ExportedStruct, allStructs: [ExportedStruct], printer: CodeFragmentPrinter, attachMethods: Bool = false ) { - let raiseScope = JSGlueVariableScope() - let raiseCleanup = CodeFragmentPrinter() + let liftScope = JSGlueVariableScope() + let liftCleanup = CodeFragmentPrinter() var fieldExpressions: [(name: String, expression: String)] = [] let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps.reversed() { - let fragment = structFieldRaiseFragment(field: property, allStructs: allStructs) - let results = fragment.printCode([], raiseScope, printer, raiseCleanup) + let fragment = structFieldLiftFragment(field: property, allStructs: allStructs) + let results = fragment.printCode([], liftScope, printer, liftCleanup) if let resultExpr = results.first { fieldExpressions.append((property.name, resultExpr)) @@ -2167,7 +2167,7 @@ struct IntrinsicJSFragment: Sendable { } if attachMethods && !structDef.methods.filter({ !$0.effects.isStatic }).isEmpty { - let instanceVar = raiseScope.variable("instance") + let instanceVar = liftScope.variable("instance") printer.write("const \(instanceVar) = { \(reconstructedFields.joined(separator: ", ")) };") // Attach instance methods to the struct instance @@ -2710,7 +2710,7 @@ struct IntrinsicJSFragment: Sendable { case tmpParamF64s } - private static func structFieldRaiseFragment( + private static func structFieldLiftFragment( field: ExportedProperty, allStructs: [ExportedStruct] ) -> IntrinsicJSFragment { @@ -2785,10 +2785,10 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("enumCaseId") printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") printer.write( - "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) } else { - let wrappedFragment = structFieldRaiseFragment( + let wrappedFragment = structFieldLiftFragment( field: ExportedProperty( name: field.name, type: wrappedType, @@ -2819,7 +2819,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let structVar = scope.variable("struct") printer.write( - "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).raise(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [structVar] } @@ -2913,7 +2913,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("value") printer.write( - "const \(varName) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).raise(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(varName) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" ) return [varName] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 6923db749..7be003943 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -54,7 +54,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const bool = tmpRetInts.pop() !== 0; const int = tmpRetInts.pop(); const string = tmpRetStrings.pop(); @@ -68,7 +68,7 @@ export async function createInstantiator(options, swift) { tmpParamF64s.push(value.baseValue); return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const f64 = tmpRetF64s.pop(); const instance1 = { baseValue: f64 }; instance1.add = function(a, b = 10.0) { @@ -171,8 +171,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Config"] = function() { - const value = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Config"] = function() { + const value = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_MathOperations"] = function(objectId) { @@ -182,8 +182,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_MathOperations"] = function() { - const value = structHelpers.MathOperations.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_MathOperations"] = function() { + const value = structHelpers.MathOperations.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -528,7 +528,7 @@ export async function createInstantiator(options, swift) { const isSome1 = tmpRetInts.pop(); let optResult; if (isSome1) { - optResult = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } else { optResult = null; } @@ -546,7 +546,7 @@ export async function createInstantiator(options, swift) { const isSome1 = tmpRetInts.pop(); let optResult; if (isSome1) { - optResult = structHelpers.Config.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } else { optResult = null; } @@ -557,7 +557,7 @@ export async function createInstantiator(options, swift) { MathOperations: { init: function(baseValue = 0.0) { instance.exports.bjs_MathOperations_init(baseValue); - const structValue = structHelpers.MathOperations.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.MathOperations.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return structValue; }, subtract: function(a, b) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index bbceab383..3c7baa5b9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -57,7 +57,7 @@ const __bjs_createAPIResultValuesHelpers = () => { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -175,7 +175,7 @@ const __bjs_createComplexResultValuesHelpers = () => { default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case ComplexResultValues.Tag.Success: { @@ -266,7 +266,7 @@ const __bjs_createResultValuesHelpers = () => { default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case ResultValues.Tag.Success: { @@ -325,7 +325,7 @@ const __bjs_createNetworkingResultValuesHelpers = () => { default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case NetworkingResultValues.Tag.Success: { @@ -414,7 +414,7 @@ const __bjs_createAPIOptionalResultValuesHelpers = () => { default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case APIOptionalResultValues.Tag.Success: { @@ -711,13 +711,13 @@ export async function createInstantiator(options, swift) { }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); - const ret = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); - const ret = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -735,7 +735,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -747,13 +747,13 @@ export async function createInstantiator(options, swift) { }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); - const ret = enumHelpers.ComplexResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); - const ret = enumHelpers.ComplexResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -771,7 +771,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.ComplexResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -790,7 +790,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.Result.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.Result.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -809,7 +809,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.NetworkingResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.NetworkingResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -828,7 +828,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIOptionalResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -854,7 +854,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIOptionalResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } if (result1Cleanup) { result1Cleanup(); } if (result2Cleanup) { result2Cleanup(); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 0cf44ffdc..f9dbb07e2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -46,7 +46,7 @@ const __bjs_createResultValuesHelpers = () => { default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case ResultValues.Tag.Success: { @@ -372,7 +372,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { try { - const enumValue = enumHelpers.Result.raise(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const enumValue = enumHelpers.Result.lift(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); swift.memory.getObject(self).result = enumValue; } catch (error) { setException(error); @@ -396,7 +396,7 @@ export async function createInstantiator(options, swift) { try { let enumValue; if (valueIsSome) { - enumValue = enumHelpers.Result.raise(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + enumValue = enumHelpers.Result.lift(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; } catch (error) { @@ -553,7 +553,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_handleResult"] = function bjs_MyViewControllerDelegate_handleResult(self, result) { try { - const enumValue = enumHelpers.Result.raise(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const enumValue = enumHelpers.Result.lift(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); swift.memory.getObject(self).handleResult(enumValue); } catch (error) { setException(error); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 201d0fd6b..84d517a57 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -39,7 +39,7 @@ const __bjs_createAPIResultValuesHelpers = () => { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -330,7 +330,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index e971c0161..97c09fb3e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -39,7 +39,7 @@ const __bjs_createAPIResultValuesHelpers = () => { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -336,7 +336,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.raise(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index b4a073d7a..58e39f0c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -77,7 +77,7 @@ const __bjs_createAPIResultValuesHelpers = () => { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - raise: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { + lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { const tag = tmpRetTag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -423,7 +423,7 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.raise(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + let param0 = enumHelpers.APIResult.lift(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -685,7 +685,7 @@ export async function createInstantiator(options, swift) { const callback = swift.memory.getObject(callbackId); let param0; if (param0IsSome) { - param0 = enumHelpers.APIResult.raise(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + param0 = enumHelpers.APIResult.lift(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); } else { param0 = null; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 91968b77a..e7c40c298 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -67,7 +67,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -115,7 +115,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -158,7 +158,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -167,7 +167,7 @@ export async function createInstantiator(options, swift) { } else { optional = null; } - const struct = structHelpers.Address.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Address.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); const int = tmpRetInts.pop(); const string1 = tmpRetStrings.pop(); return { name: string1, age: int, address: struct, email: optional }; @@ -181,7 +181,7 @@ export async function createInstantiator(options, swift) { tmpParamPointers.push(value.owner.pointer); return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const ptr = tmpRetPointers.pop(); const value = _exports['Greeter'].__construct(ptr); const int = tmpRetInts.pop(); @@ -203,7 +203,7 @@ export async function createInstantiator(options, swift) { tmpParamInts.push(isSome ? 1 : 0); return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -223,7 +223,7 @@ export async function createInstantiator(options, swift) { lower: (value) => { return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { return { }; } }); @@ -312,8 +312,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_DataPoint"] = function() { - const value = structHelpers.DataPoint.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_DataPoint"] = function() { + const value = structHelpers.DataPoint.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Address"] = function(objectId) { @@ -323,8 +323,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Address"] = function() { - const value = structHelpers.Address.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Address"] = function() { + const value = structHelpers.Address.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Person"] = function(objectId) { @@ -334,8 +334,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Person"] = function() { - const value = structHelpers.Person.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Person"] = function() { + const value = structHelpers.Person.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Session"] = function(objectId) { @@ -345,8 +345,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Session"] = function() { - const value = structHelpers.Session.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Session"] = function() { + const value = structHelpers.Session.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Measurement"] = function(objectId) { @@ -356,8 +356,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Measurement"] = function() { - const value = structHelpers.Measurement.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Measurement"] = function() { + const value = structHelpers.Measurement.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) { @@ -367,8 +367,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_ConfigStruct"] = function() { - const value = structHelpers.ConfigStruct.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_ConfigStruct"] = function() { + const value = structHelpers.ConfigStruct.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -554,7 +554,7 @@ export async function createInstantiator(options, swift) { roundtrip: function bjs_roundtrip(session) { const { cleanup: cleanup } = structHelpers.Person.lower(session); instance.exports.bjs_roundtrip(); - const structValue = structHelpers.Person.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.Person.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (cleanup) { cleanup(); } return structValue; }, @@ -566,7 +566,7 @@ export async function createInstantiator(options, swift) { const isSome = optCount != null; const isSome1 = optFlag != null; instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag : 0); - const structValue = structHelpers.DataPoint.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.DataPoint.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); swift.memory.release(labelId); return structValue; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 67a9b98e3..2f186df77 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -41,7 +41,7 @@ export async function createInstantiator(options, swift) { tmpParamInts.push((value.y | 0)); return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const int = tmpRetInts.pop(); const int1 = tmpRetInts.pop(); return { x: int1, y: int }; @@ -133,8 +133,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_Point"] = function() { - const value = structHelpers.Point.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_Point"] = function() { + const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index 4eb09bb27..aa45023ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -44,7 +44,7 @@ export async function createInstantiator(options, swift) { tmpParamPointers.push((value.mutPtr | 0)); return { cleanup: undefined }; }, - raise: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const pointer = tmpRetPointers.pop(); const pointer1 = tmpRetPointers.pop(); const pointer2 = tmpRetPointers.pop(); @@ -138,8 +138,8 @@ export async function createInstantiator(options, swift) { } return 0; } - bjs["swift_js_struct_raise_PointerFields"] = function() { - const value = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + bjs["swift_js_struct_lift_PointerFields"] = function() { + const value = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -286,14 +286,14 @@ export async function createInstantiator(options, swift) { roundTripPointerFields: function bjs_roundTripPointerFields(value) { const { cleanup: cleanup } = structHelpers.PointerFields.lower(value); instance.exports.bjs_roundTripPointerFields(); - const structValue = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (cleanup) { cleanup(); } return structValue; }, PointerFields: { init: function(raw, mutRaw, opaque, ptr, mutPtr) { instance.exports.bjs_PointerFields_init(raw, mutRaw, opaque, ptr, mutPtr); - const structValue = structHelpers.PointerFields.raise(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return structValue; }, }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index d80d78d85..b1594c328 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -65,7 +65,7 @@ extension Config: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config())) } } @@ -79,10 +79,10 @@ fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Config") -fileprivate func _bjs_struct_raise_Config() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config") +fileprivate func _bjs_struct_lift_Config() -> Int32 #else -fileprivate func _bjs_struct_raise_Config() -> Int32 { +fileprivate func _bjs_struct_lift_Config() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -108,7 +108,7 @@ extension MathOperations: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations())) } } @@ -122,10 +122,10 @@ fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MathOperations") -fileprivate func _bjs_struct_raise_MathOperations() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations") +fileprivate func _bjs_struct_lift_MathOperations() -> Int32 #else -fileprivate func _bjs_struct_raise_MathOperations() -> Int32 { +fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index 12623a344..ca164c1bf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -41,7 +41,7 @@ extension DataPoint: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint())) } } @@ -55,10 +55,10 @@ fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_DataPoint") -fileprivate func _bjs_struct_raise_DataPoint() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint") +fileprivate func _bjs_struct_lift_DataPoint() -> Int32 #else -fileprivate func _bjs_struct_raise_DataPoint() -> Int32 { +fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -109,7 +109,7 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -123,10 +123,10 @@ fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") -fileprivate func _bjs_struct_raise_Address() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") +fileprivate func _bjs_struct_lift_Address() -> Int32 #else -fileprivate func _bjs_struct_raise_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -168,7 +168,7 @@ extension Person: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Person())) } } @@ -182,10 +182,10 @@ fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Person") -fileprivate func _bjs_struct_raise_Person() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Person") +fileprivate func _bjs_struct_lift_Person() -> Int32 #else -fileprivate func _bjs_struct_raise_Person() -> Int32 { +fileprivate func _bjs_struct_lift_Person() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -213,7 +213,7 @@ extension Session: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Session())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Session())) } } @@ -227,10 +227,10 @@ fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Session") -fileprivate func _bjs_struct_raise_Session() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Session") +fileprivate func _bjs_struct_lift_Session() -> Int32 #else -fileprivate func _bjs_struct_raise_Session() -> Int32 { +fileprivate func _bjs_struct_lift_Session() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -264,7 +264,7 @@ extension Measurement: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Measurement())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Measurement())) } } @@ -278,10 +278,10 @@ fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Measurement") -fileprivate func _bjs_struct_raise_Measurement() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Measurement") +fileprivate func _bjs_struct_lift_Measurement() -> Int32 #else -fileprivate func _bjs_struct_raise_Measurement() -> Int32 { +fileprivate func _bjs_struct_lift_Measurement() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -306,7 +306,7 @@ extension ConfigStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct())) } } @@ -320,10 +320,10 @@ fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ConfigStruct") -fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct") +fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 #else -fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 3e9fad511..3ef3b9939 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -27,7 +27,7 @@ extension PointerFields: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) } } @@ -41,10 +41,10 @@ fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_PointerFields") -fileprivate func _bjs_struct_raise_PointerFields() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 #else -fileprivate func _bjs_struct_raise_PointerFields() -> Int32 { +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { fatalError("Only available on WebAssembly") } #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index b9f823d01..c31876ac9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2241,7 +2241,7 @@ extension Point: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Point())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } @@ -2255,10 +2255,10 @@ fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Point") -fileprivate func _bjs_struct_raise_Point() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 #else -fileprivate func _bjs_struct_raise_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2292,7 +2292,7 @@ extension PointerFields: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) } } @@ -2306,10 +2306,10 @@ fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_PointerFields") -fileprivate func _bjs_struct_raise_PointerFields() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 #else -fileprivate func _bjs_struct_raise_PointerFields() -> Int32 { +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2365,7 +2365,7 @@ extension DataPoint: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint())) } } @@ -2379,10 +2379,10 @@ fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_DataPoint") -fileprivate func _bjs_struct_raise_DataPoint() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint") +fileprivate func _bjs_struct_lift_DataPoint() -> Int32 #else -fileprivate func _bjs_struct_raise_DataPoint() -> Int32 { +fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2433,7 +2433,7 @@ extension Address: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -2447,10 +2447,10 @@ fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Address") -fileprivate func _bjs_struct_raise_Address() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") +fileprivate func _bjs_struct_lift_Address() -> Int32 #else -fileprivate func _bjs_struct_raise_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2498,7 +2498,7 @@ extension Contact: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Contact())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Contact())) } } @@ -2512,10 +2512,10 @@ fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Contact") -fileprivate func _bjs_struct_raise_Contact() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Contact") +fileprivate func _bjs_struct_lift_Contact() -> Int32 #else -fileprivate func _bjs_struct_raise_Contact() -> Int32 { +fileprivate func _bjs_struct_lift_Contact() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2561,7 +2561,7 @@ extension Config: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config())) } } @@ -2575,10 +2575,10 @@ fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_Config") -fileprivate func _bjs_struct_raise_Config() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config") +fileprivate func _bjs_struct_lift_Config() -> Int32 #else -fileprivate func _bjs_struct_raise_Config() -> Int32 { +fileprivate func _bjs_struct_lift_Config() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2610,7 +2610,7 @@ extension SessionData: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SessionData())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SessionData())) } } @@ -2624,10 +2624,10 @@ fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_SessionData") -fileprivate func _bjs_struct_raise_SessionData() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SessionData") +fileprivate func _bjs_struct_lift_SessionData() -> Int32 #else -fileprivate func _bjs_struct_raise_SessionData() -> Int32 { +fileprivate func _bjs_struct_lift_SessionData() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2667,7 +2667,7 @@ extension ValidationReport: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ValidationReport())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ValidationReport())) } } @@ -2681,10 +2681,10 @@ fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Int32 #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ValidationReport") -fileprivate func _bjs_struct_raise_ValidationReport() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ValidationReport") +fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 #else -fileprivate func _bjs_struct_raise_ValidationReport() -> Int32 { +fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2750,7 +2750,7 @@ extension AdvancedConfig: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_AdvancedConfig())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_AdvancedConfig())) } } @@ -2764,10 +2764,10 @@ fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_AdvancedConfig") -fileprivate func _bjs_struct_raise_AdvancedConfig() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_AdvancedConfig") +fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 #else -fileprivate func _bjs_struct_raise_AdvancedConfig() -> Int32 { +fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2807,7 +2807,7 @@ extension MeasurementConfig: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MeasurementConfig())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MeasurementConfig())) } } @@ -2821,10 +2821,10 @@ fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MeasurementConfig") -fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MeasurementConfig") +fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 #else -fileprivate func _bjs_struct_raise_MeasurementConfig() -> Int32 { +fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2850,7 +2850,7 @@ extension MathOperations: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations())) } } @@ -2864,10 +2864,10 @@ fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_MathOperations") -fileprivate func _bjs_struct_raise_MathOperations() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations") +fileprivate func _bjs_struct_lift_MathOperations() -> Int32 #else -fileprivate func _bjs_struct_raise_MathOperations() -> Int32 { +fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -2946,7 +2946,7 @@ extension CopyableCart: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCart())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCart())) } } @@ -2960,10 +2960,10 @@ fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableCart") -fileprivate func _bjs_struct_raise_CopyableCart() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCart") +fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 #else -fileprivate func _bjs_struct_raise_CopyableCart() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -3005,7 +3005,7 @@ extension CopyableCartItem: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableCartItem())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCartItem())) } } @@ -3019,10 +3019,10 @@ fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Int32 #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableCartItem") -fileprivate func _bjs_struct_raise_CopyableCartItem() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCartItem") +fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 #else -fileprivate func _bjs_struct_raise_CopyableCartItem() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -3056,7 +3056,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_CopyableNestedCart())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableNestedCart())) } } @@ -3070,10 +3070,10 @@ fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Int3 #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_CopyableNestedCart") -fileprivate func _bjs_struct_raise_CopyableNestedCart() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableNestedCart") +fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 #else -fileprivate func _bjs_struct_raise_CopyableNestedCart() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -3115,7 +3115,7 @@ extension ConfigStruct: _BridgedSwiftStruct { func toJSObject() -> JSObject { let __bjs_self = self __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct())) + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct())) } } @@ -3129,10 +3129,10 @@ fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_raise_ConfigStruct") -fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct") +fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 #else -fileprivate func _bjs_struct_raise_ConfigStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { fatalError("Only available on WebAssembly") } #endif From 515b6d65bf95d8a05add7189226d4451d8c979e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 10:24:13 +0900 Subject: [PATCH 110/252] Bump playwright from 1.52.0 to 1.55.1 (#538) Bumps [playwright](https://github.com/microsoft/playwright) from 1.52.0 to 1.55.1. - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.52.0...v1.55.1) --- updated-dependencies: - dependency-name: playwright dependency-version: 1.55.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 20 ++++++++++++-------- package.json | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e12af9c97..bf7f36315 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", + "tslib": "^2.8.1", "typescript": "^5.8.2" } }, @@ -507,12 +508,13 @@ } }, "node_modules/playwright": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz", - "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.1.tgz", + "integrity": "sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.52.0" + "playwright-core": "1.55.1" }, "bin": { "playwright": "cli.js" @@ -525,10 +527,11 @@ } }, "node_modules/playwright-core": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", - "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.1.tgz", + "integrity": "sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, @@ -579,6 +582,7 @@ "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.6" }, @@ -654,7 +658,6 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, "license": "0BSD", - "optional": true, "peer": true }, "node_modules/typescript": { @@ -663,6 +666,7 @@ "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 96443ad9a..da7d5356d 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", + "tslib": "^2.8.1", "typescript": "^5.8.2" } } From 8784a389d111002b581b4140f41e6b2a6c315b95 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 29 Jan 2026 09:26:33 +0700 Subject: [PATCH 111/252] BridgeJS: Swift Array support (#542) --- .../Sources/BridgeJSCore/ExportSwift.swift | 127 +- .../Sources/BridgeJSCore/ImportTS.swift | 14 + .../BridgeJSCore/SwiftToSkeleton.swift | 73 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 32 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 529 +++++++ .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 8 + .../BridgeJSToolTests/Inputs/ArrayTypes.swift | 56 + .../Inputs/DefaultParameters.swift | 12 + .../BridgeJSToolTests/Inputs/Protocol.swift | 18 + .../ArrayParameter.Import.js | 8 + .../BridgeJSLinkTests/ArrayTypes.Export.d.ts | 76 + .../BridgeJSLinkTests/ArrayTypes.Export.js | 845 +++++++++++ .../BridgeJSLinkTests/Async.Export.js | 8 + .../BridgeJSLinkTests/Async.Import.js | 8 + .../DefaultParameters.Export.d.ts | 26 + .../DefaultParameters.Export.js | 114 ++ .../EnumAssociatedValue.Export.js | 8 + .../BridgeJSLinkTests/EnumCase.Export.js | 8 + .../BridgeJSLinkTests/EnumNamespace.Export.js | 8 + .../EnumNamespace.Global.Export.js | 8 + .../BridgeJSLinkTests/EnumRawType.Export.js | 8 + .../GlobalGetter.ImportMacros.js | 8 + .../GlobalThisImports.ImportMacros.js | 8 + .../ImportedTypeInExportedInterface.Export.js | 8 + .../BridgeJSLinkTests/Interface.Import.js | 8 + .../InvalidPropertyNames.Import.js | 8 + .../BridgeJSLinkTests/MixedGlobal.Export.js | 8 + .../BridgeJSLinkTests/MixedModules.Export.js | 8 + .../BridgeJSLinkTests/MixedPrivate.Export.js | 8 + .../MultipleImportedTypes.Import.js | 8 + .../BridgeJSLinkTests/Namespaces.Export.js | 8 + .../Namespaces.Global.Export.js | 8 + .../BridgeJSLinkTests/Optionals.Export.js | 8 + .../PrimitiveParameters.Export.js | 8 + .../PrimitiveParameters.Import.js | 8 + .../PrimitiveReturn.Export.js | 8 + .../PrimitiveReturn.Import.js | 8 + .../BridgeJSLinkTests/PropertyTypes.Export.js | 8 + .../BridgeJSLinkTests/Protocol.Export.d.ts | 8 + .../BridgeJSLinkTests/Protocol.Export.js | 76 + .../BridgeJSLinkTests/ReExportFrom.Import.js | 8 + .../StaticFunctions.Export.js | 8 + .../StaticFunctions.Global.Export.js | 8 + .../StaticProperties.Export.js | 8 + .../StaticProperties.Global.Export.js | 8 + .../BridgeJSLinkTests/StringEnum.Import.js | 8 + .../StringParameter.Export.js | 8 + .../StringParameter.Import.js | 8 + .../BridgeJSLinkTests/StringReturn.Export.js | 8 + .../BridgeJSLinkTests/StringReturn.Import.js | 8 + .../BridgeJSLinkTests/SwiftClass.Export.js | 8 + .../BridgeJSLinkTests/SwiftClosure.Export.js | 8 + .../SwiftClosureImports.ImportMacros.js | 8 + .../BridgeJSLinkTests/SwiftStruct.Export.js | 8 + .../SwiftStructImports.ImportMacros.js | 8 + .../TS2SkeletonLike.Import.js | 8 + .../BridgeJSLinkTests/Throws.Export.js | 8 + .../BridgeJSLinkTests/TypeAlias.Import.js | 8 + .../TypeScriptClass.Import.js | 8 + .../BridgeJSLinkTests/UnsafePointer.Export.js | 8 + .../VoidParameterVoidReturn.Export.js | 8 + .../VoidParameterVoidReturn.Import.js | 8 + .../ExportSwiftTests/ArrayTypes.json | 983 +++++++++++++ .../ExportSwiftTests/ArrayTypes.swift | 694 +++++++++ .../ExportSwiftTests/DefaultParameters.json | 334 +++++ .../ExportSwiftTests/DefaultParameters.swift | 133 ++ .../ExportSwiftTests/Protocol.json | 96 +- .../ExportSwiftTests/Protocol.swift | 109 ++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 24 + .../BridgeJS/Exporting-Swift-to-JavaScript.md | 1 + .../Exporting-Swift/Exporting-Swift-Array.md | 132 ++ .../Exporting-Swift-Default-Parameters.md | 2 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 144 ++ .../Generated/BridgeJS.swift | 858 +++++++++++ .../Generated/JavaScript/BridgeJS.json | 1283 +++++++++++++++++ Tests/prelude.mjs | 124 ++ 76 files changed, 7293 insertions(+), 14 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index bfe414b76..5b0105bf6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -130,10 +130,43 @@ public class ExportSwift { case .swiftStruct(let structName): typeNameForIntrinsic = structName liftingExpr = ExprSyntax("\(raw: structName).bridgeJSLiftParameter()") + case .array: + typeNameForIntrinsic = param.type.swiftType + liftingExpr = StackCodegen().liftExpression(for: param.type) case .optional(let wrappedType): - typeNameForIntrinsic = "Optional<\(wrappedType.swiftType)>" + if case .array(let elementType) = wrappedType { + let arrayLift = StackCodegen().liftArrayExpression(elementType: elementType) + let isSomeParam = argumentsToLift[0] + let swiftTypeName = elementType.swiftType + typeNameForIntrinsic = "Optional<[\(swiftTypeName)]>" + liftingExpr = ExprSyntax( + """ + { + if \(raw: isSomeParam) == 0 { + return Optional<[\(raw: swiftTypeName)]>.none + } else { + return \(arrayLift) + } + }() + """ + ) + } else if case .swiftProtocol(let protocolName) = wrappedType { + let wrapperName = "Any\(protocolName)" + typeNameForIntrinsic = "Optional<\(wrapperName)>" + liftingExpr = ExprSyntax( + "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" + ) + } else { + typeNameForIntrinsic = "Optional<\(wrappedType.swiftType)>" + liftingExpr = ExprSyntax( + "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" + ) + } + case .swiftProtocol(let protocolName): + let wrapperName = "Any\(protocolName)" + typeNameForIntrinsic = wrapperName liftingExpr = ExprSyntax( - "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" + "\(raw: wrapperName).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" ) default: typeNameForIntrinsic = param.type.swiftType @@ -246,7 +279,8 @@ public class ExportSwift { let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in switch param.type { case .swiftStruct, .optional(.swiftStruct), - .associatedValueEnum, .optional(.associatedValueEnum): + .associatedValueEnum, .optional(.associatedValueEnum), + .array: return index default: return nil @@ -319,9 +353,15 @@ public class ExportSwift { return } - if case .closure(let signature) = returnType { + switch returnType { + case .closure(let signature): append("return _BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(ret)") - } else { + case .array, .optional(.array): + let stackCodegen = StackCodegen() + for stmt in stackCodegen.lowerStatements(for: returnType, accessor: "ret", varPrefix: "ret") { + append(stmt) + } + default: append("return ret.bridgeJSLowerReturn()") } } @@ -774,9 +814,10 @@ struct StackCodegen { return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" case .unsafePointer: return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" - case .swiftProtocol: - // Protocols are handled via JSObject - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .swiftProtocol(let protocolName): + // Protocols use their Any wrapper type for lifting + let wrapperName = "Any\(protocolName)" + return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" case .caseEnum(let enumName): return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" case .rawValueEnum(let enumName, let rawType): @@ -805,9 +846,28 @@ struct StackCodegen { return "()" case .closure: return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + case .array(let elementType): + return liftArrayExpression(elementType: elementType) } } + func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { + let elementLift = liftExpression(for: elementType) + let swiftTypeName = elementType.swiftType + return """ + { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [\(raw: swiftTypeName)] = [] + __result.reserveCapacity(__count) + for _ in 0..<__count { + __result.append(\(elementLift)) + } + __result.reverse() + return __result + }() + """ + } + private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { switch wrappedType { case .string: @@ -849,6 +909,19 @@ struct StackCodegen { "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" case .jsObject: return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + case .array(let elementType): + let arrayLift = liftArrayExpression(elementType: elementType) + let swiftTypeName = elementType.swiftType + return """ + { + let __isSome = _swift_js_pop_param_int32() + if __isSome == 0 { + return Optional<[\(raw: swiftTypeName)]>.none + } else { + return \(arrayLift) + } + }() + """ default: // Fallback for other optional types return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" @@ -886,8 +959,9 @@ struct StackCodegen { return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .unsafePointer: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] - case .swiftProtocol: - return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerParameter())"] + case .swiftProtocol(let protocolName): + let wrapperName = "Any\(protocolName)" + return ["_swift_js_push_int((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"] case .caseEnum: return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] case .rawValueEnum(_, let rawType): @@ -916,9 +990,34 @@ struct StackCodegen { return [] case .closure: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + case .array(let elementType): + return lowerArrayStatements(elementType: elementType, accessor: accessor, varPrefix: varPrefix) } } + private func lowerArrayStatements( + elementType: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + var statements: [CodeBlockItemSyntax] = [] + let elementVarName = "__bjs_elem_\(varPrefix)" + statements.append("for \(raw: elementVarName) in \(raw: accessor) {") + + let elementStatements = lowerStatements( + for: elementType, + accessor: elementVarName, + varPrefix: "\(varPrefix)_elem" + ) + for stmt in elementStatements { + statements.append(stmt) + } + + statements.append("}") + statements.append("_swift_js_push_array_length(Int32(\(raw: accessor).count))") + return statements + } + private func lowerOptionalStatements( wrappedType: BridgeType, accessor: String, @@ -985,6 +1084,8 @@ struct StackCodegen { return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .jsObject: return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + case .array(let elementType): + return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } @@ -1552,6 +1653,7 @@ extension BridgeType { case .swiftProtocol(let name): return "Any\(name)" case .void: return "Void" case .optional(let wrappedType): return "Optional<\(wrappedType.swiftType)>" + case .array(let elementType): return "[\(elementType.swiftType)]" case .caseEnum(let name): return name case .rawValueEnum(let name, _): return name case .associatedValueEnum(let name): return name @@ -1609,6 +1711,8 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: return LiftingIntrinsicInfo(parameters: [("callbackId", .i32)]) + case .array: + return LiftingIntrinsicInfo(parameters: []) } } @@ -1629,6 +1733,7 @@ extension BridgeType { static let associatedValueEnum = LoweringIntrinsicInfo(returnType: nil) static let swiftStruct = LoweringIntrinsicInfo(returnType: nil) static let optional = LoweringIntrinsicInfo(returnType: nil) + static let array = LoweringIntrinsicInfo(returnType: nil) } func loweringReturnInfo() throws -> LoweringIntrinsicInfo { @@ -1655,6 +1760,8 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: return .swiftHeapObject + case .array: + return .array } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 176b46b66..8a6ad930b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -933,6 +933,13 @@ extension BridgeType { params.append(contentsOf: wrappedInfo.loweredParameters) return LoweringParameterInfo(loweredParameters: params) } + case .array: + switch context { + case .importTS: + throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") + case .exportSwift: + return LoweringParameterInfo(loweredParameters: []) + } } } @@ -1018,6 +1025,13 @@ extension BridgeType { let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) } + case .array: + switch context { + case .importTS: + throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") + case .exportSwift: + return LiftingReturnInfo(valueToLift: nil) + } } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index e489a711a..ea79d3f3b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -157,6 +157,36 @@ public final class SwiftToSkeleton { return .optional(wrappedType) } } + // [T] + if let arrayType = type.as(ArrayTypeSyntax.self) { + if let elementType = lookupType(for: arrayType.element, errors: &errors) { + return .array(elementType) + } + } + // Array + if let identifierType = type.as(IdentifierTypeSyntax.self), + identifierType.name.text == "Array", + let genericArgs = identifierType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let elementType = lookupType(for: argType, errors: &errors) { + return .array(elementType) + } + } + // Swift.Array + if let memberType = type.as(MemberTypeSyntax.self), + let baseType = memberType.baseType.as(IdentifierTypeSyntax.self), + baseType.name.text == "Swift", + memberType.name.text == "Array", + let genericArgs = memberType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let elementType = lookupType(for: argType, errors: &errors) { + return .array(elementType) + } + } if let aliasDecl = typeDeclResolver.resolveTypeAlias(type) { if let resolvedType = lookupType(for: aliasDecl.initializer.value, errors: &errors) { return resolvedType @@ -479,7 +509,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let expression = initClause.value // Function calls are checked later in extractDefaultValue (as constructors are allowed) - if expression.is(ArrayExprSyntax.self) { return false } + // Array literals are allowed but checked in extractArrayDefaultValue if expression.is(DictionaryExprSyntax.self) { return false } if expression.is(BinaryOperatorExprSyntax.self) { return false } if expression.is(ClosureExprSyntax.self) { return false } @@ -575,6 +605,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return extractConstructorDefaultValue(from: funcCall, type: type) } + if let arrayExpr = expr.as(ArrayExprSyntax.self) { + return extractArrayDefaultValue(from: arrayExpr, type: type) + } + if let literalValue = extractLiteralValue(from: expr, type: type) { return literalValue } @@ -735,6 +769,43 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return nil } + /// Extracts default value from an array literal expression + private func extractArrayDefaultValue( + from arrayExpr: ArrayExprSyntax, + type: BridgeType + ) -> DefaultValue? { + // Verify the type is an array type + let elementType: BridgeType? + switch type { + case .array(let element): + elementType = element + case .optional(.array(let element)): + elementType = element + default: + diagnose( + node: arrayExpr, + message: "Array literal is only valid for array parameters", + hint: "Parameter type should be an array like [Int] or [String]" + ) + return nil + } + + var elements: [DefaultValue] = [] + for element in arrayExpr.elements { + guard let elementValue = extractLiteralValue(from: element.expression, type: elementType) else { + diagnose( + node: element.expression, + message: "Array element must be a literal value", + hint: "Use simple literals like \"text\", 42, true, false in array elements" + ) + return nil + } + elements.append(elementValue) + } + + return .array(elements) + } + /// Shared parameter parsing logic used by functions, initializers, and protocol methods private func parseParameters( from parameterClause: FunctionParameterClauseSyntax, diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 743494916..794637d9e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -256,6 +256,8 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", + "let \(JSGlueVariableScope.reservedTmpRetArrayLengths) = [];", + "let \(JSGlueVariableScope.reservedTmpParamArrayLengths) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", "", @@ -439,7 +441,16 @@ public struct BridgeJSLink { printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") } printer.write("}") - + printer.write("bjs[\"swift_js_push_array_length\"] = function(len) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);") + } + printer.write("}") + printer.write("bjs[\"swift_js_pop_param_array_length\"] = function() {") + printer.indent { + printer.write("return \(JSGlueVariableScope.reservedTmpParamArrayLengths).pop();") + } + printer.write("}") printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") printer.indent { printer.write("if (cleanupId === 0) { return; }") @@ -1431,6 +1442,14 @@ public struct BridgeJSLink { return name.components(separatedBy: ".").last ?? name case .optional(let wrapped): return "\(resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons)) | null" + case .array(let elementType): + let elementTypeStr = resolveTypeScriptType(elementType, exportedSkeletons: exportedSkeletons) + // Parenthesize compound types so `[]` binds correctly in TypeScript + // e.g. `(string | null)[]` not `string | null[]`, `((x: number) => void)[]` not `(x: number) => void[]` + if elementTypeStr.contains("|") || elementTypeStr.contains("=>") { + return "(\(elementTypeStr))[]" + } + return "\(elementTypeStr)[]" default: return type.tsType } @@ -3326,6 +3345,11 @@ enum DefaultValueUtils { "\(field.name): \(Self.format(field.value, as: format))" } return "{ \(fieldStrings.joined(separator: ", ")) }" + case .array(let elements): + let elementStrings = elements.map { element in + DefaultValueUtils.format(element, as: format) + } + return "[\(elementStrings.joined(separator: ", "))]" } } @@ -3410,6 +3434,12 @@ extension BridgeType { "arg\(index): \(param.tsType)" }.joined(separator: ", ") return "(\(paramTypes)) => \(signature.returnType.tsType)" + case .array(let elementType): + let inner = elementType.tsType + if inner.contains("|") || inner.contains("=>") { + return "(\(inner))[]" + } + return "\(inner)[]" } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index d5f47234d..c0282cd3c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -31,6 +31,8 @@ final class JSGlueVariableScope { static let reservedTmpRetPointers = "tmpRetPointers" static let reservedTmpParamPointers = "tmpParamPointers" static let reservedTmpStructCleanups = "tmpStructCleanups" + static let reservedTmpRetArrayLengths = "tmpRetArrayLengths" + static let reservedTmpParamArrayLengths = "tmpParamArrayLengths" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" @@ -60,6 +62,8 @@ final class JSGlueVariableScope { reservedTmpRetPointers, reservedTmpParamPointers, reservedTmpStructCleanups, + reservedTmpRetArrayLengths, + reservedTmpParamArrayLengths, reservedEnumHelpers, reservedStructHelpers, ] @@ -364,6 +368,24 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") resultExpr = structVar + case .array(let elementType): + let arrayVar = scope.variable("arrayValue") + printer.write("let \(arrayVar);") + printer.write("if (\(isSome)) {") + printer.indent { + // Lift array from stacks - reuse array lift return logic + let arrayLiftFragment = try! arrayLift(elementType: elementType) + let liftResults = arrayLiftFragment.printCode([], scope, printer, cleanupCode) + if let liftResult = liftResults.first { + printer.write("\(arrayVar) = \(liftResult);") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(arrayVar) = null;") + } + printer.write("}") + resultExpr = arrayVar default: resultExpr = "\(isSome) ? \(wrappedValue) : null" } @@ -437,6 +459,23 @@ struct IntrinsicJSFragment: Sendable { case .rawValueEnum: // Raw value enums with optional - falls through to handle based on raw type return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] + case .array(let elementType): + let cleanupArrayVar = scope.variable("\(value)Cleanups") + printer.write("const \(cleanupArrayVar) = [];") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let arrayLowerFragment = try! arrayLower(elementType: elementType) + let arrayCleanup = CodeFragmentPrinter() + let _ = arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + if !arrayCleanup.lines.isEmpty { + for line in arrayCleanup.lines { + printer.write("\(cleanupArrayVar).push(() => { \(line) });") + } + } + } + printer.write("}") + cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") + return ["+\(isSomeVar)"] default: switch wrappedType { case .swiftHeapObject: @@ -567,6 +606,23 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(resultVar) = null;") } printer.write("}") + case .array(let elementType): + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let arrayLiftFragment = try! arrayLift(elementType: elementType) + let liftResults = arrayLiftFragment.printCode([], scope, printer, cleanupCode) + if let liftResult = liftResults.first { + printer.write("\(resultVar) = \(liftResult);") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(resultVar) = null;") + } + printer.write("}") default: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") @@ -1349,6 +1405,8 @@ struct IntrinsicJSFragment: Sendable { ) case .namespaceEnum(let string): throw BridgeJSLinkError(message: "Namespace enums are not supported to be passed as parameters: \(string)") + case .array(let elementType): + return try arrayLower(elementType: elementType) } } @@ -1391,6 +1449,8 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from functions: \(string)" ) + case .array(let elementType): + return try arrayLift(elementType: elementType) } } @@ -1485,6 +1545,15 @@ struct IntrinsicJSFragment: Sendable { message: "Namespace enums are not supported to be passed as parameters to imported JS functions: \(string)" ) + case .array(let elementType): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: "Arrays are not yet supported to be passed as parameters to imported JS functions" + ) + case .exportSwift: + return try arrayLift(elementType: elementType) + } } } @@ -1558,6 +1627,15 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Namespace enums are not supported to be returned from imported JS functions: \(string)" ) + case .array(let elementType): + switch context { + case .importTS: + throw BridgeJSLinkError( + message: "Arrays are not yet supported to be returned from imported JS functions" + ) + case .exportSwift: + return try arrayLower(elementType: elementType) + } } } @@ -2055,6 +2133,453 @@ struct IntrinsicJSFragment: Sendable { ) } + // MARK: - Array Helpers + + /// Lowers an array from JS to Swift by iterating elements and pushing to stacks + static func arrayLower(elementType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["arr"], + printCode: { arguments, scope, printer, cleanupCode in + let arr = arguments[0] + let cleanupArrayVar = scope.variable("arrayCleanups") + + printer.write("const \(cleanupArrayVar) = [];") + let elemVar = scope.variable("elem") + printer.write("for (const \(elemVar) of \(arr)) {") + printer.indent { + let elementFragment = try! arrayElementLowerFragment(elementType: elementType) + let elementCleanup = CodeFragmentPrinter() + let _ = elementFragment.printCode([elemVar], scope, printer, elementCleanup) + if !elementCleanup.lines.isEmpty { + printer.write("\(cleanupArrayVar).push(() => {") + printer.indent { + for line in elementCleanup.lines { + printer.write(line) + } + } + printer.write("});") + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamArrayLengths).push(\(arr).length);") + cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") + return [] + } + ) + } + + /// Lifts an array from Swift to JS by popping elements from stacks + static func arrayLift(elementType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanupCode in + let resultVar = scope.variable("arrayResult") + let lenVar = scope.variable("arrayLen") + let iVar = scope.variable("i") + + printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetArrayLengths).pop();") + printer.write("const \(resultVar) = [];") + printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") + printer.indent { + let elementFragment = try! arrayElementRaiseFragment(elementType: elementType) + let elementResults = elementFragment.printCode([], scope, printer, cleanupCode) + if let elementExpr = elementResults.first { + printer.write("\(resultVar).push(\(elementExpr));") + } + } + printer.write("}") + printer.write("\(resultVar).reverse();") + return [resultVar] + } + ) + } + + private static func arrayElementRaiseFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + switch elementType { + case .string: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let strVar = scope.variable("string") + printer.write("const \(strVar) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + return [strVar] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let bVar = scope.variable("bool") + printer.write("const \(bVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop() !== 0;") + return [bVar] + } + ) + case .int: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let iVar = scope.variable("int") + printer.write("const \(iVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [iVar] + } + ) + case .float: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let fVar = scope.variable("f32") + printer.write("const \(fVar) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + return [fVar] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let dVar = scope.variable("f64") + printer.write("const \(dVar) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + return [dVar] + } + ) + case .swiftStruct(let fullName): + let structBase = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let resultVar = scope.variable("struct") + printer.write( + "const \(resultVar) = structHelpers.\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + return [resultVar] + } + ) + case .caseEnum: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("caseId") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [varName] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("rawValue") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + return [varName] + } + ) + default: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("rawValue") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + return [varName] + } + ) + } + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let caseIdVar = scope.variable("caseId") + let resultVar = scope.variable("enumValue") + printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write( + "const \(resultVar) = enumHelpers.\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + ) + return [resultVar] + } + ) + case .swiftHeapObject(let className): + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let ptrVar = scope.variable("ptr") + let objVar = scope.variable("obj") + printer.write("const \(ptrVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + printer.write("const \(objVar) = \(className).__construct(\(ptrVar));") + return [objVar] + } + ) + case .jsObject, .swiftProtocol: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let idVar = scope.variable("objId") + let objVar = scope.variable("obj") + printer.write("const \(idVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(objVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [objVar] + } + ) + case .array(let innerElementType): + return try! arrayLift(elementType: innerElementType) + case .optional(let wrappedType): + return try optionalElementRaiseFragment(wrappedType: wrappedType) + case .unsafePointer: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let pVar = scope.variable("pointer") + printer.write("const \(pVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + return [pVar] + } + ) + case .void, .closure, .namespaceEnum: + throw BridgeJSLinkError(message: "Unsupported array element type: \(elementType)") + } + } + + private static func arrayElementLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + switch elementType { + case .string: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let bytesVar = scope.variable("bytes") + let idVar = scope.variable("id") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [] + } + ) + case .bool: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arguments[0]) ? 1 : 0);") + return [] + } + ) + case .int: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + case .float: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + return [] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + return [] + } + ) + case .swiftStruct(let fullName): + let structBase = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let cleanupVar = scope.variable("cleanup") + printer.write("const { cleanup: \(cleanupVar) } = structHelpers.\(structBase).lower(\(value));") + cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return [] + } + ) + case .caseEnum: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let bytesVar = scope.variable("bytes") + let idVar = scope.variable("id") + printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [] + } + ) + default: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + return [] + } + ) + } + case .associatedValueEnum(let fullName): + let base = fullName.components(separatedBy: ".").last ?? fullName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let caseIdVar = scope.variable("caseId") + let cleanupVar = scope.variable("enumCleanup") + printer.write( + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + return [] + } + ) + case .swiftHeapObject: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(arguments[0]).pointer);") + return [] + } + ) + case .jsObject: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let idVar = scope.variable("objId") + printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + return [] + } + ) + case .array(let innerElementType): + return try! arrayLower(elementType: innerElementType) + case .optional(let wrappedType): + return try optionalElementLowerFragment(wrappedType: wrappedType) + case .swiftProtocol: + // Same as jsObject but no cleanup — Swift's AnyProtocol wrapper releases via deinit + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let idVar = scope.variable("objId") + printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + return [] + } + ) + case .unsafePointer: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push((\(arguments[0]) | 0));") + return [] + } + ) + case .void, .closure, .namespaceEnum: + throw BridgeJSLinkError(message: "Unsupported array element type for lowering: \(elementType)") + } + } + + private static func optionalElementRaiseFragment(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let isSomeVar = scope.variable("isSome") + let resultVar = scope.variable("optValue") + + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar) === 0) {") + printer.indent { + printer.write("\(resultVar) = null;") + } + printer.write("} else {") + printer.indent { + let innerFragment = try! arrayElementRaiseFragment(elementType: wrappedType) + let innerResults = innerFragment.printCode([], scope, printer, cleanup) + if let innerResult = innerResults.first { + printer.write("\(resultVar) = \(innerResult);") + } else { + printer.write("\(resultVar) = undefined;") + } + } + printer.write("}") + + return [resultVar] + } + ) + } + + private static func optionalElementLowerFragment(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + + printer.write("const \(isSomeVar) = \(value) != null ? 1 : 0;") + // Cleanup is written inside the if block so retained id is in scope + let localCleanupWriter = CodeFragmentPrinter() + printer.write("if (\(isSomeVar)) {") + printer.indent { + let innerFragment = try! arrayElementLowerFragment(elementType: wrappedType) + let _ = innerFragment.printCode([value], scope, printer, localCleanupWriter) + let localCleanupLines = localCleanupWriter.lines.filter { + !$0.trimmingCharacters(in: .whitespaces).isEmpty + } + if !localCleanupLines.isEmpty { + let localCleanupCode = localCleanupLines.joined(separator: " ") + printer.write("arrayCleanups.push(() => { \(localCleanupCode) });") + } + } + printer.write("} else {") + printer.indent { + // Push placeholders so Swift can unconditionally pop value slots + switch wrappedType { + case .float: + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(0.0);") + case .double: + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(0.0);") + case .swiftStruct: + // No placeholder — Swift only pops struct fields when isSome=1 + break + case .string, .rawValueEnum(_, .string): + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + case .swiftHeapObject: + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + default: + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar));") + + return [] + } + ) + } + static func structHelper(structDefinition: ExportedStruct, allStructs: [ExportedStruct]) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["structName"], @@ -2663,6 +3188,8 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .array(let elementType): + return try! arrayLower(elementType: elementType) } } @@ -2927,6 +3454,8 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .array(let elementType): + return try! arrayLift(elementType: elementType) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index c8fc84ec4..d2f60cc4c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -130,6 +130,7 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable { case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void case unsafePointer(UnsafePointerType) indirect case optional(BridgeType) + indirect case array(BridgeType) case caseEnum(String) case rawValueEnum(String, SwiftEnumRawType) case associatedValueEnum(String) @@ -202,6 +203,7 @@ public enum DefaultValue: Codable, Equatable, Sendable { case object(String) // className for parameterless constructor case objectWithArguments(String, [DefaultValue]) // className, constructor argument values case structLiteral(String, [DefaultValueField]) // structName, field name/value pairs + indirect case array([DefaultValue]) // array literal with element values } public struct Parameter: Codable, Equatable, Sendable { @@ -914,6 +916,9 @@ extension BridgeType { case .closure: // Closures pass callback ID as Int32 return .i32 + case .array: + // Arrays use stack-based return with length prefix (no direct WASM return type) + return nil } } @@ -972,6 +977,9 @@ extension BridgeType { ? "y" : signature.parameters.map { $0.mangleTypeName }.joined() return "K\(params)_\(signature.returnType.mangleTypeName)" + case .array(let elementType): + // Array mangling: "Sa" prefix followed by element type + return "Sa\(elementType.mangleTypeName)" } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift new file mode 100644 index 000000000..8454b7520 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift @@ -0,0 +1,56 @@ +@JS struct Point { + var x: Double + var y: Double +} + +@JS enum Direction { + case north + case south + case east + case west +} + +@JS enum Status: Int { + case pending = 0 + case active = 1 + case completed = 2 +} + +@JS class Item { + var name: String + + init(name: String) { + self.name = name + } +} + +@JS func processIntArray(_ values: [Int]) -> [Int] +@JS func processStringArray(_ values: [String]) -> [String] +@JS func processDoubleArray(_ values: [Double]) -> [Double] +@JS func processBoolArray(_ values: [Bool]) -> [Bool] + +@JS func processPointArray(_ points: [Point]) -> [Point] + +@JS func processDirectionArray(_ directions: [Direction]) -> [Direction] +@JS func processStatusArray(_ statuses: [Status]) -> [Status] + +@JS func sumIntArray(_ values: [Int]) -> Int +@JS func findFirstPoint(_ points: [Point], matching: String) -> Point + +@JS func processUnsafeRawPointerArray(_ values: [UnsafeRawPointer]) -> [UnsafeRawPointer] +@JS func processUnsafeMutableRawPointerArray(_ values: [UnsafeMutableRawPointer]) -> [UnsafeMutableRawPointer] +@JS func processOpaquePointerArray(_ values: [OpaquePointer]) -> [OpaquePointer] + +@JS func processOptionalIntArray(_ values: [Int?]) -> [Int?] +@JS func processOptionalStringArray(_ values: [String?]) -> [String?] +@JS func processOptionalArray(_ values: [Int]?) -> [Int]? +@JS func processOptionalPointArray(_ points: [Point?]) -> [Point?] +@JS func processOptionalDirectionArray(_ directions: [Direction?]) -> [Direction?] +@JS func processOptionalStatusArray(_ statuses: [Status?]) -> [Status?] + +@JS func processNestedIntArray(_ values: [[Int]]) -> [[Int]] +@JS func processNestedStringArray(_ values: [[String]]) -> [[String]] +@JS func processNestedPointArray(_ points: [[Point]]) -> [[Point]] + +@JS func processItemArray(_ items: [Item]) -> [Item] +@JS func processNestedItemArray(_ items: [[Item]]) -> [[Item]] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift index 73274ad5c..08dcde096 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift @@ -73,3 +73,15 @@ @JS func multiply(a: Double, b: Double) -> Double @JS static func subtract(a: Double, b: Double = 5.0) -> Double } + +// Array default values +@JS public func testIntArrayDefault(values: [Int] = [1, 2, 3]) -> [Int] +@JS public func testStringArrayDefault(names: [String] = ["a", "b", "c"]) -> [String] +@JS public func testDoubleArrayDefault(values: [Double] = [1.5, 2.5, 3.5]) -> [Double] +@JS public func testBoolArrayDefault(flags: [Bool] = [true, false, true]) -> [Bool] +@JS public func testEmptyArrayDefault(items: [Int] = []) -> [Int] +@JS public func testMixedWithArrayDefault( + name: String = "test", + values: [Int] = [10, 20, 30], + enabled: Bool = true +) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift index 689f4a355..fbbad0615 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift @@ -96,3 +96,21 @@ import JavaScriptKit delegate.onHelperUpdated(helper) } } + +// Protocol array support +@JS class DelegateManager { + @JS + var delegates: [MyViewControllerDelegate] + + @JS init(delegates: [MyViewControllerDelegate]) { + self.delegates = delegates + } + + @JS func notifyAll() { + for delegate in delegates { + delegate.onSomethingHappened() + } + } +} + +@JS func processDelegates(_ delegates: [MyViewControllerDelegate]) -> [MyViewControllerDelegate] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index 84af4bccb..e0b1c0561 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts new file mode 100644 index 000000000..988626f3e --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts @@ -0,0 +1,76 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const DirectionValues: { + readonly North: 0; + readonly South: 1; + readonly East: 2; + readonly West: 3; +}; +export type DirectionTag = typeof DirectionValues[keyof typeof DirectionValues]; + +export const StatusValues: { + readonly Pending: 0; + readonly Active: 1; + readonly Completed: 2; +}; +export type StatusTag = typeof StatusValues[keyof typeof StatusValues]; + +export interface Point { + x: number; + y: number; +} +export type DirectionObject = typeof DirectionValues; + +export type StatusObject = typeof StatusValues; + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Item extends SwiftHeapObject { +} +export type Exports = { + Item: { + } + processIntArray(values: number[]): number[]; + processStringArray(values: string[]): string[]; + processDoubleArray(values: number[]): number[]; + processBoolArray(values: boolean[]): boolean[]; + processPointArray(points: Point[]): Point[]; + processDirectionArray(directions: DirectionTag[]): DirectionTag[]; + processStatusArray(statuses: StatusTag[]): StatusTag[]; + sumIntArray(values: number[]): number; + findFirstPoint(points: Point[], matching: string): Point; + processUnsafeRawPointerArray(values: number[]): number[]; + processUnsafeMutableRawPointerArray(values: number[]): number[]; + processOpaquePointerArray(values: number[]): number[]; + processOptionalIntArray(values: (number | null)[]): (number | null)[]; + processOptionalStringArray(values: (string | null)[]): (string | null)[]; + processOptionalArray(values: number[] | null): number[] | null; + processOptionalPointArray(points: (Point | null)[]): (Point | null)[]; + processOptionalDirectionArray(directions: (DirectionTag | null)[]): (DirectionTag | null)[]; + processOptionalStatusArray(statuses: (StatusTag | null)[]): (StatusTag | null)[]; + processNestedIntArray(values: number[][]): number[][]; + processNestedStringArray(values: string[][]): string[][]; + processNestedPointArray(points: Point[][]): Point[][]; + processItemArray(items: Item[]): Item[]; + processNestedItemArray(items: Item[][]): Item[][]; + Direction: DirectionObject + Status: StatusObject +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js new file mode 100644 index 000000000..9416bb546 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js @@ -0,0 +1,845 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const DirectionValues = { + North: 0, + South: 1, + East: 2, + West: 3, +}; + +export const StatusValues = { + Pending: 0, + Active: 1, + Completed: 2, +}; + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + const __bjs_createPointHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamF64s.push(value.x); + tmpParamF64s.push(value.y); + return { cleanup: undefined }; + }, + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const f64 = tmpRetF64s.pop(); + const f641 = tmpRetF64s.pop(); + return { x: f641, y: f64 }; + } + }); + }; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_int"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_param_int32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_param_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_param_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_param_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_struct_lower_Point"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_lift_Point"] = function() { + const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Item_wrap"] = function(pointer) { + const obj = Item.__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Item extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Item_deinit, Item.prototype); + } + + } + const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Point = PointHelpers; + + const exports = { + Item, + processIntArray: function bjs_processIntArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processIntArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processStringArray: function bjs_processStringArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const bytes = textEncoder.encode(elem); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processStringArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const string = tmpRetStrings.pop(); + arrayResult.push(string); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processDoubleArray: function bjs_processDoubleArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamF64s.push(elem); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processDoubleArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const f64 = tmpRetF64s.pop(); + arrayResult.push(f64); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processBoolArray: function bjs_processBoolArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push(elem ? 1 : 0); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processBoolArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const bool = tmpRetInts.pop() !== 0; + arrayResult.push(bool); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processPointArray: function bjs_processPointArray(points) { + const arrayCleanups = []; + for (const elem of points) { + const { cleanup: cleanup } = structHelpers.Point.lower(elem); + arrayCleanups.push(() => { + if (cleanup) { cleanup(); } + }); + } + tmpParamArrayLengths.push(points.length); + instance.exports.bjs_processPointArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + arrayResult.push(struct); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processDirectionArray: function bjs_processDirectionArray(directions) { + const arrayCleanups = []; + for (const elem of directions) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(directions.length); + instance.exports.bjs_processDirectionArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const caseId = tmpRetInts.pop(); + arrayResult.push(caseId); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processStatusArray: function bjs_processStatusArray(statuses) { + const arrayCleanups = []; + for (const elem of statuses) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(statuses.length); + instance.exports.bjs_processStatusArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const rawValue = tmpRetInts.pop(); + arrayResult.push(rawValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + sumIntArray: function bjs_sumIntArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + const ret = instance.exports.bjs_sumIntArray(); + for (const cleanup of arrayCleanups) { cleanup(); } + return ret; + }, + findFirstPoint: function bjs_findFirstPoint(points, matching) { + const arrayCleanups = []; + for (const elem of points) { + const { cleanup: cleanup } = structHelpers.Point.lower(elem); + arrayCleanups.push(() => { + if (cleanup) { cleanup(); } + }); + } + tmpParamArrayLengths.push(points.length); + const matchingBytes = textEncoder.encode(matching); + const matchingId = swift.memory.retain(matchingBytes); + instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); + const structValue = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + for (const cleanup of arrayCleanups) { cleanup(); } + swift.memory.release(matchingId); + return structValue; + }, + processUnsafeRawPointerArray: function bjs_processUnsafeRawPointerArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamPointers.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processUnsafeRawPointerArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const pointer = tmpRetPointers.pop(); + arrayResult.push(pointer); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processUnsafeMutableRawPointerArray: function bjs_processUnsafeMutableRawPointerArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamPointers.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processUnsafeMutableRawPointerArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const pointer = tmpRetPointers.pop(); + arrayResult.push(pointer); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOpaquePointerArray: function bjs_processOpaquePointerArray(values) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamPointers.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processOpaquePointerArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const pointer = tmpRetPointers.pop(); + arrayResult.push(pointer); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalIntArray: function bjs_processOptionalIntArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + tmpParamInts.push((elem | 0)); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processOptionalIntArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const int = tmpRetInts.pop(); + optValue = int; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalStringArray: function bjs_processOptionalStringArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + const bytes = textEncoder.encode(elem); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { swift.memory.release(id); }); + } else { + tmpParamInts.push(0); + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processOptionalStringArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const string = tmpRetStrings.pop(); + optValue = string; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalArray: function bjs_processOptionalArray(values) { + const isSome = values != null; + const valuesCleanups = []; + if (isSome) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); + } + instance.exports.bjs_processOptionalArray(+isSome); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + optResult = arrayResult; + } else { + optResult = null; + } + for (const cleanup of valuesCleanups) { cleanup(); } + return optResult; + }, + processOptionalPointArray: function bjs_processOptionalPointArray(points) { + const arrayCleanups = []; + for (const elem of points) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + const { cleanup: cleanup } = structHelpers.Point.lower(elem); + arrayCleanups.push(() => { if (cleanup) { cleanup(); } }); + } else { + } + tmpParamInts.push(isSome); + } + tmpParamArrayLengths.push(points.length); + instance.exports.bjs_processOptionalPointArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optValue = struct; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalDirectionArray: function bjs_processOptionalDirectionArray(directions) { + const arrayCleanups = []; + for (const elem of directions) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + tmpParamInts.push((elem | 0)); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamArrayLengths.push(directions.length); + instance.exports.bjs_processOptionalDirectionArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const caseId = tmpRetInts.pop(); + optValue = caseId; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalStatusArray: function bjs_processOptionalStatusArray(statuses) { + const arrayCleanups = []; + for (const elem of statuses) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + tmpParamInts.push((elem | 0)); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamArrayLengths.push(statuses.length); + instance.exports.bjs_processOptionalStatusArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const rawValue = tmpRetInts.pop(); + optValue = rawValue; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processNestedIntArray: function bjs_processNestedIntArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const arrayCleanups1 = []; + for (const elem1 of elem) { + tmpParamInts.push((elem1 | 0)); + } + tmpParamArrayLengths.push(elem.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processNestedIntArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayResult1 = []; + for (let i1 = 0; i1 < arrayLen1; i1++) { + const int = tmpRetInts.pop(); + arrayResult1.push(int); + } + arrayResult1.reverse(); + arrayResult.push(arrayResult1); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processNestedStringArray: function bjs_processNestedStringArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const arrayCleanups1 = []; + for (const elem1 of elem) { + const bytes = textEncoder.encode(elem1); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups1.push(() => { + swift.memory.release(id); + }); + } + tmpParamArrayLengths.push(elem.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_processNestedStringArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayResult1 = []; + for (let i1 = 0; i1 < arrayLen1; i1++) { + const string = tmpRetStrings.pop(); + arrayResult1.push(string); + } + arrayResult1.reverse(); + arrayResult.push(arrayResult1); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processNestedPointArray: function bjs_processNestedPointArray(points) { + const arrayCleanups = []; + for (const elem of points) { + const arrayCleanups1 = []; + for (const elem1 of elem) { + const { cleanup: cleanup } = structHelpers.Point.lower(elem1); + arrayCleanups1.push(() => { + if (cleanup) { cleanup(); } + }); + } + tmpParamArrayLengths.push(elem.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamArrayLengths.push(points.length); + instance.exports.bjs_processNestedPointArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayResult1 = []; + for (let i1 = 0; i1 < arrayLen1; i1++) { + const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + arrayResult1.push(struct); + } + arrayResult1.reverse(); + arrayResult.push(arrayResult1); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processItemArray: function bjs_processItemArray(items) { + const arrayCleanups = []; + for (const elem of items) { + tmpParamPointers.push(elem.pointer); + } + tmpParamArrayLengths.push(items.length); + instance.exports.bjs_processItemArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const ptr = tmpRetPointers.pop(); + const obj = Item.__construct(ptr); + arrayResult.push(obj); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processNestedItemArray: function bjs_processNestedItemArray(items) { + const arrayCleanups = []; + for (const elem of items) { + const arrayCleanups1 = []; + for (const elem1 of elem) { + tmpParamPointers.push(elem1.pointer); + } + tmpParamArrayLengths.push(elem.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamArrayLengths.push(items.length); + instance.exports.bjs_processNestedItemArray(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayResult1 = []; + for (let i1 = 0; i1 < arrayLen1; i1++) { + const ptr = tmpRetPointers.pop(); + const obj = Item.__construct(ptr); + arrayResult1.push(obj); + } + arrayResult1.reverse(); + arrayResult.push(arrayResult1); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + Direction: DirectionValues, + Status: StatusValues, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index 916eafb1f..cffc92db4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 4e47329f0..9259ae32d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts index c024ecfb6..ac5658eb3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts @@ -116,6 +116,32 @@ export type Exports = { * @param point - Optional parameter (default: { name: "default", value: 42, enabled: true }) */ testOptionalStructWithValueDefault(point?: Config | null): Config | null; + /** + * @param values - Optional parameter (default: [1, 2, 3]) + */ + testIntArrayDefault(values?: number[]): number[]; + /** + * @param names - Optional parameter (default: ["a", "b", "c"]) + */ + testStringArrayDefault(names?: string[]): string[]; + /** + * @param values - Optional parameter (default: [1.5, 2.5, 3.5]) + */ + testDoubleArrayDefault(values?: number[]): number[]; + /** + * @param flags - Optional parameter (default: [true, false, true]) + */ + testBoolArrayDefault(flags?: boolean[]): boolean[]; + /** + * @param items - Optional parameter (default: []) + */ + testEmptyArrayDefault(items?: number[]): number[]; + /** + * @param name - Optional parameter (default: "test") + * @param values - Optional parameter (default: [10, 20, 30]) + * @param enabled - Optional parameter (default: true) + */ + testMixedWithArrayDefault(name?: string, values?: number[], enabled?: boolean): string; Status: StatusObject MathOperations: { /** diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 7be003943..dd0f2af21 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -35,6 +35,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -154,6 +156,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -553,6 +561,112 @@ export async function createInstantiator(options, swift) { if (pointCleanup) { pointCleanup(); } return optResult; }, + testIntArrayDefault: function bjs_testIntArrayDefault(values = [1, 2, 3]) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_testIntArrayDefault(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + testStringArrayDefault: function bjs_testStringArrayDefault(names = ["a", "b", "c"]) { + const arrayCleanups = []; + for (const elem of names) { + const bytes = textEncoder.encode(elem); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + } + tmpParamArrayLengths.push(names.length); + instance.exports.bjs_testStringArrayDefault(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const string = tmpRetStrings.pop(); + arrayResult.push(string); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + testDoubleArrayDefault: function bjs_testDoubleArrayDefault(values = [1.5, 2.5, 3.5]) { + const arrayCleanups = []; + for (const elem of values) { + tmpParamF64s.push(elem); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_testDoubleArrayDefault(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const f64 = tmpRetF64s.pop(); + arrayResult.push(f64); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + testBoolArrayDefault: function bjs_testBoolArrayDefault(flags = [true, false, true]) { + const arrayCleanups = []; + for (const elem of flags) { + tmpParamInts.push(elem ? 1 : 0); + } + tmpParamArrayLengths.push(flags.length); + instance.exports.bjs_testBoolArrayDefault(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const bool = tmpRetInts.pop() !== 0; + arrayResult.push(bool); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + testEmptyArrayDefault: function bjs_testEmptyArrayDefault(items = []) { + const arrayCleanups = []; + for (const elem of items) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(items.length); + instance.exports.bjs_testEmptyArrayDefault(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + testMixedWithArrayDefault: function bjs_testMixedWithArrayDefault(name = "test", values = [10, 20, 30], enabled = true) { + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + const arrayCleanups = []; + for (const elem of values) { + tmpParamInts.push((elem | 0)); + } + tmpParamArrayLengths.push(values.length); + instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(nameId); + for (const cleanup of arrayCleanups) { cleanup(); } + return ret; + }, Status: StatusValues, MathOperations: { init: function(baseValue = 0.0) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index 3c7baa5b9..c22bd2b18 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -504,6 +504,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -576,6 +578,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 79fba73b0..1adfe67bf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -53,6 +53,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -125,6 +127,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 4c09e3bd9..ceb2b2fd5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -54,6 +54,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -126,6 +128,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 584788f20..94e886cb5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -73,6 +73,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -145,6 +147,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 63f18d4d5..896b925f3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -104,6 +104,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -176,6 +178,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index afcdddbd4..d0d035a38 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js index b671728af..6a5969915 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index 3cfc76bb3..ba9024495 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 41b006340..2dd3e0cee 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index f43f73b1e..220b91e94 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index 5e258f47a..fd05b0884 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index 0b4f1bca0..69c674b51 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index d3f325f74..33013eae7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index d0fc9931d..08f8ab83e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index d134a8fff..bd48815c5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 554d8d794..26ba1bba7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 8b10a7e98..64340972b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index faca8ce39..c4c355c6a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 4c628d1db..a06cc4974 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 135640249..e36b1820f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 9621baf26..a19f3c0ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 35d68c047..5699a3e3d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts index b7fddd42e..4c09ad85f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts @@ -90,6 +90,10 @@ export interface MyViewController extends SwiftHeapObject { delegate: MyViewControllerDelegate; secondDelegate: MyViewControllerDelegate | null; } +export interface DelegateManager extends SwiftHeapObject { + notifyAll(): void; + delegates: MyViewControllerDelegate[]; +} export type Exports = { Helper: { new(value: number): Helper; @@ -97,6 +101,10 @@ export type Exports = { MyViewController: { new(delegate: MyViewControllerDelegate): MyViewController; } + DelegateManager: { + new(delegates: MyViewControllerDelegate[]): DelegateManager; + } + processDelegates(delegates: MyViewControllerDelegate[]): MyViewControllerDelegate[]; Direction: DirectionObject ExampleEnum: ExampleEnumObject Result: ResultObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index f9dbb07e2..4fd02029d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -93,6 +93,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -165,6 +167,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -269,6 +277,10 @@ export async function createInstantiator(options, swift) { if (!importObject["TestModule"]) { importObject["TestModule"] = {}; } + importObject["TestModule"]["bjs_DelegateManager_wrap"] = function(pointer) { + const obj = DelegateManager.__construct(pointer); + return swift.memory.retain(obj); + }; importObject["TestModule"]["bjs_Helper_wrap"] = function(pointer) { const obj = Helper.__construct(pointer); return swift.memory.retain(obj); @@ -680,9 +692,73 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_MyViewController_secondDelegate_set(this.pointer, +isSome, isSome ? swift.memory.retain(value) : 0); } } + class DelegateManager extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_DelegateManager_deinit, DelegateManager.prototype); + } + + constructor(delegates) { + const arrayCleanups = []; + for (const elem of delegates) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } + tmpParamArrayLengths.push(delegates.length); + const ret = instance.exports.bjs_DelegateManager_init(); + for (const cleanup of arrayCleanups) { cleanup(); } + return DelegateManager.__construct(ret); + } + notifyAll() { + instance.exports.bjs_DelegateManager_notifyAll(this.pointer); + } + get delegates() { + instance.exports.bjs_DelegateManager_delegates_get(this.pointer); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const objId = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + arrayResult.push(obj); + } + arrayResult.reverse(); + return arrayResult; + } + set delegates(value) { + const arrayCleanups = []; + for (const elem of value) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } + tmpParamArrayLengths.push(value.length); + instance.exports.bjs_DelegateManager_delegates_set(this.pointer); + for (const cleanup of arrayCleanups) { cleanup(); } + } + } const exports = { Helper, MyViewController, + DelegateManager, + processDelegates: function bjs_processDelegates(delegates) { + const arrayCleanups = []; + for (const elem of delegates) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } + tmpParamArrayLengths.push(delegates.length); + instance.exports.bjs_processDelegates(); + const arrayLen = tmpRetArrayLengths.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + arrayResult.push(obj); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, Direction: DirectionValues, ExampleEnum: ExampleEnumValues, Result: ResultValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index de20a1194..1cdc061e1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 84d517a57..4d8b282fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -80,6 +80,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -152,6 +154,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 97c09fb3e..5e712ef85 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -80,6 +80,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -152,6 +154,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 352d1a2c0..40c09140d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -34,6 +34,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,6 +108,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 98f4cfdf8..f5e30215c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -34,6 +34,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,6 +108,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index 5b399b276..e634e4147 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 4d76cbb7e..3155c6611 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 82b4068ed..7c3999c87 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 2d3679926..d0fd0eb1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index b4ba16cf9..dc5b94a17 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 87773621d..6fb8849f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 58e39f0c6..d32c5a27d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -131,6 +131,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -203,6 +205,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index 461d55aff..51d52e0e5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index e7c40c298..5e528e7bc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -34,6 +34,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -295,6 +297,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 2f186df77..8683a87f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -116,6 +118,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 0b0de98cd..5ff21f227 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 820a221a2..664794d4a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 1b2485296..0aa603d8a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index e0ae6c7a7..f442cd882 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index aa45023ac..95602db76 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -121,6 +123,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index 8564697d3..67eb8bc8f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -101,6 +103,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 16e42865c..915f64367 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -29,6 +29,8 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; + let tmpRetArrayLengths = []; + let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,6 +104,12 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_param_pointer"] = function() { return tmpParamPointers.pop(); } + bjs["swift_js_push_array_length"] = function(len) { + tmpRetArrayLengths.push(len | 0); + } + bjs["swift_js_pop_param_array_length"] = function() { + return tmpParamArrayLengths.pop(); + } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json new file mode 100644 index 000000000..c796433dd --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json @@ -0,0 +1,983 @@ +{ + "classes" : [ + { + "methods" : [ + + ], + "name" : "Item", + "properties" : [ + + ], + "swiftCallName" : "Item" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "pending", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "active", + "rawValue" : "1" + }, + { + "associatedValues" : [ + + ], + "name" : "completed", + "rawValue" : "2" + } + ], + "emitStyle" : "const", + "name" : "Status", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Status", + "tsFullPath" : "Status" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_processIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processBoolArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processBoolArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "abiName" : "bjs_processDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_processStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "statuses", + "type" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_sumIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sumIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_findFirstPoint", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "findFirstPoint", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "label" : "matching", + "name" : "matching", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Point" + } + } + }, + { + "abiName" : "bjs_processUnsafeRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processUnsafeRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processUnsafeMutableRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processUnsafeMutableRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processOpaquePointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOpaquePointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "statuses", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processItemArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processItemArray", + "parameters" : [ + { + "label" : "_", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + }, + { + "abiName" : "bjs_processNestedItemArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedItemArray", + "parameters" : [ + { + "label" : "_", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "methods" : [ + + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "Point" + } + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift new file mode 100644 index 000000000..8142d6905 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -0,0 +1,694 @@ +extension Direction: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> Direction { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Direction { + return Direction(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .north + case 1: + self = .south + case 2: + self = .east + case 3: + self = .west + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .north: + return 0 + case .south: + return 1 + case .east: + return 2 + case .west: + return 3 + } + } +} + +extension Status: _BridgedSwiftEnumNoPayload { +} + +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.x) + _swift_js_push_f64(self.y) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 +#else +fileprivate func _bjs_struct_lift_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_processIntArray") +@_cdecl("bjs_processIntArray") +public func _bjs_processIntArray() -> Void { + #if arch(wasm32) + let ret = processIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processStringArray") +@_cdecl("bjs_processStringArray") +public func _bjs_processStringArray() -> Void { + #if arch(wasm32) + let ret = processStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processDoubleArray") +@_cdecl("bjs_processDoubleArray") +public func _bjs_processDoubleArray() -> Void { + #if arch(wasm32) + let ret = processDoubleArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_f64(__bjs_elem_ret)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processBoolArray") +@_cdecl("bjs_processBoolArray") +public func _bjs_processBoolArray() -> Void { + #if arch(wasm32) + let ret = processBoolArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Bool] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processPointArray") +@_cdecl("bjs_processPointArray") +public func _bjs_processPointArray() -> Void { + #if arch(wasm32) + let ret = processPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processDirectionArray") +@_cdecl("bjs_processDirectionArray") +public func _bjs_processDirectionArray() -> Void { + #if arch(wasm32) + let ret = processDirectionArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Direction] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processStatusArray") +@_cdecl("bjs_processStatusArray") +public func _bjs_processStatusArray() -> Void { + #if arch(wasm32) + let ret = processStatusArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Status] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_sumIntArray") +@_cdecl("bjs_sumIntArray") +public func _bjs_sumIntArray() -> Int32 { + #if arch(wasm32) + let ret = sumIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_findFirstPoint") +@_cdecl("bjs_findFirstPoint") +public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { + #if arch(wasm32) + let ret = findFirstPoint(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processUnsafeRawPointerArray") +@_cdecl("bjs_processUnsafeRawPointerArray") +public func _bjs_processUnsafeRawPointerArray() -> Void { + #if arch(wasm32) + let ret = processUnsafeRawPointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [UnsafeRawPointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processUnsafeMutableRawPointerArray") +@_cdecl("bjs_processUnsafeMutableRawPointerArray") +public func _bjs_processUnsafeMutableRawPointerArray() -> Void { + #if arch(wasm32) + let ret = processUnsafeMutableRawPointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [UnsafeMutableRawPointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOpaquePointerArray") +@_cdecl("bjs_processOpaquePointerArray") +public func _bjs_processOpaquePointerArray() -> Void { + #if arch(wasm32) + let ret = processOpaquePointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [OpaquePointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalIntArray") +@_cdecl("bjs_processOptionalIntArray") +public func _bjs_processOptionalIntArray() -> Void { + #if arch(wasm32) + let ret = processOptionalIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalStringArray") +@_cdecl("bjs_processOptionalStringArray") +public func _bjs_processOptionalStringArray() -> Void { + #if arch(wasm32) + let ret = processOptionalStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + var __bjs_str_ret_elem = __bjs_unwrapped_ret_elem + __bjs_str_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalArray") +@_cdecl("bjs_processOptionalArray") +public func _bjs_processOptionalArray(_ values: Int32) -> Void { + #if arch(wasm32) + let ret = processOptionalArray(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalPointArray") +@_cdecl("bjs_processOptionalPointArray") +public func _bjs_processOptionalPointArray() -> Void { + #if arch(wasm32) + let ret = processOptionalPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalDirectionArray") +@_cdecl("bjs_processOptionalDirectionArray") +public func _bjs_processOptionalDirectionArray() -> Void { + #if arch(wasm32) + let ret = processOptionalDirectionArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalStatusArray") +@_cdecl("bjs_processOptionalStatusArray") +public func _bjs_processOptionalStatusArray() -> Void { + #if arch(wasm32) + let ret = processOptionalStatusArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processNestedIntArray") +@_cdecl("bjs_processNestedIntArray") +public func _bjs_processNestedIntArray() -> Void { + #if arch(wasm32) + let ret = processNestedIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Int]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_elem_ret_elem))} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processNestedStringArray") +@_cdecl("bjs_processNestedStringArray") +public func _bjs_processNestedStringArray() -> Void { + #if arch(wasm32) + let ret = processNestedStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[String]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + var __bjs_ret_elem_elem = __bjs_elem_ret_elem + __bjs_ret_elem_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processNestedPointArray") +@_cdecl("bjs_processNestedPointArray") +public func _bjs_processNestedPointArray() -> Void { + #if arch(wasm32) + let ret = processNestedPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Point]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + __bjs_elem_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processItemArray") +@_cdecl("bjs_processItemArray") +public func _bjs_processItemArray() -> Void { + #if arch(wasm32) + let ret = processItemArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Item] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processNestedItemArray") +@_cdecl("bjs_processNestedItemArray") +public func _bjs_processNestedItemArray() -> Void { + #if arch(wasm32) + let ret = processNestedItemArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Item]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Item] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Item_deinit") +@_cdecl("bjs_Item_deinit") +public func _bjs_Item_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Item: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Item_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Item_wrap") +fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json index 1a013eed0..f2e6a4e2e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json @@ -728,6 +728,340 @@ } } } + }, + { + "abiName" : "bjs_testIntArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testIntArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 1 + } + }, + { + "int" : { + "_0" : 2 + } + }, + { + "int" : { + "_0" : 3 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testStringArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStringArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "string" : { + "_0" : "a" + } + }, + { + "string" : { + "_0" : "b" + } + }, + { + "string" : { + "_0" : "c" + } + } + ] + } + }, + "label" : "names", + "name" : "names", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testDoubleArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testDoubleArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "double" : { + "_0" : 1.5 + } + }, + { + "double" : { + "_0" : 2.5 + } + }, + { + "double" : { + "_0" : 3.5 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testBoolArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testBoolArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "bool" : { + "_0" : true + } + }, + { + "bool" : { + "_0" : false + } + }, + { + "bool" : { + "_0" : true + } + } + ] + } + }, + "label" : "flags", + "name" : "flags", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testEmptyArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testEmptyArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + + ] + } + }, + "label" : "items", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testMixedWithArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testMixedWithArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "test" + } + }, + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 10 + } + }, + { + "int" : { + "_0" : 20 + } + }, + { + "int" : { + "_0" : 30 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } } ], "protocols" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index b1594c328..7803860a3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -317,6 +317,139 @@ public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { #endif } +@_expose(wasm, "bjs_testIntArrayDefault") +@_cdecl("bjs_testIntArrayDefault") +public func _bjs_testIntArrayDefault() -> Void { + #if arch(wasm32) + let ret = testIntArrayDefault(values: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testStringArrayDefault") +@_cdecl("bjs_testStringArrayDefault") +public func _bjs_testStringArrayDefault() -> Void { + #if arch(wasm32) + let ret = testStringArrayDefault(names: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testDoubleArrayDefault") +@_cdecl("bjs_testDoubleArrayDefault") +public func _bjs_testDoubleArrayDefault() -> Void { + #if arch(wasm32) + let ret = testDoubleArrayDefault(values: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_f64(__bjs_elem_ret)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testBoolArrayDefault") +@_cdecl("bjs_testBoolArrayDefault") +public func _bjs_testBoolArrayDefault() -> Void { + #if arch(wasm32) + let ret = testBoolArrayDefault(flags: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Bool] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testEmptyArrayDefault") +@_cdecl("bjs_testEmptyArrayDefault") +public func _bjs_testEmptyArrayDefault() -> Void { + #if arch(wasm32) + let ret = testEmptyArrayDefault(items: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_testMixedWithArrayDefault") +@_cdecl("bjs_testMixedWithArrayDefault") +public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { + #if arch(wasm32) + let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }(), enabled: Bool.bridgeJSLiftParameter(enabled)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_DefaultGreeter_init") @_cdecl("bjs_DefaultGreeter_init") public func _bjs_DefaultGreeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json index b79a59d19..eb8f2426a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json @@ -247,6 +247,68 @@ } ], "swiftCallName" : "MyViewController" + }, + { + "constructor" : { + "abiName" : "bjs_DelegateManager_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "delegates", + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_DelegateManager_notifyAll", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "notifyAll", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "DelegateManager", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "swiftCallName" : "DelegateManager" } ], "enums" : [ @@ -394,7 +456,39 @@ ], "exposeToGlobal" : false, "functions" : [ - + { + "abiName" : "bjs_processDelegates", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDelegates", + "parameters" : [ + { + "label" : "_", + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } ], "protocols" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 735c225f1..7592f2960 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -418,6 +418,28 @@ extension Result: _BridgedSwiftAssociatedValueEnum { extension Priority: _BridgedSwiftEnumNoPayload { } +@_expose(wasm, "bjs_processDelegates") +@_cdecl("bjs_processDelegates") +public func _bjs_processDelegates() -> Void { + #if arch(wasm32) + let ret = processDelegates(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [AnyMyViewControllerDelegate] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Helper_init") @_cdecl("bjs_Helper_init") public func _bjs_Helper_init(_ value: Int32) -> UnsafeMutableRawPointer { @@ -625,4 +647,91 @@ fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } +#endif + +@_expose(wasm, "bjs_DelegateManager_init") +@_cdecl("bjs_DelegateManager_init") +public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = DelegateManager(delegates: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [AnyMyViewControllerDelegate] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DelegateManager_notifyAll") +@_cdecl("bjs_DelegateManager_notifyAll") +public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + DelegateManager.bridgeJSLiftParameter(_self).notifyAll() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DelegateManager_delegates_get") +@_cdecl("bjs_DelegateManager_delegates_get") +public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates + for __bjs_elem_ret in ret { + _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DelegateManager_delegates_set") +@_cdecl("bjs_DelegateManager_delegates_set") +public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + DelegateManager.bridgeJSLiftParameter(_self).delegates = { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [AnyMyViewControllerDelegate] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DelegateManager_deinit") +@_cdecl("bjs_DelegateManager_deinit") +public func _bjs_DelegateManager_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension DelegateManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_DelegateManager_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_DelegateManager_wrap") +fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} #endif \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 52e05a4f6..d8145e3a7 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -282,6 +282,10 @@ extension _BridgedSwiftProtocolWrapper { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + jsObject.bridgeJSLowerParameter() + } } /// A protocol that Swift enum types that do not have a payload can conform to. @@ -457,6 +461,26 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif +// MARK: Array length operations + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_push_array_length") +@_spi(BridgeJS) public func _swift_js_push_array_length(_ length: Int32) +#else +@_spi(BridgeJS) public func _swift_js_push_array_length(_ length: Int32) { + _onlyAvailableOnWasm() +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_pop_param_array_length") +@_spi(BridgeJS) public func _swift_js_pop_param_array_length() -> Int32 +#else +@_spi(BridgeJS) public func _swift_js_pop_param_array_length() -> Int32 { + _onlyAvailableOnWasm() +} +#endif + // MARK: Struct bridging helpers (JS-side lowering/raising) #if arch(wasm32) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md index c70533055..75f0fcca5 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md @@ -66,6 +66,7 @@ This command will: - - - +- - - - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md new file mode 100644 index 000000000..fed56618f --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md @@ -0,0 +1,132 @@ +# Exporting Swift Arrays to JS + +Learn how to pass Swift arrays to and from JavaScript. + +## Overview + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +BridgeJS allows you to pass Swift arrays as function parameters and return values. + +```swift +import JavaScriptKit + +@JS func processNumbers(_ values: [Int]) -> [Int] { + return values.map { $0 * 2 } +} + +@JS func getGreeting() -> [String] { + return ["Hello", "World", "from", "Swift"] +} +``` + +In JavaScript: + +```javascript +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; +const { exports } = await init({}); + +const doubled = exports.processNumbers([1, 2, 3, 4, 5]); +console.log(doubled); // [2, 4, 6, 8, 10] + +const greeting = exports.getGreeting(); +console.log(greeting.join(" ")); // "Hello World from Swift" +``` + +The generated TypeScript declarations: + +```typescript +export type Exports = { + processNumbers(values: number[]): number[]; + getGreeting(): string[]; +} +``` + +## Arrays of Custom Types + +Arrays work with `@JS` marked structs, classes, and enums: + +```swift +@JS struct Point { + var x: Double + var y: Double +} + +@JS func scalePoints(_ points: [Point], by factor: Double) -> [Point] { + return points.map { Point(x: $0.x * factor, y: $0.y * factor) } +} +``` + +In JavaScript: + +```javascript +const points = [{ x: 1.0, y: 2.0 }, { x: 3.0, y: 4.0 }]; +const scaled = exports.scalePoints(points, 2.0); +console.log(scaled); // [{ x: 2.0, y: 4.0 }, { x: 6.0, y: 8.0 }] +``` + +## Optional and Nested Arrays + +BridgeJS supports optional arrays (`[T]?`), arrays of optionals (`[T?]`), and nested arrays (`[[T]]`): + +```swift +@JS func processOptionalInts(_ values: [Int?]) -> [Int?] { + return values.map { $0.map { $0 * 2 } } +} + +@JS func processMatrix(_ matrix: [[Int]]) -> [[Int]] { + return matrix.map { row in row.map { $0 * 2 } } +} +``` + +In JavaScript: + +```javascript +const mixed = [1, null, 3]; +console.log(exports.processOptionalInts(mixed)); // [2, null, 6] + +const matrix = [[1, 2], [3, 4]]; +console.log(exports.processMatrix(matrix)); // [[2, 4], [6, 8]] +``` + +TypeScript definitions: + +- `[Int?]` becomes `(number | null)[]` +- `[Int]?` becomes `number[] | null` +- `[[Int]]` becomes `number[][]` + +## How It Works + +Arrays use **copy semantics** when crossing the Swift/JavaScript boundary: + +1. **Data Transfer**: Array elements are pushed to type-specific stacks and reconstructed as JavaScript arrays +2. **No Shared State**: Each side has its own copy - modifications don't affect the original +3. **Element Handling**: Primitive elements are copied by value; class elements copy their references (the objects remain shared) + +This differs from classes, which use reference semantics and share state across the boundary. + +```javascript +const original = [1, 2, 3]; +const result = exports.processNumbers(original); +// original is unchanged - Swift received a copy +``` + +## Supported Features + +| Swift Feature | Status | +|:--------------|:-------| +| Primitive arrays: `[Int]`, `[Double]`, `[Bool]`, `[String]` | ✅ | +| Struct arrays: `[MyStruct]` | ✅ | +| Class arrays: `[MyClass]` | ✅ | +| Enum arrays (case, raw value, associated value) | ✅ | +| Nested arrays: `[[Int]]` | ✅ | +| Optional arrays: `[Int]?` | ✅ | +| Arrays of optionals: `[Int?]` | ✅ | +| Protocol arrays: `[MyProtocol]` | ✅ | +| UnsafePointer-family arrays: `[UnsafeRawPointer]`, `[OpaquePointer]`, etc. | ✅ | + +> Note: Array element type support matches that of regular `@JS func` parameters and return values. + +## See Also + +- diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md index 21925685d..f6115f063 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md @@ -110,6 +110,7 @@ The following default value types are supported for both function and constructo | Class initialization (no args) | `MyClass()` | `new MyClass()` | | Class initialization (literal args) | `MyClass("value", 42)` | `new MyClass("value", 42)` | | Struct initialization | `Point(x: 1.0, y: 2.0)` | `{ x: 1.0, y: 2.0 }` | +| Array literals | `[1, 2, 3]` | `[1, 2, 3]` | ## Working with Class and Struct Defaults @@ -156,7 +157,6 @@ The following expressions are **not supported** as default parameter values: |:----------------|:--------|:-------| | Method calls | `Date().description` | ❌ | | Closures | `{ "computed" }()` | ❌ | -| Array literals | `[1, 2, 3]` | ❌ | | Dictionary literals | `["key": "value"]` | ❌ | | Binary operations | `10 + 20` | ❌ | | Complex member access | `Config.shared.value` | ❌ | diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 27584d24d..af6ad530b 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -864,6 +864,22 @@ enum APIOptionalResult { } } +@JS func arrayWithDefault(_ values: [Int] = [1, 2, 3]) -> Int { + return values.reduce(0, +) +} + +@JS func arrayWithOptionalDefault(_ values: [Int]? = nil) -> Int { + return values?.reduce(0, +) ?? -1 +} + +@JS func arrayMixedDefaults( + prefix: String = "Sum", + values: [Int] = [10, 20], + suffix: String = "!" +) -> String { + return "\(prefix): \(values.reduce(0, +))\(suffix)" +} + // MARK: - Static Properties @JS class StaticPropertyHolder { @@ -1269,6 +1285,134 @@ enum APIOptionalResult { } } +// MARK: - Array Tests + +// Primitive arrays +@JS func roundTripIntArray(_ values: [Int]) -> [Int] { + return values +} + +@JS func roundTripStringArray(_ values: [String]) -> [String] { + return values +} + +@JS func roundTripDoubleArray(_ values: [Double]) -> [Double] { + return values +} + +@JS func roundTripBoolArray(_ values: [Bool]) -> [Bool] { + return values +} + +// Enum arrays +@JS func roundTripDirectionArray(_ values: [Direction]) -> [Direction] { + return values +} + +@JS func roundTripStatusArray(_ values: [Status]) -> [Status] { + return values +} + +@JS func roundTripThemeArray(_ values: [Theme]) -> [Theme] { + return values +} + +@JS func roundTripHttpStatusArray(_ values: [HttpStatus]) -> [HttpStatus] { + return values +} + +// Struct arrays +@JS func roundTripDataPointArray(_ points: [DataPoint]) -> [DataPoint] { + return points +} + +// Class arrays +@JS func roundTripGreeterArray(_ greeters: [Greeter]) -> [Greeter] { + return greeters +} + +// Arrays of optional elements +@JS func roundTripOptionalIntArray(_ values: [Int?]) -> [Int?] { + return values +} + +@JS func roundTripOptionalStringArray(_ values: [String?]) -> [String?] { + return values +} + +@JS func roundTripOptionalDataPointArray(_ points: [DataPoint?]) -> [DataPoint?] { + return points +} + +@JS func roundTripOptionalDirectionArray(_ directions: [Direction?]) -> [Direction?] { + return directions +} + +@JS func roundTripOptionalStatusArray(_ statuses: [Status?]) -> [Status?] { + return statuses +} + +// Optional arrays +@JS func roundTripOptionalIntArrayType(_ values: [Int]?) -> [Int]? { + return values +} + +@JS func roundTripOptionalStringArrayType(_ values: [String]?) -> [String]? { + return values +} + +@JS func roundTripOptionalGreeterArrayType(_ greeters: [Greeter]?) -> [Greeter]? { + return greeters +} + +// Nested arrays + +@JS func roundTripNestedIntArray(_ values: [[Int]]) -> [[Int]] { + return values +} + +@JS func roundTripNestedStringArray(_ values: [[String]]) -> [[String]] { + return values +} + +@JS func roundTripNestedDoubleArray(_ values: [[Double]]) -> [[Double]] { + return values +} + +@JS func roundTripNestedBoolArray(_ values: [[Bool]]) -> [[Bool]] { + return values +} + +@JS func roundTripNestedDataPointArray(_ points: [[DataPoint]]) -> [[DataPoint]] { + return points +} + +@JS func roundTripNestedDirectionArray(_ directions: [[Direction]]) -> [[Direction]] { + return directions +} + +@JS func roundTripNestedGreeterArray(_ greeters: [[Greeter]]) -> [[Greeter]] { + return greeters +} + +@JS func roundTripUnsafeRawPointerArray(_ values: [UnsafeRawPointer]) -> [UnsafeRawPointer] { + return values +} +@JS func roundTripUnsafeMutableRawPointerArray(_ values: [UnsafeMutableRawPointer]) -> [UnsafeMutableRawPointer] { + return values +} +@JS func roundTripOpaquePointerArray(_ values: [OpaquePointer]) -> [OpaquePointer] { + return values +} + +@JS func consumeDataProcessorArrayType(_ processors: [DataProcessor]) -> Int { + return processors.count +} + +@JS func roundTripDataProcessorArrayType(_ processors: [DataProcessor]) -> [DataProcessor] { + return processors +} + class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index c31876ac9..7f35f6725 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -4551,6 +4551,72 @@ public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutab #endif } +@_expose(wasm, "bjs_arrayWithDefault") +@_cdecl("bjs_arrayWithDefault") +public func _bjs_arrayWithDefault() -> Int32 { + #if arch(wasm32) + let ret = arrayWithDefault(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_arrayWithOptionalDefault") +@_cdecl("bjs_arrayWithOptionalDefault") +public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { + #if arch(wasm32) + let ret = arrayWithOptionalDefault(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_arrayMixedDefaults") +@_cdecl("bjs_arrayMixedDefaults") +public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { + #if arch(wasm32) + let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_formatName") @_cdecl("bjs_formatName") public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void { @@ -4584,6 +4650,798 @@ public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { #endif } +@_expose(wasm, "bjs_roundTripIntArray") +@_cdecl("bjs_roundTripIntArray") +public func _bjs_roundTripIntArray() -> Void { + #if arch(wasm32) + let ret = roundTripIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripStringArray") +@_cdecl("bjs_roundTripStringArray") +public func _bjs_roundTripStringArray() -> Void { + #if arch(wasm32) + let ret = roundTripStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripDoubleArray") +@_cdecl("bjs_roundTripDoubleArray") +public func _bjs_roundTripDoubleArray() -> Void { + #if arch(wasm32) + let ret = roundTripDoubleArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_f64(__bjs_elem_ret)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripBoolArray") +@_cdecl("bjs_roundTripBoolArray") +public func _bjs_roundTripBoolArray() -> Void { + #if arch(wasm32) + let ret = roundTripBoolArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Bool] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripDirectionArray") +@_cdecl("bjs_roundTripDirectionArray") +public func _bjs_roundTripDirectionArray() -> Void { + #if arch(wasm32) + let ret = roundTripDirectionArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Direction] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripStatusArray") +@_cdecl("bjs_roundTripStatusArray") +public func _bjs_roundTripStatusArray() -> Void { + #if arch(wasm32) + let ret = roundTripStatusArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Status] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripThemeArray") +@_cdecl("bjs_roundTripThemeArray") +public func _bjs_roundTripThemeArray() -> Void { + #if arch(wasm32) + let ret = roundTripThemeArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Theme] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Theme.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret.rawValue + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripHttpStatusArray") +@_cdecl("bjs_roundTripHttpStatusArray") +public func _bjs_roundTripHttpStatusArray() -> Void { + #if arch(wasm32) + let ret = roundTripHttpStatusArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [HttpStatus] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(HttpStatus.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripDataPointArray") +@_cdecl("bjs_roundTripDataPointArray") +public func _bjs_roundTripDataPointArray() -> Void { + #if arch(wasm32) + let ret = roundTripDataPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [DataPoint] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(DataPoint.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripGreeterArray") +@_cdecl("bjs_roundTripGreeterArray") +public func _bjs_roundTripGreeterArray() -> Void { + #if arch(wasm32) + let ret = roundTripGreeterArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Greeter] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalIntArray") +@_cdecl("bjs_roundTripOptionalIntArray") +public func _bjs_roundTripOptionalIntArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalStringArray") +@_cdecl("bjs_roundTripOptionalStringArray") +public func _bjs_roundTripOptionalStringArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + var __bjs_str_ret_elem = __bjs_unwrapped_ret_elem + __bjs_str_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalDataPointArray") +@_cdecl("bjs_roundTripOptionalDataPointArray") +public func _bjs_roundTripOptionalDataPointArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalDataPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalDirectionArray") +@_cdecl("bjs_roundTripOptionalDirectionArray") +public func _bjs_roundTripOptionalDirectionArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalDirectionArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalStatusArray") +@_cdecl("bjs_roundTripOptionalStatusArray") +public func _bjs_roundTripOptionalStatusArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalStatusArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalIntArrayType") +@_cdecl("bjs_roundTripOptionalIntArrayType") +public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalIntArrayType(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalStringArrayType") +@_cdecl("bjs_roundTripOptionalStringArrayType") +public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalStringArrayType(_: { + if values == 0 { + return Optional<[String]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalGreeterArrayType") +@_cdecl("bjs_roundTripOptionalGreeterArrayType") +public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalGreeterArrayType(_: { + if greeters == 0 { + return Optional<[Greeter]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Greeter] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedIntArray") +@_cdecl("bjs_roundTripNestedIntArray") +public func _bjs_roundTripNestedIntArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Int]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_elem_ret_elem))} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedStringArray") +@_cdecl("bjs_roundTripNestedStringArray") +public func _bjs_roundTripNestedStringArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[String]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + var __bjs_ret_elem_elem = __bjs_elem_ret_elem + __bjs_ret_elem_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedDoubleArray") +@_cdecl("bjs_roundTripNestedDoubleArray") +public func _bjs_roundTripNestedDoubleArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedDoubleArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Double]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_f64(__bjs_elem_ret_elem)} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedBoolArray") +@_cdecl("bjs_roundTripNestedBoolArray") +public func _bjs_roundTripNestedBoolArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedBoolArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Bool]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Bool] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(__bjs_elem_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedDataPointArray") +@_cdecl("bjs_roundTripNestedDataPointArray") +public func _bjs_roundTripNestedDataPointArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedDataPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[DataPoint]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [DataPoint] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(DataPoint.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + __bjs_elem_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedDirectionArray") +@_cdecl("bjs_roundTripNestedDirectionArray") +public func _bjs_roundTripNestedDirectionArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedDirectionArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Direction]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Direction] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_elem_ret_elem.bridgeJSLowerParameter()))} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripNestedGreeterArray") +@_cdecl("bjs_roundTripNestedGreeterArray") +public func _bjs_roundTripNestedGreeterArray() -> Void { + #if arch(wasm32) + let ret = roundTripNestedGreeterArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Greeter]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Greeter] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafeRawPointerArray") +@_cdecl("bjs_roundTripUnsafeRawPointerArray") +public func _bjs_roundTripUnsafeRawPointerArray() -> Void { + #if arch(wasm32) + let ret = roundTripUnsafeRawPointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [UnsafeRawPointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointerArray") +@_cdecl("bjs_roundTripUnsafeMutableRawPointerArray") +public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { + #if arch(wasm32) + let ret = roundTripUnsafeMutableRawPointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [UnsafeMutableRawPointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOpaquePointerArray") +@_cdecl("bjs_roundTripOpaquePointerArray") +public func _bjs_roundTripOpaquePointerArray() -> Void { + #if arch(wasm32) + let ret = roundTripOpaquePointerArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [OpaquePointer] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_consumeDataProcessorArrayType") +@_cdecl("bjs_consumeDataProcessorArrayType") +public func _bjs_consumeDataProcessorArrayType() -> Int32 { + #if arch(wasm32) + let ret = consumeDataProcessorArrayType(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [AnyDataProcessor] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripDataProcessorArrayType") +@_cdecl("bjs_roundTripDataProcessorArrayType") +public func _bjs_roundTripDataProcessorArrayType() -> Void { + #if arch(wasm32) + let ret = roundTripDataProcessorArrayType(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [AnyDataProcessor] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int((__bjs_elem_ret as! AnyDataProcessor).bridgeJSLowerReturn())} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripPointerFields") @_cdecl("bjs_roundTripPointerFields") public func _bjs_roundTripPointerFields() -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 1b70b0b04..2f0f964be 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -7756,6 +7756,167 @@ } } }, + { + "abiName" : "bjs_arrayWithDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayWithDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 1 + } + }, + { + "int" : { + "_0" : 2 + } + }, + { + "int" : { + "_0" : 3 + } + } + ] + } + }, + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_arrayWithOptionalDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayWithOptionalDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_arrayMixedDefaults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayMixedDefaults", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Sum" + } + }, + "label" : "prefix", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 10 + } + }, + { + "int" : { + "_0" : 20 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "defaultValue" : { + "string" : { + "_0" : "!" + } + }, + "label" : "suffix", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, { "abiName" : "bjs_formatName", "effects" : { @@ -7891,6 +8052,1128 @@ } } }, + { + "abiName" : "bjs_roundTripIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripBoolArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripBoolArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripThemeArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripThemeArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripHttpStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripHttpStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripDataPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDataPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripGreeterArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripGreeterArray", + "parameters" : [ + { + "label" : "_", + "name" : "greeters", + "type" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalDataPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalDataPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "statuses", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalIntArrayType", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalIntArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalStringArrayType", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalStringArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalGreeterArrayType", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalGreeterArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "greeters", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedBoolArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedBoolArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedDataPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedDataPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripNestedGreeterArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripNestedGreeterArray", + "parameters" : [ + { + "label" : "_", + "name" : "greeters", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutableRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutableRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOpaquePointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOpaquePointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_consumeDataProcessorArrayType", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "consumeDataProcessorArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "processors", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_roundTripDataProcessorArrayType", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDataProcessorArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "processors", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + } + } + }, { "abiName" : "bjs_roundTripPointerFields", "effects" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 141b87d35..b2a079c35 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -778,6 +778,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { testProtocolSupport(exports); testClosureSupport(exports); + testArraySupport(exports); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testClosureSupport(exports) { @@ -1300,6 +1301,129 @@ function setupTestGlobals(global) { }; } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +function testArraySupport(exports) { + const { Direction, Status, Theme, HttpStatus, Greeter } = exports; + + // Primitive arrays + assert.deepEqual(exports.roundTripIntArray([1, 2, 3, -10, 2147483647]), [1, 2, 3, -10, 2147483647]); + assert.deepEqual(exports.roundTripIntArray([]), []); + assert.deepEqual(exports.roundTripStringArray(["Hello", "World", ""]), ["Hello", "World", ""]); + const doubles = exports.roundTripDoubleArray([1.5, 0.0, -1.5, Infinity, NaN]); + assert.equal(doubles[0], 1.5); + assert(Number.isNaN(doubles[4])); + assert.deepEqual(exports.roundTripBoolArray([true, false, true]), [true, false, true]); + + // Enum arrays + assert.deepEqual(exports.roundTripDirectionArray([Direction.North, Direction.South]), [Direction.North, Direction.South]); + assert.deepEqual(exports.roundTripStatusArray([Status.Loading, Status.Success]), [Status.Loading, Status.Success]); + assert.deepEqual(exports.roundTripThemeArray([Theme.Light, Theme.Dark]), [Theme.Light, Theme.Dark]); + assert.deepEqual(exports.roundTripHttpStatusArray([HttpStatus.Ok, HttpStatus.NotFound]), [HttpStatus.Ok, HttpStatus.NotFound]); + + // Struct arrays + const points = [ + { x: 1.0, y: 2.0, label: "A", optCount: 10, optFlag: true }, + { x: 3.0, y: 4.0, label: "B", optCount: null, optFlag: null } + ]; + const pointResult = exports.roundTripDataPointArray(points); + assert.equal(pointResult[0].optCount, 10); + assert.equal(pointResult[1].optCount, null); + + // Class arrays + const g1 = new Greeter("Alice"); + const g2 = new Greeter("Bob"); + const gResult = exports.roundTripGreeterArray([g1, g2]); + assert.equal(gResult[0].name, "Alice"); + assert.equal(gResult[1].greet(), "Hello, Bob!"); + g1.release(); g2.release(); + gResult.forEach(g => g.release()); + + // Arrays of optional elements + assert.deepEqual(exports.roundTripOptionalIntArray([1, null, 3]), [1, null, 3]); + assert.deepEqual(exports.roundTripOptionalStringArray(["a", null, "b"]), ["a", null, "b"]); + const optPoint = { x: 1.0, y: 2.0, label: "", optCount: null, optFlag: null }; + const optPoints = exports.roundTripOptionalDataPointArray([optPoint, null]); + assert.deepEqual(optPoints[0], optPoint); + assert.equal(optPoints[1], null); + assert.deepEqual(exports.roundTripOptionalDirectionArray([Direction.North, null]), [Direction.North, null]); + assert.deepEqual(exports.roundTripOptionalStatusArray([Status.Success, null]), [Status.Success, null]); + + // Optional arrays + assert.deepEqual(exports.roundTripOptionalIntArrayType([1, 2, 3]), [1, 2, 3]); + assert.equal(exports.roundTripOptionalIntArrayType(null), null); + assert.deepEqual(exports.roundTripOptionalStringArrayType(["a", "b"]), ["a", "b"]); + assert.equal(exports.roundTripOptionalStringArrayType(null), null); + const og1 = new Greeter("OptGreeter"); + const optGreeterResult = exports.roundTripOptionalGreeterArrayType([og1]); + assert.equal(optGreeterResult[0].name, "OptGreeter"); + assert.equal(exports.roundTripOptionalGreeterArrayType(null), null); + og1.release(); + optGreeterResult.forEach(g => g.release()); + + // Nested arrays + assert.deepEqual(exports.roundTripNestedIntArray([[1, 2], [3]]), [[1, 2], [3]]); + assert.deepEqual(exports.roundTripNestedIntArray([[1, 2], [], [3]]), [[1, 2], [], [3]]); + assert.deepEqual(exports.roundTripNestedStringArray([["a", "b"], ["c"]]), [["a", "b"], ["c"]]); + assert.deepEqual(exports.roundTripNestedDoubleArray([[1.5], [2.5]]), [[1.5], [2.5]]); + assert.deepEqual(exports.roundTripNestedBoolArray([[true], [false]]), [[true], [false]]); + const nestedPoint = { x: 1.0, y: 2.0, label: "A", optCount: null, optFlag: null }; + assert.deepEqual(exports.roundTripNestedDataPointArray([[nestedPoint]])[0][0], nestedPoint); + assert.deepEqual(exports.roundTripNestedDirectionArray([[Direction.North], [Direction.South]]), [[Direction.North], [Direction.South]]); + const ng1 = new Greeter("Nested1"); + const ng2 = new Greeter("Nested2"); + const nestedGreeters = exports.roundTripNestedGreeterArray([[ng1], [ng2]]); + assert.equal(nestedGreeters[0][0].name, "Nested1"); + assert.equal(nestedGreeters[1][0].greet(), "Hello, Nested2!"); + ng1.release(); ng2.release(); + nestedGreeters.forEach(row => row.forEach(g => g.release())); + + // UnsafePointer-family arrays + const pointerValues = [1, 4, 1024, 65536, 2147483647]; + assert.deepEqual(exports.roundTripUnsafeRawPointerArray(pointerValues), pointerValues); + assert.deepEqual(exports.roundTripUnsafeMutableRawPointerArray(pointerValues), pointerValues); + assert.deepEqual(exports.roundTripOpaquePointerArray(pointerValues), pointerValues); + assert.deepEqual(exports.roundTripUnsafeRawPointerArray([]), []); + + // Default values + assert.equal(exports.arrayWithDefault(), 6); + assert.equal(exports.arrayWithDefault([10, 20]), 30); + assert.equal(exports.arrayWithOptionalDefault(), -1); + assert.equal(exports.arrayWithOptionalDefault(null), -1); + assert.equal(exports.arrayWithOptionalDefault([5, 5]), 10); + assert.equal(exports.arrayMixedDefaults(), "Sum: 30!"); + assert.equal(exports.arrayMixedDefaults("Total"), "Total: 30!"); + assert.equal(exports.arrayMixedDefaults("Total", [1, 2, 3]), "Total: 6!"); + assert.equal(exports.arrayMixedDefaults("Val", [100], "?"), "Val: 100?"); + assert.equal(exports.arrayMixedDefaults(undefined, [5, 5]), "Sum: 10!"); + assert.equal(exports.arrayMixedDefaults(undefined, undefined, "?"), "Sum: 30?"); + + const helper1 = new exports.Greeter("Helper1"); + const jsProcessor1 = { + count: 1, name: "Processor1", optionalTag: null, optionalCount: null, + direction: null, optionalTheme: null, httpStatus: null, apiResult: null, + helper: helper1, optionalHelper: null, + increment(by) { this.count += by; }, + getValue() { return this.count; }, + setLabelElements(a, b) { }, getLabel() { return ""; }, + isEven() { return this.count % 2 === 0; }, + processGreeter(g) { return ""; }, createGreeter() { return new exports.Greeter("P1"); }, + processOptionalGreeter(g) { return ""; }, createOptionalGreeter() { return null; }, + handleAPIResult(r) { }, getAPIResult() { return null; } + }; + + const consumeResult = exports.consumeDataProcessorArrayType([jsProcessor1]); + assert.equal(consumeResult, 1); + + const processors = [jsProcessor1]; + const result = exports.roundTripDataProcessorArrayType(processors); + + assert.equal(result.length, 1); + assert.equal(result[0], jsProcessor1); + assert.equal(result[0].count, 1); + + helper1.release(); +} + /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testProtocolSupport(exports) { let processorValue = 0; From dac11cd03c7bb5363f2d476a7d3f60d4867d3f71 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 30 Jan 2026 16:34:46 +0900 Subject: [PATCH 112/252] Revert "Bump playwright from 1.52.0 to 1.55.1 (#538)" This reverts commit 515b6d65bf95d8a05add7189226d4451d8c979e9. --- package-lock.json | 20 ++++++++------------ package.json | 1 - 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf7f36315..e12af9c97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", - "tslib": "^2.8.1", "typescript": "^5.8.2" } }, @@ -508,13 +507,12 @@ } }, "node_modules/playwright": { - "version": "1.55.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.1.tgz", - "integrity": "sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz", + "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.55.1" + "playwright-core": "1.52.0" }, "bin": { "playwright": "cli.js" @@ -527,11 +525,10 @@ } }, "node_modules/playwright-core": { - "version": "1.55.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.1.tgz", - "integrity": "sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", + "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", "dev": true, - "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, @@ -582,7 +579,6 @@ "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/estree": "1.0.6" }, @@ -658,6 +654,7 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, "license": "0BSD", + "optional": true, "peer": true }, "node_modules/typescript": { @@ -666,7 +663,6 @@ "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index da7d5356d..96443ad9a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", - "tslib": "^2.8.1", "typescript": "^5.8.2" } } From 59734ebc0b04313d6dbf0394947c41512fb83a2a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 30 Jan 2026 18:14:18 +0900 Subject: [PATCH 113/252] Re-apply Playwright upgrade (#550) * Reapply "Bump playwright from 1.52.0 to 1.55.1 (#538)" This reverts commit dac11cd03c7bb5363f2d476a7d3f60d4867d3f71. * PackageToJS: Fix missing await for `page.exposeFunction` It caused concurrent calls to `exposeFunction` and resulted losing the function bindings after the playwright upgrade. --- Plugins/PackageToJS/Templates/bin/test.js | 2 +- Plugins/PackageToJS/Templates/test.js | 6 ++++-- package-lock.json | 20 ++++++++++++-------- package.json | 1 + 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Plugins/PackageToJS/Templates/bin/test.js b/Plugins/PackageToJS/Templates/bin/test.js index 1d48b6853..82ef88cc2 100644 --- a/Plugins/PackageToJS/Templates/bin/test.js +++ b/Plugins/PackageToJS/Templates/bin/test.js @@ -116,7 +116,7 @@ Hint: This typically means that a continuation leak occurred. for (const [name, fn] of Object.entries(functions)) { // Bind the page context to each function if needed // The function can optionally use the page from its closure - page.exposeFunction(name, fn); + await page.exposeFunction(name, fn); } }; } diff --git a/Plugins/PackageToJS/Templates/test.js b/Plugins/PackageToJS/Templates/test.js index 5b7090300..606040b04 100644 --- a/Plugins/PackageToJS/Templates/test.js +++ b/Plugins/PackageToJS/Templates/test.js @@ -108,10 +108,12 @@ Please run the following command to install it: page.on("console", (message) => { console.log(message.text()); }); - + + let resolveExit = undefined; const onExit = new Promise((resolve) => { - page.exposeFunction("exitTest", resolve); + resolveExit = resolve; }); + await page.exposeFunction("exitTest", resolveExit); await page.goto(`http://localhost:${address.port}/test.browser.html`); const exitCode = await onExit; await browser.close(); diff --git a/package-lock.json b/package-lock.json index e12af9c97..bf7f36315 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", + "tslib": "^2.8.1", "typescript": "^5.8.2" } }, @@ -507,12 +508,13 @@ } }, "node_modules/playwright": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz", - "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.1.tgz", + "integrity": "sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.52.0" + "playwright-core": "1.55.1" }, "bin": { "playwright": "cli.js" @@ -525,10 +527,11 @@ } }, "node_modules/playwright-core": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", - "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", + "version": "1.55.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.1.tgz", + "integrity": "sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, @@ -579,6 +582,7 @@ "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.6" }, @@ -654,7 +658,6 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, "license": "0BSD", - "optional": true, "peer": true }, "node_modules/typescript": { @@ -663,6 +666,7 @@ "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 96443ad9a..da7d5356d 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "prettier": "3.5.3", "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", + "tslib": "^2.8.1", "typescript": "^5.8.2" } } From d2ca6ebb57e81e5c64a36e0e90f4fa0cbe02e1d8 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 30 Jan 2026 18:24:55 +0900 Subject: [PATCH 114/252] Add opt-in tracing hooks for JS bridge (#548) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Built an opt-in tracing surface and wired it through the bridge when enabled by a new trait. Implemented `JSTracing` (start/end hooks for Swift→JS calls and JSClosure invocations) with per-thread storage in `Sources/JavaScriptKit/JSTracing.swift`. Added tracing entry points to Swift→JS calls (functions, methods via dynamic members with method names, constructors, and throwing calls) and JS→Swift closures so hooks fire around each bridge crossing when compiled with tracing; closure creation now records `StaticString` file IDs for reporting (`Sources/JavaScriptKit/FundamentalObjects/JSObject+CallAsFunction.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSObject.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift`). Introduced a `JavaScriptKitTracing` package trait that gates `JAVASCRIPTKIT_ENABLE_TRACING` and updated docs with enablement and usage guidance (`Package.swift`, `Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md`). Verified the manifest parses with `swift package dump-package`. Notes: Hooks are compiled out unless `--traits JavaScriptKitTracing` is provided, and JSClosure initializers now take `StaticString` for `file`. Next steps: try `swift build --traits JavaScriptKitTracing` and exercise hooks in your app; consider adding focused tests for tracing callbacks if desired. Tests not run (not requested). * Applied the review feedback: hooked tracing to the “Tracing” trait and removed the extra compdef, made JSClosure tracing use `String` file IDs, and avoided unknown placeholders for method names by allowing nil method names. - Updated trait name and removed redundant define; tracing is now gated by trait “Tracing” and uses `#if Tracing` (`Package.swift`). - Hooks now accept optional method names and closure file IDs as `String`, with all tracing conditionals using the trait flag (`Sources/JavaScriptKit/JSTracing.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSObject+CallAsFunction.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift`, `Sources/JavaScriptKit/FundamentalObjects/JSObject.swift`). - Documentation updated to instruct enabling tracing via `--traits Tracing` (`Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md`). Tests not run. Suggest running `swift build --traits Tracing` to verify the tracing variant compiles. * Added tracing unit coverage and wired the trait into the Makefile’s `unittest` target. - New `Tests/JavaScriptKitTests/JSTracingTests.swift` exercises JS→JS call hooks (ensures method info/method name/args) and JSClosure hooks (verifies file/line metadata and end callbacks) under `#if Tracing`. - Refactored tracing-overloaded helpers to avoid conditional parameters and added `Sendable` to `JSTracing` to satisfy Swift 6 safety (`Sources/JavaScriptKit/FundamentalObjects/JSObject+CallAsFunction.swift`, `Sources/JavaScriptKit/JSTracing.swift`). - `make unittest` now enables the `Tracing` trait so tracing hooks compile during test runs (`Makefile`). I attempted `swift test --traits Tracing`; the build passed the new tracing warnings but the compiler crashed later with an unrelated wasm memory.grow codegen bug, so tests didn’t finish. You can rerun `make unittest SWIFT_SDK_ID=`; expect the same toolchain crash until Swift fixes that issue. * Add Swift 6.2 manifest and trait opt-out * Add Swift 6.2 manifest with tracing trait * Make tracing trait opt-out via env only * Add option to disable tracing trait in JavaScriptKit tests * Revert changes in Package.swift * Remove metadata fields from non-tracing builds --- .github/workflows/test.yml | 8 + Makefile | 6 + Package@swift-6.2.swift | 217 ++++++++++++++++++ .../Documentation.docc/Articles/Debugging.md | 22 ++ .../FundamentalObjects/JSClosure.swift | 63 +++-- .../JSObject+CallAsFunction.swift | 93 +++++++- .../FundamentalObjects/JSObject.swift | 20 +- .../JSThrowingFunction.swift | 9 + Sources/JavaScriptKit/JSTracing.swift | 133 +++++++++++ Tests/JavaScriptKitTests/JSTracingTests.swift | 53 +++++ 10 files changed, 601 insertions(+), 23 deletions(-) create mode 100644 Package@swift-6.2.swift create mode 100644 Sources/JavaScriptKit/JSTracing.swift create mode 100644 Tests/JavaScriptKitTests/JSTracingTests.swift diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f1eb0a5b..fc7392f7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,8 @@ jobs: download-url: https://download.swift.org/swift-6.1-release/ubuntu2204/swift-6.1-RELEASE/swift-6.1-RELEASE-ubuntu22.04.tar.gz wasi-backend: Node target: "wasm32-unknown-wasi" + env: | + JAVASCRIPTKIT_DISABLE_TRACING_TRAIT=1 - os: ubuntu-24.04 toolchain: download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a/swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a-ubuntu24.04.tar.gz @@ -36,6 +38,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 + - name: Export matrix env + if: ${{ matrix.entry.env != '' && matrix.entry.env != null }} + run: | + cat <<'EOF' >> "$GITHUB_ENV" + ${{ matrix.entry.env }} + EOF - uses: ./.github/actions/install-swift with: download-url: ${{ matrix.entry.toolchain.download-url }} diff --git a/Makefile b/Makefile index 0c5d0122a..135465a73 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,9 @@ SWIFT_SDK_ID ?= +ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1) + TRACING_ARGS := +else + TRACING_ARGS := --traits Tracing +endif .PHONY: bootstrap bootstrap: @@ -12,6 +17,7 @@ unittest: exit 2; \ } env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ + $(TRACING_ARGS) \ --disable-sandbox \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc diff --git a/Package@swift-6.2.swift b/Package@swift-6.2.swift new file mode 100644 index 000000000..456a87ca0 --- /dev/null +++ b/Package@swift-6.2.swift @@ -0,0 +1,217 @@ +// swift-tools-version:6.2 + +import CompilerPluginSupport +import PackageDescription + +// NOTE: needed for embedded customizations, ideally this will not be necessary at all in the future, or can be replaced with traits +let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false +let useLegacyResourceBundling = + Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false +let enableTracingByEnv = Context.environment["JAVASCRIPTKIT_ENABLE_TRACING"].flatMap(Bool.init) ?? false + +let tracingTrait = Trait( + name: "Tracing", + description: "Enable opt-in Swift <-> JavaScript bridge tracing hooks.", + enabledTraits: [] +) + +let testingLinkerFlags: [LinkerSetting] = [ + .unsafeFlags([ + "-Xlinker", "--stack-first", + "-Xlinker", "--global-base=524288", + "-Xlinker", "-z", + "-Xlinker", "stack-size=524288", + ]) +] + +let package = Package( + name: "JavaScriptKit", + platforms: [ + .macOS(.v13), + .iOS(.v13), + .tvOS(.v13), + .watchOS(.v6), + .macCatalyst(.v13), + ], + products: [ + .library(name: "JavaScriptKit", targets: ["JavaScriptKit"]), + .library(name: "JavaScriptEventLoop", targets: ["JavaScriptEventLoop"]), + .library(name: "JavaScriptBigIntSupport", targets: ["JavaScriptBigIntSupport"]), + .library(name: "JavaScriptFoundationCompat", targets: ["JavaScriptFoundationCompat"]), + .library(name: "JavaScriptEventLoopTestSupport", targets: ["JavaScriptEventLoopTestSupport"]), + .plugin(name: "PackageToJS", targets: ["PackageToJS"]), + .plugin(name: "BridgeJS", targets: ["BridgeJS"]), + .plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]), + ], + traits: [tracingTrait], + dependencies: [ + .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0") + ], + targets: [ + .target( + name: "JavaScriptKit", + dependencies: ["_CJavaScriptKit", "BridgeJSMacros"], + exclude: useLegacyResourceBundling ? [] : ["Runtime"], + resources: useLegacyResourceBundling ? [.copy("Runtime")] : [], + cSettings: shouldBuildForEmbedded + ? [ + .unsafeFlags(["-fdeclspec"]) + ] : nil, + swiftSettings: [ + .enableExperimentalFeature("Extern"), + .define("Tracing", .when(traits: ["Tracing"])), + ] + + (enableTracingByEnv ? [.define("Tracing")] : []) + + (shouldBuildForEmbedded + ? [ + .enableExperimentalFeature("Embedded"), + .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]), + ] : []) + ), + .target(name: "_CJavaScriptKit"), + .macro( + name: "BridgeJSMacros", + dependencies: [ + .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), + .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), + ] + ), + + .testTarget( + name: "JavaScriptKitTests", + dependencies: ["JavaScriptKit"], + swiftSettings: [ + .enableExperimentalFeature("Extern"), + .define("Tracing", .when(traits: ["Tracing"])), + ] + (enableTracingByEnv ? [.define("Tracing")] : []), + linkerSettings: testingLinkerFlags + ), + + .target( + name: "JavaScriptBigIntSupport", + dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"], + swiftSettings: shouldBuildForEmbedded + ? [ + .enableExperimentalFeature("Embedded"), + .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]), + ] : [] + ), + .target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]), + .testTarget( + name: "JavaScriptBigIntSupportTests", + dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"], + linkerSettings: testingLinkerFlags + ), + + .target( + name: "JavaScriptEventLoop", + dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"], + swiftSettings: shouldBuildForEmbedded + ? [ + .enableExperimentalFeature("Embedded"), + .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]), + ] : [] + ), + .target(name: "_CJavaScriptEventLoop"), + .testTarget( + name: "JavaScriptEventLoopTests", + dependencies: [ + "JavaScriptEventLoop", + "JavaScriptKit", + "JavaScriptEventLoopTestSupport", + ], + swiftSettings: [ + .enableExperimentalFeature("Extern") + ], + linkerSettings: testingLinkerFlags + ), + .target( + name: "JavaScriptEventLoopTestSupport", + dependencies: [ + "_CJavaScriptEventLoopTestSupport", + "JavaScriptEventLoop", + ] + ), + .target(name: "_CJavaScriptEventLoopTestSupport"), + .testTarget( + name: "JavaScriptEventLoopTestSupportTests", + dependencies: [ + "JavaScriptKit", + "JavaScriptEventLoopTestSupport", + ], + linkerSettings: testingLinkerFlags + ), + .target( + name: "JavaScriptFoundationCompat", + dependencies: [ + "JavaScriptKit" + ] + ), + .testTarget( + name: "JavaScriptFoundationCompatTests", + dependencies: [ + "JavaScriptFoundationCompat" + ], + linkerSettings: testingLinkerFlags + ), + .plugin( + name: "PackageToJS", + capability: .command( + intent: .custom(verb: "js", description: "Convert a Swift package to a JavaScript package") + ), + path: "Plugins/PackageToJS/Sources" + ), + .plugin( + name: "BridgeJS", + capability: .buildTool(), + dependencies: ["BridgeJSTool"], + path: "Plugins/BridgeJS/Sources/BridgeJSBuildPlugin" + ), + .plugin( + name: "BridgeJSCommandPlugin", + capability: .command( + intent: .custom(verb: "bridge-js", description: "Generate bridging code"), + permissions: [.writeToPackageDirectory(reason: "Generate bridging code")] + ), + dependencies: ["BridgeJSTool"], + path: "Plugins/BridgeJS/Sources/BridgeJSCommandPlugin" + ), + .executableTarget( + name: "BridgeJSTool", + dependencies: [ + .product(name: "SwiftParser", package: "swift-syntax"), + .product(name: "SwiftSyntax", package: "swift-syntax"), + .product(name: "SwiftBasicFormat", package: "swift-syntax"), + .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"), + ], + exclude: ["TS2Swift/JavaScript", "README.md"] + ), + .testTarget( + name: "BridgeJSRuntimeTests", + dependencies: ["JavaScriptKit", "JavaScriptEventLoop"], + exclude: [ + "bridge-js.config.json", + "bridge-js.d.ts", + "bridge-js.global.d.ts", + "Generated/JavaScript", + ], + swiftSettings: [ + .enableExperimentalFeature("Extern") + ], + linkerSettings: testingLinkerFlags + ), + .testTarget( + name: "BridgeJSGlobalTests", + dependencies: ["JavaScriptKit", "JavaScriptEventLoop"], + exclude: [ + "bridge-js.config.json", + "bridge-js.d.ts", + "Generated/JavaScript", + ], + swiftSettings: [ + .enableExperimentalFeature("Extern") + ], + linkerSettings: testingLinkerFlags + ), + ] +) diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md index f766be2ed..a8e5d77fd 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Debugging.md @@ -57,3 +57,25 @@ Alternatively, you can use the official [`C/C++ DevTools Support (DWARF)`](https ![Chrome DevTools](chrome-devtools.png) See [the DevTools team's official introduction](https://developer.chrome.com/blog/wasm-debugging-2020) for more details about the extension. + +## Bridge Call Tracing + +Enable the `Tracing` package trait to compile lightweight hook points for Swift <-> JavaScript calls. Tracing is off by default and adds no runtime overhead unless the trait is enabled: + +```bash +swift build --traits Tracing +``` + +The hooks are invoked at the start and end of each bridge crossing without collecting data for you. For example: + +```swift +let removeCallHook = JSTracing.default.addJSCallHook { info in + let started = Date() + return { print("JS call \(info) finished in \(Date().timeIntervalSince(started))s") } +} + +let removeClosureHook = JSTracing.default.addJSClosureCallHook { info in + print("JSClosure created at \(info.fileID):\(info.line)") + return nil +} +``` diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift index baeb29847..941b3f468 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift @@ -18,7 +18,11 @@ public protocol JSClosureProtocol: JSValueCompatible { public class JSOneshotClosure: JSObject, JSClosureProtocol { private var hostFuncRef: JavaScriptHostFuncRef = 0 - public init(file: String = #fileID, line: UInt32 = #line, _ body: @escaping (sending [JSValue]) -> JSValue) { + public init( + file: String = #fileID, + line: UInt32 = #line, + _ body: @escaping (sending [JSValue]) -> JSValue + ) { // 1. Fill `id` as zero at first to access `self` to get `ObjectIdentifier`. super.init(id: 0) @@ -29,12 +33,14 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol { } // 3. Retain the given body in static storage by `funcRef`. - JSClosure.sharedClosures.wrappedValue[hostFuncRef] = ( - self, - { + JSClosure.sharedClosures.wrappedValue[hostFuncRef] = .init( + object: self, + body: { defer { self.release() } return body($0) - } + }, + fileID: file, + line: line ) } @@ -114,14 +120,28 @@ public class JSClosure: JSObject, JSClosureProtocol { // `removeValue(forKey:)` on a dictionary with value type containing // `sending`. Wrap the value type with a struct to avoid the crash. struct Entry { - let item: (object: JSObject, body: (sending [JSValue]) -> JSValue) + let object: JSObject + let body: (sending [JSValue]) -> JSValue + #if Tracing + let fileID: String + let line: UInt32 + #endif + + init(object: JSObject, body: @escaping (sending [JSValue]) -> JSValue, fileID: String, line: UInt32) { + self.object = object + self.body = body + #if Tracing + self.fileID = fileID + self.line = line + #endif + } } private var storage: [JavaScriptHostFuncRef: Entry] = [:] init() {} - subscript(_ key: JavaScriptHostFuncRef) -> (object: JSObject, body: (sending [JSValue]) -> JSValue)? { - get { storage[key]?.item } - set { storage[key] = newValue.map { Entry(item: $0) } } + subscript(_ key: JavaScriptHostFuncRef) -> Entry? { + get { storage[key] } + set { storage[key] = newValue } } } @@ -150,7 +170,11 @@ public class JSClosure: JSObject, JSClosureProtocol { }) } - public init(file: String = #fileID, line: UInt32 = #line, _ body: @escaping (sending [JSValue]) -> JSValue) { + public init( + file: String = #fileID, + line: UInt32 = #line, + _ body: @escaping (sending [JSValue]) -> JSValue + ) { // 1. Fill `id` as zero at first to access `self` to get `ObjectIdentifier`. super.init(id: 0) @@ -161,7 +185,12 @@ public class JSClosure: JSObject, JSClosureProtocol { } // 3. Retain the given body in static storage by `funcRef`. - Self.sharedClosures.wrappedValue[hostFuncRef] = (self, body) + Self.sharedClosures.wrappedValue[hostFuncRef] = .init( + object: self, + body: body, + fileID: file, + line: line + ) } @available(*, unavailable, message: "JSClosure does not support dictionary literal initialization") @@ -317,14 +346,22 @@ func _call_host_function_impl( _ argc: Int32, _ callbackFuncRef: JavaScriptObjectRef ) -> Bool { - guard let (_, hostFunc) = JSClosure.sharedClosures.wrappedValue[hostFuncRef] else { + guard let entry = JSClosure.sharedClosures.wrappedValue[hostFuncRef] else { return true } + #if Tracing + let traceEnd = JSTracingHooks.beginJSClosureCall( + JSTracing.JSClosureCallInfo(fileID: entry.fileID, line: UInt(entry.line)) + ) + #endif var arguments: [JSValue] = [] for i in 0.. JSObject { - arguments.withRawJSValues { rawValues in + #if Tracing + let jsValues = arguments.map { $0.jsValue } + return new(arguments: jsValues) + #else + return arguments.withRawJSValues { rawValues in rawValues.withUnsafeBufferPointer { bufferPointer in JSObject(id: swjs_call_new(self.id, bufferPointer.baseAddress!, Int32(bufferPointer.count))) } } + #endif } /// A variadic arguments version of `new`. @@ -89,8 +94,22 @@ extension JSObject { invokeNonThrowingJSFunction(arguments: arguments).jsValue } + /// Instantiate an object from this function as a constructor. + /// + /// Guaranteed to return an object because either: + /// + /// - a. the constructor explicitly returns an object, or + /// - b. the constructor returns nothing, which causes JS to return the `this` value, or + /// - c. the constructor returns undefined, null or a non-object, in which case JS also returns `this`. + /// + /// - Parameter arguments: Arguments to be passed to this constructor function. + /// - Returns: A new instance of this constructor. public func new(arguments: [JSValue]) -> JSObject { - arguments.withRawJSValues { rawValues in + #if Tracing + let traceEnd = JSTracingHooks.beginJSCall(.function(function: self, arguments: arguments)) + defer { traceEnd?() } + #endif + return arguments.withRawJSValues { rawValues in rawValues.withUnsafeBufferPointer { bufferPointer in JSObject(id: swjs_call_new(self.id, bufferPointer.baseAddress!, Int32(bufferPointer.count))) } @@ -103,22 +122,80 @@ extension JSObject { } final func invokeNonThrowingJSFunction(arguments: [JSValue]) -> RawJSValue { - arguments.withRawJSValues { invokeNonThrowingJSFunction(rawValues: $0) } - } - - final func invokeNonThrowingJSFunction(arguments: [JSValue], this: JSObject) -> RawJSValue { - arguments.withRawJSValues { invokeNonThrowingJSFunction(rawValues: $0, this: this) } + #if Tracing + let traceEnd = JSTracingHooks.beginJSCall(.function(function: self, arguments: arguments)) + #endif + let result = arguments.withRawJSValues { invokeNonThrowingJSFunction(rawValues: $0) } + #if Tracing + traceEnd?() + #endif + return result + } + + #if Tracing + final func invokeNonThrowingJSFunction( + arguments: [JSValue], + this: JSObject, + tracedMethodName: String? = nil + ) -> RawJSValue { + let traceEnd = JSTracingHooks.beginJSCall( + .method(receiver: this, methodName: tracedMethodName, arguments: arguments) + ) + let result = arguments.withRawJSValues { + invokeNonThrowingJSFunction( + rawValues: $0, + this: this + ) + } + traceEnd?() + return result + } + #else + final func invokeNonThrowingJSFunction( + arguments: [JSValue], + this: JSObject + ) -> RawJSValue { + arguments.withRawJSValues { + invokeNonThrowingJSFunction( + rawValues: $0, + this: this + ) + } } + #endif #if !hasFeature(Embedded) final func invokeNonThrowingJSFunction(arguments: [ConvertibleToJSValue]) -> RawJSValue { + #if Tracing + let jsValues = arguments.map { $0.jsValue } + return invokeNonThrowingJSFunction(arguments: jsValues) + #else arguments.withRawJSValues { invokeNonThrowingJSFunction(rawValues: $0) } + #endif } - final func invokeNonThrowingJSFunction(arguments: [ConvertibleToJSValue], this: JSObject) -> RawJSValue { + #if Tracing + final func invokeNonThrowingJSFunction( + arguments: [ConvertibleToJSValue], + this: JSObject, + tracedMethodName: String? = nil + ) -> RawJSValue { + let jsValues = arguments.map { $0.jsValue } + return invokeNonThrowingJSFunction( + arguments: jsValues, + this: this, + tracedMethodName: tracedMethodName + ) + } + #else + final func invokeNonThrowingJSFunction( + arguments: [ConvertibleToJSValue], + this: JSObject + ) -> RawJSValue { arguments.withRawJSValues { invokeNonThrowingJSFunction(rawValues: $0, this: this) } } #endif + #endif final private func invokeNonThrowingJSFunction(rawValues: [RawJSValue]) -> RawJSValue { rawValues.withUnsafeBufferPointer { [id] bufferPointer in diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift index 101f13a95..caacd49f2 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSObject.swift @@ -94,7 +94,15 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral { public subscript(_ name: String) -> ((ConvertibleToJSValue...) -> JSValue)? { guard let function = self[name].function else { return nil } return { (arguments: ConvertibleToJSValue...) in - function(this: self, arguments: arguments) + #if Tracing + return function.invokeNonThrowingJSFunction( + arguments: arguments, + this: self, + tracedMethodName: name + ).jsValue + #else + return function.invokeNonThrowingJSFunction(arguments: arguments, this: self).jsValue + #endif } } @@ -112,7 +120,15 @@ public class JSObject: Equatable, ExpressibleByDictionaryLiteral { public subscript(_ name: JSString) -> ((ConvertibleToJSValue...) -> JSValue)? { guard let function = self[name].function else { return nil } return { (arguments: ConvertibleToJSValue...) in - function(this: self, arguments: arguments) + #if Tracing + return function.invokeNonThrowingJSFunction( + arguments: arguments, + this: self, + tracedMethodName: String(name) + ).jsValue + #else + return function.invokeNonThrowingJSFunction(arguments: arguments, this: self).jsValue + #endif } } diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift b/Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift index 7c75ad556..94b5b0eca 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSThrowingFunction.swift @@ -77,6 +77,15 @@ private func invokeJSFunction( arguments: [ConvertibleToJSValue], this: JSObject? ) throws -> JSValue { + #if Tracing + let jsValues = arguments.map { $0.jsValue } + let traceEnd = JSTracingHooks.beginJSCall( + this.map { + .method(receiver: $0, methodName: nil, arguments: jsValues) + } ?? .function(function: jsFunc, arguments: jsValues) + ) + defer { traceEnd?() } + #endif let id = jsFunc.id let (result, isException) = arguments.withRawJSValues { rawValues in rawValues.withUnsafeBufferPointer { bufferPointer -> (JSValue, Bool) in diff --git a/Sources/JavaScriptKit/JSTracing.swift b/Sources/JavaScriptKit/JSTracing.swift new file mode 100644 index 000000000..8804e9afb --- /dev/null +++ b/Sources/JavaScriptKit/JSTracing.swift @@ -0,0 +1,133 @@ +#if Tracing + +/// Hooks for tracing Swift <-> JavaScript bridge calls. +public struct JSTracing: Sendable { + public static let `default` = JSTracing() + + public enum JSCallInfo { + case function(function: JSObject, arguments: [JSValue]) + case method(receiver: JSObject, methodName: String?, arguments: [JSValue]) + } + + /// Register a hook for Swift to JavaScript calls. + /// + /// The hook is invoked at the start of the call. Return a closure to run when + /// the call finishes, or `nil` to skip the end hook. + /// + /// - Returns: A cleanup closure that unregisters the hook. + @discardableResult + public func addJSCallHook( + _ hook: @escaping (_ info: JSCallInfo) -> (() -> Void)? + ) -> () -> Void { + JSTracingHooks.addJSCallHook(hook) + } + + public struct JSClosureCallInfo { + /// The file identifier where the called `JSClosure` was created. + public let fileID: String + /// The line number where the called `JSClosure` was created. + public let line: UInt + } + + /// Register a hook for JavaScript to Swift calls via `JSClosure`. + /// + /// The hook is invoked at the start of the call. Return a closure to run when + /// the call finishes, or `nil` to skip the end hook. + /// + /// - Returns: A cleanup closure that unregisters the hook. + @discardableResult + public func addJSClosureCallHook( + _ hook: @escaping (_ info: JSClosureCallInfo) -> (() -> Void)? + ) -> () -> Void { + JSTracingHooks.addJSClosureCallHook(hook) + } +} + +enum JSTracingHooks { + typealias HookEnd = () -> Void + typealias JSCallHook = (JSTracing.JSCallInfo) -> HookEnd? + typealias JSClosureCallHook = (JSTracing.JSClosureCallInfo) -> HookEnd? + + private final class HookList { + private var hooks: [(id: UInt, hook: Hook)] = [] + private var nextID: UInt = 0 + + var isEmpty: Bool { hooks.isEmpty } + + func add(_ hook: Hook) -> UInt { + let id = nextID + nextID &+= 1 + hooks.append((id, hook)) + return id + } + + func remove(id: UInt) { + hooks.removeAll { $0.id == id } + } + + func forEach(_ body: (Hook) -> Void) { + for entry in hooks { + body(entry.hook) + } + } + } + + private final class Storage { + let jsCallHooks = HookList() + let jsClosureCallHooks = HookList() + } + + private static let storage = LazyThreadLocal(initialize: Storage.init) + + static func addJSCallHook(_ hook: @escaping JSCallHook) -> () -> Void { + let storage = storage.wrappedValue + let id = storage.jsCallHooks.add(hook) + return { storage.jsCallHooks.remove(id: id) } + } + + static func addJSClosureCallHook(_ hook: @escaping JSClosureCallHook) -> () -> Void { + let storage = storage.wrappedValue + let id = storage.jsClosureCallHooks.add(hook) + return { storage.jsClosureCallHooks.remove(id: id) } + } + + static func beginJSCall(_ info: JSTracing.JSCallInfo) -> HookEnd? { + let storage = storage.wrappedValue + guard !storage.jsCallHooks.isEmpty else { return nil } + + var callbacks: [HookEnd] = [] + storage.jsCallHooks.forEach { hook in + if let callback = hook(info) { + callbacks.append(callback) + } + } + + guard !callbacks.isEmpty else { return nil } + return { + for callback in callbacks.reversed() { + callback() + } + } + } + + static func beginJSClosureCall(_ info: JSTracing.JSClosureCallInfo) -> HookEnd? { + let storage = storage.wrappedValue + guard !storage.jsClosureCallHooks.isEmpty else { return nil } + + var callbacks: [HookEnd] = [] + storage.jsClosureCallHooks.forEach { hook in + if let callback = hook(info) { + callbacks.append(callback) + } + } + + guard !callbacks.isEmpty else { return nil } + return { + for callback in callbacks.reversed() { + callback() + } + } + } +} + +#endif diff --git a/Tests/JavaScriptKitTests/JSTracingTests.swift b/Tests/JavaScriptKitTests/JSTracingTests.swift new file mode 100644 index 000000000..84fb9bfc6 --- /dev/null +++ b/Tests/JavaScriptKitTests/JSTracingTests.swift @@ -0,0 +1,53 @@ +#if Tracing +import JavaScriptKit +import XCTest + +final class JSTracingTests: XCTestCase { + func testJSCallHookReportsMethod() throws { + var startInfo: [JSTracing.JSCallInfo] = [] + var ended = 0 + let remove = JSTracing.default.addJSCallHook { info in + startInfo.append(info) + return { ended += 1 } + } + defer { remove() } + + let globalObject1 = JSObject.global.globalObject1 + let prop5 = try XCTUnwrap(globalObject1.prop_5.object) + _ = prop5.func6!(true, 1, 2) + + XCTAssertEqual(startInfo.count, 1) + guard case let .method(receiver, methodName, arguments) = startInfo.first else { + XCTFail("Expected method info") + return + } + XCTAssertEqual(receiver.id, prop5.id) + XCTAssertEqual(methodName, "func6") + XCTAssertEqual(arguments, [.boolean(true), .number(1), .number(2)]) + XCTAssertEqual(ended, 1) + } + + func testJSClosureCallHookReportsMetadata() throws { + var startInfo: [JSTracing.JSClosureCallInfo] = [] + var ended = 0 + let remove = JSTracing.default.addJSClosureCallHook { info in + startInfo.append(info) + return { ended += 1 } + } + defer { remove() } + + let globalObject1 = JSObject.global.globalObject1 + let prop6 = try XCTUnwrap(globalObject1.prop_6.object) + let closure = JSClosure(file: "TracingTests.swift", line: 4242) { _ in .number(7) } + prop6.host_func_1 = .object(closure) + + let callHost = try XCTUnwrap(prop6.call_host_1.function) + XCTAssertEqual(callHost(), .number(7)) + + XCTAssertEqual(startInfo.count, 1) + XCTAssertEqual(startInfo.first?.fileID, "TracingTests.swift") + XCTAssertEqual(startInfo.first?.line, 4242) + XCTAssertEqual(ended, 1) + } +} +#endif From d08ab429df178ac7262b5fa3576c5e1a676653a4 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Sat, 31 Jan 2026 04:57:12 +0700 Subject: [PATCH 115/252] BridgeJS: Array benchmarks (#549) --- Benchmarks/Sources/Benchmarks.swift | 128 +++ Benchmarks/Sources/Generated/BridgeJS.swift | 689 +++++++++++++ .../Generated/JavaScript/BridgeJS.json | 943 ++++++++++++++++++ Benchmarks/run.js | 229 +++++ 4 files changed, 1989 insertions(+) diff --git a/Benchmarks/Sources/Benchmarks.swift b/Benchmarks/Sources/Benchmarks.swift index 921db50ea..59da8c96c 100644 --- a/Benchmarks/Sources/Benchmarks.swift +++ b/Benchmarks/Sources/Benchmarks.swift @@ -257,6 +257,134 @@ enum ComplexResult { } } +// MARK: - Array Performance Tests + +@JS struct Point { + var x: Double + var y: Double +} + +@JS class ArrayRoundtrip { + @JS init() {} + + // MARK: Primitive Arrays - Int + + @JS func takeIntArray(_ values: [Int]) {} + @JS func makeIntArray() -> [Int] { + return Array(1...1000) + } + @JS func roundtripIntArray(_ values: [Int]) -> [Int] { + return values + } + + @JS func makeIntArrayLarge() -> [Int] { + return Array(1...10000) + } + + // MARK: Primitive Arrays - Double + + @JS func takeDoubleArray(_ values: [Double]) {} + @JS func makeDoubleArray() -> [Double] { + return (1...1000).map { Double($0) * 1.1 } + } + @JS func roundtripDoubleArray(_ values: [Double]) -> [Double] { + return values + } + + // MARK: Primitive Arrays - String + + @JS func takeStringArray(_ values: [String]) {} + @JS func makeStringArray() -> [String] { + return ["one", "two", "three", "four", "five"] + } + @JS func roundtripStringArray(_ values: [String]) -> [String] { + return values + } + + // MARK: Struct Arrays + + @JS func takePointArray(_ points: [Point]) {} + @JS func makePointArray() -> [Point] { + return [ + Point(x: 0.0, y: 0.0), + Point(x: 1.0, y: 1.0), + Point(x: 2.0, y: 2.0), + Point(x: 3.0, y: 3.0), + Point(x: 4.0, y: 4.0), + ] + } + @JS func roundtripPointArray(_ points: [Point]) -> [Point] { + return points + } + + @JS func makePointArrayLarge() -> [Point] { + return (0..<50).map { Point(x: Double($0), y: Double($0)) } + } + + // MARK: Nested Arrays + + @JS func takeNestedIntArray(_ values: [[Int]]) {} + @JS func makeNestedIntArray() -> [[Int]] { + return [ + [1, 2, 3], + [4, 5, 6], + [7, 8, 9], + ] + } + @JS func roundtripNestedIntArray(_ values: [[Int]]) -> [[Int]] { + return values + } + + @JS func takeNestedPointArray(_ points: [[Point]]) {} + @JS func makeNestedPointArray() -> [[Point]] { + return [ + [Point(x: 0.0, y: 0.0), Point(x: 1.0, y: 1.0)], + [Point(x: 2.0, y: 2.0), Point(x: 3.0, y: 3.0)], + [Point(x: 4.0, y: 4.0), Point(x: 5.0, y: 5.0)], + ] + } + @JS func roundtripNestedPointArray(_ points: [[Point]]) -> [[Point]] { + return points + } + + // MARK: Optional Element Arrays + + @JS func takeOptionalIntArray(_ values: [Int?]) {} + @JS func makeOptionalIntArray() -> [Int?] { + return [1, nil, 3, nil, 5, nil, 7, nil, 9, nil] + } + @JS func roundtripOptionalIntArray(_ values: [Int?]) -> [Int?] { + return values + } + + @JS func takeOptionalPointArray(_ points: [Point?]) {} + @JS func makeOptionalPointArray() -> [Point?] { + return [ + Point(x: 0.0, y: 0.0), + nil, + Point(x: 2.0, y: 2.0), + nil, + Point(x: 4.0, y: 4.0), + ] + } + @JS func roundtripOptionalPointArray(_ points: [Point?]) -> [Point?] { + return points + } + + // MARK: Optional Arrays + + @JS func takeOptionalArray(_ values: [Int]?) {} + @JS func makeOptionalArraySome() -> [Int]? { + return [1, 2, 3, 4, 5] + } + @JS func makeOptionalArrayNone() -> [Int]? { + return nil + } + @JS func roundtripOptionalArray(_ values: [Int]?) -> [Int]? { + return values + } +} + @JS func run() { let call = Benchmark("Call") diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 9cf164d6d..569eb2eac 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -475,6 +475,51 @@ fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { } #endif +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + _swift_js_push_f64(self.x) + _swift_js_push_f64(self.y) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 +#else +fileprivate func _bjs_struct_lift_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_run") @_cdecl("bjs_run") public func _bjs_run() -> Void { @@ -1427,6 +1472,650 @@ fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> } #endif +@_expose(wasm, "bjs_ArrayRoundtrip_init") +@_cdecl("bjs_ArrayRoundtrip_init") +public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = ArrayRoundtrip() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeIntArray") +@_cdecl("bjs_ArrayRoundtrip_takeIntArray") +public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeIntArray") +@_cdecl("bjs_ArrayRoundtrip_makeIntArray") +public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripIntArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripIntArray") +public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeIntArrayLarge") +@_cdecl("bjs_ArrayRoundtrip_makeIntArrayLarge") +public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() + for __bjs_elem_ret in ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeDoubleArray") +@_cdecl("bjs_ArrayRoundtrip_takeDoubleArray") +public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeDoubleArray") +@_cdecl("bjs_ArrayRoundtrip_makeDoubleArray") +public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() + for __bjs_elem_ret in ret { + _swift_js_push_f64(__bjs_elem_ret)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripDoubleArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripDoubleArray") +public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Double] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + _swift_js_push_f64(__bjs_elem_ret)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeStringArray") +@_cdecl("bjs_ArrayRoundtrip_takeStringArray") +public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeStringArray") +@_cdecl("bjs_ArrayRoundtrip_makeStringArray") +public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeStringArray() + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripStringArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripStringArray") +public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [String] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + var __bjs_ret_elem = __bjs_elem_ret + __bjs_ret_elem.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + }} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takePointArray") +@_cdecl("bjs_ArrayRoundtrip_takePointArray") +public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makePointArray") +@_cdecl("bjs_ArrayRoundtrip_makePointArray") +public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripPointArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripPointArray") +public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makePointArrayLarge") +@_cdecl("bjs_ArrayRoundtrip_makePointArrayLarge") +public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeNestedIntArray") +@_cdecl("bjs_ArrayRoundtrip_takeNestedIntArray") +public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Int]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeNestedIntArray") +@_cdecl("bjs_ArrayRoundtrip_makeNestedIntArray") +public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_elem_ret_elem))} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripNestedIntArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripNestedIntArray") +public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Int]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_elem_ret_elem))} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeNestedPointArray") +@_cdecl("bjs_ArrayRoundtrip_takeNestedPointArray") +public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Point]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeNestedPointArray") +@_cdecl("bjs_ArrayRoundtrip_makeNestedPointArray") +public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + __bjs_elem_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripNestedPointArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripNestedPointArray") +public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [[Point]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append({ + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Point] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Point.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + for __bjs_elem_ret_elem in __bjs_elem_ret { + __bjs_elem_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeOptionalIntArray") +@_cdecl("bjs_ArrayRoundtrip_takeOptionalIntArray") +public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeOptionalIntArray") +@_cdecl("bjs_ArrayRoundtrip_makeOptionalIntArray") +public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalIntArray() + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripOptionalIntArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripOptionalIntArray") +public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeOptionalPointArray") +@_cdecl("bjs_ArrayRoundtrip_takeOptionalPointArray") +public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeOptionalPointArray") +@_cdecl("bjs_ArrayRoundtrip_makeOptionalPointArray") +public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalPointArray() + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripOptionalPointArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripOptionalPointArray") +public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_array_length(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_takeOptionalArray") +@_cdecl("bjs_ArrayRoundtrip_takeOptionalArray") +public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPointer, _ values: Int32) -> Void { + #if arch(wasm32) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalArray(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeOptionalArraySome") +@_cdecl("bjs_ArrayRoundtrip_makeOptionalArraySome") +public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_makeOptionalArrayNone") +@_cdecl("bjs_ArrayRoundtrip_makeOptionalArrayNone") +public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_roundtripOptionalArray") +@_cdecl("bjs_ArrayRoundtrip_roundtripOptionalArray") +public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRawPointer, _ values: Int32) -> Void { + #if arch(wasm32) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalArray(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return { + let __count = Int(_swift_js_pop_param_array_length()) + var __result: [Int] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + } + __result.reverse() + return __result + }() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + for __bjs_elem_ret in __bjs_unwrapped_ret { + _swift_js_push_int(Int32(__bjs_elem_ret))} + _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayRoundtrip_deinit") +@_cdecl("bjs_ArrayRoundtrip_deinit") +public func _bjs_ArrayRoundtrip_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ArrayRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ArrayRoundtrip_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "Benchmarks", name: "bjs_ArrayRoundtrip_wrap") +fileprivate func _bjs_ArrayRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ArrayRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") fileprivate func bjs_benchmarkHelperNoop() -> Void diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json index 42cbcb707..cb081ab39 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json @@ -1243,6 +1243,920 @@ ], "swiftCallName" : "ClassRoundtrip" + }, + { + "constructor" : { + "abiName" : "bjs_ArrayRoundtrip_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_ArrayRoundtrip_takeIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeIntArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeIntArrayLarge", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeIntArrayLarge", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDoubleArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStringArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takePointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takePointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makePointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makePointArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makePointArrayLarge", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makePointArrayLarge", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeNestedIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeNestedIntArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripNestedIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeNestedPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeNestedPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeNestedPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeNestedPointArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripNestedPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripNestedPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOptionalIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalIntArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeOptionalPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOptionalPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeOptionalPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalPointArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripOptionalPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_takeOptionalArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOptionalArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeOptionalArraySome", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalArraySome", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_makeOptionalArrayNone", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalArrayNone", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_ArrayRoundtrip_roundtripOptionalArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "name" : "ArrayRoundtrip", + "properties" : [ + + ], + "swiftCallName" : "ArrayRoundtrip" } ], "enums" : [ @@ -1767,6 +2681,35 @@ } ], "swiftCallName" : "ComplexStruct" + }, + { + "methods" : [ + + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "Point" } ] }, diff --git a/Benchmarks/run.js b/Benchmarks/run.js index 7771887c5..5a1ae61e6 100644 --- a/Benchmarks/run.js +++ b/Benchmarks/run.js @@ -640,6 +640,235 @@ async function singleRun(results, nameFilter, iterations) { classRoundtrip.roundtripAddressClass(address) } }) + + // Array performance tests + const arrayRoundtrip = new exports.ArrayRoundtrip(); + + // Primitive Arrays - Int + benchmarkRunner("ArrayRoundtrip/takeIntArray", () => { + const arr = Array.from({length: 1000}, (_, i) => i + 1) + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeIntArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeIntArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeIntArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripIntArray", () => { + const arr = Array.from({length: 1000}, (_, i) => i + 1) + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripIntArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeIntArrayLarge", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeIntArrayLarge() + } + }) + + // Primitive Arrays - Double + benchmarkRunner("ArrayRoundtrip/takeDoubleArray", () => { + const arr = Array.from({length: 1000}, (_, i) => (i + 1) * 1.1) + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeDoubleArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeDoubleArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeDoubleArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripDoubleArray", () => { + const arr = Array.from({length: 1000}, (_, i) => (i + 1) * 1.1) + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripDoubleArray(arr) + } + }) + + // Primitive Arrays - String + benchmarkRunner("ArrayRoundtrip/takeStringArray", () => { + const arr = ["one", "two", "three", "four", "five"] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeStringArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeStringArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeStringArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripStringArray", () => { + const arr = ["one", "two", "three", "four", "five"] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripStringArray(arr) + } + }) + + // Struct Arrays + benchmarkRunner("ArrayRoundtrip/takePointArray", () => { + const arr = [ + { x: 0.0, y: 0.0 }, + { x: 1.0, y: 1.0 }, + { x: 2.0, y: 2.0 }, + { x: 3.0, y: 3.0 }, + { x: 4.0, y: 4.0 } + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takePointArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makePointArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makePointArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripPointArray", () => { + const arr = [ + { x: 0.0, y: 0.0 }, + { x: 1.0, y: 1.0 }, + { x: 2.0, y: 2.0 }, + { x: 3.0, y: 3.0 }, + { x: 4.0, y: 4.0 } + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripPointArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makePointArrayLarge", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makePointArrayLarge() + } + }) + + // Nested Arrays + benchmarkRunner("ArrayRoundtrip/takeNestedIntArray", () => { + const arr = [[1, 2, 3], [4, 5, 6], [7, 8, 9]] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeNestedIntArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeNestedIntArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeNestedIntArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripNestedIntArray", () => { + const arr = [[1, 2, 3], [4, 5, 6], [7, 8, 9]] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripNestedIntArray(arr) + } + }) + + benchmarkRunner("ArrayRoundtrip/takeNestedPointArray", () => { + const arr = [ + [{ x: 0.0, y: 0.0 }, { x: 1.0, y: 1.0 }], + [{ x: 2.0, y: 2.0 }, { x: 3.0, y: 3.0 }], + [{ x: 4.0, y: 4.0 }, { x: 5.0, y: 5.0 }] + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeNestedPointArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeNestedPointArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeNestedPointArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripNestedPointArray", () => { + const arr = [ + [{ x: 0.0, y: 0.0 }, { x: 1.0, y: 1.0 }], + [{ x: 2.0, y: 2.0 }, { x: 3.0, y: 3.0 }], + [{ x: 4.0, y: 4.0 }, { x: 5.0, y: 5.0 }] + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripNestedPointArray(arr) + } + }) + + // Optional Element Arrays + benchmarkRunner("ArrayRoundtrip/takeOptionalIntArray", () => { + const arr = [1, null, 3, null, 5, null, 7, null, 9, null] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeOptionalIntArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeOptionalIntArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeOptionalIntArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripOptionalIntArray", () => { + const arr = [1, null, 3, null, 5, null, 7, null, 9, null] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripOptionalIntArray(arr) + } + }) + + benchmarkRunner("ArrayRoundtrip/takeOptionalPointArray", () => { + const arr = [ + { x: 0.0, y: 0.0 }, + null, + { x: 2.0, y: 2.0 }, + null, + { x: 4.0, y: 4.0 } + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeOptionalPointArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/makeOptionalPointArray", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeOptionalPointArray() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripOptionalPointArray", () => { + const arr = [ + { x: 0.0, y: 0.0 }, + null, + { x: 2.0, y: 2.0 }, + null, + { x: 4.0, y: 4.0 } + ] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripOptionalPointArray(arr) + } + }) + + // Optional Arrays + benchmarkRunner("ArrayRoundtrip/takeOptionalArraySome", () => { + const arr = [1, 2, 3, 4, 5] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeOptionalArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/takeOptionalArrayNone", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.takeOptionalArray(null) + } + }) + benchmarkRunner("ArrayRoundtrip/makeOptionalArraySome", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeOptionalArraySome() + } + }) + benchmarkRunner("ArrayRoundtrip/makeOptionalArrayNone", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.makeOptionalArrayNone() + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripOptionalArraySome", () => { + const arr = [1, 2, 3, 4, 5] + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripOptionalArray(arr) + } + }) + benchmarkRunner("ArrayRoundtrip/roundtripOptionalArrayNone", () => { + for (let i = 0; i < iterations; i++) { + arrayRoundtrip.roundtripOptionalArray(null) + } + }) } /** From bffab39b75e76e4d953720c72d8a571cea398c1e Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Sat, 31 Jan 2026 04:57:55 +0700 Subject: [PATCH 116/252] BridgeJS: Add UInt support (#551) --- .../Sources/BridgeJSCore/ExportSwift.swift | 13 ++-- .../Sources/BridgeJSCore/ImportTS.swift | 4 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 2 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 39 +++++++----- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 7 ++- .../Inputs/PrimitiveParameters.swift | 2 +- .../Inputs/PrimitiveReturn.swift | 1 + .../PrimitiveParameters.Export.d.ts | 2 +- .../PrimitiveParameters.Export.js | 4 +- .../PrimitiveReturn.Export.d.ts | 1 + .../PrimitiveReturn.Export.js | 4 ++ .../ExportSwiftTests/PrimitiveParameters.json | 13 +++- .../PrimitiveParameters.swift | 4 +- .../ExportSwiftTests/PrimitiveReturn.json | 17 +++++ .../ExportSwiftTests/PrimitiveReturn.swift | 11 ++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 63 +++++++++++++++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 3 + .../Generated/BridgeJS.swift | 11 ++++ .../Generated/JavaScript/BridgeJS.json | 25 ++++++++ Tests/prelude.mjs | 3 + 20 files changed, 196 insertions(+), 33 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 5b0105bf6..dd28397df 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -800,7 +800,7 @@ struct StackCodegen { switch type { case .string: return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: + case .int, .uint: return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" case .bool: return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" @@ -873,7 +873,7 @@ struct StackCodegen { case .string: return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" - case .int: + case .int, .uint: return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" case .bool: return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" @@ -945,7 +945,7 @@ struct StackCodegen { "var __bjs_\(raw: varPrefix) = \(raw: accessor)", "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", ] - case .int: + case .int, .uint: return ["_swift_js_push_int(Int32(\(raw: accessor)))"] case .bool: return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"] @@ -1052,7 +1052,7 @@ struct StackCodegen { "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar)", "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", ] - case .int: + case .int, .uint: return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"] case .bool: return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"] @@ -1643,6 +1643,7 @@ extension BridgeType { switch self { case .bool: return "Bool" case .int: return "Int" + case .uint: return "UInt" case .float: return "Float" case .double: return "Double" case .string: return "String" @@ -1687,7 +1688,7 @@ extension BridgeType { func liftParameterInfo() throws -> LiftingIntrinsicInfo { switch self { case .bool: return .bool - case .int: return .int + case .int, .uint: return .int case .float: return .float case .double: return .double case .string: return .string @@ -1739,7 +1740,7 @@ extension BridgeType { func loweringReturnInfo() throws -> LoweringIntrinsicInfo { switch self { case .bool: return .bool - case .int: return .int + case .int, .uint: return .int case .float: return .float case .double: return .double case .string: return .string diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 8a6ad930b..9e5575c41 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -866,7 +866,7 @@ extension BridgeType { func loweringParameterInfo(context: BridgeContext = .importTS) throws -> LoweringParameterInfo { switch self { case .bool: return .bool - case .int: return .int + case .int, .uint: return .int case .float: return .float case .double: return .double case .string: return .string @@ -960,7 +960,7 @@ extension BridgeType { ) throws -> LiftingReturnInfo { switch self { case .bool: return .bool - case .int: return .int + case .int, .uint: return .int case .float: return .float case .double: return .double case .string: return .string diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 794637d9e..4e2c9f86d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3401,7 +3401,7 @@ extension BridgeType { return "void" case .string: return "string" - case .int: + case .int, .uint: return "number" case .float: return "number" diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index c0282cd3c..cf0919304 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -149,6 +149,15 @@ struct IntrinsicJSFragment: Sendable { } ) + /// Convert signed Int32 to unsigned for UInt values + static let uintLiftReturn = IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + return ["\(arguments[0]) >>> 0"] + } + ) + static let uintLiftParameter = uintLiftReturn + static let stringLowerParameter = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanupCode in @@ -519,7 +528,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalBool);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = undefined;") - case .int: + case .int, .uint: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = undefined;") case .float: @@ -651,7 +660,7 @@ struct IntrinsicJSFragment: Sendable { printer.write( "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" ) - case .int: + case .int, .uint: printer.write( "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" ) @@ -937,7 +946,7 @@ struct IntrinsicJSFragment: Sendable { ) printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") printer.write("\(targetVar) = String(\(objectLabel));") - case .int: + case .int, .uint: printer.write("\(targetVar) = \(value) | 0;") case .bool: printer.write("\(targetVar) = \(value) !== 0;") @@ -1121,7 +1130,7 @@ struct IntrinsicJSFragment: Sendable { case .string: printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(result);") printer.write("return;") - case .int: + case .int, .uint: printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") printer.write("return;") case .bool: @@ -1370,7 +1379,7 @@ struct IntrinsicJSFragment: Sendable { /// Returns a fragment that lowers a JS value to Wasm core values for parameters static func lowerParameter(type: BridgeType) throws -> IntrinsicJSFragment { switch type { - case .int, .float, .double, .bool, .unsafePointer: return .identity + case .int, .uint, .float, .double, .bool, .unsafePointer: return .identity case .string: return .stringLowerParameter case .jsObject: return .jsObjectLowerParameter case .swiftHeapObject: @@ -1414,6 +1423,7 @@ struct IntrinsicJSFragment: Sendable { static func liftReturn(type: BridgeType) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity + case .uint: return .uintLiftReturn case .bool: return .boolLiftReturn case .string: return .stringLiftReturn case .jsObject: return .jsObjectLiftReturn @@ -1460,6 +1470,7 @@ struct IntrinsicJSFragment: Sendable { static func liftParameter(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { case .int, .float, .double: return .identity + case .uint: return .uintLiftParameter case .bool: return .boolLiftParameter case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter @@ -1560,7 +1571,7 @@ struct IntrinsicJSFragment: Sendable { /// Returns a fragment that lowers a JS value to Wasm core values for return values static func lowerReturn(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { - case .int, .float, .double: return .identity + case .int, .uint, .float, .double: return .identity case .bool: return .boolLowerReturn case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn @@ -1909,7 +1920,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in @@ -1967,7 +1978,7 @@ struct IntrinsicJSFragment: Sendable { cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") } cleanup.write("}") - case .int: + case .int, .uint: printer.write( "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" ) @@ -2024,7 +2035,7 @@ struct IntrinsicJSFragment: Sendable { return [bVar] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -2214,7 +2225,7 @@ struct IntrinsicJSFragment: Sendable { return [bVar] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -2363,7 +2374,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in @@ -2779,7 +2790,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in @@ -3009,7 +3020,7 @@ struct IntrinsicJSFragment: Sendable { } else { // Handle optional primitive types using helper switch wrappedType { - case .int: + case .int, .uint: pushOptionalPrimitive( value: value, isSomeVar: isSomeVar, @@ -3260,7 +3271,7 @@ struct IntrinsicJSFragment: Sendable { return [bVar] } ) - case .int: + case .int, .uint: return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index d2f60cc4c..33cc94479 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -127,7 +127,7 @@ public struct UnsafePointerType: Codable, Equatable, Hashable, Sendable { } public enum BridgeType: Codable, Equatable, Hashable, Sendable { - case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void + case int, uint, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void case unsafePointer(UnsafePointerType) indirect case optional(BridgeType) indirect case array(BridgeType) @@ -860,6 +860,8 @@ extension BridgeType { switch swiftType { case "Int": self = .int + case "UInt": + self = .uint case "Float": self = .float case "Double": @@ -887,7 +889,7 @@ extension BridgeType { switch self { case .void: return nil case .bool: return .i32 - case .int: return .i32 + case .int, .uint: return .i32 case .float: return .f32 case .double: return .f64 case .string: return nil @@ -933,6 +935,7 @@ extension BridgeType { public var mangleTypeName: String { switch self { case .int: return "Si" + case .uint: return "Su" case .float: return "Sf" case .double: return "Sd" case .string: return "SS" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift index 62e780083..a0d4353eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift @@ -1 +1 @@ -@JS func check(a: Int, b: Float, c: Double, d: Bool) {} +@JS func check(a: Int, b: UInt, c: Float, d: Double, e: Bool) {} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift index 96a5dbc3c..144a759ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift @@ -1,4 +1,5 @@ @JS func checkInt() -> Int { fatalError() } +@JS func checkUInt() -> UInt { fatalError() } @JS func checkFloat() -> Float { fatalError() } @JS func checkDouble() -> Double { fatalError() } @JS func checkBool() -> Bool { fatalError() } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts index a9c37f378..9bf0e1e35 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts @@ -5,7 +5,7 @@ // `swift package bridge-js`. export type Exports = { - check(a: number, b: number, c: number, d: boolean): void; + check(a: number, b: number, c: number, d: number, e: boolean): void; } export type Imports = { } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index c4c355c6a..8e14c6c75 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -222,8 +222,8 @@ export async function createInstantiator(options, swift) { createExports: (instance) => { const js = swift.memory.heap; const exports = { - check: function bjs_check(a, b, c, d) { - instance.exports.bjs_check(a, b, c, d); + check: function bjs_check(a, b, c, d, e) { + instance.exports.bjs_check(a, b, c, d, e); }, }; _exports = exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts index da7f59772..c726e1f5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts @@ -6,6 +6,7 @@ export type Exports = { checkInt(): number; + checkUInt(): number; checkFloat(): number; checkDouble(): number; checkBool(): boolean; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index e36b1820f..f187fa8f0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -226,6 +226,10 @@ export async function createInstantiator(options, swift) { const ret = instance.exports.bjs_checkInt(); return ret; }, + checkUInt: function bjs_checkUInt() { + const ret = instance.exports.bjs_checkUInt(); + return ret >>> 0; + }, checkFloat: function bjs_checkFloat() { const ret = instance.exports.bjs_checkFloat(); return ret; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json index ab2539abf..3b45bf30f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json @@ -29,7 +29,7 @@ "label" : "b", "name" : "b", "type" : { - "float" : { + "uint" : { } } @@ -38,7 +38,7 @@ "label" : "c", "name" : "c", "type" : { - "double" : { + "float" : { } } @@ -46,6 +46,15 @@ { "label" : "d", "name" : "d", + "type" : { + "double" : { + + } + } + }, + { + "label" : "e", + "name" : "e", "type" : { "bool" : { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift index bb3ea0fd8..f91e1e213 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift @@ -1,8 +1,8 @@ @_expose(wasm, "bjs_check") @_cdecl("bjs_check") -public func _bjs_check(_ a: Int32, _ b: Float32, _ c: Float64, _ d: Int32) -> Void { +public func _bjs_check(_ a: Int32, _ b: Int32, _ c: Float32, _ d: Float64, _ e: Int32) -> Void { #if arch(wasm32) - check(a: Int.bridgeJSLiftParameter(a), b: Float.bridgeJSLiftParameter(b), c: Double.bridgeJSLiftParameter(c), d: Bool.bridgeJSLiftParameter(d)) + check(a: Int.bridgeJSLiftParameter(a), b: UInt.bridgeJSLiftParameter(b), c: Float.bridgeJSLiftParameter(c), d: Double.bridgeJSLiftParameter(d), e: Bool.bridgeJSLiftParameter(e)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json index e63b4a242..d70b0c9b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json @@ -24,6 +24,23 @@ } } }, + { + "abiName" : "bjs_checkUInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkUInt", + "parameters" : [ + + ], + "returnType" : { + "uint" : { + + } + } + }, { "abiName" : "bjs_checkFloat", "effects" : { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift index 62b5826d3..74ee7b1c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift @@ -9,6 +9,17 @@ public func _bjs_checkInt() -> Int32 { #endif } +@_expose(wasm, "bjs_checkUInt") +@_cdecl("bjs_checkUInt") +public func _bjs_checkUInt() -> Int32 { + #if arch(wasm32) + let ret = checkUInt() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_checkFloat") @_cdecl("bjs_checkFloat") public func _bjs_checkFloat() -> Float32 { diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index d8145e3a7..dcdb8f6d0 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -128,6 +128,23 @@ extension Int: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { } } +extension UInt: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { + // MARK: ImportTS + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + Int32(bitPattern: UInt32(self)) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> UInt { + UInt(UInt32(bitPattern: value)) + } + // MARK: ExportSwift + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> UInt { + UInt(UInt32(bitPattern: value)) + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + Int32(bitPattern: UInt32(self)) + } +} + extension Float: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Float32 { @@ -918,6 +935,52 @@ extension Optional where Wrapped == Int { } } } + +extension Optional where Wrapped == UInt { + // MARK: ImportTS + + @available(*, unavailable, message: "Optional UInt type is not supported to be passed to imported JS functions") + @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + isSome: Int32, value: Int32 + ) { + switch consume self { + case .none: + return (isSome: 0, value: 0) + case .some(let wrapped): + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> UInt? { + if isSome == 0 { + return nil + } else { + return UInt.bridgeJSLiftParameter(wrappedValue) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> UInt? { + let isSome = _swift_js_get_optional_int_presence() + if isSome == 0 { + return nil + } else { + return UInt.bridgeJSLiftReturn(_swift_js_get_optional_int_value()) + } + } + + @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { + switch self { + case .none: + _swift_js_return_optional_int(0, 0) + case .some(let value): + _swift_js_return_optional_int(1, value.bridgeJSLowerReturn()) + } + } +} extension Optional where Wrapped == String { // MARK: ExportSwift diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index af6ad530b..2aee862c6 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -13,6 +13,9 @@ func runJsWorks() -> Void @JS func roundTripInt(v: Int) -> Int { return v } +@JS func roundTripUInt(v: UInt) -> UInt { + return v +} @JS func roundTripFloat(v: Float) -> Float { return v } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 7f35f6725..948b454c4 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3222,6 +3222,17 @@ public func _bjs_roundTripInt(_ v: Int32) -> Int32 { #endif } +@_expose(wasm, "bjs_roundTripUInt") +@_cdecl("bjs_roundTripUInt") +public func _bjs_roundTripUInt(_ v: Int32) -> Int32 { + #if arch(wasm32) + let ret = roundTripUInt(v: UInt.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripFloat") @_cdecl("bjs_roundTripFloat") public func _bjs_roundTripFloat(_ v: Float32) -> Float32 { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 2f0f964be..c79139ea4 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -4651,6 +4651,31 @@ } } }, + { + "abiName" : "bjs_roundTripUInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUInt", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "uint" : { + + } + } + } + ], + "returnType" : { + "uint" : { + + } + } + }, { "abiName" : "bjs_roundTripFloat", "effects" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index b2a079c35..12307d605 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -155,6 +155,9 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { for (const v of [0, 1, -1, 2147483647, -2147483648]) { assert.equal(exports.roundTripInt(v), v); } + for (const v of [0, 1, 2147483647, 4294967295]) { + assert.equal(exports.roundTripUInt(v), v); + } for (const v of [ 0.0, 1.0, -1.0, NaN, From 8004473687df288021ecaf3465c6c46ec4d3ba1a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 2 Feb 2026 11:15:29 +0900 Subject: [PATCH 117/252] Fix `ExperimentalCustomExecutors` SPI import build issues (#552) The custom executor feature is now hidden behind the `ExperimentalCustomExecutors` SPI until it goes through the evolution process. https://github.com/swiftlang/swift/pull/86808 --- .../JavaScriptEventLoop+ExecutorFactory.swift | 5 ++++- Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift index 574e8d03a..d31e03597 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift @@ -4,7 +4,7 @@ // See: https://github.com/swiftlang/swift/pull/80266 // See: https://forums.swift.org/t/pitch-2-custom-main-and-global-executors/78437 -import _Concurrency +@_spi(ExperimentalCustomExecutors) import _Concurrency import _CJavaScriptKit #if compiler(>=6.3) @@ -12,6 +12,7 @@ import _CJavaScriptKit // MARK: - MainExecutor Implementation // MainExecutor is used by the main actor to execute tasks on the main thread @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *) +@_spi(ExperimentalCustomExecutors) extension JavaScriptEventLoop: MainExecutor { public func run() throws { // This method is called from `swift_task_asyncMainDrainQueueImpl`. @@ -27,6 +28,7 @@ extension JavaScriptEventLoop: MainExecutor { extension JavaScriptEventLoop: TaskExecutor {} @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *) +@_spi(ExperimentalCustomExecutors) extension JavaScriptEventLoop: SchedulingExecutor { public func enqueue( _ job: consuming ExecutorJob, @@ -65,6 +67,7 @@ extension JavaScriptEventLoop: SchedulingExecutor { // MARK: - ExecutorFactory Implementation @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *) +@_spi(ExperimentalCustomExecutors) extension JavaScriptEventLoop: ExecutorFactory { // Forward all operations to the current thread's JavaScriptEventLoop instance final class CurrentThread: TaskExecutor, SchedulingExecutor, MainExecutor, SerialExecutor { diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift index 960a59be0..4b4115602 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift @@ -1,5 +1,5 @@ import JavaScriptKit -import _Concurrency +@_spi(ExperimentalCustomExecutors) import _Concurrency import _CJavaScriptEventLoop import _CJavaScriptKit From d9c0301e5840e2ddf8bf4c116710f56781cfeceb Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 2 Feb 2026 19:14:24 +0900 Subject: [PATCH 118/252] BridgeJS: Rename stack manipulation imports - `swift_js_pop_param_int32` -> `swift_js_pop_i32` - `swift_js_pop_param_f32` -> `swift_js_pop_f32` - `swift_js_pop_param_f64` -> `swift_js_pop_f64` --- Benchmarks/Sources/Generated/BridgeJS.swift | 132 ++++---- .../Sources/BridgeJSCore/ExportSwift.swift | 66 ++-- .../Sources/BridgeJSLink/BridgeJSLink.swift | 10 +- .../ArrayParameter.Import.js | 10 +- .../BridgeJSLinkTests/ArrayTypes.Export.js | 10 +- .../BridgeJSLinkTests/Async.Export.js | 10 +- .../BridgeJSLinkTests/Async.Import.js | 10 +- .../DefaultParameters.Export.js | 10 +- .../EnumAssociatedValue.Export.js | 10 +- .../BridgeJSLinkTests/EnumCase.Export.js | 10 +- .../BridgeJSLinkTests/EnumNamespace.Export.js | 10 +- .../EnumNamespace.Global.Export.js | 10 +- .../BridgeJSLinkTests/EnumRawType.Export.js | 10 +- .../GlobalGetter.ImportMacros.js | 10 +- .../GlobalThisImports.ImportMacros.js | 10 +- .../ImportedTypeInExportedInterface.Export.js | 10 +- .../BridgeJSLinkTests/Interface.Import.js | 10 +- .../InvalidPropertyNames.Import.js | 10 +- .../BridgeJSLinkTests/MixedGlobal.Export.js | 10 +- .../BridgeJSLinkTests/MixedModules.Export.js | 10 +- .../BridgeJSLinkTests/MixedPrivate.Export.js | 10 +- .../MultipleImportedTypes.Import.js | 10 +- .../BridgeJSLinkTests/Namespaces.Export.js | 10 +- .../Namespaces.Global.Export.js | 10 +- .../BridgeJSLinkTests/Optionals.Export.js | 10 +- .../PrimitiveParameters.Export.js | 10 +- .../PrimitiveParameters.Import.js | 10 +- .../PrimitiveReturn.Export.js | 10 +- .../PrimitiveReturn.Import.js | 10 +- .../BridgeJSLinkTests/PropertyTypes.Export.js | 10 +- .../BridgeJSLinkTests/Protocol.Export.js | 10 +- .../BridgeJSLinkTests/ReExportFrom.Import.js | 10 +- .../StaticFunctions.Export.js | 10 +- .../StaticFunctions.Global.Export.js | 10 +- .../StaticProperties.Export.js | 10 +- .../StaticProperties.Global.Export.js | 10 +- .../BridgeJSLinkTests/StringEnum.Import.js | 10 +- .../StringParameter.Export.js | 10 +- .../StringParameter.Import.js | 10 +- .../BridgeJSLinkTests/StringReturn.Export.js | 10 +- .../BridgeJSLinkTests/StringReturn.Import.js | 10 +- .../BridgeJSLinkTests/SwiftClass.Export.js | 10 +- .../BridgeJSLinkTests/SwiftClosure.Export.js | 10 +- .../SwiftClosureImports.ImportMacros.js | 10 +- .../BridgeJSLinkTests/SwiftStruct.Export.js | 10 +- .../SwiftStructImports.ImportMacros.js | 10 +- .../TS2SkeletonLike.Import.js | 10 +- .../BridgeJSLinkTests/Throws.Export.js | 10 +- .../BridgeJSLinkTests/TypeAlias.Import.js | 10 +- .../TypeScriptClass.Import.js | 10 +- .../BridgeJSLinkTests/UnsafePointer.Export.js | 10 +- .../VoidParameterVoidReturn.Export.js | 10 +- .../VoidParameterVoidReturn.Import.js | 10 +- .../ExportSwiftTests/ArrayTypes.swift | 98 +++--- .../ExportSwiftTests/DefaultParameters.swift | 32 +- .../EnumAssociatedValue.swift | 36 +-- .../ExportSwiftTests/Protocol.swift | 16 +- .../StaticFunctions.Global.swift | 4 +- .../ExportSwiftTests/StaticFunctions.swift | 4 +- .../ExportSwiftTests/SwiftClosure.swift | 10 +- .../ExportSwiftTests/SwiftStruct.swift | 32 +- .../ExportSwiftTests/UnsafePointer.swift | 10 +- Plugins/PackageToJS/Templates/instantiate.js | 6 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 30 +- .../Generated/BridgeJS.swift | 282 +++++++++--------- 65 files changed, 634 insertions(+), 634 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 569eb2eac..fd45582e1 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -11,15 +11,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())) + return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: return .info default: @@ -94,17 +94,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .location(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .location(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 3: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 4: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 6: return .info default: @@ -249,11 +249,11 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { extension SimpleStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SimpleStruct { - let precise = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let rate = Float.bridgeJSLiftParameter(_swift_js_pop_param_f32()) - let flag = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let count = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let precise = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let rate = Float.bridgeJSLiftParameter(_swift_js_pop_f32()) + let flag = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) + let count = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return SimpleStruct(name: name, count: count, flag: flag, rate: rate, precise: precise) } @@ -303,9 +303,9 @@ fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let zipCode = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Address(street: street, city: city, zipCode: zipCode) } @@ -356,10 +356,10 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Person(name: name, age: age, address: address, email: email) } @@ -415,12 +415,12 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { extension ComplexStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ComplexStruct { - let metadata = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let tags = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let score = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let active = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let title = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let metadata = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let tags = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let score = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let active = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) + let title = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return ComplexStruct(id: id, title: title, active: active, score: score, tags: tags, metadata: metadata) } @@ -477,8 +477,8 @@ fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return Point(x: x, y: y) } @@ -1488,11 +1488,11 @@ public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -1520,11 +1520,11 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -1555,11 +1555,11 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -1587,11 +1587,11 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -1609,11 +1609,11 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -1644,11 +1644,11 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -1669,7 +1669,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1701,7 +1701,7 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1736,16 +1736,16 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -1779,16 +1779,16 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -1812,12 +1812,12 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1855,12 +1855,12 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1888,11 +1888,11 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -1923,11 +1923,11 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -1948,11 +1948,11 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -1983,11 +1983,11 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -2012,11 +2012,11 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -2069,11 +2069,11 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index dd28397df..d91024d10 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -799,41 +799,41 @@ struct StackCodegen { func liftExpression(for type: BridgeType) -> ExprSyntax { switch type { case .string: - return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + return "String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .int, .uint: - return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "Int.bridgeJSLiftParameter(_swift_js_pop_i32())" case .bool: - return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "Bool.bridgeJSLiftParameter(_swift_js_pop_i32())" case .float: - return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())" + return "Float.bridgeJSLiftParameter(_swift_js_pop_f32())" case .double: - return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())" + return "Double.bridgeJSLiftParameter(_swift_js_pop_f64())" case .jsObject: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())" case .swiftHeapObject(let className): - return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" + return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_pointer())" case .unsafePointer: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_param_pointer())" + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_pointer())" case .swiftProtocol(let protocolName): // Protocols use their Any wrapper type for lifting let wrapperName = "Any\(protocolName)" - return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_i32())" case .caseEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" case .rawValueEnum(let enumName, let rawType): switch rawType { case .string: return - "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .float: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f32())" + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f32())" case .double: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f64())" + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f64())" case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" } case .associatedValueEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" case .swiftStruct(let structName): return "\(raw: structName).bridgeJSLiftParameter()" case .optional(let wrappedType): @@ -845,7 +845,7 @@ struct StackCodegen { // Namespace enums are not passed as values return "()" case .closure: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())" case .array(let elementType): return liftArrayExpression(elementType: elementType) } @@ -856,7 +856,7 @@ struct StackCodegen { let swiftTypeName = elementType.swiftType return """ { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [\(raw: swiftTypeName)] = [] __result.reserveCapacity(__count) for _ in 0..<__count { @@ -872,49 +872,49 @@ struct StackCodegen { switch wrappedType { case .string: return - "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())" case .int, .uint: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .bool: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .float: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())" case .double: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())" case .caseEnum(let enumName): return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .rawValueEnum(let enumName, let rawType): switch rawType { case .string: return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())" case .float: return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())" case .double: return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())" case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" } case .swiftStruct(let nestedName): - return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())" + return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_i32())" case .swiftHeapObject(let className): return - "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())" + "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer())" case .associatedValueEnum(let enumName): return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .jsObject: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .array(let elementType): let arrayLift = liftArrayExpression(elementType: elementType) let swiftTypeName = elementType.swiftType return """ { - let __isSome = _swift_js_pop_param_int32() + let __isSome = _swift_js_pop_i32() if __isSome == 0 { return Optional<[\(raw: swiftTypeName)]>.none } else { @@ -924,7 +924,7 @@ struct StackCodegen { """ default: // Fallback for other optional types - return "Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())" + return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 4e2c9f86d..dc20ee73a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -416,17 +416,17 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedTmpRetStrings).push(value);") } printer.write("}") - printer.write("bjs[\"swift_js_pop_param_int32\"] = function() {") + printer.write("bjs[\"swift_js_pop_i32\"] = function() {") printer.indent { printer.write("return \(JSGlueVariableScope.reservedTmpParamInts).pop();") } printer.write("}") - printer.write("bjs[\"swift_js_pop_param_f32\"] = function() {") + printer.write("bjs[\"swift_js_pop_f32\"] = function() {") printer.indent { printer.write("return \(JSGlueVariableScope.reservedTmpParamF32s).pop();") } printer.write("}") - printer.write("bjs[\"swift_js_pop_param_f64\"] = function() {") + printer.write("bjs[\"swift_js_pop_f64\"] = function() {") printer.indent { printer.write("return \(JSGlueVariableScope.reservedTmpParamF64s).pop();") } @@ -436,7 +436,7 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(pointer);") } printer.write("}") - printer.write("bjs[\"swift_js_pop_param_pointer\"] = function() {") + printer.write("bjs[\"swift_js_pop_pointer\"] = function() {") printer.indent { printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") } @@ -446,7 +446,7 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);") } printer.write("}") - printer.write("bjs[\"swift_js_pop_param_array_length\"] = function() {") + printer.write("bjs[\"swift_js_pop_array_length\"] = function() {") printer.indent { printer.write("return \(JSGlueVariableScope.reservedTmpParamArrayLengths).pop();") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index e0b1c0561..30b8318bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js index 9416bb546..b99d6dabf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js @@ -115,25 +115,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index cffc92db4..77c342a4a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 9259ae32d..9bc5e68f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index dd0f2af21..10610bffe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -141,25 +141,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index c22bd2b18..93a671ce0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -563,25 +563,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 1adfe67bf..bce9a1e13 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -112,25 +112,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index ceb2b2fd5..7fa29cbeb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -113,25 +113,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 94e886cb5..144189324 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -132,25 +132,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 896b925f3..7d26b5a93 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -163,25 +163,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index d0d035a38..7c209def8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js index 6a5969915..e5f0cd3ee 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index ba9024495..c9534033f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 2dd3e0cee..681816a95 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 220b91e94..5a1deb65a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index fd05b0884..c1b926130 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index 69c674b51..ae95f4431 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index 33013eae7..63dd5b663 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index 08f8ab83e..f4833046b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index bd48815c5..0d7b5da19 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 26ba1bba7..6e7b72de5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 64340972b..979053ca9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index 8e14c6c75..e7dc4822a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index a06cc4974..5bc929c84 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index f187fa8f0..15ba11dd9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index a19f3c0ac..3fb51061f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 5699a3e3d..db62b9a72 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 4fd02029d..6f0810c05 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -152,25 +152,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index 1cdc061e1..10ab693ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 4d8b282fa..a77b18b37 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -139,25 +139,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 5e712ef85..317e80b89 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -139,25 +139,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 40c09140d..d7e384d43 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -93,25 +93,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index f5e30215c..b9b4307cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -93,25 +93,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index e634e4147..9712e79e0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 3155c6611..c06d3fb4e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 7c3999c87..fb12e02f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index d0fd0eb1c..52b0ffc2e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index dc5b94a17..b81ff5526 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 6fb8849f6..189cab792 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index d32c5a27d..ada39cb45 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -190,25 +190,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index 51d52e0e5..5f3d4bb0c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 5e528e7bc..fe124a7d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -282,25 +282,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 8683a87f6..23937d680 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -103,25 +103,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 5ff21f227..feac2e1be 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 664794d4a..1b6ecbf8b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 0aa603d8a..2bbe333e2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index f442cd882..be93e6af4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index 95602db76..a6d141ebf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -108,25 +108,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index 67eb8bc8f..1328d8af1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 915f64367..dbb6cc0ba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) { const value = textDecoder.decode(bytes); tmpRetStrings.push(value); } - bjs["swift_js_pop_param_int32"] = function() { + bjs["swift_js_pop_i32"] = function() { return tmpParamInts.pop(); } - bjs["swift_js_pop_param_f32"] = function() { + bjs["swift_js_pop_f32"] = function() { return tmpParamF32s.pop(); } - bjs["swift_js_pop_param_f64"] = function() { + bjs["swift_js_pop_f64"] = function() { return tmpParamF64s.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { tmpRetPointers.push(pointer); } - bjs["swift_js_pop_param_pointer"] = function() { + bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_param_array_length"] = function() { + bjs["swift_js_pop_array_length"] = function() { return tmpParamArrayLengths.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift index 8142d6905..b897ab42f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -46,8 +46,8 @@ extension Status: _BridgedSwiftEnumNoPayload { extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return Point(x: x, y: y) } @@ -94,11 +94,11 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { public func _bjs_processIntArray() -> Void { #if arch(wasm32) let ret = processIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -116,11 +116,11 @@ public func _bjs_processIntArray() -> Void { public func _bjs_processStringArray() -> Void { #if arch(wasm32) let ret = processStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -141,11 +141,11 @@ public func _bjs_processStringArray() -> Void { public func _bjs_processDoubleArray() -> Void { #if arch(wasm32) let ret = processDoubleArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -163,11 +163,11 @@ public func _bjs_processDoubleArray() -> Void { public func _bjs_processBoolArray() -> Void { #if arch(wasm32) let ret = processBoolArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -185,7 +185,7 @@ public func _bjs_processBoolArray() -> Void { public func _bjs_processPointArray() -> Void { #if arch(wasm32) let ret = processPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -207,11 +207,11 @@ public func _bjs_processPointArray() -> Void { public func _bjs_processDirectionArray() -> Void { #if arch(wasm32) let ret = processDirectionArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -229,11 +229,11 @@ public func _bjs_processDirectionArray() -> Void { public func _bjs_processStatusArray() -> Void { #if arch(wasm32) let ret = processStatusArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Status] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -251,11 +251,11 @@ public func _bjs_processStatusArray() -> Void { public func _bjs_sumIntArray() -> Int32 { #if arch(wasm32) let ret = sumIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -271,7 +271,7 @@ public func _bjs_sumIntArray() -> Int32 { public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { #if arch(wasm32) let ret = findFirstPoint(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -291,11 +291,11 @@ public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) public func _bjs_processUnsafeRawPointerArray() -> Void { #if arch(wasm32) let ret = processUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [UnsafeRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -313,11 +313,11 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { public func _bjs_processUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) let ret = processUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [UnsafeMutableRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -335,11 +335,11 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { public func _bjs_processOpaquePointerArray() -> Void { #if arch(wasm32) let ret = processOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [OpaquePointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -357,11 +357,11 @@ public func _bjs_processOpaquePointerArray() -> Void { public func _bjs_processOptionalIntArray() -> Void { #if arch(wasm32) let ret = processOptionalIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -382,11 +382,11 @@ public func _bjs_processOptionalIntArray() -> Void { public func _bjs_processOptionalStringArray() -> Void { #if arch(wasm32) let ret = processOptionalStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -414,11 +414,11 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -441,11 +441,11 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { public func _bjs_processOptionalPointArray() -> Void { #if arch(wasm32) let ret = processOptionalPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -466,11 +466,11 @@ public func _bjs_processOptionalPointArray() -> Void { public func _bjs_processOptionalDirectionArray() -> Void { #if arch(wasm32) let ret = processOptionalDirectionArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -491,11 +491,11 @@ public func _bjs_processOptionalDirectionArray() -> Void { public func _bjs_processOptionalStatusArray() -> Void { #if arch(wasm32) let ret = processOptionalStatusArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -516,16 +516,16 @@ public func _bjs_processOptionalStatusArray() -> Void { public func _bjs_processNestedIntArray() -> Void { #if arch(wasm32) let ret = processNestedIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -549,16 +549,16 @@ public func _bjs_processNestedIntArray() -> Void { public func _bjs_processNestedStringArray() -> Void { #if arch(wasm32) let ret = processNestedStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -585,12 +585,12 @@ public func _bjs_processNestedStringArray() -> Void { public func _bjs_processNestedPointArray() -> Void { #if arch(wasm32) let ret = processNestedPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -618,11 +618,11 @@ public func _bjs_processNestedPointArray() -> Void { public func _bjs_processItemArray() -> Void { #if arch(wasm32) let ret = processItemArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Item] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -640,16 +640,16 @@ public func _bjs_processItemArray() -> Void { public func _bjs_processNestedItemArray() -> Void { #if arch(wasm32) let ret = processNestedItemArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Item]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Item] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 7803860a3..f4d02f14f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -39,9 +39,9 @@ extension Status: _BridgedSwiftCaseEnum { extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) + let value = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Config(name: name, value: value, enabled: enabled) } @@ -89,7 +89,7 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return MathOperations(baseValue: baseValue) } @@ -322,11 +322,11 @@ public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { public func _bjs_testIntArrayDefault() -> Void { #if arch(wasm32) let ret = testIntArrayDefault(values: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -344,11 +344,11 @@ public func _bjs_testIntArrayDefault() -> Void { public func _bjs_testStringArrayDefault() -> Void { #if arch(wasm32) let ret = testStringArrayDefault(names: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -369,11 +369,11 @@ public func _bjs_testStringArrayDefault() -> Void { public func _bjs_testDoubleArrayDefault() -> Void { #if arch(wasm32) let ret = testDoubleArrayDefault(values: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -391,11 +391,11 @@ public func _bjs_testDoubleArrayDefault() -> Void { public func _bjs_testBoolArrayDefault() -> Void { #if arch(wasm32) let ret = testBoolArrayDefault(flags: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -413,11 +413,11 @@ public func _bjs_testBoolArrayDefault() -> Void { public func _bjs_testEmptyArrayDefault() -> Void { #if arch(wasm32) let ret = testEmptyArrayDefault(items: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -435,11 +435,11 @@ public func _bjs_testEmptyArrayDefault() -> Void { public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index 13239108f..fa9e791ee 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -2,15 +2,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())) + return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: return .info default: @@ -85,15 +85,15 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 3: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 4: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 5: return .info default: @@ -224,11 +224,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -303,9 +303,9 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) default: fatalError("Unknown NetworkingResult case ID: \(caseId)") } @@ -364,11 +364,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 2: - return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 7592f2960..cccbbf524 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -366,9 +366,9 @@ extension Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) default: fatalError("Unknown Result case ID: \(caseId)") } @@ -423,11 +423,11 @@ extension Priority: _BridgedSwiftEnumNoPayload { public func _bjs_processDelegates() -> Void { #if arch(wasm32) let ret = processDelegates(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -654,11 +654,11 @@ fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = DelegateManager(delegates: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -697,11 +697,11 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) DelegateManager.bridgeJSLiftParameter(_self).delegates = { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 8a5b56065..6d1f56f50 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) default: fatalError("Unknown APIResult case ID: \(caseId)") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 8a5b56065..6d1f56f50 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) default: fatalError("Unknown APIResult case ID: \(caseId)") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index 7d0ae15da..feddadf15 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -677,15 +677,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())) + return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: return .info default: diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index ca164c1bf..35fbe039c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -3,11 +3,11 @@ extension Precision: _BridgedSwiftEnumNoPayload { extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let label = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let label = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } @@ -76,9 +76,9 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Address(street: street, city: city, zipCode: zipCode) } @@ -133,10 +133,10 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Person(name: name, age: age, address: address, email: email) } @@ -192,8 +192,8 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { extension Session: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Session { - let owner = Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let owner = Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return Session(id: id, owner: owner) } @@ -237,9 +237,9 @@ fileprivate func _bjs_struct_lift_Session() -> Int32 { extension Measurement: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Measurement { - let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) - let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) - let value = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32()) + let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) + let value = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return Measurement(value: value, precision: precision, optionalPrecision: optionalPrecision) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 3ef3b9939..4c368908b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -1,10 +1,10 @@ extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 1ab35de35..462df924b 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -44,9 +44,9 @@ async function createInstantiator(options, swift) { swift_js_push_f32: unexpectedBjsCall, swift_js_push_f64: unexpectedBjsCall, swift_js_push_string: unexpectedBjsCall, - swift_js_pop_param_int32: unexpectedBjsCall, - swift_js_pop_param_f32: unexpectedBjsCall, - swift_js_pop_param_f64: unexpectedBjsCall, + swift_js_pop_i32: unexpectedBjsCall, + swift_js_pop_f32: unexpectedBjsCall, + swift_js_pop_f64: unexpectedBjsCall, swift_js_return_optional_bool: unexpectedBjsCall, swift_js_return_optional_int: unexpectedBjsCall, swift_js_return_optional_string: unexpectedBjsCall, diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index dcdb8f6d0..3f4914ca0 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -452,28 +452,28 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_param_int32") -@_spi(BridgeJS) public func _swift_js_pop_param_int32() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_pop_i32") +@_spi(BridgeJS) public func _swift_js_pop_i32() -> Int32 #else -@_spi(BridgeJS) public func _swift_js_pop_param_int32() -> Int32 { +@_spi(BridgeJS) public func _swift_js_pop_i32() -> Int32 { _onlyAvailableOnWasm() } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_param_f32") -@_spi(BridgeJS) public func _swift_js_pop_param_f32() -> Float32 +@_extern(wasm, module: "bjs", name: "swift_js_pop_f32") +@_spi(BridgeJS) public func _swift_js_pop_f32() -> Float32 #else -@_spi(BridgeJS) public func _swift_js_pop_param_f32() -> Float32 { +@_spi(BridgeJS) public func _swift_js_pop_f32() -> Float32 { _onlyAvailableOnWasm() } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_param_f64") -@_spi(BridgeJS) public func _swift_js_pop_param_f64() -> Float64 +@_extern(wasm, module: "bjs", name: "swift_js_pop_f64") +@_spi(BridgeJS) public func _swift_js_pop_f64() -> Float64 #else -@_spi(BridgeJS) public func _swift_js_pop_param_f64() -> Float64 { +@_spi(BridgeJS) public func _swift_js_pop_f64() -> Float64 { _onlyAvailableOnWasm() } #endif @@ -490,10 +490,10 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_param_array_length") -@_spi(BridgeJS) public func _swift_js_pop_param_array_length() -> Int32 +@_extern(wasm, module: "bjs", name: "swift_js_pop_array_length") +@_spi(BridgeJS) public func _swift_js_pop_array_length() -> Int32 #else -@_spi(BridgeJS) public func _swift_js_pop_param_array_length() -> Int32 { +@_spi(BridgeJS) public func _swift_js_pop_array_length() -> Int32 { _onlyAvailableOnWasm() } #endif @@ -704,10 +704,10 @@ func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_param_pointer") -@_spi(BridgeJS) public func _swift_js_pop_param_pointer() -> UnsafeMutableRawPointer +@_extern(wasm, module: "bjs", name: "swift_js_pop_pointer") +@_spi(BridgeJS) public func _swift_js_pop_pointer() -> UnsafeMutableRawPointer #else -@_spi(BridgeJS) public func _swift_js_pop_param_pointer() -> UnsafeMutableRawPointer { +@_spi(BridgeJS) public func _swift_js_pop_pointer() -> UnsafeMutableRawPointer { _onlyAvailableOnWasm() } #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 948b454c4..0cc31abc4 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1438,15 +1438,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())) + return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: return .info default: @@ -1521,17 +1521,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .location(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .location(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 3: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 4: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 6: return .info default: @@ -1678,11 +1678,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()), String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -1757,9 +1757,9 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> API.NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) default: fatalError("Unknown API.NetworkingResult case ID: \(caseId)") } @@ -1818,11 +1818,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) case 1: - return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) case 2: - return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()), Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } @@ -2220,8 +2220,8 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let x = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let y = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let x = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return Point(x: x, y: y) } @@ -2265,11 +2265,11 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) - let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer()) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } @@ -2327,11 +2327,11 @@ public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: Un extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let label = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let y = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let label = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } @@ -2400,9 +2400,9 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Address(street: street, city: city, zipCode: zipCode) } @@ -2457,11 +2457,11 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Contact: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Contact { - let secondaryAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let secondaryAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_i32()) + let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress) } @@ -2522,10 +2522,10 @@ fileprivate func _bjs_struct_lift_Contact() -> Int32 { extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let status = Status.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let direction = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let theme = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) + let direction = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let theme = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return Config(name: name, theme: theme, direction: direction, status: status) } @@ -2585,8 +2585,8 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { extension SessionData: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SessionData { - let owner = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let owner = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return SessionData(id: id, owner: owner) } @@ -2634,10 +2634,10 @@ fileprivate func _bjs_struct_lift_SessionData() -> Int32 { extension ValidationReport: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { - let outcome = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let status = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let outcome = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let status = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_i32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return ValidationReport(id: id, result: result, status: status, outcome: outcome) } @@ -2691,16 +2691,16 @@ fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { extension AdvancedConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> AdvancedConfig { - let overrideDefaults = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let overrideDefaults = Optional.bridgeJSLiftParameter(_swift_js_pop_i32()) let defaults = ConfigStruct.bridgeJSLiftParameter() - let location = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let metadata = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let result = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let status = Status.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let title = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let location = Optional.bridgeJSLiftParameter(_swift_js_pop_i32()) + let metadata = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let result = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) + let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) + let title = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults) } @@ -2774,10 +2774,10 @@ fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { extension MeasurementConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { - let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64()) - let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32()) - let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_param_f64()) - let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_param_f32()) + let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64()) + let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32()) + let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_f64()) + let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) } @@ -2831,7 +2831,7 @@ fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_param_f64()) + let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) return MathOperations(baseValue: baseValue) } @@ -2918,8 +2918,8 @@ public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> F extension CopyableCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCart { - let note = Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32()) - let x = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let note = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) + let x = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return CopyableCart(x: x, note: note) } @@ -2981,8 +2981,8 @@ public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void { extension CopyableCartItem: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCartItem { - let quantity = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let sku = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let quantity = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let sku = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return CopyableCartItem(sku: sku, quantity: quantity) } @@ -3029,9 +3029,9 @@ fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { extension CopyableNestedCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableNestedCart { - let shippingAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let shippingAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_i32()) let item = CopyableCartItem.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) + let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress) } @@ -3091,8 +3091,8 @@ public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { - let value = Int.bridgeJSLiftParameter(_swift_js_pop_param_int32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32()) + let value = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) return ConfigStruct(name: name, value: value) } @@ -4567,11 +4567,11 @@ public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutab public func _bjs_arrayWithDefault() -> Int32 { #if arch(wasm32) let ret = arrayWithDefault(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4591,11 +4591,11 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4613,11 +4613,11 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4666,11 +4666,11 @@ public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { public func _bjs_roundTripIntArray() -> Void { #if arch(wasm32) let ret = roundTripIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4688,11 +4688,11 @@ public func _bjs_roundTripIntArray() -> Void { public func _bjs_roundTripStringArray() -> Void { #if arch(wasm32) let ret = roundTripStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -4713,11 +4713,11 @@ public func _bjs_roundTripStringArray() -> Void { public func _bjs_roundTripDoubleArray() -> Void { #if arch(wasm32) let ret = roundTripDoubleArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -4735,11 +4735,11 @@ public func _bjs_roundTripDoubleArray() -> Void { public func _bjs_roundTripBoolArray() -> Void { #if arch(wasm32) let ret = roundTripBoolArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4757,11 +4757,11 @@ public func _bjs_roundTripBoolArray() -> Void { public func _bjs_roundTripDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripDirectionArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4779,11 +4779,11 @@ public func _bjs_roundTripDirectionArray() -> Void { public func _bjs_roundTripStatusArray() -> Void { #if arch(wasm32) let ret = roundTripStatusArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Status] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4801,11 +4801,11 @@ public func _bjs_roundTripStatusArray() -> Void { public func _bjs_roundTripThemeArray() -> Void { #if arch(wasm32) let ret = roundTripThemeArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Theme] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Theme.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -4826,11 +4826,11 @@ public func _bjs_roundTripThemeArray() -> Void { public func _bjs_roundTripHttpStatusArray() -> Void { #if arch(wasm32) let ret = roundTripHttpStatusArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [HttpStatus] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(HttpStatus.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(HttpStatus.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4848,7 +4848,7 @@ public func _bjs_roundTripHttpStatusArray() -> Void { public func _bjs_roundTripDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripDataPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [DataPoint] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4870,11 +4870,11 @@ public func _bjs_roundTripDataPointArray() -> Void { public func _bjs_roundTripGreeterArray() -> Void { #if arch(wasm32) let ret = roundTripGreeterArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -4892,11 +4892,11 @@ public func _bjs_roundTripGreeterArray() -> Void { public func _bjs_roundTripOptionalIntArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -4917,11 +4917,11 @@ public func _bjs_roundTripOptionalIntArray() -> Void { public func _bjs_roundTripOptionalStringArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -4945,11 +4945,11 @@ public func _bjs_roundTripOptionalStringArray() -> Void { public func _bjs_roundTripOptionalDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalDataPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -4970,11 +4970,11 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { public func _bjs_roundTripOptionalDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalDirectionArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -4995,11 +4995,11 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { public func _bjs_roundTripOptionalStatusArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalStatusArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -5024,11 +5024,11 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -5055,11 +5055,11 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { return Optional<[String]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -5089,11 +5089,11 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { return Optional<[Greeter]>.none } else { return { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -5116,16 +5116,16 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { public func _bjs_roundTripNestedIntArray() -> Void { #if arch(wasm32) let ret = roundTripNestedIntArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -5149,16 +5149,16 @@ public func _bjs_roundTripNestedIntArray() -> Void { public func _bjs_roundTripNestedStringArray() -> Void { #if arch(wasm32) let ret = roundTripNestedStringArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())) + __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) } __result.reverse() return __result @@ -5185,16 +5185,16 @@ public func _bjs_roundTripNestedStringArray() -> Void { public func _bjs_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDoubleArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Double]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())) + __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) } __result.reverse() return __result @@ -5218,16 +5218,16 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { public func _bjs_roundTripNestedBoolArray() -> Void { #if arch(wasm32) let ret = roundTripNestedBoolArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Bool]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -5251,12 +5251,12 @@ public func _bjs_roundTripNestedBoolArray() -> Void { public func _bjs_roundTripNestedDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDataPointArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[DataPoint]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [DataPoint] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5284,16 +5284,16 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { public func _bjs_roundTripNestedDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDirectionArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Direction]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -5317,16 +5317,16 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { public func _bjs_roundTripNestedGreeterArray() -> Void { #if arch(wasm32) let ret = roundTripNestedGreeterArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [[Greeter]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -5350,11 +5350,11 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { public func _bjs_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) let ret = roundTripUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [UnsafeRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -5372,11 +5372,11 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) let ret = roundTripUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [UnsafeMutableRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -5394,11 +5394,11 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { public func _bjs_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) let ret = roundTripOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [OpaquePointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_param_pointer())) + __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) } __result.reverse() return __result @@ -5416,11 +5416,11 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { public func _bjs_consumeDataProcessorArrayType() -> Int32 { #if arch(wasm32) let ret = consumeDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [AnyDataProcessor] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result @@ -5436,11 +5436,11 @@ public func _bjs_consumeDataProcessorArrayType() -> Int32 { public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) let ret = roundTripDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_param_array_length()) + let __count = Int(_swift_js_pop_array_length()) var __result: [AnyDataProcessor] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_param_int32())) + __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_i32())) } __result.reverse() return __result From dbc216afc4836e0977b0345f43462ef7a463a50e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 2 Feb 2026 19:23:30 +0900 Subject: [PATCH 119/252] BridgeJS: Remove `swift_js_pop_array_length` --- Benchmarks/Sources/Generated/BridgeJS.swift | 44 +++++----- .../Sources/BridgeJSCore/ExportSwift.swift | 2 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 6 -- .../Sources/BridgeJSLink/JSGlueGen.swift | 4 +- .../ArrayParameter.Import.js | 4 - .../BridgeJSLinkTests/ArrayTypes.Export.js | 58 +++++++------- .../BridgeJSLinkTests/Async.Export.js | 4 - .../BridgeJSLinkTests/Async.Import.js | 4 - .../DefaultParameters.Export.js | 16 ++-- .../EnumAssociatedValue.Export.js | 4 - .../BridgeJSLinkTests/EnumCase.Export.js | 4 - .../BridgeJSLinkTests/EnumNamespace.Export.js | 4 - .../EnumNamespace.Global.Export.js | 4 - .../BridgeJSLinkTests/EnumRawType.Export.js | 4 - .../GlobalGetter.ImportMacros.js | 4 - .../GlobalThisImports.ImportMacros.js | 4 - .../ImportedTypeInExportedInterface.Export.js | 4 - .../BridgeJSLinkTests/Interface.Import.js | 4 - .../InvalidPropertyNames.Import.js | 4 - .../BridgeJSLinkTests/MixedGlobal.Export.js | 4 - .../BridgeJSLinkTests/MixedModules.Export.js | 4 - .../BridgeJSLinkTests/MixedPrivate.Export.js | 4 - .../MultipleImportedTypes.Import.js | 4 - .../BridgeJSLinkTests/Namespaces.Export.js | 4 - .../Namespaces.Global.Export.js | 4 - .../BridgeJSLinkTests/Optionals.Export.js | 4 - .../PrimitiveParameters.Export.js | 4 - .../PrimitiveParameters.Import.js | 4 - .../PrimitiveReturn.Export.js | 4 - .../PrimitiveReturn.Import.js | 4 - .../BridgeJSLinkTests/PropertyTypes.Export.js | 4 - .../BridgeJSLinkTests/Protocol.Export.js | 10 +-- .../BridgeJSLinkTests/ReExportFrom.Import.js | 4 - .../StaticFunctions.Export.js | 4 - .../StaticFunctions.Global.Export.js | 4 - .../StaticProperties.Export.js | 4 - .../StaticProperties.Global.Export.js | 4 - .../BridgeJSLinkTests/StringEnum.Import.js | 4 - .../StringParameter.Export.js | 4 - .../StringParameter.Import.js | 4 - .../BridgeJSLinkTests/StringReturn.Export.js | 4 - .../BridgeJSLinkTests/StringReturn.Import.js | 4 - .../BridgeJSLinkTests/SwiftClass.Export.js | 4 - .../BridgeJSLinkTests/SwiftClosure.Export.js | 4 - .../SwiftClosureImports.ImportMacros.js | 4 - .../BridgeJSLinkTests/SwiftStruct.Export.js | 4 - .../SwiftStructImports.ImportMacros.js | 4 - .../TS2SkeletonLike.Import.js | 4 - .../BridgeJSLinkTests/Throws.Export.js | 4 - .../BridgeJSLinkTests/TypeAlias.Import.js | 4 - .../TypeScriptClass.Import.js | 4 - .../BridgeJSLinkTests/UnsafePointer.Export.js | 4 - .../VoidParameterVoidReturn.Export.js | 4 - .../VoidParameterVoidReturn.Import.js | 4 - .../ExportSwiftTests/ArrayTypes.swift | 54 ++++++------- .../ExportSwiftTests/DefaultParameters.swift | 12 +-- .../ExportSwiftTests/Protocol.swift | 6 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 9 --- .../Generated/BridgeJS.swift | 80 +++++++++---------- 59 files changed, 136 insertions(+), 353 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index fd45582e1..a582a1bed 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -1488,7 +1488,7 @@ public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1520,7 +1520,7 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1555,7 +1555,7 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1587,7 +1587,7 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1609,7 +1609,7 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1644,7 +1644,7 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1669,7 +1669,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1701,7 +1701,7 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1736,12 +1736,12 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1779,12 +1779,12 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1812,12 +1812,12 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1855,12 +1855,12 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1888,7 +1888,7 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1923,7 +1923,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1948,7 +1948,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -1983,7 +1983,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -2012,7 +2012,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -2069,7 +2069,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index d91024d10..62c0475ea 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -856,7 +856,7 @@ struct StackCodegen { let swiftTypeName = elementType.swiftType return """ { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [\(raw: swiftTypeName)] = [] __result.reserveCapacity(__count) for _ in 0..<__count { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index dc20ee73a..8c2cbe474 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -257,7 +257,6 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", "let \(JSGlueVariableScope.reservedTmpRetArrayLengths) = [];", - "let \(JSGlueVariableScope.reservedTmpParamArrayLengths) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", "", @@ -446,11 +445,6 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);") } printer.write("}") - printer.write("bjs[\"swift_js_pop_array_length\"] = function() {") - printer.indent { - printer.write("return \(JSGlueVariableScope.reservedTmpParamArrayLengths).pop();") - } - printer.write("}") printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") printer.indent { printer.write("if (cleanupId === 0) { return; }") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index cf0919304..5ff651282 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -32,7 +32,6 @@ final class JSGlueVariableScope { static let reservedTmpParamPointers = "tmpParamPointers" static let reservedTmpStructCleanups = "tmpStructCleanups" static let reservedTmpRetArrayLengths = "tmpRetArrayLengths" - static let reservedTmpParamArrayLengths = "tmpParamArrayLengths" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" @@ -63,7 +62,6 @@ final class JSGlueVariableScope { reservedTmpParamPointers, reservedTmpStructCleanups, reservedTmpRetArrayLengths, - reservedTmpParamArrayLengths, reservedEnumHelpers, reservedStructHelpers, ] @@ -2172,7 +2170,7 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamArrayLengths).push(\(arr).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arr).length);") cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return [] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index 30b8318bb..be84c1438 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js index b99d6dabf..89c574bb3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js @@ -43,7 +43,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -133,9 +132,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -302,7 +298,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processIntArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -325,7 +321,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); }); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processStringArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -342,7 +338,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamF64s.push(elem); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processDoubleArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -359,7 +355,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push(elem ? 1 : 0); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processBoolArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -379,7 +375,7 @@ export async function createInstantiator(options, swift) { if (cleanup) { cleanup(); } }); } - tmpParamArrayLengths.push(points.length); + tmpParamInts.push(points.length); instance.exports.bjs_processPointArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -396,7 +392,7 @@ export async function createInstantiator(options, swift) { for (const elem of directions) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(directions.length); + tmpParamInts.push(directions.length); instance.exports.bjs_processDirectionArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -413,7 +409,7 @@ export async function createInstantiator(options, swift) { for (const elem of statuses) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(statuses.length); + tmpParamInts.push(statuses.length); instance.exports.bjs_processStatusArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -430,7 +426,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); const ret = instance.exports.bjs_sumIntArray(); for (const cleanup of arrayCleanups) { cleanup(); } return ret; @@ -443,7 +439,7 @@ export async function createInstantiator(options, swift) { if (cleanup) { cleanup(); } }); } - tmpParamArrayLengths.push(points.length); + tmpParamInts.push(points.length); const matchingBytes = textEncoder.encode(matching); const matchingId = swift.memory.retain(matchingBytes); instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); @@ -457,7 +453,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamPointers.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processUnsafeRawPointerArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -474,7 +470,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamPointers.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processUnsafeMutableRawPointerArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -491,7 +487,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamPointers.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processOpaquePointerArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -514,7 +510,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(isSome); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processOptionalIntArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -549,7 +545,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(isSome); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processOptionalStringArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -576,7 +572,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } instance.exports.bjs_processOptionalArray(+isSome); @@ -608,7 +604,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(isSome); } - tmpParamArrayLengths.push(points.length); + tmpParamInts.push(points.length); instance.exports.bjs_processOptionalPointArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -638,7 +634,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(isSome); } - tmpParamArrayLengths.push(directions.length); + tmpParamInts.push(directions.length); instance.exports.bjs_processOptionalDirectionArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -668,7 +664,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(isSome); } - tmpParamArrayLengths.push(statuses.length); + tmpParamInts.push(statuses.length); instance.exports.bjs_processOptionalStatusArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -694,12 +690,12 @@ export async function createInstantiator(options, swift) { for (const elem1 of elem) { tmpParamInts.push((elem1 | 0)); } - tmpParamArrayLengths.push(elem.length); + tmpParamInts.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processNestedIntArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -730,12 +726,12 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); }); } - tmpParamArrayLengths.push(elem.length); + tmpParamInts.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_processNestedStringArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -763,12 +759,12 @@ export async function createInstantiator(options, swift) { if (cleanup) { cleanup(); } }); } - tmpParamArrayLengths.push(elem.length); + tmpParamInts.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamArrayLengths.push(points.length); + tmpParamInts.push(points.length); instance.exports.bjs_processNestedPointArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -791,7 +787,7 @@ export async function createInstantiator(options, swift) { for (const elem of items) { tmpParamPointers.push(elem.pointer); } - tmpParamArrayLengths.push(items.length); + tmpParamInts.push(items.length); instance.exports.bjs_processItemArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -811,12 +807,12 @@ export async function createInstantiator(options, swift) { for (const elem1 of elem) { tmpParamPointers.push(elem1.pointer); } - tmpParamArrayLengths.push(elem.length); + tmpParamInts.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamArrayLengths.push(items.length); + tmpParamInts.push(items.length); instance.exports.bjs_processNestedItemArray(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index 77c342a4a..a83274e1a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 9bc5e68f6..ff3551e31 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 10610bffe..6b9785933 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -36,7 +36,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -159,9 +158,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -566,7 +562,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_testIntArrayDefault(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -589,7 +585,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); }); } - tmpParamArrayLengths.push(names.length); + tmpParamInts.push(names.length); instance.exports.bjs_testStringArrayDefault(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -606,7 +602,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamF64s.push(elem); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_testDoubleArrayDefault(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -623,7 +619,7 @@ export async function createInstantiator(options, swift) { for (const elem of flags) { tmpParamInts.push(elem ? 1 : 0); } - tmpParamArrayLengths.push(flags.length); + tmpParamInts.push(flags.length); instance.exports.bjs_testBoolArrayDefault(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -640,7 +636,7 @@ export async function createInstantiator(options, swift) { for (const elem of items) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(items.length); + tmpParamInts.push(items.length); instance.exports.bjs_testEmptyArrayDefault(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; @@ -659,7 +655,7 @@ export async function createInstantiator(options, swift) { for (const elem of values) { tmpParamInts.push((elem | 0)); } - tmpParamArrayLengths.push(values.length); + tmpParamInts.push(values.length); instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled); const ret = tmpRetString; tmpRetString = undefined; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index 93a671ce0..d1bf82d39 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -505,7 +505,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -581,9 +580,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index bce9a1e13..5b5a631cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -54,7 +54,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -130,9 +129,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 7fa29cbeb..936080db8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -55,7 +55,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -131,9 +130,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 144189324..9e4b57dbe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -74,7 +74,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -150,9 +149,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 7d26b5a93..1ef43bd79 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -105,7 +105,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -181,9 +180,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index 7c209def8..ac53d326f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js index e5f0cd3ee..724df077e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index c9534033f..231873ab0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 681816a95..b1dd75c44 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 5a1deb65a..50de3378c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index c1b926130..d11b74338 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index ae95f4431..f39b6209b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index 63dd5b663..a78095948 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index f4833046b..d6adac3c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 0d7b5da19..5342ac94e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index 6e7b72de5..e262b76fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 979053ca9..df4337f5f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index e7dc4822a..ccde5f78f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 5bc929c84..4d7787868 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 15ba11dd9..35069b2e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index 3fb51061f..c07676bc4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index db62b9a72..7e5e3c1ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 6f0810c05..6d51db5e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -94,7 +94,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -170,9 +169,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -703,7 +699,7 @@ export async function createInstantiator(options, swift) { const objId = swift.memory.retain(elem); tmpParamInts.push(objId); } - tmpParamArrayLengths.push(delegates.length); + tmpParamInts.push(delegates.length); const ret = instance.exports.bjs_DelegateManager_init(); for (const cleanup of arrayCleanups) { cleanup(); } return DelegateManager.__construct(ret); @@ -730,7 +726,7 @@ export async function createInstantiator(options, swift) { const objId = swift.memory.retain(elem); tmpParamInts.push(objId); } - tmpParamArrayLengths.push(value.length); + tmpParamInts.push(value.length); instance.exports.bjs_DelegateManager_delegates_set(this.pointer); for (const cleanup of arrayCleanups) { cleanup(); } } @@ -745,7 +741,7 @@ export async function createInstantiator(options, swift) { const objId = swift.memory.retain(elem); tmpParamInts.push(objId); } - tmpParamArrayLengths.push(delegates.length); + tmpParamInts.push(delegates.length); instance.exports.bjs_processDelegates(); const arrayLen = tmpRetArrayLengths.pop(); const arrayResult = []; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index 10ab693ec..3a3cc4fd6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index a77b18b37..cdf2e4d80 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -81,7 +81,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -157,9 +156,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 317e80b89..51833fee1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -81,7 +81,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -157,9 +156,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index d7e384d43..91ced0c67 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -35,7 +35,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -111,9 +110,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index b9b4307cc..c374d9a6f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -35,7 +35,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -111,9 +110,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index 9712e79e0..a836bf2b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index c06d3fb4e..9a9c9cdc2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index fb12e02f6..9ebd38074 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 52b0ffc2e..cfe649726 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index b81ff5526..75c9a1d47 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 189cab792..e7f76436c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index ada39cb45..9d18cd143 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -132,7 +132,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -208,9 +207,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index 5f3d4bb0c..a51be1c96 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index fe124a7d6..745998d8e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -35,7 +35,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -300,9 +299,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 23937d680..916be5c96 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -121,9 +120,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index feac2e1be..d87b8b6cb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 1b6ecbf8b..8c039e374 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 2bbe333e2..94012ee5d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index be93e6af4..01646bc60 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index a6d141ebf..1b7fd5ceb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -126,9 +125,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index 1328d8af1..bc542c373 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -106,9 +105,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index dbb6cc0ba..7f99e811e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -30,7 +30,6 @@ export async function createInstantiator(options, swift) { let tmpParamPointers = []; let tmpStructCleanups = []; let tmpRetArrayLengths = []; - let tmpParamArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_array_length"] = function(len) { tmpRetArrayLengths.push(len | 0); } - bjs["swift_js_pop_array_length"] = function() { - return tmpParamArrayLengths.pop(); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift index b897ab42f..7c0d12892 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -94,7 +94,7 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { public func _bjs_processIntArray() -> Void { #if arch(wasm32) let ret = processIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -116,7 +116,7 @@ public func _bjs_processIntArray() -> Void { public func _bjs_processStringArray() -> Void { #if arch(wasm32) let ret = processStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -141,7 +141,7 @@ public func _bjs_processStringArray() -> Void { public func _bjs_processDoubleArray() -> Void { #if arch(wasm32) let ret = processDoubleArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -163,7 +163,7 @@ public func _bjs_processDoubleArray() -> Void { public func _bjs_processBoolArray() -> Void { #if arch(wasm32) let ret = processBoolArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -185,7 +185,7 @@ public func _bjs_processBoolArray() -> Void { public func _bjs_processPointArray() -> Void { #if arch(wasm32) let ret = processPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -207,7 +207,7 @@ public func _bjs_processPointArray() -> Void { public func _bjs_processDirectionArray() -> Void { #if arch(wasm32) let ret = processDirectionArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -229,7 +229,7 @@ public func _bjs_processDirectionArray() -> Void { public func _bjs_processStatusArray() -> Void { #if arch(wasm32) let ret = processStatusArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Status] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -251,7 +251,7 @@ public func _bjs_processStatusArray() -> Void { public func _bjs_sumIntArray() -> Int32 { #if arch(wasm32) let ret = sumIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -271,7 +271,7 @@ public func _bjs_sumIntArray() -> Int32 { public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { #if arch(wasm32) let ret = findFirstPoint(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -291,7 +291,7 @@ public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) public func _bjs_processUnsafeRawPointerArray() -> Void { #if arch(wasm32) let ret = processUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [UnsafeRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -313,7 +313,7 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { public func _bjs_processUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) let ret = processUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [UnsafeMutableRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -335,7 +335,7 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { public func _bjs_processOpaquePointerArray() -> Void { #if arch(wasm32) let ret = processOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [OpaquePointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -357,7 +357,7 @@ public func _bjs_processOpaquePointerArray() -> Void { public func _bjs_processOptionalIntArray() -> Void { #if arch(wasm32) let ret = processOptionalIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -382,7 +382,7 @@ public func _bjs_processOptionalIntArray() -> Void { public func _bjs_processOptionalStringArray() -> Void { #if arch(wasm32) let ret = processOptionalStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -414,7 +414,7 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -441,7 +441,7 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { public func _bjs_processOptionalPointArray() -> Void { #if arch(wasm32) let ret = processOptionalPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -466,7 +466,7 @@ public func _bjs_processOptionalPointArray() -> Void { public func _bjs_processOptionalDirectionArray() -> Void { #if arch(wasm32) let ret = processOptionalDirectionArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -491,7 +491,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { public func _bjs_processOptionalStatusArray() -> Void { #if arch(wasm32) let ret = processOptionalStatusArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -516,12 +516,12 @@ public func _bjs_processOptionalStatusArray() -> Void { public func _bjs_processNestedIntArray() -> Void { #if arch(wasm32) let ret = processNestedIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -549,12 +549,12 @@ public func _bjs_processNestedIntArray() -> Void { public func _bjs_processNestedStringArray() -> Void { #if arch(wasm32) let ret = processNestedStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -585,12 +585,12 @@ public func _bjs_processNestedStringArray() -> Void { public func _bjs_processNestedPointArray() -> Void { #if arch(wasm32) let ret = processNestedPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Point] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -618,7 +618,7 @@ public func _bjs_processNestedPointArray() -> Void { public func _bjs_processItemArray() -> Void { #if arch(wasm32) let ret = processItemArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Item] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -640,12 +640,12 @@ public func _bjs_processItemArray() -> Void { public func _bjs_processNestedItemArray() -> Void { #if arch(wasm32) let ret = processNestedItemArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Item]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Item] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index f4d02f14f..b60a3c782 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -322,7 +322,7 @@ public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { public func _bjs_testIntArrayDefault() -> Void { #if arch(wasm32) let ret = testIntArrayDefault(values: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -344,7 +344,7 @@ public func _bjs_testIntArrayDefault() -> Void { public func _bjs_testStringArrayDefault() -> Void { #if arch(wasm32) let ret = testStringArrayDefault(names: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -369,7 +369,7 @@ public func _bjs_testStringArrayDefault() -> Void { public func _bjs_testDoubleArrayDefault() -> Void { #if arch(wasm32) let ret = testDoubleArrayDefault(values: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -391,7 +391,7 @@ public func _bjs_testDoubleArrayDefault() -> Void { public func _bjs_testBoolArrayDefault() -> Void { #if arch(wasm32) let ret = testBoolArrayDefault(flags: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -413,7 +413,7 @@ public func _bjs_testBoolArrayDefault() -> Void { public func _bjs_testEmptyArrayDefault() -> Void { #if arch(wasm32) let ret = testEmptyArrayDefault(items: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -435,7 +435,7 @@ public func _bjs_testEmptyArrayDefault() -> Void { public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index cccbbf524..b22bc404b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -423,7 +423,7 @@ extension Priority: _BridgedSwiftEnumNoPayload { public func _bjs_processDelegates() -> Void { #if arch(wasm32) let ret = processDelegates(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -654,7 +654,7 @@ fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { #if arch(wasm32) let ret = DelegateManager(delegates: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -697,7 +697,7 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) DelegateManager.bridgeJSLiftParameter(_self).delegates = { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [AnyMyViewControllerDelegate] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 3f4914ca0..4737a2d50 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -489,15 +489,6 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_pop_array_length") -@_spi(BridgeJS) public func _swift_js_pop_array_length() -> Int32 -#else -@_spi(BridgeJS) public func _swift_js_pop_array_length() -> Int32 { - _onlyAvailableOnWasm() -} -#endif - // MARK: Struct bridging helpers (JS-side lowering/raising) #if arch(wasm32) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 0cc31abc4..1476436ae 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -4567,7 +4567,7 @@ public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutab public func _bjs_arrayWithDefault() -> Int32 { #if arch(wasm32) let ret = arrayWithDefault(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4591,7 +4591,7 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4613,7 +4613,7 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4666,7 +4666,7 @@ public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { public func _bjs_roundTripIntArray() -> Void { #if arch(wasm32) let ret = roundTripIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4688,7 +4688,7 @@ public func _bjs_roundTripIntArray() -> Void { public func _bjs_roundTripStringArray() -> Void { #if arch(wasm32) let ret = roundTripStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4713,7 +4713,7 @@ public func _bjs_roundTripStringArray() -> Void { public func _bjs_roundTripDoubleArray() -> Void { #if arch(wasm32) let ret = roundTripDoubleArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4735,7 +4735,7 @@ public func _bjs_roundTripDoubleArray() -> Void { public func _bjs_roundTripBoolArray() -> Void { #if arch(wasm32) let ret = roundTripBoolArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4757,7 +4757,7 @@ public func _bjs_roundTripBoolArray() -> Void { public func _bjs_roundTripDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripDirectionArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4779,7 +4779,7 @@ public func _bjs_roundTripDirectionArray() -> Void { public func _bjs_roundTripStatusArray() -> Void { #if arch(wasm32) let ret = roundTripStatusArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Status] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4801,7 +4801,7 @@ public func _bjs_roundTripStatusArray() -> Void { public func _bjs_roundTripThemeArray() -> Void { #if arch(wasm32) let ret = roundTripThemeArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Theme] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4826,7 +4826,7 @@ public func _bjs_roundTripThemeArray() -> Void { public func _bjs_roundTripHttpStatusArray() -> Void { #if arch(wasm32) let ret = roundTripHttpStatusArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [HttpStatus] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4848,7 +4848,7 @@ public func _bjs_roundTripHttpStatusArray() -> Void { public func _bjs_roundTripDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripDataPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [DataPoint] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4870,7 +4870,7 @@ public func _bjs_roundTripDataPointArray() -> Void { public func _bjs_roundTripGreeterArray() -> Void { #if arch(wasm32) let ret = roundTripGreeterArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4892,7 +4892,7 @@ public func _bjs_roundTripGreeterArray() -> Void { public func _bjs_roundTripOptionalIntArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4917,7 +4917,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { public func _bjs_roundTripOptionalStringArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4945,7 +4945,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { public func _bjs_roundTripOptionalDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalDataPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4970,7 +4970,7 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { public func _bjs_roundTripOptionalDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalDirectionArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -4995,7 +4995,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { public func _bjs_roundTripOptionalStatusArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalStatusArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5024,7 +5024,7 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { return Optional<[Int]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5055,7 +5055,7 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { return Optional<[String]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5089,7 +5089,7 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { return Optional<[Greeter]>.none } else { return { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5116,12 +5116,12 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { public func _bjs_roundTripNestedIntArray() -> Void { #if arch(wasm32) let ret = roundTripNestedIntArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Int] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5149,12 +5149,12 @@ public func _bjs_roundTripNestedIntArray() -> Void { public func _bjs_roundTripNestedStringArray() -> Void { #if arch(wasm32) let ret = roundTripNestedStringArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [String] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5185,12 +5185,12 @@ public func _bjs_roundTripNestedStringArray() -> Void { public func _bjs_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDoubleArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Double]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Double] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5218,12 +5218,12 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { public func _bjs_roundTripNestedBoolArray() -> Void { #if arch(wasm32) let ret = roundTripNestedBoolArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Bool]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Bool] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5251,12 +5251,12 @@ public func _bjs_roundTripNestedBoolArray() -> Void { public func _bjs_roundTripNestedDataPointArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDataPointArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[DataPoint]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [DataPoint] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5284,12 +5284,12 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { public func _bjs_roundTripNestedDirectionArray() -> Void { #if arch(wasm32) let ret = roundTripNestedDirectionArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Direction]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Direction] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5317,12 +5317,12 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { public func _bjs_roundTripNestedGreeterArray() -> Void { #if arch(wasm32) let ret = roundTripNestedGreeterArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [[Greeter]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { __result.append({ - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [Greeter] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5350,7 +5350,7 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { public func _bjs_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) let ret = roundTripUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [UnsafeRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5372,7 +5372,7 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) let ret = roundTripUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [UnsafeMutableRawPointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5394,7 +5394,7 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { public func _bjs_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) let ret = roundTripOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [OpaquePointer] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5416,7 +5416,7 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { public func _bjs_consumeDataProcessorArrayType() -> Int32 { #if arch(wasm32) let ret = consumeDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [AnyDataProcessor] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { @@ -5436,7 +5436,7 @@ public func _bjs_consumeDataProcessorArrayType() -> Int32 { public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) let ret = roundTripDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_array_length()) + let __count = Int(_swift_js_pop_i32()) var __result: [AnyDataProcessor] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { From 8c82550721aafc8d05dd09f3fe6552bfb74fc8fd Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 2 Feb 2026 19:26:52 +0900 Subject: [PATCH 120/252] BridgeJS: Remove `swift_js_push_array_length` --- Benchmarks/Sources/Generated/BridgeJS.swift | 50 ++++++------- .../Sources/BridgeJSCore/ExportSwift.swift | 2 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 6 -- .../Sources/BridgeJSLink/JSGlueGen.swift | 4 +- .../ArrayParameter.Import.js | 4 -- .../BridgeJSLinkTests/ArrayTypes.Export.js | 54 +++++++------- .../BridgeJSLinkTests/Async.Export.js | 4 -- .../BridgeJSLinkTests/Async.Import.js | 4 -- .../DefaultParameters.Export.js | 14 ++-- .../EnumAssociatedValue.Export.js | 4 -- .../BridgeJSLinkTests/EnumCase.Export.js | 4 -- .../BridgeJSLinkTests/EnumNamespace.Export.js | 4 -- .../EnumNamespace.Global.Export.js | 4 -- .../BridgeJSLinkTests/EnumRawType.Export.js | 4 -- .../GlobalGetter.ImportMacros.js | 4 -- .../GlobalThisImports.ImportMacros.js | 4 -- .../ImportedTypeInExportedInterface.Export.js | 4 -- .../BridgeJSLinkTests/Interface.Import.js | 4 -- .../InvalidPropertyNames.Import.js | 4 -- .../BridgeJSLinkTests/MixedGlobal.Export.js | 4 -- .../BridgeJSLinkTests/MixedModules.Export.js | 4 -- .../BridgeJSLinkTests/MixedPrivate.Export.js | 4 -- .../MultipleImportedTypes.Import.js | 4 -- .../BridgeJSLinkTests/Namespaces.Export.js | 4 -- .../Namespaces.Global.Export.js | 4 -- .../BridgeJSLinkTests/Optionals.Export.js | 4 -- .../PrimitiveParameters.Export.js | 4 -- .../PrimitiveParameters.Import.js | 4 -- .../PrimitiveReturn.Export.js | 4 -- .../PrimitiveReturn.Import.js | 4 -- .../BridgeJSLinkTests/PropertyTypes.Export.js | 4 -- .../BridgeJSLinkTests/Protocol.Export.js | 8 +-- .../BridgeJSLinkTests/ReExportFrom.Import.js | 4 -- .../StaticFunctions.Export.js | 4 -- .../StaticFunctions.Global.Export.js | 4 -- .../StaticProperties.Export.js | 4 -- .../StaticProperties.Global.Export.js | 4 -- .../BridgeJSLinkTests/StringEnum.Import.js | 4 -- .../StringParameter.Export.js | 4 -- .../StringParameter.Import.js | 4 -- .../BridgeJSLinkTests/StringReturn.Export.js | 4 -- .../BridgeJSLinkTests/StringReturn.Import.js | 4 -- .../BridgeJSLinkTests/SwiftClass.Export.js | 4 -- .../BridgeJSLinkTests/SwiftClosure.Export.js | 4 -- .../SwiftClosureImports.ImportMacros.js | 4 -- .../BridgeJSLinkTests/SwiftStruct.Export.js | 4 -- .../SwiftStructImports.ImportMacros.js | 4 -- .../TS2SkeletonLike.Import.js | 4 -- .../BridgeJSLinkTests/Throws.Export.js | 4 -- .../BridgeJSLinkTests/TypeAlias.Import.js | 4 -- .../TypeScriptClass.Import.js | 4 -- .../BridgeJSLinkTests/UnsafePointer.Export.js | 4 -- .../VoidParameterVoidReturn.Export.js | 4 -- .../VoidParameterVoidReturn.Import.js | 4 -- .../ExportSwiftTests/ArrayTypes.swift | 50 ++++++------- .../ExportSwiftTests/DefaultParameters.swift | 10 +-- .../ExportSwiftTests/Protocol.swift | 4 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 11 --- .../Generated/BridgeJS.swift | 72 +++++++++---------- 59 files changed, 127 insertions(+), 346 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index a582a1bed..5572db46e 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -1509,7 +1509,7 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1531,7 +1531,7 @@ public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPoint }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1544,7 +1544,7 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1576,7 +1576,7 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1598,7 +1598,7 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1633,7 +1633,7 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1658,7 +1658,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1690,7 +1690,7 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1712,7 +1712,7 @@ public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPoi }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1725,7 +1725,7 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1767,8 +1767,8 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1800,8 +1800,8 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1843,8 +1843,8 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1876,8 +1876,8 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1912,7 +1912,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1937,7 +1937,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1972,7 +1972,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1997,7 +1997,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -2037,7 +2037,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -2053,7 +2053,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -2084,7 +2084,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 62c0475ea..567b16ee0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1014,7 +1014,7 @@ struct StackCodegen { } statements.append("}") - statements.append("_swift_js_push_array_length(Int32(\(raw: accessor).count))") + statements.append("_swift_js_push_int(Int32(\(raw: accessor).count))") return statements } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 8c2cbe474..be120d4c8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -256,7 +256,6 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", - "let \(JSGlueVariableScope.reservedTmpRetArrayLengths) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", "", @@ -440,11 +439,6 @@ public struct BridgeJSLink { printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") } printer.write("}") - printer.write("bjs[\"swift_js_push_array_length\"] = function(len) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);") - } - printer.write("}") printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") printer.indent { printer.write("if (cleanupId === 0) { return; }") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 5ff651282..28f756a43 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -31,7 +31,6 @@ final class JSGlueVariableScope { static let reservedTmpRetPointers = "tmpRetPointers" static let reservedTmpParamPointers = "tmpParamPointers" static let reservedTmpStructCleanups = "tmpStructCleanups" - static let reservedTmpRetArrayLengths = "tmpRetArrayLengths" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" @@ -61,7 +60,6 @@ final class JSGlueVariableScope { reservedTmpRetPointers, reservedTmpParamPointers, reservedTmpStructCleanups, - reservedTmpRetArrayLengths, reservedEnumHelpers, reservedStructHelpers, ] @@ -2186,7 +2184,7 @@ struct IntrinsicJSFragment: Sendable { let lenVar = scope.variable("arrayLen") let iVar = scope.variable("i") - printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetArrayLengths).pop();") + printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") printer.write("const \(resultVar) = [];") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") printer.indent { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index be84c1438..cb77759da 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js index 89c574bb3..5abce72bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js @@ -42,7 +42,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -129,9 +128,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -300,7 +296,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processIntArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const int = tmpRetInts.pop(); @@ -323,7 +319,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processStringArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const string = tmpRetStrings.pop(); @@ -340,7 +336,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processDoubleArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const f64 = tmpRetF64s.pop(); @@ -357,7 +353,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processBoolArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const bool = tmpRetInts.pop() !== 0; @@ -377,7 +373,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(points.length); instance.exports.bjs_processPointArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); @@ -394,7 +390,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(directions.length); instance.exports.bjs_processDirectionArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const caseId = tmpRetInts.pop(); @@ -411,7 +407,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(statuses.length); instance.exports.bjs_processStatusArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const rawValue = tmpRetInts.pop(); @@ -455,7 +451,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processUnsafeRawPointerArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const pointer = tmpRetPointers.pop(); @@ -472,7 +468,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processUnsafeMutableRawPointerArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const pointer = tmpRetPointers.pop(); @@ -489,7 +485,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processOpaquePointerArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const pointer = tmpRetPointers.pop(); @@ -512,7 +508,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processOptionalIntArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const isSome1 = tmpRetInts.pop(); @@ -547,7 +543,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processOptionalStringArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const isSome1 = tmpRetInts.pop(); @@ -579,7 +575,7 @@ export async function createInstantiator(options, swift) { const isSome1 = tmpRetInts.pop(); let optResult; if (isSome1) { - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const int = tmpRetInts.pop(); @@ -606,7 +602,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(points.length); instance.exports.bjs_processOptionalPointArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const isSome1 = tmpRetInts.pop(); @@ -636,7 +632,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(directions.length); instance.exports.bjs_processOptionalDirectionArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const isSome1 = tmpRetInts.pop(); @@ -666,7 +662,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(statuses.length); instance.exports.bjs_processOptionalStatusArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const isSome1 = tmpRetInts.pop(); @@ -697,10 +693,10 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processNestedIntArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayLen1 = tmpRetInts.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const int = tmpRetInts.pop(); @@ -733,10 +729,10 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_processNestedStringArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayLen1 = tmpRetInts.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const string = tmpRetStrings.pop(); @@ -766,10 +762,10 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(points.length); instance.exports.bjs_processNestedPointArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayLen1 = tmpRetInts.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); @@ -789,7 +785,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(items.length); instance.exports.bjs_processItemArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const ptr = tmpRetPointers.pop(); @@ -814,10 +810,10 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(items.length); instance.exports.bjs_processNestedItemArray(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetArrayLengths.pop(); + const arrayLen1 = tmpRetInts.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const ptr = tmpRetPointers.pop(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index a83274e1a..afdd6e578 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index ff3551e31..50b71fef0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index 6b9785933..dfbf187f8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -35,7 +35,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -155,9 +154,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -564,7 +560,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_testIntArrayDefault(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const int = tmpRetInts.pop(); @@ -587,7 +583,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(names.length); instance.exports.bjs_testStringArrayDefault(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const string = tmpRetStrings.pop(); @@ -604,7 +600,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(values.length); instance.exports.bjs_testDoubleArrayDefault(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const f64 = tmpRetF64s.pop(); @@ -621,7 +617,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(flags.length); instance.exports.bjs_testBoolArrayDefault(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const bool = tmpRetInts.pop() !== 0; @@ -638,7 +634,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(items.length); instance.exports.bjs_testEmptyArrayDefault(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const int = tmpRetInts.pop(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index d1bf82d39..ff6813db9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -504,7 +504,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -577,9 +576,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 5b5a631cd..1858b6aed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -53,7 +53,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -126,9 +125,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 936080db8..457b71af3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -54,7 +54,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -127,9 +126,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 9e4b57dbe..6c3e7b2cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -73,7 +73,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -146,9 +145,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 1ef43bd79..9189b3e5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -104,7 +104,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -177,9 +176,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index ac53d326f..1b48c018b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js index 724df077e..98b94270c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index 231873ab0..6f835d8e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index b1dd75c44..48959038e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 50de3378c..1908f78c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index d11b74338..bbd8acf95 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index f39b6209b..7328c7978 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index a78095948..df5a2824d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index d6adac3c0..be1baccad 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index 5342ac94e..b843caf53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index e262b76fc..c13941e40 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index df4337f5f..159667388 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index ccde5f78f..e14c49547 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 4d7787868..3bf604348 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 35069b2e4..04be2979b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index c07676bc4..a24360f8e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 7e5e3c1ca..917a0e17b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index 6d51db5e6..b25433743 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -93,7 +93,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -166,9 +165,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; @@ -709,7 +705,7 @@ export async function createInstantiator(options, swift) { } get delegates() { instance.exports.bjs_DelegateManager_delegates_get(this.pointer); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const objId = tmpRetInts.pop(); @@ -743,7 +739,7 @@ export async function createInstantiator(options, swift) { } tmpParamInts.push(delegates.length); instance.exports.bjs_processDelegates(); - const arrayLen = tmpRetArrayLengths.pop(); + const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const objId1 = tmpRetInts.pop(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index 3a3cc4fd6..7ece6c8f4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index cdf2e4d80..85aa83fe4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -80,7 +80,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -153,9 +152,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 51833fee1..3ba252268 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -80,7 +80,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -153,9 +152,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 91ced0c67..7cba70388 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -34,7 +34,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index c374d9a6f..4e621547a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -34,7 +34,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -107,9 +106,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index a836bf2b5..5feacfdac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index 9a9c9cdc2..c3ed2fbbd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index 9ebd38074..de72a94c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index cfe649726..05a0206ea 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index 75c9a1d47..2a60e1aba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index e7f76436c..8af3295cf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index 9d18cd143..ee89aa98d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -131,7 +131,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -204,9 +203,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index a51be1c96..7ff9cc0b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 745998d8e..36b0d1685 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -34,7 +34,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -296,9 +295,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 916be5c96..7102f173e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -117,9 +116,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index d87b8b6cb..97cf902e7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 8c039e374..202a39045 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index 94012ee5d..b6cab607b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 01646bc60..97204e7d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index 1b7fd5ceb..737fd1867 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -122,9 +121,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index bc542c373..b50901edd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -102,9 +101,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index 7f99e811e..bcda74570 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetPointers = []; let tmpParamPointers = []; let tmpStructCleanups = []; - let tmpRetArrayLengths = []; const enumHelpers = {}; const structHelpers = {}; @@ -103,9 +102,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return tmpParamPointers.pop(); } - bjs["swift_js_push_array_length"] = function(len) { - tmpRetArrayLengths.push(len | 0); - } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } const index = (cleanupId | 0) - 1; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift index 7c0d12892..19971fc0b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -105,7 +105,7 @@ public func _bjs_processIntArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -130,7 +130,7 @@ public func _bjs_processStringArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -152,7 +152,7 @@ public func _bjs_processDoubleArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -174,7 +174,7 @@ public func _bjs_processBoolArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -196,7 +196,7 @@ public func _bjs_processPointArray() -> Void { }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -218,7 +218,7 @@ public func _bjs_processDirectionArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -240,7 +240,7 @@ public func _bjs_processStatusArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -302,7 +302,7 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -324,7 +324,7 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -346,7 +346,7 @@ public func _bjs_processOpaquePointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -371,7 +371,7 @@ public func _bjs_processOptionalIntArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -399,7 +399,7 @@ public func _bjs_processOptionalStringArray() -> Void { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -429,7 +429,7 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -455,7 +455,7 @@ public func _bjs_processOptionalPointArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -480,7 +480,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -505,7 +505,7 @@ public func _bjs_processOptionalStatusArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -537,8 +537,8 @@ public func _bjs_processNestedIntArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -573,8 +573,8 @@ public func _bjs_processNestedStringArray() -> Void { __bjs_ret_elem_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -606,8 +606,8 @@ public func _bjs_processNestedPointArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -629,7 +629,7 @@ public func _bjs_processItemArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -661,8 +661,8 @@ public func _bjs_processNestedItemArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index b60a3c782..6827af228 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -333,7 +333,7 @@ public func _bjs_testIntArrayDefault() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -358,7 +358,7 @@ public func _bjs_testStringArrayDefault() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -380,7 +380,7 @@ public func _bjs_testDoubleArrayDefault() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -402,7 +402,7 @@ public func _bjs_testBoolArrayDefault() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -424,7 +424,7 @@ public func _bjs_testEmptyArrayDefault() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index b22bc404b..02a202268 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -434,7 +434,7 @@ public func _bjs_processDelegates() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -686,7 +686,7 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates for __bjs_elem_ret in ret { _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 4737a2d50..0bf62648c 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -478,17 +478,6 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif -// MARK: Array length operations - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_push_array_length") -@_spi(BridgeJS) public func _swift_js_push_array_length(_ length: Int32) -#else -@_spi(BridgeJS) public func _swift_js_push_array_length(_ length: Int32) { - _onlyAvailableOnWasm() -} -#endif - // MARK: Struct bridging helpers (JS-side lowering/raising) #if arch(wasm32) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 1476436ae..e9b2aa903 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -4677,7 +4677,7 @@ public func _bjs_roundTripIntArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4702,7 +4702,7 @@ public func _bjs_roundTripStringArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4724,7 +4724,7 @@ public func _bjs_roundTripDoubleArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4746,7 +4746,7 @@ public func _bjs_roundTripBoolArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4768,7 +4768,7 @@ public func _bjs_roundTripDirectionArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4790,7 +4790,7 @@ public func _bjs_roundTripStatusArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4815,7 +4815,7 @@ public func _bjs_roundTripThemeArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4837,7 +4837,7 @@ public func _bjs_roundTripHttpStatusArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4859,7 +4859,7 @@ public func _bjs_roundTripDataPointArray() -> Void { }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4881,7 +4881,7 @@ public func _bjs_roundTripGreeterArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4906,7 +4906,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4934,7 +4934,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4959,7 +4959,7 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4984,7 +4984,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5009,7 +5009,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5039,7 +5039,7 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5073,7 +5073,7 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5104,7 +5104,7 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5137,8 +5137,8 @@ public func _bjs_roundTripNestedIntArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5173,8 +5173,8 @@ public func _bjs_roundTripNestedStringArray() -> Void { __bjs_ret_elem_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5206,8 +5206,8 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_f64(__bjs_elem_ret_elem)} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5239,8 +5239,8 @@ public func _bjs_roundTripNestedBoolArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(__bjs_elem_ret_elem ? 1 : 0)} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5272,8 +5272,8 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5305,8 +5305,8 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_int(Int32(__bjs_elem_ret_elem.bridgeJSLowerParameter()))} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5338,8 +5338,8 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(__bjs_elem_ret.count))} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(__bjs_elem_ret.count))} + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5361,7 +5361,7 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5383,7 +5383,7 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5405,7 +5405,7 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5447,7 +5447,7 @@ public func _bjs_roundTripDataProcessorArrayType() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_int((__bjs_elem_ret as! AnyDataProcessor).bridgeJSLowerReturn())} - _swift_js_push_array_length(Int32(ret.count)) + _swift_js_push_int(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif From e604fa6707143373082aba77326ef4ca75ba0e28 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 2 Feb 2026 19:28:34 +0900 Subject: [PATCH 121/252] BridgeJS: Rename swift_js_push_int -> swift_js_push_i32 --- Benchmarks/Sources/Generated/BridgeJS.swift | 134 ++++----- .../Sources/BridgeJSCore/ExportSwift.swift | 28 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 2 +- .../ArrayParameter.Import.js | 2 +- .../BridgeJSLinkTests/ArrayTypes.Export.js | 2 +- .../BridgeJSLinkTests/Async.Export.js | 2 +- .../BridgeJSLinkTests/Async.Import.js | 2 +- .../DefaultParameters.Export.js | 2 +- .../EnumAssociatedValue.Export.js | 2 +- .../BridgeJSLinkTests/EnumCase.Export.js | 2 +- .../BridgeJSLinkTests/EnumNamespace.Export.js | 2 +- .../EnumNamespace.Global.Export.js | 2 +- .../BridgeJSLinkTests/EnumRawType.Export.js | 2 +- .../GlobalGetter.ImportMacros.js | 2 +- .../GlobalThisImports.ImportMacros.js | 2 +- .../ImportedTypeInExportedInterface.Export.js | 2 +- .../BridgeJSLinkTests/Interface.Import.js | 2 +- .../InvalidPropertyNames.Import.js | 2 +- .../BridgeJSLinkTests/MixedGlobal.Export.js | 2 +- .../BridgeJSLinkTests/MixedModules.Export.js | 2 +- .../BridgeJSLinkTests/MixedPrivate.Export.js | 2 +- .../MultipleImportedTypes.Import.js | 2 +- .../BridgeJSLinkTests/Namespaces.Export.js | 2 +- .../Namespaces.Global.Export.js | 2 +- .../BridgeJSLinkTests/Optionals.Export.js | 2 +- .../PrimitiveParameters.Export.js | 2 +- .../PrimitiveParameters.Import.js | 2 +- .../PrimitiveReturn.Export.js | 2 +- .../PrimitiveReturn.Import.js | 2 +- .../BridgeJSLinkTests/PropertyTypes.Export.js | 2 +- .../BridgeJSLinkTests/Protocol.Export.js | 2 +- .../BridgeJSLinkTests/ReExportFrom.Import.js | 2 +- .../StaticFunctions.Export.js | 2 +- .../StaticFunctions.Global.Export.js | 2 +- .../StaticProperties.Export.js | 2 +- .../StaticProperties.Global.Export.js | 2 +- .../BridgeJSLinkTests/StringEnum.Import.js | 2 +- .../StringParameter.Export.js | 2 +- .../StringParameter.Import.js | 2 +- .../BridgeJSLinkTests/StringReturn.Export.js | 2 +- .../BridgeJSLinkTests/StringReturn.Import.js | 2 +- .../BridgeJSLinkTests/SwiftClass.Export.js | 2 +- .../BridgeJSLinkTests/SwiftClosure.Export.js | 2 +- .../SwiftClosureImports.ImportMacros.js | 2 +- .../BridgeJSLinkTests/SwiftStruct.Export.js | 2 +- .../SwiftStructImports.ImportMacros.js | 2 +- .../TS2SkeletonLike.Import.js | 2 +- .../BridgeJSLinkTests/Throws.Export.js | 2 +- .../BridgeJSLinkTests/TypeAlias.Import.js | 2 +- .../TypeScriptClass.Import.js | 2 +- .../BridgeJSLinkTests/UnsafePointer.Export.js | 2 +- .../VoidParameterVoidReturn.Export.js | 2 +- .../VoidParameterVoidReturn.Import.js | 2 +- .../ExportSwiftTests/ArrayTypes.swift | 80 ++--- .../ExportSwiftTests/DefaultParameters.swift | 20 +- .../EnumAssociatedValue.swift | 92 +++--- .../ExportSwiftTests/Protocol.swift | 12 +- .../StaticFunctions.Global.swift | 4 +- .../ExportSwiftTests/StaticFunctions.swift | 4 +- .../ExportSwiftTests/SwiftClosure.swift | 8 +- .../ExportSwiftTests/SwiftStruct.swift | 20 +- Plugins/PackageToJS/Templates/instantiate.js | 2 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 10 +- .../Generated/BridgeJS.swift | 284 +++++++++--------- 64 files changed, 400 insertions(+), 400 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 5572db46e..86f4c87dc 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -38,10 +38,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) case .flag(let param0): - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) return Int32(2) case .rate(let param0): _swift_js_push_f32(param0) @@ -74,10 +74,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) case .rate(let param0): _swift_js_push_tag(Int32(3)) _swift_js_push_f32(param0) @@ -127,7 +127,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) case .location(let param0, let param1, let param2): _swift_js_push_f64(param0) @@ -138,8 +138,8 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } return Int32(2) case .status(let param0, let param1, let param2): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -151,10 +151,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -199,7 +199,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) case .location(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) _swift_js_push_f64(param0) @@ -210,8 +210,8 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(3)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -223,10 +223,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(5)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -262,8 +262,8 @@ extension SimpleStruct: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.count)) - _swift_js_push_int(self.flag ? 1 : 0) + _swift_js_push_i32(Int32(self.count)) + _swift_js_push_i32(self.flag ? 1 : 0) _swift_js_push_f32(self.rate) _swift_js_push_f64(self.precise) } @@ -318,7 +318,7 @@ extension Address: _BridgedSwiftStruct { __bjs_city.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.zipCode)) + _swift_js_push_i32(Int32(self.zipCode)) } init(unsafelyCopying jsObject: JSObject) { @@ -368,7 +368,7 @@ extension Person: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.age)) + _swift_js_push_i32(Int32(self.age)) self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { @@ -377,7 +377,7 @@ extension Person: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -425,12 +425,12 @@ extension ComplexStruct: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) var __bjs_title = self.title __bjs_title.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(self.active ? 1 : 0) + _swift_js_push_i32(self.active ? 1 : 0) _swift_js_push_f64(self.score) var __bjs_tags = self.tags __bjs_tags.withUTF8 { ptr in @@ -1508,8 +1508,8 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1530,8 +1530,8 @@ public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPoint return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1543,8 +1543,8 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1576,7 +1576,7 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1598,7 +1598,7 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1633,7 +1633,7 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1658,7 +1658,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1690,7 +1690,7 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1712,7 +1712,7 @@ public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPoi }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1725,7 +1725,7 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1766,9 +1766,9 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1799,9 +1799,9 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa }()) for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1843,8 +1843,8 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1876,8 +1876,8 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1910,9 +1910,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1935,9 +1935,9 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1971,8 +1971,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -1996,8 +1996,8 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -2036,9 +2036,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -2052,9 +2052,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -2083,9 +2083,9 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 567b16ee0..d7d5c8200 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -946,24 +946,24 @@ struct StackCodegen { "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", ] case .int, .uint: - return ["_swift_js_push_int(Int32(\(raw: accessor)))"] + return ["_swift_js_push_i32(Int32(\(raw: accessor)))"] case .bool: - return ["_swift_js_push_int(\(raw: accessor) ? 1 : 0)"] + return ["_swift_js_push_i32(\(raw: accessor) ? 1 : 0)"] case .float: return ["_swift_js_push_f32(\(raw: accessor))"] case .double: return ["_swift_js_push_f64(\(raw: accessor))"] case .jsObject: - return ["_swift_js_push_int(\(raw: accessor).bridgeJSLowerReturn())"] + return ["_swift_js_push_i32(\(raw: accessor).bridgeJSLowerReturn())"] case .swiftHeapObject: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .unsafePointer: return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .swiftProtocol(let protocolName): let wrapperName = "Any\(protocolName)" - return ["_swift_js_push_int((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"] + return ["_swift_js_push_i32((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"] case .caseEnum: - return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -976,7 +976,7 @@ struct StackCodegen { case .double: return ["_swift_js_push_f64(\(raw: accessor).bridgeJSLowerParameter())"] default: - return ["_swift_js_push_int(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] + return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] } case .associatedValueEnum: return ["\(raw: accessor).bridgeJSLowerReturn()"] @@ -1014,7 +1014,7 @@ struct StackCodegen { } statements.append("}") - statements.append("_swift_js_push_int(Int32(\(raw: accessor).count))") + statements.append("_swift_js_push_i32(Int32(\(raw: accessor).count))") return statements } @@ -1037,7 +1037,7 @@ struct StackCodegen { } statements.append("}") - statements.append("_swift_js_push_int(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") + statements.append("_swift_js_push_i32(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") return statements } @@ -1053,15 +1053,15 @@ struct StackCodegen { "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", ] case .int, .uint: - return ["_swift_js_push_int(Int32(\(raw: unwrappedVar)))"] + return ["_swift_js_push_i32(Int32(\(raw: unwrappedVar)))"] case .bool: - return ["_swift_js_push_int(\(raw: unwrappedVar) ? 1 : 0)"] + return ["_swift_js_push_i32(\(raw: unwrappedVar) ? 1 : 0)"] case .float: return ["_swift_js_push_f32(\(raw: unwrappedVar))"] case .double: return ["_swift_js_push_f64(\(raw: unwrappedVar))"] case .caseEnum: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -1074,16 +1074,16 @@ struct StackCodegen { case .double: return ["_swift_js_push_f64(\(raw: unwrappedVar).bridgeJSLowerParameter())"] default: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] } case .swiftStruct: return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] case .swiftHeapObject: return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"] case .associatedValueEnum: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerParameter())"] + return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .jsObject: - return ["_swift_js_push_int(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerReturn())"] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) default: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index be120d4c8..60b55cd47 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -390,7 +390,7 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedTmpRetTag) = tag;") } printer.write("}") - printer.write("bjs[\"swift_js_push_int\"] = function(v) {") + printer.write("bjs[\"swift_js_push_i32\"] = function(v) {") printer.indent { printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(v | 0);") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js index cb77759da..8add18b9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js index 5abce72bb..7388f4150 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js @@ -99,7 +99,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js index afdd6e578..4015b6261 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js index 50b71fef0..981cecbe5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js index dfbf187f8..978272568 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js @@ -125,7 +125,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js index ff6813db9..2d8dbc0ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js @@ -547,7 +547,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js index 1858b6aed..89a0f0897 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js @@ -96,7 +96,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index 457b71af3..b01148873 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -97,7 +97,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 6c3e7b2cd..77c327e8d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -116,7 +116,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js index 9189b3e5a..c1865adfc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js @@ -147,7 +147,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js index 1b48c018b..b3b809476 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js index 98b94270c..35a3d76ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js index 6f835d8e8..094c2241d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js index 48959038e..1d25a2954 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js index 1908f78c0..833436226 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js index bbd8acf95..f079de1da 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js index 7328c7978..2c43b91e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js index df5a2824d..4b8ce8a66 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js index be1baccad..f8cfd7366 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js index b843caf53..ae7bf7451 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js index c13941e40..671868eab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js index 159667388..2c08e3d9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js index e14c49547..0a92510f7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js index 3bf604348..fe6c3ae04 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js index 04be2979b..836a82f21 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js index a24360f8e..e3263af05 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js index 917a0e17b..fc13a471a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js index b25433743..24c02750f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js @@ -136,7 +136,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js index 7ece6c8f4..94e22ffc4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js index 85aa83fe4..8b5a54315 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js @@ -123,7 +123,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js index 3ba252268..e7bebfe6c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js @@ -123,7 +123,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js index 7cba70388..ee127ed07 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js @@ -77,7 +77,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js index 4e621547a..9806fc631 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js @@ -77,7 +77,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js index 5feacfdac..373b433b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js index c3ed2fbbd..021adcba3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js index de72a94c0..718f776c7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js index 05a0206ea..479b313dd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js index 2a60e1aba..bb5278068 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js index 8af3295cf..d04cd6507 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js index ee89aa98d..40378d042 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js @@ -174,7 +174,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js index 7ff9cc0b5..9ab218df1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js index 36b0d1685..a3d60d0bd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js @@ -266,7 +266,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js index 7102f173e..f4e7e61e9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js @@ -87,7 +87,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js index 97cf902e7..45c273115 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js index 202a39045..5a492295a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js index b6cab607b..406d7f0f3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js index 97204e7d7..d83919051 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js index 737fd1867..2ac28b7e9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js @@ -92,7 +92,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js index b50901edd..8a2fabca9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js @@ -72,7 +72,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js index bcda74570..2944bcf5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js @@ -73,7 +73,7 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_tag"] = function(tag) { tmpRetTag = tag; } - bjs["swift_js_push_int"] = function(v) { + bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift index 19971fc0b..711694c9d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -104,8 +104,8 @@ public func _bjs_processIntArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -130,7 +130,7 @@ public func _bjs_processStringArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -152,7 +152,7 @@ public func _bjs_processDoubleArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -173,8 +173,8 @@ public func _bjs_processBoolArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -196,7 +196,7 @@ public func _bjs_processPointArray() -> Void { }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -217,8 +217,8 @@ public func _bjs_processDirectionArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -239,8 +239,8 @@ public func _bjs_processStatusArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -302,7 +302,7 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -324,7 +324,7 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -346,7 +346,7 @@ public func _bjs_processOpaquePointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -369,9 +369,9 @@ public func _bjs_processOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -398,8 +398,8 @@ public func _bjs_processOptionalStringArray() -> Void { __bjs_str_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -428,9 +428,9 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -454,8 +454,8 @@ public func _bjs_processOptionalPointArray() -> Void { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -478,9 +478,9 @@ public func _bjs_processOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -503,9 +503,9 @@ public func _bjs_processOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -536,9 +536,9 @@ public func _bjs_processNestedIntArray() -> Void { }()) for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -573,8 +573,8 @@ public func _bjs_processNestedStringArray() -> Void { __bjs_ret_elem_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -606,8 +606,8 @@ public func _bjs_processNestedPointArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -629,7 +629,7 @@ public func _bjs_processItemArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -661,8 +661,8 @@ public func _bjs_processNestedItemArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 6827af228..5232bdd53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -50,8 +50,8 @@ extension Config: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.value)) - _swift_js_push_int(self.enabled ? 1 : 0) + _swift_js_push_i32(Int32(self.value)) + _swift_js_push_i32(self.enabled ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -332,8 +332,8 @@ public func _bjs_testIntArrayDefault() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -358,7 +358,7 @@ public func _bjs_testStringArrayDefault() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -380,7 +380,7 @@ public func _bjs_testDoubleArrayDefault() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -401,8 +401,8 @@ public func _bjs_testBoolArrayDefault() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -423,8 +423,8 @@ public func _bjs_testEmptyArrayDefault() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index fa9e791ee..e35da2f77 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -29,10 +29,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) case .flag(let param0): - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) return Int32(2) case .rate(let param0): _swift_js_push_f32(param0) @@ -65,10 +65,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) case .rate(let param0): _swift_js_push_tag(Int32(3)) _swift_js_push_f32(param0) @@ -116,11 +116,11 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -132,10 +132,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) return Int32(3) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -180,11 +180,11 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -196,10 +196,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(4)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -249,11 +249,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -286,11 +286,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -326,7 +326,7 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) } } @@ -355,7 +355,7 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) } } } @@ -386,31 +386,31 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { var __bjs_str_param2 = __bjs_unwrapped_param2 @@ -418,7 +418,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) } } @@ -444,31 +444,31 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { var __bjs_str_param2 = __bjs_unwrapped_param2 @@ -476,7 +476,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 02a202268..0558e2a1f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -385,7 +385,7 @@ extension Result: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) } } @@ -410,7 +410,7 @@ extension Result: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) } } } @@ -433,8 +433,8 @@ public func _bjs_processDelegates() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -685,8 +685,8 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) #if arch(wasm32) let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates for __bjs_elem_ret in ret { - _swift_js_push_int((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 6d1f56f50..378eff8bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -67,7 +67,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) } } @@ -92,7 +92,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 6d1f56f50..378eff8bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -67,7 +67,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) } } @@ -92,7 +92,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index feddadf15..415aa54f6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -704,10 +704,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) case .flag(let param0): - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) return Int32(2) case .rate(let param0): _swift_js_push_f32(param0) @@ -740,10 +740,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) case .rate(let param0): _swift_js_push_tag(Int32(3)) _swift_js_push_f32(param0) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index 35fbe039c..af4428979 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -20,14 +20,14 @@ extension DataPoint: _BridgedSwiftStruct { } let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - _swift_js_push_int(Int32(__bjs_unwrapped_optCount)) + _swift_js_push_i32(Int32(__bjs_unwrapped_optCount)) } - _swift_js_push_int(__bjs_isSome_optCount ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - _swift_js_push_int(__bjs_unwrapped_optFlag ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_optFlag ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -93,9 +93,9 @@ extension Address: _BridgedSwiftStruct { } let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - _swift_js_push_int(Int32(__bjs_unwrapped_zipCode)) + _swift_js_push_i32(Int32(__bjs_unwrapped_zipCode)) } - _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -145,7 +145,7 @@ extension Person: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.age)) + _swift_js_push_i32(Int32(self.age)) self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { @@ -154,7 +154,7 @@ extension Person: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -198,7 +198,7 @@ extension Session: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) _swift_js_push_pointer(self.owner.bridgeJSLowerReturn()) } @@ -250,7 +250,7 @@ extension Measurement: _BridgedSwiftStruct { if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 462df924b..54a7212c6 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -40,7 +40,7 @@ async function createInstantiator(options, swift) { swift_js_retain: unexpectedBjsCall, swift_js_release: unexpectedBjsCall, swift_js_push_tag: unexpectedBjsCall, - swift_js_push_int: unexpectedBjsCall, + swift_js_push_i32: unexpectedBjsCall, swift_js_push_f32: unexpectedBjsCall, swift_js_push_f64: unexpectedBjsCall, swift_js_push_string: unexpectedBjsCall, diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 0bf62648c..1e7893c82 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -425,10 +425,10 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_push_int") -@_spi(BridgeJS) public func _swift_js_push_int(_ value: Int32) +@_extern(wasm, module: "bjs", name: "swift_js_push_i32") +@_spi(BridgeJS) public func _swift_js_push_i32(_ value: Int32) #else -@_spi(BridgeJS) public func _swift_js_push_int(_ value: Int32) { +@_spi(BridgeJS) public func _swift_js_push_i32(_ value: Int32) { _onlyAvailableOnWasm() } #endif @@ -1491,10 +1491,10 @@ extension Optional where Wrapped: _BridgedSwiftStruct { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { switch consume self { case .none: - _swift_js_push_int(0) // Push only isSome=0 (no struct fields) + _swift_js_push_i32(0) // Push only isSome=0 (no struct fields) case .some(let value): value.bridgeJSLowerReturn() // Push all struct fields FIRST - _swift_js_push_int(1) // Then push isSome=1 LAST (so it's popped FIRST by JS) + _swift_js_push_i32(1) // Then push isSome=1 LAST (so it's popped FIRST by JS) } } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index e9b2aa903..35a53805d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1465,10 +1465,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } return Int32(0) case .failure(let param0): - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) return Int32(1) case .flag(let param0): - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) return Int32(2) case .rate(let param0): _swift_js_push_f32(param0) @@ -1501,10 +1501,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_int(Int32(param0)) + _swift_js_push_i32(Int32(param0)) case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) + _swift_js_push_i32(param0 ? 1 : 0) case .rate(let param0): _swift_js_push_tag(Int32(3)) _swift_js_push_f32(param0) @@ -1554,7 +1554,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) case .location(let param0, let param1, let param2): _swift_js_push_f64(param0) @@ -1565,8 +1565,8 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } return Int32(2) case .status(let param0, let param1, let param2): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -1578,10 +1578,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -1626,7 +1626,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) case .location(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) _swift_js_push_f64(param0) @@ -1637,8 +1637,8 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(3)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -1650,10 +1650,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_f64(param2) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(5)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(param1 ? 1 : 0) - _swift_js_push_int(Int32(param2)) - _swift_js_push_int(Int32(param3)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(param1 ? 1 : 0) + _swift_js_push_i32(Int32(param2)) + _swift_js_push_i32(Int32(param3)) _swift_js_push_f64(param4) _swift_js_push_f64(param5) var __bjs_param6 = param6 @@ -1703,11 +1703,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -1740,11 +1740,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_int(param0 ? 1 : 0) - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(param0 ? 1 : 0) + _swift_js_push_i32(Int32(param1)) var __bjs_param2 = param2 __bjs_param2.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) @@ -1780,7 +1780,7 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) return Int32(1) } } @@ -1809,7 +1809,7 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { __bjs_param0.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(param1)) + _swift_js_push_i32(Int32(param1)) } } } @@ -1840,31 +1840,31 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { var __bjs_str_param2 = __bjs_unwrapped_param2 @@ -1872,7 +1872,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) } } @@ -1898,31 +1898,31 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(Int32(__bjs_unwrapped_param0)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(__bjs_unwrapped_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_int(__bjs_unwrapped_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_int(Int32(__bjs_unwrapped_param1)) + _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) } - _swift_js_push_int(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { var __bjs_str_param2 = __bjs_unwrapped_param2 @@ -1930,7 +1930,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) } } } @@ -2226,8 +2226,8 @@ extension Point: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.x)) - _swift_js_push_int(Int32(self.y)) + _swift_js_push_i32(Int32(self.x)) + _swift_js_push_i32(Int32(self.y)) } init(unsafelyCopying jsObject: JSObject) { @@ -2344,14 +2344,14 @@ extension DataPoint: _BridgedSwiftStruct { } let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - _swift_js_push_int(Int32(__bjs_unwrapped_optCount)) + _swift_js_push_i32(Int32(__bjs_unwrapped_optCount)) } - _swift_js_push_int(__bjs_isSome_optCount ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - _swift_js_push_int(__bjs_unwrapped_optFlag ? 1 : 0) + _swift_js_push_i32(__bjs_unwrapped_optFlag ? 1 : 0) } - _swift_js_push_int(__bjs_isSome_optFlag ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2417,9 +2417,9 @@ extension Address: _BridgedSwiftStruct { } let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - _swift_js_push_int(Int32(__bjs_unwrapped_zipCode)) + _swift_js_push_i32(Int32(__bjs_unwrapped_zipCode)) } - _swift_js_push_int(__bjs_isSome_zipCode ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2470,7 +2470,7 @@ extension Contact: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.age)) + _swift_js_push_i32(Int32(self.age)) self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { @@ -2479,12 +2479,12 @@ extension Contact: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_email ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) let __bjs_isSome_secondaryAddress = self.secondaryAddress != nil if let __bjs_unwrapped_secondaryAddress = self.secondaryAddress { __bjs_unwrapped_secondaryAddress.bridgeJSLowerReturn() } - _swift_js_push_int(__bjs_isSome_secondaryAddress ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_secondaryAddress ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2541,13 +2541,13 @@ extension Config: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_theme ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_theme ? 1 : 0) let __bjs_isSome_direction = self.direction != nil if let __bjs_unwrapped_direction = self.direction { - _swift_js_push_int(__bjs_unwrapped_direction.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_direction.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_direction ? 1 : 0) - _swift_js_push_int(Int32(self.status.bridgeJSLowerParameter())) + _swift_js_push_i32(__bjs_isSome_direction ? 1 : 0) + _swift_js_push_i32(Int32(self.status.bridgeJSLowerParameter())) } init(unsafelyCopying jsObject: JSObject) { @@ -2591,12 +2591,12 @@ extension SessionData: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) let __bjs_isSome_owner = self.owner != nil if let __bjs_unwrapped_owner = self.owner { _swift_js_push_pointer(__bjs_unwrapped_owner.bridgeJSLowerReturn()) } - _swift_js_push_int(__bjs_isSome_owner ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_owner ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2642,18 +2642,18 @@ extension ValidationReport: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) self.result.bridgeJSLowerReturn() let __bjs_isSome_status = self.status != nil if let __bjs_unwrapped_status = self.status { - _swift_js_push_int(__bjs_unwrapped_status.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_status.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_status ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_status ? 1 : 0) let __bjs_isSome_outcome = self.outcome != nil if let __bjs_unwrapped_outcome = self.outcome { - _swift_js_push_int(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_outcome ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_outcome ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2705,38 +2705,38 @@ extension AdvancedConfig: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) var __bjs_title = self.title __bjs_title.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(self.enabled ? 1 : 0) + _swift_js_push_i32(self.enabled ? 1 : 0) var __bjs_theme = self.theme.rawValue __bjs_theme.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.status.bridgeJSLowerParameter())) + _swift_js_push_i32(Int32(self.status.bridgeJSLowerParameter())) let __bjs_isSome_result = self.result != nil if let __bjs_unwrapped_result = self.result { - _swift_js_push_int(__bjs_unwrapped_result.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_result.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_result ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_result ? 1 : 0) let __bjs_isSome_metadata = self.metadata != nil if let __bjs_unwrapped_metadata = self.metadata { - _swift_js_push_int(__bjs_unwrapped_metadata.bridgeJSLowerReturn()) + _swift_js_push_i32(__bjs_unwrapped_metadata.bridgeJSLowerReturn()) } - _swift_js_push_int(__bjs_isSome_metadata ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_metadata ? 1 : 0) let __bjs_isSome_location = self.location != nil if let __bjs_unwrapped_location = self.location { __bjs_unwrapped_location.bridgeJSLowerReturn() } - _swift_js_push_int(__bjs_isSome_location ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_location ? 1 : 0) self.defaults.bridgeJSLowerReturn() let __bjs_isSome_overrideDefaults = self.overrideDefaults != nil if let __bjs_unwrapped_overrideDefaults = self.overrideDefaults { __bjs_unwrapped_overrideDefaults.bridgeJSLowerReturn() } - _swift_js_push_int(__bjs_isSome_overrideDefaults ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_overrideDefaults ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2788,12 +2788,12 @@ extension MeasurementConfig: _BridgedSwiftStruct { if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_optionalPrecision ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) let __bjs_isSome_optionalRatio = self.optionalRatio != nil if let __bjs_unwrapped_optionalRatio = self.optionalRatio { _swift_js_push_f64(__bjs_unwrapped_optionalRatio.bridgeJSLowerParameter()) } - _swift_js_push_int(__bjs_isSome_optionalRatio ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_optionalRatio ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2924,7 +2924,7 @@ extension CopyableCart: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.x)) + _swift_js_push_i32(Int32(self.x)) let __bjs_isSome_note = self.note != nil if let __bjs_unwrapped_note = self.note { var __bjs_str_note = __bjs_unwrapped_note @@ -2932,7 +2932,7 @@ extension CopyableCart: _BridgedSwiftStruct { _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } } - _swift_js_push_int(__bjs_isSome_note ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_note ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -2991,7 +2991,7 @@ extension CopyableCartItem: _BridgedSwiftStruct { __bjs_sku.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.quantity)) + _swift_js_push_i32(Int32(self.quantity)) } init(unsafelyCopying jsObject: JSObject) { @@ -3036,13 +3036,13 @@ extension CopyableNestedCart: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_int(Int32(self.id)) + _swift_js_push_i32(Int32(self.id)) self.item.bridgeJSLowerReturn() let __bjs_isSome_shippingAddress = self.shippingAddress != nil if let __bjs_unwrapped_shippingAddress = self.shippingAddress { __bjs_unwrapped_shippingAddress.bridgeJSLowerReturn() } - _swift_js_push_int(__bjs_isSome_shippingAddress ? 1 : 0) + _swift_js_push_i32(__bjs_isSome_shippingAddress ? 1 : 0) } init(unsafelyCopying jsObject: JSObject) { @@ -3101,7 +3101,7 @@ extension ConfigStruct: _BridgedSwiftStruct { __bjs_name.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } - _swift_js_push_int(Int32(self.value)) + _swift_js_push_i32(Int32(self.value)) } init(unsafelyCopying jsObject: JSObject) { @@ -4676,8 +4676,8 @@ public func _bjs_roundTripIntArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4702,7 +4702,7 @@ public func _bjs_roundTripStringArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4724,7 +4724,7 @@ public func _bjs_roundTripDoubleArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4745,8 +4745,8 @@ public func _bjs_roundTripBoolArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4767,8 +4767,8 @@ public func _bjs_roundTripDirectionArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4789,8 +4789,8 @@ public func _bjs_roundTripStatusArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4815,7 +4815,7 @@ public func _bjs_roundTripThemeArray() -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4836,8 +4836,8 @@ public func _bjs_roundTripHttpStatusArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4859,7 +4859,7 @@ public func _bjs_roundTripDataPointArray() -> Void { }()) for __bjs_elem_ret in ret { __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4881,7 +4881,7 @@ public func _bjs_roundTripGreeterArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4904,9 +4904,9 @@ public func _bjs_roundTripOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_unwrapped_ret_elem))} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4933,8 +4933,8 @@ public func _bjs_roundTripOptionalStringArray() -> Void { __bjs_str_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4958,8 +4958,8 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -4982,9 +4982,9 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5007,9 +5007,9 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_int(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} - _swift_js_push_int(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5038,9 +5038,9 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_int(Int32(__bjs_elem_ret))} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_elem_ret))} + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -5073,8 +5073,8 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { __bjs_ret_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -5104,8 +5104,8 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { if let __bjs_unwrapped_ret = ret { for __bjs_elem_ret in __bjs_unwrapped_ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(__bjs_unwrapped_ret.count))} - _swift_js_push_int(__bjs_isSome_ret ? 1 : 0) + _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif @@ -5136,9 +5136,9 @@ public func _bjs_roundTripNestedIntArray() -> Void { }()) for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_elem_ret_elem))} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5173,8 +5173,8 @@ public func _bjs_roundTripNestedStringArray() -> Void { __bjs_ret_elem_elem.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5206,8 +5206,8 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_f64(__bjs_elem_ret_elem)} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5238,9 +5238,9 @@ public func _bjs_roundTripNestedBoolArray() -> Void { }()) for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(__bjs_elem_ret_elem ? 1 : 0)} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(__bjs_elem_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5272,8 +5272,8 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5304,9 +5304,9 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { }()) for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_int(Int32(__bjs_elem_ret_elem.bridgeJSLowerParameter()))} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret_elem.bridgeJSLowerParameter()))} + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5338,8 +5338,8 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { for __bjs_elem_ret in ret { for __bjs_elem_ret_elem in __bjs_elem_ret { _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(__bjs_elem_ret.count))} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5361,7 +5361,7 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5383,7 +5383,7 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5405,7 +5405,7 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { }()) for __bjs_elem_ret in ret { _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif @@ -5446,8 +5446,8 @@ public func _bjs_roundTripDataProcessorArrayType() -> Void { return __result }()) for __bjs_elem_ret in ret { - _swift_js_push_int((__bjs_elem_ret as! AnyDataProcessor).bridgeJSLowerReturn())} - _swift_js_push_int(Int32(ret.count)) + _swift_js_push_i32((__bjs_elem_ret as! AnyDataProcessor).bridgeJSLowerReturn())} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif From d4c16e4ae7c8a7408058974142164dfffe7ad162 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Tue, 3 Feb 2026 01:24:31 +0100 Subject: [PATCH 122/252] Fix: Ensure `BridgeJS.Macros.swift` is processed by `SwiftToSkeleton` (#556) Fix: Ensure BridgeJS.Macros.swift is processed by SwiftToSkeleton Regenerate BridgeJS files --- .../Sources/BridgeJSTool/BridgeJSTool.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index f75619489..dd37fb3bc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -113,6 +113,7 @@ import BridgeJSUtilities let bridgeJsGlobalDtsPath = targetDirectory.appending(path: "bridge-js.global.d.ts") let hasDts = FileManager.default.fileExists(atPath: bridgeJsDtsPath.path) let hasGlobalDts = FileManager.default.fileExists(atPath: bridgeJsGlobalDtsPath.path) + var generatedMacrosPath: String? = nil if hasDts || hasGlobalDts { guard let tsconfigPath = doubleDashOptions["project"] else { throw BridgeJSToolError("--project option is required when processing .d.ts files") @@ -128,9 +129,19 @@ import BridgeJSUtilities progress: progress, outputPath: bridgeJSMacrosPath.path ) + generatedMacrosPath = bridgeJSMacrosPath.path } - let inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) + var inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) + // BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need + // to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin + // filters out Generated/ files, so we explicitly add it here after generation. + if let macrosPath = generatedMacrosPath, FileManager.default.fileExists(atPath: macrosPath) { + // Only add if not already present (when running directly vs through plugin) + if !inputFiles.contains(macrosPath) { + inputFiles.append(macrosPath) + } + } let swiftToSkeleton = SwiftToSkeleton( progress: progress, moduleName: moduleName, From 36d4c7369e614a4cdd46af011b18df3224856c58 Mon Sep 17 00:00:00 2001 From: zhiqipan <12974112+zhiqipan@users.noreply.github.com> Date: Tue, 3 Feb 2026 01:02:25 +0000 Subject: [PATCH 123/252] Fix missing comma in @_expose attribute for SwiftSyntax602 (#555) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix missing comma in @_expose attribute for SwiftSyntax602 The SwiftSyntax602 code path in `buildExposeAttributes` was using array literal syntax to construct `LabeledExprListSyntax`, which doesn't set `trailingComma` on the AST nodes. This resulted in malformed attributes: `@_expose(wasm "name")` instead of `@_expose(wasm, "name")`. The fix uses the result builder syntax with explicit `.with(\.trailingComma, .commaToken())` to ensure the comma is present in the generated code. Also adds a dedicated `bridgejs-test` CI job that tests BridgeJS with multiple Swift/SwiftSyntax version combinations to ensure both code paths (pre-602 and 602+) are exercised: - Swift 6.0.3 with SwiftSyntax 600.0.1 - Swift 6.1.2 with SwiftSyntax 601.0.1 - Swift 6.2 with SwiftSyntax 602.0.0 Co-Authored-By: Claude Opus 4.5 * Rename CI job to test-bridgejs-against-swift-versions * Simplify CI: let SPM resolve SwiftSyntax version naturally Remove sed-based version pinning that caused linker errors on Swift 6.2. Swift 6.2 ships with prebuilt SwiftSyntax 602.0.0, and forcing an exact version caused duplicate symbol errors during linking. Each Swift version naturally resolves to compatible SwiftSyntax: - Swift 6.0.x → SwiftSyntax 600.x - Swift 6.1.x → SwiftSyntax 601.x - Swift 6.2.x → SwiftSyntax 602.x Co-Authored-By: Claude Opus 4.5 * Remove Swift 6.0.3 from test matrix The codebase uses trailing commas in argument lists (BridgeJSToolInternal.swift) which requires Swift 6.1+. Testing with 6.1.2 and 6.2 covers both SwiftSyntax code paths (non-602 and 602). Co-Authored-By: Claude Opus 4.5 * Force SwiftSyntax 602.x for Swift 6.2 CI job On Swift 6.2, SPM resolves to SwiftSyntax 600.0.1 by default (per Package.swift), which doesn't have the SwiftSyntax602 module. Use sed to temporarily force SwiftSyntax 602.x so we actually test the SwiftSyntax602 code path. This also may avoid the prebuilt binary linker conflicts that occur with SwiftSyntax 600.0.1 on Swift 6.2. Co-Authored-By: Claude Opus 4.5 * Disable experimental SwiftSyntax prebuilts for BridgeJS tests * Override swift-syntax version via environment variable --------- Co-authored-by: Claude Opus 4.5 Co-authored-by: Yuta Saito --- .github/workflows/test.yml | 27 +++++++++++++++++++ Plugins/BridgeJS/Package.swift | 4 ++- .../Sources/BridgeJSCore/ImportTS.swift | 9 ++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc7392f7f..6b5ace046 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,6 +67,33 @@ jobs: - run: swift test --package-path ./Plugins/PackageToJS - run: swift test --package-path ./Plugins/BridgeJS + test-bridgejs-against-swift-versions: + name: Test BridgeJS against Swift versions + strategy: + matrix: + entry: + - image: "swift:6.1.2" + swift-syntax-version: "601.0.0" + - image: "swift:6.2" + swift-syntax-version: "602.0.0" + runs-on: ubuntu-latest + container: + image: ${{ matrix.entry.image }} + steps: + - uses: actions/checkout@v6 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + - name: Install TypeScript + run: npm install --prefix Plugins/BridgeJS/Sources/TS2Swift/JavaScript + - name: Run BridgeJS tests + # NOTE: Seems like the prebuilt SwiftSyntax binaries are not compatible with + # non-macro dependents, so disable experimental prebuilts for now. + run: swift test --disable-experimental-prebuilts --package-path ./Plugins/BridgeJS + env: + BRIDGEJS_OVERRIDE_SWIFT_SYNTAX_VERSION: ${{ matrix.entry.swift-syntax-version }} + native-build: # Check native build to make it easy to develop applications by Xcode name: Build for native target diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index eb675c86b..01a3c6d41 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -3,11 +3,13 @@ import CompilerPluginSupport import PackageDescription +let swiftSyntaxVersion = Context.environment["BRIDGEJS_OVERRIDE_SWIFT_SYNTAX_VERSION"] ?? "600.0.1" + let package = Package( name: "BridgeJS", platforms: [.macOS(.v13)], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.1"), + .package(url: "https://github.com/swiftlang/swift-syntax", from: Version(swiftSyntaxVersion)!), // Development dependencies .package(url: "https://github.com/apple/swift-argument-parser", from: "1.7.0"), ], diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 9e5575c41..7c391eea0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -760,10 +760,11 @@ enum SwiftCodePattern { return AttributeListSyntax { #if canImport(SwiftSyntax602) let exposeAttrArgs = AttributeSyntax.Arguments.argumentList( - [ - LabeledExprSyntax(label: nil, expression: DeclReferenceExprSyntax(baseName: "wasm")), - LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)), - ] + LabeledExprListSyntax { + LabeledExprSyntax(label: nil, expression: DeclReferenceExprSyntax(baseName: "wasm")) + .with(\.trailingComma, .commaToken()) + LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)) + } ) let cdeclAttrArgs = AttributeSyntax.Arguments.argumentList( [ From b0bf4a3b87688119ece2c9e695da38950f0079ed Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 3 Feb 2026 10:28:51 +0900 Subject: [PATCH 124/252] Examples: Build SwiftSyntax in debug mode for macro plugins (#558) --- Examples/ActorOnWebWorker/build.sh | 4 ++-- Examples/Basic/build.sh | 2 +- Examples/Multithreading/build.sh | 4 ++-- Examples/OffscrenCanvas/build.sh | 4 ++-- Examples/PlayBridgeJS/build.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Examples/ActorOnWebWorker/build.sh b/Examples/ActorOnWebWorker/build.sh index 62b31144c..4def77883 100755 --- a/Examples/ActorOnWebWorker/build.sh +++ b/Examples/ActorOnWebWorker/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euxo pipefail -swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" -c release \ +swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \ plugin --allow-writing-to-package-directory \ - js --use-cdn --output ./Bundle + js --use-cdn --output ./Bundle -c release diff --git a/Examples/Basic/build.sh b/Examples/Basic/build.sh index 7b5864c44..2351f4e2d 100755 --- a/Examples/Basic/build.sh +++ b/Examples/Basic/build.sh @@ -1,3 +1,3 @@ #!/bin/bash set -euxo pipefail -swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" -c "${1:-debug}" js --use-cdn +swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" js --use-cdn -c "${1:-debug}" diff --git a/Examples/Multithreading/build.sh b/Examples/Multithreading/build.sh index 62b31144c..4def77883 100755 --- a/Examples/Multithreading/build.sh +++ b/Examples/Multithreading/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euxo pipefail -swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" -c release \ +swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \ plugin --allow-writing-to-package-directory \ - js --use-cdn --output ./Bundle + js --use-cdn --output ./Bundle -c release diff --git a/Examples/OffscrenCanvas/build.sh b/Examples/OffscrenCanvas/build.sh index 62b31144c..4def77883 100755 --- a/Examples/OffscrenCanvas/build.sh +++ b/Examples/OffscrenCanvas/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euxo pipefail -swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" -c release \ +swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1_threads:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}}" \ plugin --allow-writing-to-package-directory \ - js --use-cdn --output ./Bundle + js --use-cdn --output ./Bundle -c release diff --git a/Examples/PlayBridgeJS/build.sh b/Examples/PlayBridgeJS/build.sh index 97e4b0f95..d2589f798 100755 --- a/Examples/PlayBridgeJS/build.sh +++ b/Examples/PlayBridgeJS/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euxo pipefail -env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" -c "${1:-debug}" \ +env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" \ plugin --allow-writing-to-package-directory \ - js --use-cdn --output ./Bundle + js --use-cdn --output ./Bundle -c "${1:-debug}" From 4af19840a86c36ab7b9726a36b1d875f324e5804 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 3 Feb 2026 11:48:36 +0900 Subject: [PATCH 125/252] BridgeJS: Fix macro test suites silently ignoring failures (#559) * BridgeJS: Fix macro test suites silently ignoring failures * BridgeJS: Fix macro unit tests and macro implementations to pass tests --- Plugins/BridgeJS/Package.swift | 2 +- .../Sources/BridgeJSMacros/JSClassMacro.swift | 9 +- .../BridgeJSMacros/JSFunctionMacro.swift | 18 ++- .../BridgeJSMacros/JSGetterMacro.swift | 17 +++ .../BridgeJSMacros/JSSetterMacro.swift | 38 ++++- .../JSClassMacroTests.swift | 54 +++---- .../JSFunctionMacroTests.swift | 135 +++++++++--------- .../JSGetterMacroTests.swift | 110 +++++++------- .../JSSetterMacroTests.swift | 107 +++++++------- .../BridgeJSMacrosTests/TestSupport.swift | 52 +++++++ 10 files changed, 347 insertions(+), 195 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSMacrosTests/TestSupport.swift diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index 01a3c6d41..a03172f17 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -72,7 +72,7 @@ let package = Package( name: "BridgeJSMacrosTests", dependencies: [ "BridgeJSMacros", - .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"), + .product(name: "SwiftSyntaxMacrosGenericTestSupport", package: "swift-syntax"), ] ), diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift index 8a3f83f05..2641df4bf 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -66,9 +66,16 @@ extension JSClassMacro: ExtensionMacro { conformingTo protocols: [TypeSyntax], in context: some MacroExpansionContext ) throws -> [ExtensionDeclSyntax] { - guard declaration.is(StructDeclSyntax.self) else { return [] } + guard let structDecl = declaration.as(StructDeclSyntax.self) else { return [] } guard !protocols.isEmpty else { return [] } + // Do not add extension if the struct already conforms to _JSBridgedClass + if let clause = structDecl.inheritanceClause, + clause.inheritedTypes.contains(where: { $0.type.trimmed.description == "_JSBridgedClass" }) + { + return [] + } + let conformanceList = protocols.map { $0.trimmed.description }.joined(separator: ", ") return [ try ExtensionDeclSyntax("extension \(type.trimmed): \(raw: conformanceList) {}") diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift index 7dfd635f9..a51bf10c5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift @@ -47,7 +47,7 @@ extension JSFunctionMacro: BodyMacro { context.diagnose( Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration) ) - return [] + return [CodeBlockItemSyntax(stringLiteral: "fatalError(\"@JSFunction init must be inside a type\")")] } let glueName = JSMacroHelper.glueName(baseName: "init", enclosingTypeName: enclosingTypeName) @@ -70,3 +70,19 @@ extension JSFunctionMacro: BodyMacro { return [] } } + +extension JSFunctionMacro: PeerMacro { + /// Emits a diagnostic when @JSFunction is applied to a declaration that is not a function or initializer. + /// BodyMacro is only invoked for declarations with optional code blocks (e.g. functions, initializers), + /// so for vars and other decls we need PeerMacro to run and diagnose. + public static func expansion( + of node: AttributeSyntax, + providingPeersOf declaration: some DeclSyntaxProtocol, + in context: some MacroExpansionContext + ) throws -> [DeclSyntax] { + if declaration.is(FunctionDeclSyntax.self) { return [] } + if declaration.is(InitializerDeclSyntax.self) { return [] } + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration)) + return [] + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift index b996facfa..44c3620cf 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift @@ -60,3 +60,20 @@ extension JSGetterMacro: AccessorMacro { ] } } + +extension JSGetterMacro: PeerMacro { + /// Emits a diagnostic when @JSGetter is applied to a declaration that is not a variable (e.g. a function). + /// AccessorMacro may not be invoked for non-property declarations. For variables with multiple + /// bindings, the compiler emits its own diagnostic; we only diagnose non-variable decls here. + public static func expansion( + of node: AttributeSyntax, + providingPeersOf declaration: some DeclSyntaxProtocol, + in context: some MacroExpansionContext + ) throws -> [DeclSyntax] { + guard declaration.is(VariableDeclSyntax.self) else { + context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedVariable)) + return [] + } + return [] + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift index bb9fd1f21..3c7280079 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift @@ -25,13 +25,23 @@ extension JSSetterMacro: BodyMacro { let rawFunctionName = JSMacroHelper.stripBackticks(functionName) guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) - return [] + return [ + CodeBlockItemSyntax( + stringLiteral: + "fatalError(\"@JSSetter function name must start with 'set' followed by a property name\")" + ) + ] } let propertyName = String(rawFunctionName.dropFirst(3)) guard !propertyName.isEmpty else { context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) - return [] + return [ + CodeBlockItemSyntax( + stringLiteral: + "fatalError(\"@JSSetter function name must start with 'set' followed by a property name\")" + ) + ] } // Convert first character to lowercase (e.g., "Foo" -> "foo") @@ -56,7 +66,11 @@ extension JSSetterMacro: BodyMacro { let parameters = functionDecl.signature.parameterClause.parameters guard let firstParam = parameters.first else { context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.setterRequiresParameter)) - return [] + return [ + CodeBlockItemSyntax( + stringLiteral: "fatalError(\"@JSSetter function must have at least one parameter\")" + ) + ] } let paramName = firstParam.secondName ?? firstParam.firstName @@ -69,3 +83,21 @@ extension JSSetterMacro: BodyMacro { return [CodeBlockItemSyntax(stringLiteral: "try \(call)")] } } + +extension JSSetterMacro: PeerMacro { + /// Emits a diagnostic when @JSSetter is applied to a declaration that is not a function. + /// BodyMacro is only invoked for declarations with optional code blocks (e.g. functions). + public static func expansion( + of node: AttributeSyntax, + providingPeersOf declaration: some DeclSyntaxProtocol, + in context: some MacroExpansionContext + ) throws -> [DeclSyntax] { + guard declaration.is(FunctionDeclSyntax.self) else { + context.diagnose( + Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedSetterDeclaration) + ) + return [] + } + return [] + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift index b27b93941..7640916e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -1,8 +1,7 @@ import SwiftDiagnostics import SwiftSyntax import SwiftSyntaxMacroExpansion -import SwiftSyntaxMacros -import SwiftSyntaxMacrosTestSupport +import SwiftSyntaxMacrosGenericTestSupport import Testing import BridgeJSMacros @@ -13,7 +12,7 @@ import BridgeJSMacros ] @Test func emptyStruct() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -21,6 +20,7 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { + let jsObject: JSObject init(unsafelyWrapping jsObject: JSObject) { @@ -32,12 +32,12 @@ import BridgeJSMacros } """, macroSpecs: macroSpecs, - indentationWidth: indentationWidth + indentationWidth: indentationWidth, ) } @Test func structWithExistingJSObject() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -62,7 +62,7 @@ import BridgeJSMacros } @Test func structWithExistingInit() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -73,11 +73,11 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { - let jsObject: JSObject - init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } + + let jsObject: JSObject } extension MyClass: _JSBridgedClass { @@ -89,7 +89,7 @@ import BridgeJSMacros } @Test func structWithBothExisting() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -118,7 +118,7 @@ import BridgeJSMacros } @Test func structWithMembers() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -127,10 +127,10 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { - let jsObject: JSObject - var name: String + let jsObject: JSObject + init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } @@ -145,7 +145,7 @@ import BridgeJSMacros } @Test func _class() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass class MyClass { @@ -168,7 +168,7 @@ import BridgeJSMacros } @Test func _enum() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass enum MyEnum { @@ -191,7 +191,7 @@ import BridgeJSMacros } @Test func _actor() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass actor MyActor { @@ -214,7 +214,7 @@ import BridgeJSMacros } @Test func structWithDifferentJSObjectName() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -223,10 +223,10 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { - let jsObject: JSObject - var otherProperty: String + let jsObject: JSObject + init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } @@ -241,7 +241,7 @@ import BridgeJSMacros } @Test func structWithDifferentInit() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -251,11 +251,11 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { - let jsObject: JSObject - init(name: String) { } + let jsObject: JSObject + init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } @@ -270,7 +270,7 @@ import BridgeJSMacros } @Test func structWithMultipleMembers() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass { @@ -280,11 +280,11 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass { - let jsObject: JSObject - var name: String var age: Int + let jsObject: JSObject + init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } @@ -299,7 +299,7 @@ import BridgeJSMacros } @Test func structWithComment() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ /// Documentation comment @JSClass @@ -309,6 +309,7 @@ import BridgeJSMacros expandedSource: """ /// Documentation comment struct MyClass { + let jsObject: JSObject init(unsafelyWrapping jsObject: JSObject) { @@ -325,7 +326,7 @@ import BridgeJSMacros } @Test func structAlreadyConforms() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSClass struct MyClass: _JSBridgedClass { @@ -333,6 +334,7 @@ import BridgeJSMacros """, expandedSource: """ struct MyClass: _JSBridgedClass { + let jsObject: JSObject init(unsafelyWrapping jsObject: JSObject) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift index 8cfdd66e0..756935e7d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift @@ -1,15 +1,18 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros -import SwiftSyntaxMacrosTestSupport +import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacrosGenericTestSupport import Testing import BridgeJSMacros @Suite struct JSFunctionMacroTests { private let indentationWidth: Trivia = .spaces(4) + private let macroSpecs: [String: MacroSpec] = [ + "JSFunction": MacroSpec(type: JSFunctionMacro.self) + ] @Test func topLevelFunction() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func greet(name: String) -> String @@ -19,13 +22,13 @@ import BridgeJSMacros return _$greet(name) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionVoidReturn() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func log(message: String) @@ -35,13 +38,13 @@ import BridgeJSMacros _$log(message) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionWithExplicitVoidReturn() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func log(message: String) -> Void @@ -51,13 +54,13 @@ import BridgeJSMacros _$log(message) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionWithEmptyTupleReturn() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func log(message: String) -> () @@ -67,13 +70,13 @@ import BridgeJSMacros _$log(message) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionThrows() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func parse(json: String) throws -> [String: Any] @@ -83,13 +86,13 @@ import BridgeJSMacros return try _$parse(json) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionAsync() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func fetch(url: String) async -> String @@ -99,13 +102,13 @@ import BridgeJSMacros return await _$fetch(url) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionAsyncThrows() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func fetch(url: String) async throws -> String @@ -115,13 +118,13 @@ import BridgeJSMacros return try await _$fetch(url) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionWithUnderscoreParameter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func process(_ value: Int) -> Int @@ -131,13 +134,13 @@ import BridgeJSMacros return _$process(value) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelFunctionWithMultipleParameters() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func add(a: Int, b: Int) -> Int @@ -147,13 +150,13 @@ import BridgeJSMacros return _$add(a, b) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func instanceMethod() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSFunction @@ -167,13 +170,13 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func staticMethod() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSFunction @@ -183,17 +186,17 @@ import BridgeJSMacros expandedSource: """ struct MyClass { static func create() -> MyClass { - return _$create() + return _$MyClass_create() } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func classMethod() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ class MyClass { @JSFunction @@ -203,17 +206,17 @@ import BridgeJSMacros expandedSource: """ class MyClass { class func create() -> MyClass { - return _$create() + return _$MyClass_create() } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func initializer() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSFunction @@ -228,13 +231,13 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func initializerThrows() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSFunction @@ -249,13 +252,13 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func initializerAsyncThrows() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSFunction @@ -270,19 +273,21 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func initializerWithoutEnclosingType() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction init() """, expandedSource: """ - init() + init() { + fatalError("@JSFunction init must be inside a type") + } """, diagnostics: [ DiagnosticSpec( @@ -291,13 +296,13 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func unsupportedDeclaration() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction var property: String @@ -312,13 +317,13 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func enumInstanceMethod() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ enum MyEnum { @JSFunction @@ -332,13 +337,13 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func actorInstanceMethod() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ actor MyActor { @JSFunction @@ -352,13 +357,13 @@ import BridgeJSMacros } } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func functionWithExistingBody() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSFunction func greet(name: String) -> String { @@ -370,8 +375,8 @@ import BridgeJSMacros return _$greet(name) } """, - macros: ["JSFunction": JSFunctionMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift index 8c7f3c119..2796c1014 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift @@ -1,15 +1,18 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros -import SwiftSyntaxMacrosTestSupport +import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacrosGenericTestSupport import Testing import BridgeJSMacros @Suite struct JSGetterMacroTests { private let indentationWidth: Trivia = .spaces(4) + private let macroSpecs: [String: MacroSpec] = [ + "JSGetter": MacroSpec(type: JSGetterMacro.self) + ] @Test func topLevelVariable() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var count: Int @@ -21,13 +24,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelLet() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter let constant: String @@ -39,13 +42,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func instanceProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSGetter @@ -61,13 +64,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func instanceLetProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSGetter @@ -83,13 +86,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func staticProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSGetter @@ -100,18 +103,18 @@ import BridgeJSMacros struct MyClass { static var version: String { get throws(JSException) { - return try _$version_get() + return try _$MyClass_version_get() } } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func classProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ class MyClass { @JSGetter @@ -122,18 +125,18 @@ import BridgeJSMacros class MyClass { class var version: String { get throws(JSException) { - return try _$version_get() + return try _$MyClass_version_get() } } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func enumProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ enum MyEnum { @JSGetter @@ -149,13 +152,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func actorProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ actor MyActor { @JSGetter @@ -171,13 +174,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func variableWithExistingAccessor() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var count: Int { @@ -194,13 +197,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func variableWithInitializer() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var count: Int = 0 @@ -212,13 +215,13 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func multipleBindings() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var x: Int, y: Int @@ -228,19 +231,25 @@ import BridgeJSMacros """, diagnostics: [ DiagnosticSpec( - message: "@JSGetter can only be applied to single-variable declarations.", + message: "accessor macro can only be applied to a single variable", line: 1, column: 1, severity: .error - ) + ), + DiagnosticSpec( + message: "peer macro can only be applied to a single variable", + line: 1, + column: 1, + severity: .error + ), ], - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func unsupportedDeclaration() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter func test() {} @@ -256,13 +265,15 @@ import BridgeJSMacros severity: .error ) ], - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } + #if canImport(SwiftSyntax601) + // https://github.com/swiftlang/swift-syntax/pull/2722 @Test func variableWithTrailingComment() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var count: Int // comment @@ -274,13 +285,14 @@ import BridgeJSMacros } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } + #endif @Test func variableWithUnderscoreName() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSGetter var _internal: String @@ -288,12 +300,12 @@ import BridgeJSMacros expandedSource: """ var _internal: String { get throws(JSException) { - return try _$internal_get() + return try _$_internal_get() } } """, - macros: ["JSGetter": JSGetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift index 83289e092..1ed4e1081 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift @@ -1,15 +1,18 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros -import SwiftSyntaxMacrosTestSupport +import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacrosGenericTestSupport import Testing import BridgeJSMacros @Suite struct JSSetterMacroTests { private let indentationWidth: Trivia = .spaces(4) + private let macroSpecs: [String: MacroSpec] = [ + "JSSetter": MacroSpec(type: JSSetterMacro.self) + ] @Test func topLevelSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setFoo(_ value: Foo) throws(JSException) @@ -19,13 +22,13 @@ import BridgeJSMacros try _$foo_set(value) } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func topLevelSetterWithNamedParameter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setCount(count: Int) throws(JSException) @@ -35,13 +38,13 @@ import BridgeJSMacros try _$count_set(count) } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func instanceSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSSetter @@ -55,13 +58,13 @@ import BridgeJSMacros } } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func staticSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ struct MyClass { @JSSetter @@ -71,17 +74,17 @@ import BridgeJSMacros expandedSource: """ struct MyClass { static func setVersion(_ version: String) throws(JSException) { - try _$version_set(version) + try _$MyClass_version_set(version) } } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func classSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ class MyClass { @JSSetter @@ -91,17 +94,17 @@ import BridgeJSMacros expandedSource: """ class MyClass { class func setConfig(_ config: Config) throws(JSException) { - try _$config_set(config) + try _$MyClass_config_set(config) } } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func enumSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ enum MyEnum { @JSSetter @@ -115,13 +118,13 @@ import BridgeJSMacros } } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func actorSetter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ actor MyActor { @JSSetter @@ -135,13 +138,13 @@ import BridgeJSMacros } } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func setterWithExistingBody() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setFoo(_ value: Foo) throws(JSException) { @@ -153,19 +156,21 @@ import BridgeJSMacros try _$foo_set(value) } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func invalidSetterName() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func updateFoo(_ value: Foo) throws(JSException) """, expandedSource: """ - func updateFoo(_ value: Foo) throws(JSException) + func updateFoo(_ value: Foo) throws(JSException) { + fatalError("@JSSetter function name must start with 'set' followed by a property name") + } """, diagnostics: [ DiagnosticSpec( @@ -175,19 +180,21 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func setterNameTooShort() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func set(_ value: Foo) throws(JSException) """, expandedSource: """ - func set(_ value: Foo) throws(JSException) + func set(_ value: Foo) throws(JSException) { + fatalError("@JSSetter function name must start with 'set' followed by a property name") + } """, diagnostics: [ DiagnosticSpec( @@ -197,19 +204,21 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func setterWithoutParameter() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setFoo() throws(JSException) """, expandedSource: """ - func setFoo() throws(JSException) + func setFoo() throws(JSException) { + fatalError("@JSSetter function must have at least one parameter") + } """, diagnostics: [ DiagnosticSpec( @@ -218,13 +227,13 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func unsupportedDeclaration() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter var property: String @@ -239,13 +248,13 @@ import BridgeJSMacros column: 1 ) ], - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func setterWithMultipleWords() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setConnectionTimeout(_ timeout: Int) throws(JSException) @@ -255,13 +264,13 @@ import BridgeJSMacros try _$connectionTimeout_set(timeout) } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } @Test func setterWithSingleLetterProperty() { - assertMacroExpansion( + TestSupport.assertMacroExpansion( """ @JSSetter func setX(_ x: Int) throws(JSException) @@ -271,8 +280,8 @@ import BridgeJSMacros try _$x_set(x) } """, - macros: ["JSSetter": JSSetterMacro.self], - indentationWidth: indentationWidth + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, ) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/TestSupport.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/TestSupport.swift new file mode 100644 index 000000000..84e343281 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/TestSupport.swift @@ -0,0 +1,52 @@ +import SwiftSyntaxMacrosGenericTestSupport +import Testing +import SwiftSyntax +import SwiftDiagnostics +import SwiftSyntaxMacroExpansion + +enum TestSupport { + static func failureHandler(spec: TestFailureSpec) { + Issue.record( + Comment(rawValue: spec.message), + sourceLocation: .init( + fileID: spec.location.fileID, + filePath: spec.location.filePath, + line: spec.location.line, + column: spec.location.column + ) + ) + } + + static func assertMacroExpansion( + _ originalSource: String, + expandedSource expectedExpandedSource: String, + diagnostics: [DiagnosticSpec] = [], + macroSpecs: [String: MacroSpec], + applyFixIts: [String]? = nil, + fixedSource expectedFixedSource: String? = nil, + testModuleName: String = "TestModule", + testFileName: String = "test.swift", + indentationWidth: Trivia = .spaces(4), + fileID: StaticString = #fileID, + filePath: StaticString = #filePath, + line: UInt = #line, + column: UInt = #column + ) { + SwiftSyntaxMacrosGenericTestSupport.assertMacroExpansion( + originalSource, + expandedSource: expectedExpandedSource, + diagnostics: diagnostics, + macroSpecs: macroSpecs, + applyFixIts: applyFixIts, + fixedSource: expectedFixedSource, + testModuleName: testModuleName, + testFileName: testFileName, + indentationWidth: indentationWidth, + failureHandler: TestSupport.failureHandler, + fileID: fileID, + filePath: filePath, + line: line, + column: column + ) + } +} From 4fa48cf5dd6c5b686b22d832b1953f495d746de4 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 3 Feb 2026 16:18:51 +0700 Subject: [PATCH 126/252] BridgeJS: Fix namespace enum with `@JS(namespace:)` attribute (#562) --- .../Sources/BridgeJSCore/ExportSwift.swift | 9 +- .../BridgeJSCore/SwiftToSkeleton.swift | 8 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 10 +- .../Inputs/EnumNamespace.swift | 15 +- .../EnumNamespace.Export.d.ts | 9 + .../BridgeJSLinkTests/EnumNamespace.Export.js | 24 +++ .../EnumNamespace.Global.Export.d.ts | 18 ++ .../EnumNamespace.Global.Export.js | 36 ++++ .../EnumNamespace.Global.json | 123 ++++++++++++ .../EnumNamespace.Global.swift | 47 +++++ .../ExportSwiftTests/EnumNamespace.json | 123 ++++++++++++ .../ExportSwiftTests/EnumNamespace.swift | 47 +++++ .../StaticFunctions.Global.json | 2 +- .../ExportSwiftTests/StaticFunctions.json | 2 +- .../StaticProperties.Global.json | 10 +- .../ExportSwiftTests/StaticProperties.json | 10 +- .../Generated/JavaScript/BridgeJS.json | 10 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 21 ++ .../Generated/BridgeJS.swift | 44 +++++ .../Generated/JavaScript/BridgeJS.json | 185 +++++++++++++++++- Tests/prelude.mjs | 10 + 21 files changed, 723 insertions(+), 40 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index d7d5c8200..1f8f72ad7 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -533,14 +533,9 @@ public class ExportSwift { if function.effects.isStatic, let staticContext = function.staticContext { let callName: String switch staticContext { - case .className(let baseName), .enumName(let baseName), .structName(let baseName): + case .className(let baseName), .enumName(let baseName), .structName(let baseName), + .namespaceEnum(let baseName): callName = "\(baseName).\(function.name)" - case .namespaceEnum: - if let namespace = function.namespace, !namespace.isEmpty { - callName = "\(namespace.joined(separator: ".")).\(function.name)" - } else { - callName = function.name - } } builder.call(name: callName, returnType: function.returnType) } else { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index ea79d3f3b..b780012f0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -990,7 +990,8 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { } let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true - staticContext = isNamespaceEnum ? .namespaceEnum : .enumName(enumName) + let swiftCallName = exportedEnumByName[enumKey]?.swiftCallName ?? enumName + staticContext = isNamespaceEnum ? .namespaceEnum(swiftCallName) : .enumName(enumName) case .protocolBody(_, _): return nil case .structBody(let structName, _): @@ -1187,7 +1188,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .skipChildren } let isNamespaceEnum = exportedEnumByName[enumKey]?.cases.isEmpty ?? true - staticContext = isStatic ? (isNamespaceEnum ? .namespaceEnum : .enumName(enumName)) : nil + // Use swiftCallName for the full Swift call path (handles nested enums correctly) + let swiftCallName = exportedEnumByName[enumKey]?.swiftCallName ?? enumName + staticContext = + isStatic ? (isNamespaceEnum ? .namespaceEnum(swiftCallName) : .enumName(swiftCallName)) : nil case .topLevel: diagnose(node: node, message: "@JS var must be inside a @JS class or enum") return .skipChildren diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 33cc94479..5013dda66 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -242,7 +242,7 @@ public enum StaticContext: Codable, Equatable, Sendable { case className(String) case structName(String) case enumName(String) - case namespaceEnum + case namespaceEnum(String) } // MARK: - Struct Skeleton @@ -533,13 +533,9 @@ public struct ExportedProperty: Codable, Equatable, Sendable { public func callName(prefix: String? = nil) -> String { if let staticContext = staticContext { switch staticContext { - case .className(let baseName), .enumName(let baseName), .structName(let baseName): + case .className(let baseName), .enumName(let baseName), .structName(let baseName), + .namespaceEnum(let baseName): return "\(baseName).\(name)" - case .namespaceEnum: - if let namespace = namespace, !namespace.isEmpty { - let namespacePath = namespace.joined(separator: ".") - return "\(namespacePath).\(name)" - } } } if let prefix = prefix { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift index 26a4e9c3a..dbf044834 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift @@ -53,4 +53,17 @@ enum Internal { } } -// TODO: Add namespace enum with static functions when supported +@JS(namespace: "Services.Graph") +enum GraphOperations { + @JS static func createGraph(rootId: Int) -> Int { + return rootId * 10 + } + + @JS static func nodeCount(graphId: Int) -> Int { + return graphId + } + + @JS static func validate(graphId: Int) throws(JSException) -> Bool { + return graphId > 0 + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts index b8b92d14e..a6934d6e7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts @@ -84,6 +84,15 @@ export type Exports = { }, }, }, + Services: { + Graph: { + GraphOperations: { + createGraph(rootId: number): number; + nodeCount(graphId: number): number; + validate(graphId: number): boolean; + }, + }, + }, Utils: { Converter: { new(): Converter; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js index b01148873..1eb483365 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js @@ -332,6 +332,30 @@ export async function createInstantiator(options, swift) { }, }, }, + Services: { + Graph: { + GraphOperations: { + createGraph: function bjs_Services_Graph_GraphOperations_static_createGraph(rootId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_createGraph(rootId); + return ret; + }, + nodeCount: function bjs_Services_Graph_GraphOperations_static_nodeCount(graphId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_nodeCount(graphId); + return ret; + }, + validate: function bjs_Services_Graph_GraphOperations_static_validate(graphId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_validate(graphId); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return ret !== 0; + }, + }, + }, + }, Utils: { Converter, }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts index 4261ca3bb..f1dc0a926 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts @@ -58,6 +58,15 @@ declare global { } } } + namespace Services { + namespace Graph { + namespace GraphOperations { + createGraph(rootId: number): number; + nodeCount(graphId: number): number; + validate(graphId: number): boolean; + } + } + } namespace Utils { class Converter { constructor(); @@ -103,6 +112,15 @@ export type Exports = { }, }, }, + Services: { + Graph: { + GraphOperations: { + createGraph(rootId: number): number; + nodeCount(graphId: number): number; + validate(graphId: number): boolean; + }, + }, + }, Utils: { Converter: { new(): Converter; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js index 77c327e8d..f48a0050e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js @@ -349,6 +349,15 @@ export async function createInstantiator(options, swift) { if (typeof globalThis.Networking.APIV2.Internal === 'undefined') { globalThis.Networking.APIV2.Internal = {}; } + if (typeof globalThis.Services === 'undefined') { + globalThis.Services = {}; + } + if (typeof globalThis.Services.Graph === 'undefined') { + globalThis.Services.Graph = {}; + } + if (typeof globalThis.Services.Graph.GraphOperations === 'undefined') { + globalThis.Services.Graph.GraphOperations = {}; + } if (typeof globalThis.Utils === 'undefined') { globalThis.Utils = {}; } @@ -369,6 +378,30 @@ export async function createInstantiator(options, swift) { }, }, }, + Services: { + Graph: { + GraphOperations: { + createGraph: function bjs_Services_Graph_GraphOperations_static_createGraph(rootId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_createGraph(rootId); + return ret; + }, + nodeCount: function bjs_Services_Graph_GraphOperations_static_nodeCount(graphId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_nodeCount(graphId); + return ret; + }, + validate: function bjs_Services_Graph_GraphOperations_static_validate(graphId) { + const ret = instance.exports.bjs_Services_Graph_GraphOperations_static_validate(graphId); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return ret !== 0; + }, + }, + }, + }, Utils: { Converter, }, @@ -377,6 +410,9 @@ export async function createInstantiator(options, swift) { globalThis.Utils.Converter = exports.Utils.Converter; globalThis.Networking.API.HTTPServer = exports.Networking.API.HTTPServer; globalThis.Networking.APIV2.Internal.TestServer = exports.Networking.APIV2.Internal.TestServer; + globalThis.Services.Graph.GraphOperations.createGraph = exports.Services.Graph.GraphOperations.createGraph; + globalThis.Services.Graph.GraphOperations.nodeCount = exports.Services.Graph.GraphOperations.nodeCount; + globalThis.Services.Graph.GraphOperations.validate = exports.Services.Graph.GraphOperations.validate; return exports; }, } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json index 42a084c44..135908d7f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json @@ -400,6 +400,129 @@ ], "swiftCallName" : "Internal.SupportedMethod", "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GraphOperations", + "namespace" : [ + "Services", + "Graph" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "createGraph", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "rootId", + "name" : "rootId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "nodeCount", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : true + }, + "name" : "validate", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GraphOperations", + "tsFullPath" : "Services.Graph.GraphOperations" } ], "exposeToGlobal" : true, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift index 9683b5307..43e3f69a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -82,6 +82,53 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { } } +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_createGraph") +@_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") +public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_nodeCount") +@_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") +public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_validate") +@_cdecl("bjs_Services_Graph_GraphOperations_static_validate") +public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32) -> Int32 { + #if arch(wasm32) + do { + let ret = try GraphOperations.validate(graphId: Int.bridgeJSLiftParameter(graphId)) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") public func _bjs_Converter_init() -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json index 23bb06429..374ae13f4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json @@ -400,6 +400,129 @@ ], "swiftCallName" : "Internal.SupportedMethod", "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GraphOperations", + "namespace" : [ + "Services", + "Graph" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "createGraph", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "rootId", + "name" : "rootId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "nodeCount", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : true + }, + "name" : "validate", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GraphOperations", + "tsFullPath" : "Services.Graph.GraphOperations" } ], "exposeToGlobal" : false, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index 9683b5307..43e3f69a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -82,6 +82,53 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { } } +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_createGraph") +@_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") +public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_nodeCount") +@_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") +public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_validate") +@_cdecl("bjs_Services_Graph_GraphOperations_static_validate") +public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32) -> Int32 { + #if arch(wasm32) + do { + let ret = try GraphOperations.validate(graphId: Int.bridgeJSLiftParameter(graphId)) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") public func _bjs_Converter_init() -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json index 3b6937c30..0eec726c8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json @@ -311,7 +311,7 @@ }, "staticContext" : { "namespaceEnum" : { - + "_0" : "Utils.String" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json index 652465dff..372504135 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json @@ -311,7 +311,7 @@ }, "staticContext" : { "namespaceEnum" : { - + "_0" : "Utils.String" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json index 4ec19f83c..28457fb63 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json @@ -220,7 +220,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace" } }, "type" : { @@ -238,7 +238,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace" } }, "type" : { @@ -274,7 +274,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { @@ -293,7 +293,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { @@ -312,7 +312,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json index 0e8b2de22..829c20718 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json @@ -220,7 +220,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace" } }, "type" : { @@ -238,7 +238,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace" } }, "type" : { @@ -274,7 +274,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { @@ -293,7 +293,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { @@ -312,7 +312,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "PropertyNamespace.Nested" } }, "type" : { diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json index 8b91ea964..e7bcf59b6 100644 --- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json @@ -406,7 +406,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "GlobalStaticPropertyNamespace" } }, "type" : { @@ -424,7 +424,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "GlobalStaticPropertyNamespace" } }, "type" : { @@ -460,7 +460,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "GlobalStaticPropertyNamespace.NestedProperties" } }, "type" : { @@ -479,7 +479,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "GlobalStaticPropertyNamespace.NestedProperties" } }, "type" : { @@ -498,7 +498,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "GlobalStaticPropertyNamespace.NestedProperties" } }, "type" : { diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 2aee862c6..f82106ac1 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -295,6 +295,16 @@ struct TestError: Error { return String(value) } } + + @JS enum StringUtils { + @JS static func uppercase(_ text: String) -> String { + return text.uppercased() + } + + @JS static func lowercase(_ text: String) -> String { + return text.lowercased() + } + } } @JS enum Networking { @@ -788,6 +798,17 @@ enum APIOptionalResult { } } +@JS(namespace: "Services.Graph") +enum GraphOperations { + @JS static func createGraph(rootId: Int) -> Int { + return rootId * 10 + } + + @JS static func nodeCount(graphId: Int) -> Int { + return graphId + } +} + // MARK: - Default Parameters @JS func testStringDefault(message: String = "Hello World") -> String { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 35a53805d..42f360ce7 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1350,6 +1350,28 @@ extension TSDirection: _BridgedSwiftCaseEnum { extension TSTheme: _BridgedSwiftEnumNoPayload { } +@_expose(wasm, "bjs_Utils_StringUtils_static_uppercase") +@_cdecl("bjs_Utils_StringUtils_static_uppercase") +public func _bjs_Utils_StringUtils_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { + #if arch(wasm32) + let ret = Utils.StringUtils.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Utils_StringUtils_static_lowercase") +@_cdecl("bjs_Utils_StringUtils_static_lowercase") +public func _bjs_Utils_StringUtils_static_lowercase(_ textBytes: Int32, _ textLength: Int32) -> Void { + #if arch(wasm32) + let ret = Utils.StringUtils.lowercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension Networking.API.Method: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -1992,6 +2014,28 @@ public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valu #endif } +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_createGraph") +@_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") +public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Services_Graph_GraphOperations_static_nodeCount") +@_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") +public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { + #if arch(wasm32) + let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension StaticPropertyEnum: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index c79139ea4..5d75ef55e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -3500,6 +3500,91 @@ { "cases" : [ + ], + "emitStyle" : "const", + "name" : "StringUtils", + "namespace" : [ + "Utils" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Utils_StringUtils_static_uppercase", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "uppercase", + "namespace" : [ + "Utils", + "StringUtils" + ], + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "Utils.StringUtils" + } + } + }, + { + "abiName" : "bjs_Utils_StringUtils_static_lowercase", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "lowercase", + "namespace" : [ + "Utils", + "StringUtils" + ], + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "Utils.StringUtils" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils.StringUtils", + "tsFullPath" : "Utils.StringUtils" + }, + { + "cases" : [ + ], "emitStyle" : "const", "name" : "Networking", @@ -4356,7 +4441,7 @@ }, "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticUtils.Nested" } } } @@ -4367,6 +4452,94 @@ "swiftCallName" : "StaticUtils.Nested", "tsFullPath" : "StaticUtils.Nested" }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GraphOperations", + "namespace" : [ + "Services", + "Graph" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "createGraph", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "rootId", + "name" : "rootId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "nodeCount", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GraphOperations", + "tsFullPath" : "Services.Graph.GraphOperations" + }, { "cases" : [ { @@ -4501,7 +4674,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticPropertyNamespace" } }, "type" : { @@ -4519,7 +4692,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticPropertyNamespace" } }, "type" : { @@ -4555,7 +4728,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticPropertyNamespace.NestedProperties" } }, "type" : { @@ -4574,7 +4747,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticPropertyNamespace.NestedProperties" } }, "type" : { @@ -4593,7 +4766,7 @@ ], "staticContext" : { "namespaceEnum" : { - + "_0" : "StaticPropertyNamespace.NestedProperties" } }, "type" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 12307d605..0319ce424 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -527,6 +527,11 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(converter.toString(123), "123"); converter.release(); + assert.equal(exports.Utils.StringUtils.uppercase("hello"), "HELLO"); + assert.equal(exports.Utils.StringUtils.uppercase(""), ""); + assert.equal(exports.Utils.StringUtils.lowercase("WORLD"), "world"); + assert.equal(exports.Utils.StringUtils.lowercase("HeLLo"), "hello"); + const httpServer = new exports.Networking.API.HTTPServer(); httpServer.call(exports.Networking.API.Method.Get); httpServer.call(exports.Networking.API.Method.Post); @@ -717,6 +722,11 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.StaticUtils.Nested.roundtrip("hello world"), "hello world"); assert.equal(exports.StaticUtils.Nested.roundtrip("test"), "test"); + assert.equal(exports.Services.Graph.GraphOperations.createGraph(5), 50); + assert.equal(exports.Services.Graph.GraphOperations.createGraph(0), 0); + assert.equal(exports.Services.Graph.GraphOperations.nodeCount(42), 42); + assert.equal(exports.Services.Graph.GraphOperations.nodeCount(0), 0); + // Test default parameters assert.equal(exports.testStringDefault(), "Hello World"); assert.equal(exports.testStringDefault("Custom Message"), "Custom Message"); From d0724f291a7c66b464653284edb0ff1aef7070dd Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 3 Feb 2026 17:33:06 +0700 Subject: [PATCH 127/252] BridgeJS: Add intrinsic extensions for stack-based lifting and refactor Swift glue code generation to use them (#554) BridgeJS: Add reusable intrinsics for stack-based types --- .../Sources/Generated/BridgeJS.Macros.swift | 2 +- Benchmarks/Sources/Generated/BridgeJS.swift | 514 +++------ .../Generated/BridgeJS.Macros.swift | 2 +- .../Sources/BridgeJSCore/ExportSwift.swift | 244 ++--- .../Sources/TS2Swift/JavaScript/src/cli.js | 2 +- .../TS2Swift/JavaScript/src/processor.js | 4 +- .../ExportSwiftTests/ArrayTypes.swift | 299 +----- .../ExportSwiftTests/DefaultParameters.swift | 108 +- .../EnumAssociatedValue.swift | 272 ++--- .../EnumNamespace.Global.swift | 4 +- .../ExportSwiftTests/EnumNamespace.swift | 4 +- .../ExportSwiftTests/EnumRawType.swift | 24 +- .../ExportSwiftTests/Protocol.swift | 67 +- .../StaticFunctions.Global.swift | 18 +- .../ExportSwiftTests/StaticFunctions.swift | 18 +- .../ExportSwiftTests/SwiftClosure.swift | 40 +- .../ExportSwiftTests/SwiftStruct.swift | 79 +- .../ExportSwiftTests/UnsafePointer.swift | 20 +- .../ImportTSTests/ArrayParameter.Macros.swift | 2 +- .../ImportTSTests/Async.Macros.swift | 2 +- .../ImportTSTests/Interface.Macros.swift | 2 +- .../InvalidPropertyNames.Macros.swift | 2 +- .../MultipleImportedTypes.Macros.swift | 2 +- .../PrimitiveParameters.Macros.swift | 2 +- .../PrimitiveReturn.Macros.swift | 2 +- .../ImportTSTests/ReExportFrom.Macros.swift | 2 +- .../ImportTSTests/StringEnum.Macros.swift | 4 +- .../StringParameter.Macros.swift | 2 +- .../ImportTSTests/StringReturn.Macros.swift | 2 +- .../TS2SkeletonLike.Macros.swift | 2 +- .../ImportTSTests/TypeAlias.Macros.swift | 2 +- .../TypeScriptClass.Macros.swift | 2 +- .../VoidParameterVoidReturn.Macros.swift | 2 +- Plugins/PackageToJS/Templates/instantiate.js | 3 + .../JavaScriptKit/BridgeJSIntrinsics.swift | 355 ++++++- .../Generated/BridgeJS.swift | 4 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 6 + .../Generated/BridgeJS.Macros.swift | 4 +- .../Generated/BridgeJS.swift | 981 +++++------------- .../Generated/JavaScript/BridgeJS.json | 78 ++ Tests/prelude.mjs | 2 + 41 files changed, 1223 insertions(+), 1963 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift index bc2ceb32b..edf727004 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func benchmarkHelperNoop() throws (JSException) -> Void diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 86f4c87dc..1a413268d 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -11,15 +11,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .flag(Bool.bridgeJSLiftParameter()) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .rate(Float.bridgeJSLiftParameter()) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .precise(Double.bridgeJSLiftParameter()) case 5: return .info default: @@ -32,22 +32,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) case .flag(let param0): - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() return Int32(2) case .rate(let param0): - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() return Int32(3) case .precise(let param0): - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() return Int32(4) case .info: return Int32(5) @@ -68,22 +65,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() case .rate(let param0): _swift_js_push_tag(Int32(3)) - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() case .precise(let param0): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(5)) } @@ -94,17 +88,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) case 2: - return .location(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .location(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 3: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 4: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 6: return .info default: @@ -117,58 +111,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .error(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) case .location(let param0, let param1, let param2): - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(2) case .status(let param0, let param1, let param2): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(3) case .coordinates(let param0, let param1, let param2): - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() return Int32(5) case .info: return Int32(6) @@ -189,58 +162,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .error(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() case .location(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(3)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .coordinates(let param0, let param1, let param2): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(5)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(6)) } @@ -249,23 +201,20 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { extension SimpleStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SimpleStruct { - let precise = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let rate = Float.bridgeJSLiftParameter(_swift_js_pop_f32()) - let flag = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) - let count = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let precise = Double.bridgeJSLiftParameter() + let rate = Float.bridgeJSLiftParameter() + let flag = Bool.bridgeJSLiftParameter() + let count = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return SimpleStruct(name: name, count: count, flag: flag, rate: rate, precise: precise) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.count)) - _swift_js_push_i32(self.flag ? 1 : 0) - _swift_js_push_f32(self.rate) - _swift_js_push_f64(self.precise) + self.name.bridgeJSLowerStackReturn() + self.count.bridgeJSLowerStackReturn() + self.flag.bridgeJSLowerStackReturn() + self.rate.bridgeJSLowerStackReturn() + self.precise.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -303,22 +252,16 @@ fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let zipCode = Int.bridgeJSLiftParameter() + let city = String.bridgeJSLiftParameter() + let street = String.bridgeJSLiftParameter() return Address(street: street, city: city, zipCode: zipCode) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_street = self.street - __bjs_street.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_city = self.city - __bjs_city.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.zipCode)) + self.street.bridgeJSLowerStackReturn() + self.city.bridgeJSLowerStackReturn() + self.zipCode.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -356,26 +299,20 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) + let email = Optional.bridgeJSLiftParameter() let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let age = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return Person(name: name, age: age, address: address, email: email) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.age)) + self.name.bridgeJSLowerStackReturn() + self.age.bridgeJSLowerStackReturn() self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - var __bjs_str_email = __bjs_unwrapped_email - __bjs_str_email.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -415,31 +352,22 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { extension ComplexStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ComplexStruct { - let metadata = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let tags = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let score = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let active = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) - let title = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let metadata = String.bridgeJSLiftParameter() + let tags = String.bridgeJSLiftParameter() + let score = Double.bridgeJSLiftParameter() + let active = Bool.bridgeJSLiftParameter() + let title = String.bridgeJSLiftParameter() + let id = Int.bridgeJSLiftParameter() return ComplexStruct(id: id, title: title, active: active, score: score, tags: tags, metadata: metadata) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) - var __bjs_title = self.title - __bjs_title.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(self.active ? 1 : 0) - _swift_js_push_f64(self.score) - var __bjs_tags = self.tags - __bjs_tags.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_metadata = self.metadata - __bjs_metadata.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.id.bridgeJSLowerStackReturn() + self.title.bridgeJSLowerStackReturn() + self.active.bridgeJSLowerStackReturn() + self.score.bridgeJSLowerStackReturn() + self.tags.bridgeJSLowerStackReturn() + self.metadata.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -477,14 +405,14 @@ fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let y = Double.bridgeJSLiftParameter() + let x = Double.bridgeJSLiftParameter() return Point(x: x, y: y) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.x) - _swift_js_push_f64(self.y) + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -1487,16 +1415,7 @@ public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ArrayRoundtrip_takeIntArray") public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: [Int].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1507,9 +1426,7 @@ public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) - public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1519,19 +1436,8 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ArrayRoundtrip_roundtripIntArray") public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1542,9 +1448,7 @@ public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1554,16 +1458,7 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ArrayRoundtrip_takeDoubleArray") public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: [Double].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1574,9 +1469,7 @@ public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() - for __bjs_elem_ret in ret { - _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1586,19 +1479,8 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripDoubleArray") public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: [Double].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1608,16 +1490,7 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takeStringArray") public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: [String].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1628,12 +1501,7 @@ public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeStringArray() - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1643,22 +1511,8 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripStringArray") public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: [String].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1668,16 +1522,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takePointArray") public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: [Point].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1688,9 +1533,7 @@ public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1700,19 +1543,8 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ArrayRoundtrip_roundtripPointArray") public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: [Point].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1723,9 +1555,7 @@ public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPoi public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1740,16 +1570,7 @@ public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPoin var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result @@ -1765,9 +1586,7 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1783,24 +1602,13 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1816,16 +1624,7 @@ public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPo var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result @@ -1841,9 +1640,7 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1859,24 +1656,13 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1892,7 +1678,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPo var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -1910,7 +1696,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -1927,7 +1713,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -1935,7 +1721,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -1952,7 +1738,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRaw var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -1987,7 +1773,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -2011,16 +1797,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint if values == 0 { return Optional<[Int]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [Int].bridgeJSLiftParameter() } }()) #else @@ -2035,9 +1812,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -2051,9 +1826,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -2068,23 +1841,12 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw if values == 0 { return Optional<[Int]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [Int].bridgeJSLiftParameter() } }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift index 221302716..cc62396ea 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func createTS2Swift() throws (JSException) -> TS2Swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 1f8f72ad7..0c5debeac 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -793,60 +793,56 @@ struct StackCodegen { /// - Returns: An ExprSyntax representing the lift expression func liftExpression(for type: BridgeType) -> ExprSyntax { switch type { - case .string: - return "String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .int, .uint: - return "Int.bridgeJSLiftParameter(_swift_js_pop_i32())" - case .bool: - return "Bool.bridgeJSLiftParameter(_swift_js_pop_i32())" - case .float: - return "Float.bridgeJSLiftParameter(_swift_js_pop_f32())" - case .double: - return "Double.bridgeJSLiftParameter(_swift_js_pop_f64())" - case .jsObject: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())" - case .swiftHeapObject(let className): - return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_pointer())" + case .string, .int, .uint, .bool, .float, .double, + .jsObject, .swiftStruct, .swiftHeapObject: + return "\(raw: type.swiftType).bridgeJSLiftParameter()" case .unsafePointer: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_pointer())" + return "\(raw: type.swiftType).bridgeJSLiftParameter()" case .swiftProtocol(let protocolName): - // Protocols use their Any wrapper type for lifting - let wrapperName = "Any\(protocolName)" - return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .caseEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .rawValueEnum(let enumName, let rawType): + return "Any\(raw: protocolName).bridgeJSLiftParameter(_swift_js_pop_i32())" + case .caseEnum: + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" + case .rawValueEnum(_, let rawType): switch rawType { case .string: return - "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" + "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" case .float: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f32())" + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_f32())" case .double: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f64())" + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_f64())" case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" } - case .associatedValueEnum(let enumName): - return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .swiftStruct(let structName): - return "\(raw: structName).bridgeJSLiftParameter()" + case .associatedValueEnum: + return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" case .optional(let wrappedType): return liftOptionalExpression(wrappedType: wrappedType) - case .void: - // Void shouldn't be lifted, but return a placeholder - return "()" - case .namespaceEnum: - // Namespace enums are not passed as values - return "()" - case .closure: - return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())" case .array(let elementType): return liftArrayExpression(elementType: elementType) + case .closure: + return "JSObject.bridgeJSLiftParameter()" + case .void, .namespaceEnum: + return "()" } } func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { + switch elementType { + case .int, .uint, .float, .double, .string, .bool, + .jsObject, .swiftStruct, .caseEnum, .swiftHeapObject, + .unsafePointer, .rawValueEnum, .associatedValueEnum: + return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" + case .swiftProtocol(let protocolName): + return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" + case .optional, .array, .closure: + return liftArrayExpressionInline(elementType: elementType) + case .void, .namespaceEnum: + fatalError("Invalid array element type: \(elementType)") + } + } + + private func liftArrayExpressionInline(elementType: BridgeType) -> ExprSyntax { let elementLift = liftExpression(for: elementType) let swiftTypeName = elementType.swiftType return """ @@ -865,45 +861,9 @@ struct StackCodegen { private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { switch wrappedType { - case .string: - return - "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())" - case .int, .uint: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .bool: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .float: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())" - case .double: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())" - case .caseEnum(let enumName): - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .rawValueEnum(let enumName, let rawType): - switch rawType { - case .string: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())" - case .float: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())" - case .double: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())" - case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - } - case .swiftStruct(let nestedName): - return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_i32())" - case .swiftHeapObject(let className): - return - "Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer())" - case .associatedValueEnum(let enumName): - return - "Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .jsObject: - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" + case .string, .int, .uint, .bool, .float, .double, .jsObject, + .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: + return "Optional<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" case .array(let elementType): let arrayLift = liftArrayExpression(elementType: elementType) let swiftTypeName = elementType.swiftType @@ -917,9 +877,8 @@ struct StackCodegen { } }() """ - default: - // Fallback for other optional types - return "Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" + case .void, .namespaceEnum, .closure, .optional, .unsafePointer, .swiftProtocol: + fatalError("Invalid optional wrapped type: \(wrappedType)") } } @@ -935,56 +894,23 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch type { - case .string: - return [ - "var __bjs_\(raw: varPrefix) = \(raw: accessor)", - "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .int, .uint: - return ["_swift_js_push_i32(Int32(\(raw: accessor)))"] - case .bool: - return ["_swift_js_push_i32(\(raw: accessor) ? 1 : 0)"] - case .float: - return ["_swift_js_push_f32(\(raw: accessor))"] - case .double: - return ["_swift_js_push_f64(\(raw: accessor))"] + case .string, .int, .uint, .bool, .float, .double: + return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .jsObject: - return ["_swift_js_push_i32(\(raw: accessor).bridgeJSLowerReturn())"] - case .swiftHeapObject: - return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] - case .unsafePointer: - return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] + return ["\(raw: accessor).bridgeJSLowerStackReturn()"] + case .swiftHeapObject, .unsafePointer, .closure: + return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .swiftProtocol(let protocolName): let wrapperName = "Any\(protocolName)" - return ["_swift_js_push_i32((\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerReturn())"] - case .caseEnum: - return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return [ - "var __bjs_\(raw: varPrefix) = \(raw: accessor).rawValue", - "__bjs_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .float: - return ["_swift_js_push_f32(\(raw: accessor).bridgeJSLowerParameter())"] - case .double: - return ["_swift_js_push_f64(\(raw: accessor).bridgeJSLowerParameter())"] - default: - return ["_swift_js_push_i32(Int32(\(raw: accessor).bridgeJSLowerParameter()))"] - } - case .associatedValueEnum: - return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .swiftStruct: + return ["(\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerStackReturn()"] + case .caseEnum, .rawValueEnum: + return ["\(raw: accessor).bridgeJSLowerStackReturn()"] + case .associatedValueEnum, .swiftStruct: return ["\(raw: accessor).bridgeJSLowerReturn()"] case .optional(let wrappedType): return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) - case .void: + case .void, .namespaceEnum: return [] - case .namespaceEnum: - return [] - case .closure: - return ["_swift_js_push_pointer(\(raw: accessor).bridgeJSLowerReturn())"] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: accessor, varPrefix: varPrefix) } @@ -994,6 +920,29 @@ struct StackCodegen { elementType: BridgeType, accessor: String, varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch elementType { + case .int, .uint, .float, .double, .string, .bool, + .jsObject, .swiftStruct, .caseEnum, .swiftHeapObject, + .unsafePointer, .rawValueEnum, .associatedValueEnum: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .swiftProtocol(let protocolName): + return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] + case .optional, .array, .closure: + return lowerArrayStatementsInline( + elementType: elementType, + accessor: accessor, + varPrefix: varPrefix + ) + case .void, .namespaceEnum: + fatalError("Invalid array element type: \(elementType)") + } + } + + private func lowerArrayStatementsInline( + elementType: BridgeType, + accessor: String, + varPrefix: String ) -> [CodeBlockItemSyntax] { var statements: [CodeBlockItemSyntax] = [] let elementVarName = "__bjs_elem_\(varPrefix)" @@ -1042,43 +991,20 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch wrappedType { - case .string: - return [ - "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar)", - "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .int, .uint: - return ["_swift_js_push_i32(Int32(\(raw: unwrappedVar)))"] - case .bool: - return ["_swift_js_push_i32(\(raw: unwrappedVar) ? 1 : 0)"] - case .float: - return ["_swift_js_push_f32(\(raw: unwrappedVar))"] - case .double: - return ["_swift_js_push_f64(\(raw: unwrappedVar))"] - case .caseEnum: - return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return [ - "var __bjs_str_\(raw: varPrefix) = \(raw: unwrappedVar).rawValue", - "__bjs_str_\(raw: varPrefix).withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) }", - ] - case .float: - return ["_swift_js_push_f32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .double: - return ["_swift_js_push_f64(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - default: - return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - } + case .string, .int, .uint, .bool, .float, .double: + return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] + case .caseEnum, .rawValueEnum: + // Enums conform to _BridgedSwiftStackType + return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .swiftStruct: return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] case .swiftHeapObject: - return ["_swift_js_push_pointer(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .associatedValueEnum: + // Push payloads via bridgeJSLowerParameter(), then push the returned case ID return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .jsObject: - return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerReturn())"] + return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) default: @@ -1145,7 +1071,17 @@ struct EnumCodegen { } private func renderRawValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { - return "extension \(raw: enumDef.swiftCallName): _BridgedSwiftEnumNoPayload {}" + let typeName = enumDef.swiftCallName + guard enumDef.rawType != nil else { + return """ + extension \(raw: typeName): _BridgedSwiftEnumNoPayload {} + """ + } + // When rawType is present, conform to _BridgedSwiftRawValueEnum which provides + // default implementations for _BridgedSwiftStackType methods via protocol extension. + return """ + extension \(raw: typeName): _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} + """ } private func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 645be1f5a..922b8dbbc 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -154,7 +154,7 @@ export function main(args) { "// To update this file, just rebuild your project or run", "// `swift package bridge-js`.", "", - "@_spi(Experimental) import JavaScriptKit", + "@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit", "", "", ].join("\n"); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index e48510466..1d2d0f64f 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -399,7 +399,7 @@ export class TypeProcessor { this.swiftLines.push(` case ${this.renderIdentifier(name)} = "${raw.replaceAll("\"", "\\\\\"")}"`); } this.swiftLines.push("}"); - this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload {}`); + this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {}`); this.swiftLines.push(""); return; } @@ -410,7 +410,7 @@ export class TypeProcessor { this.swiftLines.push(` case ${this.renderIdentifier(name)} = ${raw}`); } this.swiftLines.push("}"); - this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload {}`); + this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {}`); this.swiftLines.push(""); return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift index 711694c9d..55a6258b0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift @@ -41,19 +41,19 @@ extension Direction: _BridgedSwiftCaseEnum { } } -extension Status: _BridgedSwiftEnumNoPayload { +extension Status: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let y = Double.bridgeJSLiftParameter() + let x = Double.bridgeJSLiftParameter() return Point(x: x, y: y) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.x) - _swift_js_push_f64(self.y) + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -93,19 +93,8 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { @_cdecl("bjs_processIntArray") public func _bjs_processIntArray() -> Void { #if arch(wasm32) - let ret = processIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + let ret = processIntArray(_: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -115,22 +104,8 @@ public func _bjs_processIntArray() -> Void { @_cdecl("bjs_processStringArray") public func _bjs_processStringArray() -> Void { #if arch(wasm32) - let ret = processStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + let ret = processStringArray(_: [String].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -140,19 +115,8 @@ public func _bjs_processStringArray() -> Void { @_cdecl("bjs_processDoubleArray") public func _bjs_processDoubleArray() -> Void { #if arch(wasm32) - let ret = processDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_i32(Int32(ret.count)) + let ret = processDoubleArray(_: [Double].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -162,19 +126,8 @@ public func _bjs_processDoubleArray() -> Void { @_cdecl("bjs_processBoolArray") public func _bjs_processBoolArray() -> Void { #if arch(wasm32) - let ret = processBoolArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Bool] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = processBoolArray(_: [Bool].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -184,19 +137,8 @@ public func _bjs_processBoolArray() -> Void { @_cdecl("bjs_processPointArray") public func _bjs_processPointArray() -> Void { #if arch(wasm32) - let ret = processPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = processPointArray(_: [Point].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -206,19 +148,8 @@ public func _bjs_processPointArray() -> Void { @_cdecl("bjs_processDirectionArray") public func _bjs_processDirectionArray() -> Void { #if arch(wasm32) - let ret = processDirectionArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Direction] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(ret.count)) + let ret = processDirectionArray(_: [Direction].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -228,19 +159,8 @@ public func _bjs_processDirectionArray() -> Void { @_cdecl("bjs_processStatusArray") public func _bjs_processStatusArray() -> Void { #if arch(wasm32) - let ret = processStatusArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Status] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(ret.count)) + let ret = processStatusArray(_: [Status].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -250,16 +170,7 @@ public func _bjs_processStatusArray() -> Void { @_cdecl("bjs_sumIntArray") public func _bjs_sumIntArray() -> Int32 { #if arch(wasm32) - let ret = sumIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + let ret = sumIntArray(_: [Int].bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -270,16 +181,7 @@ public func _bjs_sumIntArray() -> Int32 { @_cdecl("bjs_findFirstPoint") public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { #if arch(wasm32) - let ret = findFirstPoint(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) + let ret = findFirstPoint(_: [Point].bridgeJSLiftParameter(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -290,19 +192,8 @@ public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) @_cdecl("bjs_processUnsafeRawPointerArray") public func _bjs_processUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [UnsafeRawPointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = processUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -312,19 +203,8 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { @_cdecl("bjs_processUnsafeMutableRawPointerArray") public func _bjs_processUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [UnsafeMutableRawPointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = processUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -334,19 +214,8 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { @_cdecl("bjs_processOpaquePointerArray") public func _bjs_processOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = processOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [OpaquePointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = processOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -361,7 +230,7 @@ public func _bjs_processOptionalIntArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -369,7 +238,7 @@ public func _bjs_processOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -386,7 +255,7 @@ public func _bjs_processOptionalStringArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -394,10 +263,7 @@ public func _bjs_processOptionalStringArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - var __bjs_str_ret_elem = __bjs_unwrapped_ret_elem - __bjs_str_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -413,23 +279,12 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { if values == 0 { return Optional<[Int]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [Int].bridgeJSLiftParameter() } }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -445,7 +300,7 @@ public func _bjs_processOptionalPointArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -470,7 +325,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -478,7 +333,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -495,7 +350,7 @@ public func _bjs_processOptionalStatusArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -503,7 +358,7 @@ public func _bjs_processOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -520,24 +375,13 @@ public func _bjs_processNestedIntArray() -> Void { var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -553,27 +397,13 @@ public func _bjs_processNestedStringArray() -> Void { var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([String].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - var __bjs_ret_elem_elem = __bjs_elem_ret_elem - __bjs_ret_elem_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -589,24 +419,13 @@ public func _bjs_processNestedPointArray() -> Void { var __result: [[Point]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Point] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Point.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -617,19 +436,8 @@ public func _bjs_processNestedPointArray() -> Void { @_cdecl("bjs_processItemArray") public func _bjs_processItemArray() -> Void { #if arch(wasm32) - let ret = processItemArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Item] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = processItemArray(_: [Item].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -644,24 +452,13 @@ public func _bjs_processNestedItemArray() -> Void { var __result: [[Item]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Item] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Item.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) + __result.append([Item].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift index 5232bdd53..4c4c69c99 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift @@ -39,19 +39,16 @@ extension Status: _BridgedSwiftCaseEnum { extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) - let value = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let enabled = Bool.bridgeJSLiftParameter() + let value = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return Config(name: name, value: value, enabled: enabled) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.value)) - _swift_js_push_i32(self.enabled ? 1 : 0) + self.name.bridgeJSLowerStackReturn() + self.value.bridgeJSLowerStackReturn() + self.enabled.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -89,12 +86,12 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let baseValue = Double.bridgeJSLiftParameter() return MathOperations(baseValue: baseValue) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.baseValue) + self.baseValue.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -321,19 +318,8 @@ public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { @_cdecl("bjs_testIntArrayDefault") public func _bjs_testIntArrayDefault() -> Void { #if arch(wasm32) - let ret = testIntArrayDefault(values: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + let ret = testIntArrayDefault(values: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -343,22 +329,8 @@ public func _bjs_testIntArrayDefault() -> Void { @_cdecl("bjs_testStringArrayDefault") public func _bjs_testStringArrayDefault() -> Void { #if arch(wasm32) - let ret = testStringArrayDefault(names: { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + let ret = testStringArrayDefault(names: [String].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -368,19 +340,8 @@ public func _bjs_testStringArrayDefault() -> Void { @_cdecl("bjs_testDoubleArrayDefault") public func _bjs_testDoubleArrayDefault() -> Void { #if arch(wasm32) - let ret = testDoubleArrayDefault(values: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_i32(Int32(ret.count)) + let ret = testDoubleArrayDefault(values: [Double].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -390,19 +351,8 @@ public func _bjs_testDoubleArrayDefault() -> Void { @_cdecl("bjs_testBoolArrayDefault") public func _bjs_testBoolArrayDefault() -> Void { #if arch(wasm32) - let ret = testBoolArrayDefault(flags: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Bool] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = testBoolArrayDefault(flags: [Bool].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -412,19 +362,8 @@ public func _bjs_testBoolArrayDefault() -> Void { @_cdecl("bjs_testEmptyArrayDefault") public func _bjs_testEmptyArrayDefault() -> Void { #if arch(wasm32) - let ret = testEmptyArrayDefault(items: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + let ret = testEmptyArrayDefault(items: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -434,16 +373,7 @@ public func _bjs_testEmptyArrayDefault() -> Void { @_cdecl("bjs_testMixedWithArrayDefault") public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }(), enabled: Bool.bridgeJSLiftParameter(enabled)) + let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: [Int].bridgeJSLiftParameter(), enabled: Bool.bridgeJSLiftParameter(enabled)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift index e35da2f77..0854cba74 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift @@ -2,15 +2,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .flag(Bool.bridgeJSLiftParameter()) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .rate(Float.bridgeJSLiftParameter()) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .precise(Double.bridgeJSLiftParameter()) case 5: return .info default: @@ -23,22 +23,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) case .flag(let param0): - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() return Int32(2) case .rate(let param0): - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() return Int32(3) case .precise(let param0): - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() return Int32(4) case .info: return Int32(5) @@ -59,22 +56,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() case .rate(let param0): _swift_js_push_tag(Int32(3)) - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() case .precise(let param0): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(5)) } @@ -85,15 +79,15 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 3: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) case 4: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 5: return .info default: @@ -106,50 +100,32 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .error(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(2) case .coordinates(let param0, let param1, let param2): - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(3) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() return Int32(4) case .info: return Int32(5) @@ -170,50 +146,32 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .error(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .coordinates(let param0, let param1, let param2): _swift_js_push_tag(Int32(3)) - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(4)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(5)) } @@ -224,11 +182,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -239,25 +197,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(2) } } @@ -276,25 +225,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() } } } @@ -303,9 +243,9 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) default: fatalError("Unknown NetworkingResult case ID: \(caseId)") } @@ -316,17 +256,11 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) } } @@ -345,17 +279,11 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() } } } @@ -364,11 +292,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(Optional.bridgeJSLiftParameter()) case 1: - return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) case 2: - return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } @@ -381,42 +309,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - var __bjs_str_param0 = __bjs_unwrapped_param0 - __bjs_str_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - var __bjs_str_param2 = __bjs_unwrapped_param2 - __bjs_str_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -439,42 +361,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_tag(Int32(0)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - var __bjs_str_param0 = __bjs_unwrapped_param0 - __bjs_str_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - var __bjs_str_param2 = __bjs_unwrapped_param2 - __bjs_str_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift index 43e3f69a4..b1b5e9c8c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift @@ -41,10 +41,10 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum { } } -extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload { +extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Configuration.Port: _BridgedSwiftEnumNoPayload { +extension Configuration.Port: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift index 43e3f69a4..b1b5e9c8c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift @@ -41,10 +41,10 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum { } } -extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload { +extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Configuration.Port: _BridgedSwiftEnumNoPayload { +extension Configuration.Port: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift index 12fdeba04..55c902af0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift @@ -1,37 +1,37 @@ -extension Theme: _BridgedSwiftEnumNoPayload { +extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension TSTheme: _BridgedSwiftEnumNoPayload { +extension TSTheme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension FeatureFlag: _BridgedSwiftEnumNoPayload { +extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension HttpStatus: _BridgedSwiftEnumNoPayload { +extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension TSHttpStatus: _BridgedSwiftEnumNoPayload { +extension TSHttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Priority: _BridgedSwiftEnumNoPayload { +extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension FileSize: _BridgedSwiftEnumNoPayload { +extension FileSize: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension UserId: _BridgedSwiftEnumNoPayload { +extension UserId: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension TokenId: _BridgedSwiftEnumNoPayload { +extension TokenId: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension SessionId: _BridgedSwiftEnumNoPayload { +extension SessionId: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Precision: _BridgedSwiftEnumNoPayload { +extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Ratio: _BridgedSwiftEnumNoPayload { +extension Ratio: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } @_expose(wasm, "bjs_setTheme") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift index 0558e2a1f..21178521d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift @@ -359,16 +359,16 @@ extension Direction: _BridgedSwiftCaseEnum { } } -extension ExampleEnum: _BridgedSwiftEnumNoPayload { +extension ExampleEnum: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) default: fatalError("Unknown Result case ID: \(caseId)") } @@ -379,13 +379,10 @@ extension Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) } } @@ -404,37 +401,25 @@ extension Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() } } } -extension Priority: _BridgedSwiftEnumNoPayload { +extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } @_expose(wasm, "bjs_processDelegates") @_cdecl("bjs_processDelegates") public func _bjs_processDelegates() -> Void { #if arch(wasm32) - let ret = processDelegates(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [AnyMyViewControllerDelegate] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = processDelegates(_: [AnyMyViewControllerDelegate].bridgeJSLiftParameter()) + ret.map { + $0 as! AnyMyViewControllerDelegate + } .bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -653,16 +638,7 @@ fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_init") public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DelegateManager(delegates: { - let __count = Int(_swift_js_pop_i32()) - var __result: [AnyMyViewControllerDelegate] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + let ret = DelegateManager(delegates: [AnyMyViewControllerDelegate].bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -684,9 +660,9 @@ public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates - for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! AnyMyViewControllerDelegate).bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + ret.map { + $0 as! AnyMyViewControllerDelegate + } .bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -696,16 +672,7 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_delegates_set") public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DelegateManager.bridgeJSLiftParameter(_self).delegates = { - let __count = Int(_swift_js_pop_i32()) - var __result: [AnyMyViewControllerDelegate] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(AnyMyViewControllerDelegate.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + DelegateManager.bridgeJSLiftParameter(_self).delegates = [AnyMyViewControllerDelegate].bridgeJSLiftParameter() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift index 378eff8bb..ed6cb98c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) default: fatalError("Unknown APIResult case ID: \(caseId)") } @@ -61,13 +61,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) } } @@ -86,13 +83,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift index 378eff8bb..ed6cb98c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) default: fatalError("Unknown APIResult case ID: \(caseId)") } @@ -61,13 +61,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) } } @@ -86,13 +83,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift index 415aa54f6..df6046693 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift @@ -667,25 +667,25 @@ extension Direction: _BridgedSwiftCaseEnum { } } -extension Theme: _BridgedSwiftEnumNoPayload { +extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension HttpStatus: _BridgedSwiftEnumNoPayload { +extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .flag(Bool.bridgeJSLiftParameter()) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .rate(Float.bridgeJSLiftParameter()) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .precise(Double.bridgeJSLiftParameter()) case 5: return .info default: @@ -698,22 +698,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) case .flag(let param0): - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() return Int32(2) case .rate(let param0): - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() return Int32(3) case .precise(let param0): - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() return Int32(4) case .info: return Int32(5) @@ -734,22 +731,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() case .rate(let param0): _swift_js_push_tag(Int32(3)) - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() case .precise(let param0): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(5)) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift index af4428979..9b7ddd024 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift @@ -1,31 +1,28 @@ -extension Precision: _BridgedSwiftEnumNoPayload { +extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let label = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let optFlag = Optional.bridgeJSLiftParameter() + let optCount = Optional.bridgeJSLiftParameter() + let label = String.bridgeJSLiftParameter() + let y = Double.bridgeJSLiftParameter() + let x = Double.bridgeJSLiftParameter() return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.x) - _swift_js_push_f64(self.y) - var __bjs_label = self.label - __bjs_label.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + self.label.bridgeJSLowerStackReturn() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - _swift_js_push_i32(Int32(__bjs_unwrapped_optCount)) + __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - _swift_js_push_i32(__bjs_unwrapped_optFlag ? 1 : 0) + __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -76,24 +73,18 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let zipCode = Optional.bridgeJSLiftParameter() + let city = String.bridgeJSLiftParameter() + let street = String.bridgeJSLiftParameter() return Address(street: street, city: city, zipCode: zipCode) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_street = self.street - __bjs_street.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_city = self.city - __bjs_city.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.street.bridgeJSLowerStackReturn() + self.city.bridgeJSLowerStackReturn() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - _swift_js_push_i32(Int32(__bjs_unwrapped_zipCode)) + __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -133,26 +124,20 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) + let email = Optional.bridgeJSLiftParameter() let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let age = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return Person(name: name, age: age, address: address, email: email) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.age)) + self.name.bridgeJSLowerStackReturn() + self.age.bridgeJSLowerStackReturn() self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - var __bjs_str_email = __bjs_unwrapped_email - __bjs_str_email.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -192,14 +177,14 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { extension Session: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Session { - let owner = Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let owner = Greeter.bridgeJSLiftParameter() + let id = Int.bridgeJSLiftParameter() return Session(id: id, owner: owner) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) - _swift_js_push_pointer(self.owner.bridgeJSLowerReturn()) + self.id.bridgeJSLowerStackReturn() + self.owner.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -237,18 +222,18 @@ fileprivate func _bjs_struct_lift_Session() -> Int32 { extension Measurement: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Measurement { - let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32()) + let optionalPrecision = Optional.bridgeJSLiftParameter() let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) - let value = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let value = Double.bridgeJSLiftParameter() return Measurement(value: value, precision: precision, optionalPrecision: optionalPrecision) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.value) - _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) + self.value.bridgeJSLowerStackReturn() + self.precision.bridgeJSLowerStackReturn() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) + __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift index 4c368908b..752cc6bc3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift @@ -1,19 +1,19 @@ extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() + let ptr = UnsafePointer.bridgeJSLiftParameter() + let opaque = OpaquePointer.bridgeJSLiftParameter() + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() + let raw = UnsafeRawPointer.bridgeJSLiftParameter() return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_pointer(self.raw.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.mutRaw.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.opaque.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) + self.raw.bridgeJSLowerStackReturn() + self.mutRaw.bridgeJSLowerStackReturn() + self.opaque.bridgeJSLowerStackReturn() + self.ptr.bridgeJSLowerStackReturn() + self.mutPtr.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift index cf1118df0..551385093 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift index dd0377377..032fcadfc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift index 5d13234ca..8c60cd218 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func returnAnimatable() throws (JSException) -> Animatable diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift index 43d6a3eb9..37ccd0287 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift index 47efcbc84..f7b2ebc3b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift index eea42f30d..72f503afa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift index 15867131d..1f24ec359 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func checkNumber() throws (JSException) -> Double diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift index 0c0dfb362..f71778e26 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift index b0049af28..7140ecac7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift @@ -4,13 +4,13 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit enum FeatureFlag: String { case foo = "foo" case bar = "bar" } -extension FeatureFlag: _BridgedSwiftEnumNoPayload {} +extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift index 38fe0dd2b..75ba0eefd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func checkString(_ a: String) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift index 60aae03c4..c7618d7ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func checkString() throws (JSException) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift index e0d6c9d24..eab06f1db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift index 62b2b4663..ef9500566 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift index 1fbf3376d..a0857a57e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSClass struct Greeter { @JSGetter var name: String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift index b3a7fc6f6..7247e3aff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift @@ -4,6 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func check() throws (JSException) -> Void diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 54a7212c6..c17d78841 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -62,6 +62,9 @@ async function createInstantiator(options, swift) { swift_js_get_optional_double_presence: unexpectedBjsCall, swift_js_get_optional_double_value: unexpectedBjsCall, swift_js_get_optional_heap_object_pointer: unexpectedBjsCall, + swift_js_push_pointer: unexpectedBjsCall, + swift_js_pop_pointer: unexpectedBjsCall, + swift_js_struct_cleanup: unexpectedBjsCall, } }, /** @param {WebAssembly.Instance} instance */ diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 1e7893c82..7b2d97f06 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -64,6 +64,8 @@ import _CJavaScriptKit // // MARK: ExportSwift // @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ ...) -> <#Self#> { // } +// @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> <#Self#> { +// } // @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> <#WasmCoreType#> { // } // } @@ -75,7 +77,10 @@ import _CJavaScriptKit // - `func bridgeJSLowerParameter()`: lower the given higher-level parameter to a WebAssembly core type // - `func bridgeJSLiftReturn(_ ...) -> <#TargetType#>`: lift the given Wasm core type return value to a higher-level type // - `func bridgeJSLiftParameter(_ ...) -> <#TargetType#>`: lift the given Wasm core type parameters to a higher-level type +// - `func bridgeJSLiftParameter() -> <#TargetType#>`: no-arg overload that pops parameters from the param stack internally. +// Note: Pop order must match Swift's left-to-right argument evaluation order. // - `func bridgeJSLowerReturn() -> <#WasmCoreType#>`: lower the given higher-level return value to a Wasm core type +// - `func bridgeJSLowerStackReturn()`: push the value onto the return stack (used by _BridgedSwiftStackType for array elements) // // Optional types (ExportSwift only) additionally define: // - `func bridgeJSLowerParameterWithRetain()`: lower optional heap object with ownership transfer for escaping closures @@ -94,7 +99,13 @@ public protocol _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { consuming func bridgeJSLowerReturn() -> WasmCoreType } -extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { +public protocol _BridgedSwiftStackType { + associatedtype StackLiftResult = Self + static func bridgeJSLiftParameter() -> StackLiftResult + consuming func bridgeJSLowerStackReturn() +} + +extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { self ? 1 : 0 @@ -106,12 +117,18 @@ extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Bool { value == 1 } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Bool { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { self ? 1 : 0 } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(self ? 1 : 0) + } } -extension Int: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { +extension Int: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { Int32(self) @@ -123,12 +140,18 @@ extension Int: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Int { Int(value) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { Int32(self) } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(Int32(self)) + } } -extension UInt: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { +extension UInt: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { Int32(bitPattern: UInt32(self)) @@ -140,12 +163,54 @@ extension UInt: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> UInt { UInt(UInt32(bitPattern: value)) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { Int32(bitPattern: UInt32(self)) } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(Int32(bitPattern: UInt32(self))) + } +} + +extension Int32: _BridgedSwiftStackType { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int32 { + _swift_js_pop_i32() + } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(self) + } +} + +extension Int64: _BridgedSwiftStackType { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int64 { + Int64(_swift_js_pop_i32()) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(Int32(self)) + } +} + +extension UInt32: _BridgedSwiftStackType { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt32 { + UInt32(bitPattern: _swift_js_pop_i32()) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(Int32(bitPattern: self)) + } } -extension Float: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { +extension UInt64: _BridgedSwiftStackType { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt64 { + UInt64(UInt32(bitPattern: _swift_js_pop_i32())) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(Int32(bitPattern: UInt32(self))) + } +} + +extension Float: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Float32 { Float32(self) @@ -157,12 +222,18 @@ extension Float: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Float32) -> Float { Float(value) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Float { + bridgeJSLiftParameter(_swift_js_pop_f32()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Float32 { Float32(self) } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_f32(Float32(self)) + } } -extension Double: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { +extension Double: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Float64 { Float64(self) @@ -174,12 +245,20 @@ extension Double: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Float64) -> Double { Double(value) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Double { + bridgeJSLiftParameter(_swift_js_pop_f64()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Float64 { Float64(self) } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_f64(Float64(self)) + } } -extension String { +extension String: _BridgedSwiftStackType { + public typealias StackLiftResult = String + // MARK: ImportTS @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { @@ -210,14 +289,30 @@ extension String { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> String { + let bytes = _swift_js_pop_i32() + let count = _swift_js_pop_i32() + return bridgeJSLiftParameter(bytes, count) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { return self.withUTF8 { ptr in _swift_js_return_string(ptr.baseAddress, Int32(ptr.count)) } } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + self.withUTF8 { ptr in + _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + } + } } -extension JSObject { +extension JSObject: _BridgedSwiftStackType { + // JSObject is a non-final class, so we must explicitly specify the associated type + // rather than relying on the default `Self` (which Swift requires for covariant returns). + public typealias StackLiftResult = JSObject + // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -233,15 +328,23 @@ extension JSObject { JSObject(id: JavaScriptObjectRef(bitPattern: id)) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSObject { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { return _swift_js_retain(Int32(bitPattern: self.id)) } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(bridgeJSLowerReturn()) + } } /// A protocol that Swift heap objects exposed to JavaScript via `@JS class` must conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftHeapObject: AnyObject {} +public protocol _BridgedSwiftHeapObject: AnyObject, _BridgedSwiftStackType {} /// Define the lowering/lifting for `_BridgedSwiftHeapObject` extension _BridgedSwiftHeapObject { @@ -260,10 +363,16 @@ extension _BridgedSwiftHeapObject { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self { Unmanaged.fromOpaque(pointer).takeUnretainedValue() } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { // Perform a manual retain on the object, which will be balanced by a release called via FinalizationRegistry return Unmanaged.passRetained(self).toOpaque() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(Unmanaged.passRetained(self).toOpaque()) + } } // MARK: Closure Box Protocol @@ -289,17 +398,25 @@ extension _JSBridgedClass { /// A protocol that Swift protocol wrappers exposed from JavaScript must conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftProtocolWrapper { +public protocol _BridgedSwiftProtocolWrapper: _BridgedSwiftStackType { var jsObject: JSObject { get } static func bridgeJSLiftParameter(_ value: Int32) -> Self } extension _BridgedSwiftProtocolWrapper { // MARK: ExportSwift + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(jsObject.bridgeJSLowerReturn()) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { jsObject.bridgeJSLowerParameter() } @@ -310,10 +427,29 @@ extension _BridgedSwiftProtocolWrapper { /// The conformance is automatically synthesized by the BridgeJS code generator. public protocol _BridgedSwiftEnumNoPayload {} +/// A protocol for raw value enums that enables automatic stack operations. +/// +/// Conforming to this protocol provides default implementations of `_BridgedSwiftStackType` +/// methods by delegating to the raw value's stack operations. The raw value type must itself +/// conform to `_BridgedSwiftStackType`. +/// +/// The conformance is automatically synthesized by the BridgeJS code generator. +public protocol _BridgedSwiftRawValueEnum: _BridgedSwiftStackType, RawRepresentable +where RawValue: _BridgedSwiftStackType, RawValue.StackLiftResult == RawValue {} + +extension _BridgedSwiftRawValueEnum { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(rawValue: RawValue.bridgeJSLiftParameter())! + } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + rawValue.bridgeJSLowerStackReturn() + } +} + /// A protocol that Swift case enum types (enums without raw values or associated values) conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftCaseEnum { +public protocol _BridgedSwiftCaseEnum: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 @_spi(BridgeJS) static func bridgeJSLiftReturn(_ value: Int32) -> Self @@ -323,10 +459,20 @@ public protocol _BridgedSwiftCaseEnum { @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Int32 } +extension _BridgedSwiftCaseEnum { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(bridgeJSLowerReturn()) + } +} + /// A protocol that Swift associated value enum types conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVoidType { +public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 @_spi(BridgeJS) static func bridgeJSLiftReturn(_ caseId: Int32) -> Self @@ -336,10 +482,20 @@ public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVo @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void } +extension _BridgedSwiftAssociatedValueEnum { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() + } +} + /// A protocol that Swift struct types conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType { +public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftStackType { // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter() -> Self @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void @@ -359,6 +515,10 @@ extension _BridgedSwiftStruct { let jsObject = JSObject.bridgeJSLiftReturn(objectId) return Self(unsafelyCopying: jsObject) } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() + } } extension _BridgedSwiftEnumNoPayload where Self: RawRepresentable, RawValue == String { @@ -685,16 +845,20 @@ func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_pointer") -@_spi(BridgeJS) public func _swift_js_pop_pointer() -> UnsafeMutableRawPointer +private func _swift_js_pop_pointer_extern() -> UnsafeMutableRawPointer #else -@_spi(BridgeJS) public func _swift_js_pop_pointer() -> UnsafeMutableRawPointer { +private func _swift_js_pop_pointer_extern() -> UnsafeMutableRawPointer { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_pop_pointer() -> UnsafeMutableRawPointer { + _swift_js_pop_pointer_extern() +} + // MARK: - UnsafePointer family -extension UnsafeMutableRawPointer { +extension UnsafeMutableRawPointer: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { self } @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( @@ -713,10 +877,16 @@ extension UnsafeMutableRawPointer { { pointer } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeMutableRawPointer { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { self } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(self) + } } -extension UnsafeRawPointer { +extension UnsafeRawPointer: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(mutating: self) @@ -737,12 +907,18 @@ extension UnsafeRawPointer { { UnsafeRawPointer(pointer) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeRawPointer { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { bridgeJSLowerParameter() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(UnsafeMutableRawPointer(mutating: self)) + } } -extension OpaquePointer { +extension OpaquePointer: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) @@ -763,12 +939,18 @@ extension OpaquePointer { { OpaquePointer(UnsafeRawPointer(pointer)) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> OpaquePointer { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { bridgeJSLowerParameter() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self))) + } } -extension UnsafePointer { +extension UnsafePointer: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) @@ -789,12 +971,18 @@ extension UnsafePointer { { UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafePointer { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { bridgeJSLowerParameter() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(bridgeJSLowerParameter()) + } } -extension UnsafeMutablePointer { +extension UnsafeMutablePointer: _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(self) @@ -815,9 +1003,15 @@ extension UnsafeMutablePointer { { pointer.assumingMemoryBound(to: Pointee.self) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeMutablePointer { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { bridgeJSLowerParameter() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_pointer(bridgeJSLowerParameter()) + } } extension Optional where Wrapped == Bool { @@ -847,6 +1041,12 @@ extension Optional where Wrapped == Bool { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Bool? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Bool? { switch value { case -1: @@ -897,6 +1097,12 @@ extension Optional where Wrapped == Int { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Int? { let isSome = _swift_js_get_optional_int_presence() if isSome == 0 { @@ -943,6 +1149,12 @@ extension Optional where Wrapped == UInt { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> UInt? { let isSome = _swift_js_get_optional_int_presence() if isSome == 0 { @@ -984,6 +1196,13 @@ extension Optional where Wrapped == String { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> String? { + let isSome = _swift_js_pop_i32() + let bytes = _swift_js_pop_i32() + let count = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, bytes, count) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> String? { let length = _swift_js_get_optional_string() if length < 0 { @@ -1026,6 +1245,12 @@ extension Optional where Wrapped == JSObject { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSObject? { + let isSome = _swift_js_pop_i32() + let objectId = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, objectId) + } + @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { switch self { case .none: @@ -1053,7 +1278,7 @@ extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { case .none: _swift_js_return_optional_object(0, 0) case .some(let wrapper): - let retainedId = wrapper.bridgeJSLowerReturn() + let retainedId: Int32 = wrapper.bridgeJSLowerReturn() _swift_js_return_optional_object(1, retainedId) } } @@ -1121,6 +1346,12 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let pointer = _swift_js_pop_pointer() + return bridgeJSLiftParameter(isSome, pointer) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let pointer = _swift_js_get_optional_heap_object_pointer() if pointer == UnsafeMutableRawPointer(bitPattern: 0) { @@ -1135,7 +1366,7 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { case .none: _swift_js_return_optional_heap_object(0, nil) case .some(let value): - let retainedPointer = value.bridgeJSLowerReturn() + let retainedPointer: UnsafeMutableRawPointer = value.bridgeJSLowerReturn() _swift_js_return_optional_heap_object(1, retainedPointer) } } @@ -1162,6 +1393,12 @@ extension Optional where Wrapped == Float { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Float? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_f32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Float? { let isSome = _swift_js_get_optional_float_presence() if isSome == 0 { @@ -1204,6 +1441,12 @@ extension Optional where Wrapped == Double { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Double? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_f64() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Double? { let isSome = _swift_js_get_optional_double_presence() if isSome == 0 { @@ -1244,6 +1487,12 @@ extension Optional where Wrapped: _BridgedSwiftCaseEnum { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Wrapped? { if value == -1 { return nil @@ -1303,6 +1552,13 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let bytes = _swift_js_pop_i32() + let count = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, bytes, count) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let length = _swift_js_get_optional_string() if length < 0 { @@ -1335,6 +1591,12 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let isSome = _swift_js_get_optional_int_presence() if isSome == 0 { @@ -1359,6 +1621,12 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { let optionalRawValue: Bool? = self?.rawValue optionalRawValue.bridgeJSLowerReturn() @@ -1384,6 +1652,12 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_f32() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let isSome = _swift_js_get_optional_float_presence() if isSome == 0 { @@ -1419,6 +1693,12 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let wrappedValue = _swift_js_pop_f64() + return bridgeJSLiftParameter(isSome, wrappedValue) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let isSome = _swift_js_get_optional_double_presence() if isSome == 0 { @@ -1457,6 +1737,12 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let caseId = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, caseId) + } + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Wrapped? { if caseId == -1 { return nil @@ -1488,6 +1774,11 @@ extension Optional where Wrapped: _BridgedSwiftStruct { } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + let isSome = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { switch consume self { case .none: @@ -1498,3 +1789,25 @@ extension Optional where Wrapped: _BridgedSwiftStruct { } } } + +// MARK: - Array Support + +extension Array where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [Element] { + let count = Int(_swift_js_pop_i32()) + var result: [Element] = [] + result.reserveCapacity(count) + for _ in 0.. [OpaquePointer] { return values } +@JS func roundTripUnsafePointerArray(_ values: [UnsafePointer]) -> [UnsafePointer] { + return values +} +@JS func roundTripUnsafeMutablePointerArray(_ values: [UnsafeMutablePointer]) -> [UnsafeMutablePointer] { + return values +} @JS func consumeDataProcessorArrayType(_ processors: [DataProcessor]) -> Int { return processors.count diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index b0b24137a..6836000c6 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) import JavaScriptKit +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit @JSFunction func jsRoundTripVoid() throws (JSException) -> Void @@ -26,7 +26,7 @@ enum FeatureFlag: String { case foo = "foo" case bar = "bar" } -extension FeatureFlag: _BridgedSwiftEnumNoPayload {} +extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction func jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> FeatureFlag diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 42f360ce7..55a77466e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1292,16 +1292,16 @@ extension Status: _BridgedSwiftCaseEnum { } } -extension Theme: _BridgedSwiftEnumNoPayload { +extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension HttpStatus: _BridgedSwiftEnumNoPayload { +extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Precision: _BridgedSwiftEnumNoPayload { +extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Ratio: _BridgedSwiftEnumNoPayload { +extension Ratio: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension TSDirection: _BridgedSwiftCaseEnum { @@ -1347,7 +1347,7 @@ extension TSDirection: _BridgedSwiftCaseEnum { } } -extension TSTheme: _BridgedSwiftEnumNoPayload { +extension TSTheme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } @_expose(wasm, "bjs_Utils_StringUtils_static_uppercase") @@ -1415,10 +1415,10 @@ extension Networking.API.Method: _BridgedSwiftCaseEnum { } } -extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload { +extension Configuration.LogLevel: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } -extension Configuration.Port: _BridgedSwiftEnumNoPayload { +extension Configuration.Port: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { @@ -1460,15 +1460,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(Int.bridgeJSLiftParameter()) case 2: - return .flag(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .flag(Bool.bridgeJSLiftParameter()) case 3: - return .rate(Float.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .rate(Float.bridgeJSLiftParameter()) case 4: - return .precise(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .precise(Double.bridgeJSLiftParameter()) case 5: return .info default: @@ -1481,22 +1481,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0): - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() return Int32(1) case .flag(let param0): - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() return Int32(2) case .rate(let param0): - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() return Int32(3) case .precise(let param0): - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() return Int32(4) case .info: return Int32(5) @@ -1517,22 +1514,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0): _swift_js_push_tag(Int32(1)) - _swift_js_push_i32(Int32(param0)) + param0.bridgeJSLowerStackReturn() case .flag(let param0): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) + param0.bridgeJSLowerStackReturn() case .rate(let param0): _swift_js_push_tag(Int32(3)) - _swift_js_push_f32(param0) + param0.bridgeJSLowerStackReturn() case .precise(let param0): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) + param0.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(5)) } @@ -1543,17 +1537,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .error(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) case 2: - return .location(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .location(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 3: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 4: - return .coordinates(Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64())) + return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), Double.bridgeJSLiftParameter(_swift_js_pop_f64()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) case 6: return .info default: @@ -1566,58 +1560,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .error(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) case .location(let param0, let param1, let param2): - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(2) case .status(let param0, let param1, let param2): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(3) case .coordinates(let param0, let param1, let param2): - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() return Int32(5) case .info: return Int32(6) @@ -1638,58 +1611,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .error(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() case .location(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(3)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .coordinates(let param0, let param1, let param2): _swift_js_push_tag(Int32(4)) - _swift_js_push_f64(param0) - _swift_js_push_f64(param1) - _swift_js_push_f64(param2) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): _swift_js_push_tag(Int32(5)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(param1 ? 1 : 0) - _swift_js_push_i32(Int32(param2)) - _swift_js_push_i32(Int32(param3)) - _swift_js_push_f64(param4) - _swift_js_push_f64(param5) - var __bjs_param6 = param6 - __bjs_param6.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param7 = param7 - __bjs_param7.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_param8 = param8 - __bjs_param8.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() + param3.bridgeJSLowerStackReturn() + param4.bridgeJSLowerStackReturn() + param5.bridgeJSLowerStackReturn() + param6.bridgeJSLowerStackReturn() + param7.bridgeJSLowerStackReturn() + param8.bridgeJSLowerStackReturn() case .info: _swift_js_push_tag(Int32(6)) } @@ -1700,11 +1652,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) case 2: - return .status(Bool.bridgeJSLiftParameter(_swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32()), String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -1715,25 +1667,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) case .status(let param0, let param1, let param2): - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() return Int32(2) } } @@ -1752,25 +1695,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) - _swift_js_push_i32(param0 ? 1 : 0) - _swift_js_push_i32(Int32(param1)) - var __bjs_param2 = param2 - __bjs_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() + param2.bridgeJSLowerStackReturn() } } } @@ -1779,9 +1713,9 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> API.NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(String.bridgeJSLiftParameter()) case 1: - return .failure(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Int.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) default: fatalError("Unknown API.NetworkingResult case ID: \(caseId)") } @@ -1792,17 +1726,11 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .success(let param0): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() return Int32(0) case .failure(let param0, let param1): - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() return Int32(1) } } @@ -1821,17 +1749,11 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): _swift_js_push_tag(Int32(0)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + param0.bridgeJSLowerStackReturn() case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) - var __bjs_param0 = param0 - __bjs_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(param1)) + param0.bridgeJSLowerStackReturn() + param1.bridgeJSLowerStackReturn() } } } @@ -1840,11 +1762,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + return .success(Optional.bridgeJSLiftParameter()) case 1: - return .failure(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) case 2: - return .status(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()), Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } @@ -1857,42 +1779,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - var __bjs_str_param0 = __bjs_unwrapped_param0 - __bjs_str_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - var __bjs_str_param2 = __bjs_unwrapped_param2 - __bjs_str_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -1915,42 +1831,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_tag(Int32(0)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - var __bjs_str_param0 = __bjs_unwrapped_param0 - __bjs_str_param0.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) case .failure(let param0, let param1): _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param0)) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(__bjs_unwrapped_param1 ? 1 : 0) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) case .status(let param0, let param1, let param2): _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0 ? 1 : 0) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - _swift_js_push_i32(Int32(__bjs_unwrapped_param1)) + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - var __bjs_str_param2 = __bjs_unwrapped_param2 - __bjs_str_param2.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) } @@ -2264,14 +2174,14 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let x = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let y = Int.bridgeJSLiftParameter() + let x = Int.bridgeJSLiftParameter() return Point(x: x, y: y) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.x)) - _swift_js_push_i32(Int32(self.y)) + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -2309,20 +2219,20 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let ptr = UnsafePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let opaque = OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) - let raw = UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer()) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() + let ptr = UnsafePointer.bridgeJSLiftParameter() + let opaque = OpaquePointer.bridgeJSLiftParameter() + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() + let raw = UnsafeRawPointer.bridgeJSLiftParameter() return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_pointer(self.raw.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.mutRaw.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.opaque.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.ptr.bridgeJSLowerReturn()) - _swift_js_push_pointer(self.mutPtr.bridgeJSLowerReturn()) + self.raw.bridgeJSLowerStackReturn() + self.mutRaw.bridgeJSLowerStackReturn() + self.opaque.bridgeJSLowerStackReturn() + self.ptr.bridgeJSLowerStackReturn() + self.mutPtr.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -2371,29 +2281,26 @@ public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: Un extension DataPoint: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let optCount = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let label = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let y = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) - let x = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let optFlag = Optional.bridgeJSLiftParameter() + let optCount = Optional.bridgeJSLiftParameter() + let label = String.bridgeJSLiftParameter() + let y = Double.bridgeJSLiftParameter() + let x = Double.bridgeJSLiftParameter() return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.x) - _swift_js_push_f64(self.y) - var __bjs_label = self.label - __bjs_label.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + self.label.bridgeJSLowerStackReturn() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - _swift_js_push_i32(Int32(__bjs_unwrapped_optCount)) + __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - _swift_js_push_i32(__bjs_unwrapped_optFlag ? 1 : 0) + __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -2444,24 +2351,18 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let city = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let street = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let zipCode = Optional.bridgeJSLiftParameter() + let city = String.bridgeJSLiftParameter() + let street = String.bridgeJSLiftParameter() return Address(street: street, city: city, zipCode: zipCode) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_street = self.street - __bjs_street.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - var __bjs_city = self.city - __bjs_city.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.street.bridgeJSLowerStackReturn() + self.city.bridgeJSLowerStackReturn() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - _swift_js_push_i32(Int32(__bjs_unwrapped_zipCode)) + __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -2501,27 +2402,21 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { extension Contact: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Contact { - let secondaryAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_i32()) - let email = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) + let secondaryAddress = Optional
        .bridgeJSLiftParameter() + let email = Optional.bridgeJSLiftParameter() let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let age = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.age)) + self.name.bridgeJSLowerStackReturn() + self.age.bridgeJSLowerStackReturn() self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - var __bjs_str_email = __bjs_unwrapped_email - __bjs_str_email.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) let __bjs_isSome_secondaryAddress = self.secondaryAddress != nil @@ -2567,31 +2462,25 @@ fileprivate func _bjs_struct_lift_Contact() -> Int32 { extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) - let direction = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let theme = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let direction = Optional.bridgeJSLiftParameter() + let theme = Optional.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return Config(name: name, theme: theme, direction: direction, status: status) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + self.name.bridgeJSLowerStackReturn() let __bjs_isSome_theme = self.theme != nil if let __bjs_unwrapped_theme = self.theme { - var __bjs_str_theme = __bjs_unwrapped_theme.rawValue - __bjs_str_theme.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_theme.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_theme ? 1 : 0) let __bjs_isSome_direction = self.direction != nil if let __bjs_unwrapped_direction = self.direction { - _swift_js_push_i32(__bjs_unwrapped_direction.bridgeJSLowerParameter()) + __bjs_unwrapped_direction.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_direction ? 1 : 0) - _swift_js_push_i32(Int32(self.status.bridgeJSLowerParameter())) + self.status.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -2629,16 +2518,16 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { extension SessionData: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SessionData { - let owner = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let owner = Optional.bridgeJSLiftParameter() + let id = Int.bridgeJSLiftParameter() return SessionData(id: id, owner: owner) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) + self.id.bridgeJSLowerStackReturn() let __bjs_isSome_owner = self.owner != nil if let __bjs_unwrapped_owner = self.owner { - _swift_js_push_pointer(__bjs_unwrapped_owner.bridgeJSLowerReturn()) + __bjs_unwrapped_owner.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_owner ? 1 : 0) } @@ -2678,19 +2567,19 @@ fileprivate func _bjs_struct_lift_SessionData() -> Int32 { extension ValidationReport: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { - let outcome = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let status = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let outcome = Optional.bridgeJSLiftParameter() + let status = Optional.bridgeJSLiftParameter() let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_i32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let id = Int.bridgeJSLiftParameter() return ValidationReport(id: id, result: result, status: status, outcome: outcome) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) + self.id.bridgeJSLowerStackReturn() self.result.bridgeJSLowerReturn() let __bjs_isSome_status = self.status != nil if let __bjs_unwrapped_status = self.status { - _swift_js_push_i32(__bjs_unwrapped_status.bridgeJSLowerParameter()) + __bjs_unwrapped_status.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_status ? 1 : 0) let __bjs_isSome_outcome = self.outcome != nil @@ -2735,31 +2624,25 @@ fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { extension AdvancedConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> AdvancedConfig { - let overrideDefaults = Optional.bridgeJSLiftParameter(_swift_js_pop_i32()) + let overrideDefaults = Optional.bridgeJSLiftParameter() let defaults = ConfigStruct.bridgeJSLiftParameter() - let location = Optional.bridgeJSLiftParameter(_swift_js_pop_i32()) - let metadata = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let result = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let location = Optional.bridgeJSLiftParameter() + let metadata = Optional.bridgeJSLiftParameter() + let result = Optional.bridgeJSLiftParameter() let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let enabled = Bool.bridgeJSLiftParameter(_swift_js_pop_i32()) - let title = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let enabled = Bool.bridgeJSLiftParameter() + let title = String.bridgeJSLiftParameter() + let id = Int.bridgeJSLiftParameter() return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) - var __bjs_title = self.title - __bjs_title.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(self.enabled ? 1 : 0) - var __bjs_theme = self.theme.rawValue - __bjs_theme.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.status.bridgeJSLowerParameter())) + self.id.bridgeJSLowerStackReturn() + self.title.bridgeJSLowerStackReturn() + self.enabled.bridgeJSLowerStackReturn() + self.theme.bridgeJSLowerStackReturn() + self.status.bridgeJSLowerStackReturn() let __bjs_isSome_result = self.result != nil if let __bjs_unwrapped_result = self.result { _swift_js_push_i32(__bjs_unwrapped_result.bridgeJSLowerParameter()) @@ -2767,7 +2650,7 @@ extension AdvancedConfig: _BridgedSwiftStruct { _swift_js_push_i32(__bjs_isSome_result ? 1 : 0) let __bjs_isSome_metadata = self.metadata != nil if let __bjs_unwrapped_metadata = self.metadata { - _swift_js_push_i32(__bjs_unwrapped_metadata.bridgeJSLowerReturn()) + __bjs_unwrapped_metadata.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_metadata ? 1 : 0) let __bjs_isSome_location = self.location != nil @@ -2818,24 +2701,24 @@ fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { extension MeasurementConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { - let optionalRatio = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64()) - let optionalPrecision = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32()) + let optionalRatio = Optional.bridgeJSLiftParameter() + let optionalPrecision = Optional.bridgeJSLiftParameter() let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_f64()) let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f32(self.precision.bridgeJSLowerParameter()) - _swift_js_push_f64(self.ratio.bridgeJSLowerParameter()) + self.precision.bridgeJSLowerStackReturn() + self.ratio.bridgeJSLowerStackReturn() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - _swift_js_push_f32(__bjs_unwrapped_optionalPrecision.bridgeJSLowerParameter()) + __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) let __bjs_isSome_optionalRatio = self.optionalRatio != nil if let __bjs_unwrapped_optionalRatio = self.optionalRatio { - _swift_js_push_f64(__bjs_unwrapped_optionalRatio.bridgeJSLowerParameter()) + __bjs_unwrapped_optionalRatio.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalRatio ? 1 : 0) } @@ -2875,12 +2758,12 @@ fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter(_swift_js_pop_f64()) + let baseValue = Double.bridgeJSLiftParameter() return MathOperations(baseValue: baseValue) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_f64(self.baseValue) + self.baseValue.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -2962,19 +2845,16 @@ public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> F extension CopyableCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCart { - let note = Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32()) - let x = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let note = Optional.bridgeJSLiftParameter() + let x = Int.bridgeJSLiftParameter() return CopyableCart(x: x, note: note) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.x)) + self.x.bridgeJSLowerStackReturn() let __bjs_isSome_note = self.note != nil if let __bjs_unwrapped_note = self.note { - var __bjs_str_note = __bjs_unwrapped_note - __bjs_str_note.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } + __bjs_unwrapped_note.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_note ? 1 : 0) } @@ -3025,17 +2905,14 @@ public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void { extension CopyableCartItem: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCartItem { - let quantity = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let sku = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let quantity = Int.bridgeJSLiftParameter() + let sku = String.bridgeJSLiftParameter() return CopyableCartItem(sku: sku, quantity: quantity) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_sku = self.sku - __bjs_sku.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.quantity)) + self.sku.bridgeJSLowerStackReturn() + self.quantity.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -3073,14 +2950,14 @@ fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { extension CopyableNestedCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableNestedCart { - let shippingAddress = Optional
        .bridgeJSLiftParameter(_swift_js_pop_i32()) + let shippingAddress = Optional
        .bridgeJSLiftParameter() let item = CopyableCartItem.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) + let id = Int.bridgeJSLiftParameter() return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(Int32(self.id)) + self.id.bridgeJSLowerStackReturn() self.item.bridgeJSLowerReturn() let __bjs_isSome_shippingAddress = self.shippingAddress != nil if let __bjs_unwrapped_shippingAddress = self.shippingAddress { @@ -3135,17 +3012,14 @@ public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { - let value = Int.bridgeJSLiftParameter(_swift_js_pop_i32()) - let name = String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let value = Int.bridgeJSLiftParameter() + let name = String.bridgeJSLiftParameter() return ConfigStruct(name: name, value: value) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - var __bjs_name = self.name - __bjs_name.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - } - _swift_js_push_i32(Int32(self.value)) + self.name.bridgeJSLowerStackReturn() + self.value.bridgeJSLowerStackReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -4610,16 +4484,7 @@ public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutab @_cdecl("bjs_arrayWithDefault") public func _bjs_arrayWithDefault() -> Int32 { #if arch(wasm32) - let ret = arrayWithDefault(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + let ret = arrayWithDefault(_: [Int].bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4634,16 +4499,7 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { if values == 0 { return Optional<[Int]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [Int].bridgeJSLiftParameter() } }()) return ret.bridgeJSLowerReturn() @@ -4656,16 +4512,7 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { @_cdecl("bjs_arrayMixedDefaults") public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSLiftParameter(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4709,19 +4556,8 @@ public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { @_cdecl("bjs_roundTripIntArray") public func _bjs_roundTripIntArray() -> Void { #if arch(wasm32) - let ret = roundTripIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripIntArray(_: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4731,22 +4567,8 @@ public func _bjs_roundTripIntArray() -> Void { @_cdecl("bjs_roundTripStringArray") public func _bjs_roundTripStringArray() -> Void { #if arch(wasm32) - let ret = roundTripStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripStringArray(_: [String].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4756,19 +4578,8 @@ public func _bjs_roundTripStringArray() -> Void { @_cdecl("bjs_roundTripDoubleArray") public func _bjs_roundTripDoubleArray() -> Void { #if arch(wasm32) - let ret = roundTripDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_f64(__bjs_elem_ret)} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripDoubleArray(_: [Double].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4778,19 +4589,8 @@ public func _bjs_roundTripDoubleArray() -> Void { @_cdecl("bjs_roundTripBoolArray") public func _bjs_roundTripBoolArray() -> Void { #if arch(wasm32) - let ret = roundTripBoolArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Bool] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(__bjs_elem_ret ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripBoolArray(_: [Bool].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4800,19 +4600,8 @@ public func _bjs_roundTripBoolArray() -> Void { @_cdecl("bjs_roundTripDirectionArray") public func _bjs_roundTripDirectionArray() -> Void { #if arch(wasm32) - let ret = roundTripDirectionArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Direction] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripDirectionArray(_: [Direction].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4822,19 +4611,8 @@ public func _bjs_roundTripDirectionArray() -> Void { @_cdecl("bjs_roundTripStatusArray") public func _bjs_roundTripStatusArray() -> Void { #if arch(wasm32) - let ret = roundTripStatusArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Status] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Status.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripStatusArray(_: [Status].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4844,22 +4622,8 @@ public func _bjs_roundTripStatusArray() -> Void { @_cdecl("bjs_roundTripThemeArray") public func _bjs_roundTripThemeArray() -> Void { #if arch(wasm32) - let ret = roundTripThemeArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Theme] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - var __bjs_ret_elem = __bjs_elem_ret.rawValue - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripThemeArray(_: [Theme].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4869,19 +4633,8 @@ public func _bjs_roundTripThemeArray() -> Void { @_cdecl("bjs_roundTripHttpStatusArray") public func _bjs_roundTripHttpStatusArray() -> Void { #if arch(wasm32) - let ret = roundTripHttpStatusArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [HttpStatus] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(HttpStatus.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32(Int32(__bjs_elem_ret.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripHttpStatusArray(_: [HttpStatus].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4891,19 +4644,8 @@ public func _bjs_roundTripHttpStatusArray() -> Void { @_cdecl("bjs_roundTripDataPointArray") public func _bjs_roundTripDataPointArray() -> Void { #if arch(wasm32) - let ret = roundTripDataPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [DataPoint] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(DataPoint.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripDataPointArray(_: [DataPoint].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4913,19 +4655,8 @@ public func _bjs_roundTripDataPointArray() -> Void { @_cdecl("bjs_roundTripGreeterArray") public func _bjs_roundTripGreeterArray() -> Void { #if arch(wasm32) - let ret = roundTripGreeterArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Greeter] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripGreeterArray(_: [Greeter].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4940,7 +4671,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -4948,7 +4679,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_unwrapped_ret_elem))} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -4965,7 +4696,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -4973,10 +4704,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - var __bjs_str_ret_elem = __bjs_unwrapped_ret_elem - __bjs_str_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -4993,7 +4721,7 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -5018,7 +4746,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -5026,7 +4754,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -5043,7 +4771,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -5051,7 +4779,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - _swift_js_push_i32(__bjs_unwrapped_ret_elem.bridgeJSLowerParameter())} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -5067,23 +4795,12 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { if values == 0 { return Optional<[Int]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [Int].bridgeJSLiftParameter() } }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret))} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5098,26 +4815,12 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { if values == 0 { return Optional<[String]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }() + return [String].bridgeJSLiftParameter() } }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - var __bjs_ret_elem = __bjs_elem_ret - __bjs_ret_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5132,23 +4835,12 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { if greeters == 0 { return Optional<[Greeter]>.none } else { - return { - let __count = Int(_swift_js_pop_i32()) - var __result: [Greeter] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }() + return [Greeter].bridgeJSLiftParameter() } }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - for __bjs_elem_ret in __bjs_unwrapped_ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(__bjs_unwrapped_ret.count))} + __bjs_unwrapped_ret.bridgeJSLowerReturn()} _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5164,24 +4856,13 @@ public func _bjs_roundTripNestedIntArray() -> Void { var __result: [[Int]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Int] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Int.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret_elem))} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5197,27 +4878,13 @@ public func _bjs_roundTripNestedStringArray() -> Void { var __result: [[String]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [String] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([String].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - var __bjs_ret_elem_elem = __bjs_elem_ret_elem - __bjs_ret_elem_elem.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) - }} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5233,24 +4900,13 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { var __result: [[Double]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Double] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Double.bridgeJSLiftParameter(_swift_js_pop_f64())) - } - __result.reverse() - return __result - }()) + __result.append([Double].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_f64(__bjs_elem_ret_elem)} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5266,24 +4922,13 @@ public func _bjs_roundTripNestedBoolArray() -> Void { var __result: [[Bool]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Bool] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Bool.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Bool].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(__bjs_elem_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5299,24 +4944,13 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { var __result: [[DataPoint]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [DataPoint] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(DataPoint.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + __result.append([DataPoint].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - __bjs_elem_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5332,24 +4966,13 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { var __result: [[Direction]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Direction] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + __result.append([Direction].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_i32(Int32(__bjs_elem_ret_elem.bridgeJSLowerParameter()))} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5365,24 +4988,13 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { var __result: [[Greeter]] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append({ - let __count = Int(_swift_js_pop_i32()) - var __result: [Greeter] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Greeter.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) + __result.append([Greeter].bridgeJSLiftParameter()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - for __bjs_elem_ret_elem in __bjs_elem_ret { - _swift_js_push_pointer(__bjs_elem_ret_elem.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(__bjs_elem_ret.count))} + __bjs_elem_ret.bridgeJSLowerReturn()} _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5393,19 +5005,8 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { @_cdecl("bjs_roundTripUnsafeRawPointerArray") public func _bjs_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafeRawPointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [UnsafeRawPointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(UnsafeRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5415,19 +5016,8 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { @_cdecl("bjs_roundTripUnsafeMutableRawPointerArray") public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafeMutableRawPointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [UnsafeMutableRawPointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(UnsafeMutableRawPointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5437,19 +5027,30 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { @_cdecl("bjs_roundTripOpaquePointerArray") public func _bjs_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripOpaquePointerArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [OpaquePointer] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(OpaquePointer.bridgeJSLiftParameter(_swift_js_pop_pointer())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_pointer(__bjs_elem_ret.bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafePointerArray") +@_cdecl("bjs_roundTripUnsafePointerArray") +public func _bjs_roundTripUnsafePointerArray() -> Void { + #if arch(wasm32) + let ret = roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripUnsafeMutablePointerArray") +@_cdecl("bjs_roundTripUnsafeMutablePointerArray") +public func _bjs_roundTripUnsafeMutablePointerArray() -> Void { + #if arch(wasm32) + let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5459,16 +5060,7 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { @_cdecl("bjs_consumeDataProcessorArrayType") public func _bjs_consumeDataProcessorArrayType() -> Int32 { #if arch(wasm32) - let ret = consumeDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [AnyDataProcessor] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) + let ret = consumeDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5479,19 +5071,10 @@ public func _bjs_consumeDataProcessorArrayType() -> Int32 { @_cdecl("bjs_roundTripDataProcessorArrayType") public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) - let ret = roundTripDataProcessorArrayType(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [AnyDataProcessor] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(AnyDataProcessor.bridgeJSLiftParameter(_swift_js_pop_i32())) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! AnyDataProcessor).bridgeJSLowerReturn())} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) + ret.map { + $0 as! AnyDataProcessor + } .bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 5d75ef55e..e31c69a51 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9310,6 +9310,84 @@ } } }, + { + "abiName" : "bjs_roundTripUnsafePointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafePointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutablePointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutablePointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + } + }, { "abiName" : "bjs_consumeDataProcessorArrayType", "effects" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 0319ce424..684ff02fc 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -1395,6 +1395,8 @@ function testArraySupport(exports) { assert.deepEqual(exports.roundTripUnsafeRawPointerArray(pointerValues), pointerValues); assert.deepEqual(exports.roundTripUnsafeMutableRawPointerArray(pointerValues), pointerValues); assert.deepEqual(exports.roundTripOpaquePointerArray(pointerValues), pointerValues); + assert.deepEqual(exports.roundTripUnsafePointerArray(pointerValues), pointerValues); + assert.deepEqual(exports.roundTripUnsafeMutablePointerArray(pointerValues), pointerValues); assert.deepEqual(exports.roundTripUnsafeRawPointerArray([]), []); // Default values From 794e7862bf526aec3eb80607b08e183b10398e8a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 3 Feb 2026 20:02:07 +0900 Subject: [PATCH 128/252] BridgeJS: Re-organize snapshot test structure (#561) --- .github/workflows/test.yml | 2 +- .gitignore | 2 +- CONTRIBUTING.md | 6 + Plugins/BridgeJS/Package.swift | 2 +- Plugins/BridgeJS/README.md | 8 +- .../Sources/TS2Swift/JavaScript/package.json | 3 + .../Sources/TS2Swift/JavaScript/src/cli.js | 129 +- .../test/__snapshots__/ts2swift.test.js.snap | 313 ++++ .../test/fixtures}/ArrayParameter.d.ts | 0 .../JavaScript/test/fixtures}/Async.d.ts | 0 .../JavaScript/test/fixtures}/Interface.d.ts | 0 .../test/fixtures}/InvalidPropertyNames.d.ts | 0 .../test/fixtures}/MultipleImportedTypes.d.ts | 0 .../test/fixtures}/PrimitiveParameters.d.ts | 0 .../test/fixtures}/PrimitiveReturn.d.ts | 0 .../test/fixtures}/ReExportFrom.d.ts | 0 .../JavaScript/test/fixtures}/StringEnum.d.ts | 0 .../test/fixtures}/StringParameter.d.ts | 0 .../test/fixtures}/StringReturn.d.ts | 0 .../fixtures}/Support/ReExportTarget.d.ts | 0 .../test/fixtures}/TS2SkeletonLike.d.ts | 0 .../JavaScript/test/fixtures}/TypeAlias.d.ts | 0 .../test/fixtures}/TypeScriptClass.d.ts | 0 .../fixtures}/VoidParameterVoidReturn.d.ts | 0 .../JavaScript/test/fixtures}/tsconfig.json | 0 .../TS2Swift/JavaScript/test/ts2swift.test.js | 41 + .../TS2Swift/JavaScript/vitest.config.js | 9 + .../JSGetterMacroTests.swift | 2 +- .../BridgeJSCodegenTests.swift | 169 ++ .../BridgeJSToolTests/BridgeJSLinkTests.swift | 61 +- .../BridgeJSToolTests/ExportSwiftTests.swift | 158 -- .../BridgeJSToolTests/ImportTSTests.swift | 101 -- .../Inputs/{ => MacroSwift}/ArrayTypes.swift | 4 + .../Inputs/{ => MacroSwift}/Async.swift | 0 .../{ => MacroSwift}/DefaultParameters.swift | 0 .../EnumAssociatedValue.swift | 0 .../Inputs/{ => MacroSwift}/EnumCase.swift | 0 .../{ => MacroSwift}/EnumNamespace.swift | 0 .../Inputs/{ => MacroSwift}/EnumRawType.swift | 10 + .../MacroSwift}/GlobalGetter.swift | 0 .../MacroSwift}/GlobalThisImports.swift | 0 .../ImportedTypeInExportedInterface.swift | 0 .../MacroSwift/InvalidPropertyNames.swift | 29 + .../Inputs/MacroSwift/JSClass.swift | 15 + .../Inputs/{ => MacroSwift}/MixedGlobal.swift | 0 .../{ => MacroSwift}/MixedPrivate.swift | 0 .../Multifile}/CrossFileClassA.swift | 0 .../Multifile}/CrossFileClassB.swift | 0 .../Multifile}/CrossFileFunctionA.swift | 0 .../Multifile}/CrossFileFunctionB.swift | 0 .../Inputs/{ => MacroSwift}/Namespaces.swift | 0 .../Inputs/{ => MacroSwift}/Optionals.swift | 0 .../MacroSwift/PrimitiveParameters.swift | 2 + .../{ => MacroSwift}/PrimitiveReturn.swift | 3 + .../{ => MacroSwift}/PropertyTypes.swift | 0 .../Inputs/{ => MacroSwift}/Protocol.swift | 0 .../{ => MacroSwift}/StaticFunctions.swift | 0 .../{ => MacroSwift}/StaticProperties.swift | 0 .../Inputs/MacroSwift/StringParameter.swift | 5 + .../Inputs/MacroSwift/StringReturn.swift | 2 + .../Inputs/{ => MacroSwift}/SwiftClass.swift | 0 .../{ => MacroSwift}/SwiftClosure.swift | 0 .../MacroSwift}/SwiftClosureImports.swift | 0 .../Inputs/{ => MacroSwift}/SwiftStruct.swift | 0 .../MacroSwift}/SwiftStructImports.swift | 0 .../Inputs/{ => MacroSwift}/Throws.swift | 0 .../{ => MacroSwift}/UnsafePointer.swift | 0 .../MacroSwift/VoidParameterVoidReturn.swift | 2 + .../Inputs/PrimitiveParameters.swift | 1 - .../Inputs/StringParameter.swift | 2 - .../Inputs/StringReturn.swift | 1 - .../Inputs/VoidParameterVoidReturn.swift | 1 - .../TS2SwiftVitestTests.swift | 34 + .../BridgeJSCodegenTests/ArrayTypes.json | 1059 +++++++++++ .../ArrayTypes.swift | 54 +- .../BridgeJSCodegenTests/Async.json | 187 ++ .../Async.swift | 0 .../CrossFileFunctionTypes.ReverseOrder.json | 152 ++ .../CrossFileFunctionTypes.ReverseOrder.swift | 0 .../CrossFileFunctionTypes.json | 152 ++ .../CrossFileFunctionTypes.swift | 0 .../CrossFileTypeResolution.ReverseOrder.json | 64 + ...CrossFileTypeResolution.ReverseOrder.swift | 0 .../CrossFileTypeResolution.json | 64 + .../CrossFileTypeResolution.swift | 0 .../DefaultParameters.json | 1273 ++++++++++++++ .../DefaultParameters.swift | 0 .../EnumAssociatedValue.json | 847 +++++++++ .../EnumAssociatedValue.swift | 0 .../BridgeJSCodegenTests/EnumCase.json | 323 ++++ .../EnumCase.swift | 0 .../EnumNamespace.Global.json | 541 ++++++ .../EnumNamespace.Global.swift | 0 .../BridgeJSCodegenTests/EnumNamespace.json | 541 ++++++ .../EnumNamespace.swift | 0 .../BridgeJSCodegenTests/EnumRawType.json | 1543 +++++++++++++++++ .../EnumRawType.swift | 44 +- .../BridgeJSCodegenTests/GlobalGetter.json | 71 + .../GlobalGetter.swift} | 4 +- .../GlobalThisImports.json | 126 ++ .../GlobalThisImports.swift} | 10 +- .../ImportedTypeInExportedInterface.json | 65 + .../ImportedTypeInExportedInterface.swift | 17 + .../InvalidPropertyNames.json | 258 +++ .../InvalidPropertyNames.swift | 99 +- .../BridgeJSCodegenTests/JSClass.json | 172 ++ .../JSClass.swift} | 68 +- .../BridgeJSCodegenTests/MixedGlobal.json | 79 + .../MixedGlobal.swift | 0 .../BridgeJSCodegenTests/MixedPrivate.json | 79 + .../MixedPrivate.swift | 0 .../Namespaces.Global.json | 185 ++ .../Namespaces.Global.swift | 0 .../BridgeJSCodegenTests/Namespaces.json | 185 ++ .../Namespaces.swift | 0 .../BridgeJSCodegenTests/Optionals.json | 702 ++++++++ .../Optionals.swift | 0 .../PrimitiveParameters.json | 118 ++ .../PrimitiveParameters.swift | 27 + .../BridgeJSCodegenTests/PrimitiveReturn.json | 138 ++ .../PrimitiveReturn.swift | 34 + .../BridgeJSCodegenTests/PropertyTypes.json | 363 ++++ .../PropertyTypes.swift | 0 .../BridgeJSCodegenTests/Protocol.json | 901 ++++++++++ .../Protocol.swift | 0 .../StaticFunctions.Global.json | 339 ++++ .../StaticFunctions.Global.swift | 0 .../BridgeJSCodegenTests/StaticFunctions.json | 339 ++++ .../StaticFunctions.swift | 0 .../StaticProperties.Global.json | 342 ++++ .../StaticProperties.Global.swift | 0 .../StaticProperties.json | 342 ++++ .../StaticProperties.swift | 0 .../BridgeJSCodegenTests/StringParameter.json | 125 ++ .../StringParameter.swift | 25 +- .../BridgeJSCodegenTests/StringReturn.json | 59 + .../StringReturn.swift | 13 +- .../BridgeJSCodegenTests/SwiftClass.json | 145 ++ .../SwiftClass.swift | 0 .../BridgeJSCodegenTests/SwiftClosure.json | 1078 ++++++++++++ .../SwiftClosure.swift | 0 .../SwiftClosureImports.json | 110 ++ .../SwiftClosureImports.swift} | 30 +- .../BridgeJSCodegenTests/SwiftStruct.json | 523 ++++++ .../SwiftStruct.swift | 0 .../SwiftStructImports.json | 94 + .../SwiftStructImports.swift | 64 + .../BridgeJSCodegenTests/Throws.json | 37 + .../Throws.swift | 0 .../BridgeJSCodegenTests/UnsafePointer.json | 416 +++++ .../UnsafePointer.swift | 0 .../VoidParameterVoidReturn.json | 59 + .../VoidParameterVoidReturn.swift | 12 +- .../ArrayParameter.Import.d.ts | 20 - .../ArrayParameter.Import.js | 245 --- ...ArrayTypes.Export.d.ts => ArrayTypes.d.ts} | 3 + .../{ArrayTypes.Export.js => ArrayTypes.js} | 23 + .../BridgeJSLinkTests/Async.Import.d.ts | 24 - .../BridgeJSLinkTests/Async.Import.js | 289 --- .../{Async.Export.d.ts => Async.d.ts} | 0 .../{Async.Export.js => Async.js} | 0 ...ers.Export.d.ts => DefaultParameters.d.ts} | 0 ...ameters.Export.js => DefaultParameters.js} | 0 ...e.Export.d.ts => EnumAssociatedValue.d.ts} | 0 ...Value.Export.js => EnumAssociatedValue.js} | 0 .../{EnumCase.Export.d.ts => EnumCase.d.ts} | 0 .../{EnumCase.Export.js => EnumCase.js} | 0 ....Export.d.ts => EnumNamespace.Global.d.ts} | 0 ...obal.Export.js => EnumNamespace.Global.js} | 0 ...mespace.Export.d.ts => EnumNamespace.d.ts} | 0 ...umNamespace.Export.js => EnumNamespace.js} | 0 ...umRawType.Export.d.ts => EnumRawType.d.ts} | 2 + .../{EnumRawType.Export.js => EnumRawType.js} | 45 +- ...er.ImportMacros.d.ts => GlobalGetter.d.ts} | 0 ...Getter.ImportMacros.js => GlobalGetter.js} | 0 ...portMacros.d.ts => GlobalThisImports.d.ts} | 0 ...s.ImportMacros.js => GlobalThisImports.js} | 0 ...s => ImportedTypeInExportedInterface.d.ts} | 0 ....js => ImportedTypeInExportedInterface.js} | 0 .../BridgeJSLinkTests/Interface.Import.d.ts | 22 - .../BridgeJSLinkTests/Interface.Import.js | 251 --- ....Import.d.ts => InvalidPropertyNames.d.ts} | 5 - ...ames.Import.js => InvalidPropertyNames.js} | 27 - ...peScriptClass.Import.d.ts => JSClass.d.ts} | 5 + .../{TypeScriptClass.Import.js => JSClass.js} | 27 + ...xedGlobal.Export.d.ts => MixedGlobal.d.ts} | 0 .../{MixedGlobal.Export.js => MixedGlobal.js} | 0 ...dModules.Export.d.ts => MixedModules.d.ts} | 0 ...MixedModules.Export.js => MixedModules.js} | 0 ...dPrivate.Export.d.ts => MixedPrivate.d.ts} | 0 ...MixedPrivate.Export.js => MixedPrivate.js} | 0 .../MultipleImportedTypes.Import.d.ts | 36 - .../MultipleImportedTypes.Import.js | 354 ---- ...bal.Export.d.ts => Namespaces.Global.d.ts} | 0 ....Global.Export.js => Namespaces.Global.js} | 0 ...Namespaces.Export.d.ts => Namespaces.d.ts} | 0 .../{Namespaces.Export.js => Namespaces.js} | 0 .../{Optionals.Export.d.ts => Optionals.d.ts} | 0 .../{Optionals.Export.js => Optionals.js} | 0 .../PrimitiveParameters.Export.js | 225 --- .../PrimitiveParameters.Import.d.ts | 18 - ...s.Export.d.ts => PrimitiveParameters.d.ts} | 1 + ...eters.Import.js => PrimitiveParameters.js} | 3 + .../PrimitiveReturn.Import.d.ts | 19 - .../PrimitiveReturn.Import.js | 242 --- ...eturn.Export.d.ts => PrimitiveReturn.d.ts} | 2 + ...iveReturn.Export.js => PrimitiveReturn.js} | 20 + ...tyTypes.Export.d.ts => PropertyTypes.d.ts} | 0 ...opertyTypes.Export.js => PropertyTypes.js} | 0 .../{Protocol.Export.d.ts => Protocol.d.ts} | 0 .../{Protocol.Export.js => Protocol.js} | 0 .../ReExportFrom.Import.d.ts | 24 - .../BridgeJSLinkTests/ReExportFrom.Import.js | 252 --- ...xport.d.ts => StaticFunctions.Global.d.ts} | 0 ...al.Export.js => StaticFunctions.Global.js} | 0 ...tions.Export.d.ts => StaticFunctions.d.ts} | 0 ...Functions.Export.js => StaticFunctions.js} | 0 ...port.d.ts => StaticProperties.Global.d.ts} | 0 ...l.Export.js => StaticProperties.Global.js} | 0 ...ties.Export.d.ts => StaticProperties.d.ts} | 0 ...operties.Export.js => StaticProperties.js} | 0 .../BridgeJSLinkTests/StringEnum.Import.d.ts | 19 - .../BridgeJSLinkTests/StringEnum.Import.js | 242 --- .../StringParameter.Export.d.ts | 19 - .../StringParameter.Export.js | 237 --- ...meter.Import.d.ts => StringParameter.d.ts} | 2 + ...Parameter.Import.js => StringParameter.js} | 15 + .../BridgeJSLinkTests/StringReturn.Export.js | 228 --- .../StringReturn.Import.d.ts | 18 - ...ngReturn.Export.d.ts => StringReturn.d.ts} | 1 + ...StringReturn.Import.js => StringReturn.js} | 6 + ...SwiftClass.Export.d.ts => SwiftClass.d.ts} | 0 .../{SwiftClass.Export.js => SwiftClass.js} | 0 ...tClosure.Export.d.ts => SwiftClosure.d.ts} | 0 ...SwiftClosure.Export.js => SwiftClosure.js} | 0 ...rtMacros.d.ts => SwiftClosureImports.d.ts} | 0 ...ImportMacros.js => SwiftClosureImports.js} | 0 ...iftStruct.Export.d.ts => SwiftStruct.d.ts} | 0 .../{SwiftStruct.Export.js => SwiftStruct.js} | 0 ...ortMacros.d.ts => SwiftStructImports.d.ts} | 0 ....ImportMacros.js => SwiftStructImports.js} | 0 .../TS2SkeletonLike.Import.d.ts | 28 - .../TS2SkeletonLike.Import.js | 293 ---- .../{Throws.Export.d.ts => Throws.d.ts} | 0 .../{Throws.Export.js => Throws.js} | 0 .../BridgeJSLinkTests/TypeAlias.Import.d.ts | 18 - .../BridgeJSLinkTests/TypeAlias.Import.js | 231 --- ...Pointer.Export.d.ts => UnsafePointer.d.ts} | 0 ...safePointer.Export.js => UnsafePointer.js} | 0 .../VoidParameterVoidReturn.Export.d.ts | 18 - .../VoidParameterVoidReturn.Export.js | 225 --- ...port.d.ts => VoidParameterVoidReturn.d.ts} | 1 + ...n.Import.js => VoidParameterVoidReturn.js} | 3 + .../ExportSwiftTests/ArrayTypes.json | 983 ----------- .../__Snapshots__/ExportSwiftTests/Async.json | 184 -- .../CrossFileFunctionTypes.ReverseOrder.json | 149 -- .../CrossFileFunctionTypes.json | 149 -- .../CrossFileTypeResolution.ReverseOrder.json | 61 - .../CrossFileTypeResolution.json | 61 - .../ExportSwiftTests/DefaultParameters.json | 1270 -------------- .../ExportSwiftTests/EnumAssociatedValue.json | 844 --------- .../ExportSwiftTests/EnumCase.json | 320 ---- .../EnumNamespace.Global.json | 538 ------ .../ExportSwiftTests/EnumNamespace.json | 538 ------ .../ExportSwiftTests/EnumRawType.json | 1498 ---------------- .../ImportedTypeInExportedInterface.json | 34 - .../ExportSwiftTests/MixedGlobal.json | 76 - .../ExportSwiftTests/MixedPrivate.json | 76 - .../ExportSwiftTests/Namespaces.Global.json | 182 -- .../ExportSwiftTests/Namespaces.json | 182 -- .../ExportSwiftTests/Optionals.json | 699 -------- .../ExportSwiftTests/PrimitiveParameters.json | 78 - .../PrimitiveParameters.swift | 9 - .../ExportSwiftTests/PrimitiveReturn.json | 102 -- .../ExportSwiftTests/PropertyTypes.json | 360 ---- .../ExportSwiftTests/Protocol.json | 898 ---------- .../StaticFunctions.Global.json | 336 ---- .../ExportSwiftTests/StaticFunctions.json | 336 ---- .../StaticProperties.Global.json | 339 ---- .../ExportSwiftTests/StaticProperties.json | 339 ---- .../ExportSwiftTests/StringParameter.json | 67 - .../ExportSwiftTests/StringParameter.swift | 20 - .../ExportSwiftTests/StringReturn.json | 34 - .../ExportSwiftTests/StringReturn.swift | 10 - .../ExportSwiftTests/SwiftClass.json | 142 -- .../ExportSwiftTests/SwiftClosure.json | 1075 ------------ .../ExportSwiftTests/SwiftStruct.json | 520 ------ .../ExportSwiftTests/Throws.json | 34 - .../ExportSwiftTests/UnsafePointer.json | 413 ----- .../VoidParameterVoidReturn.json | 34 - .../VoidParameterVoidReturn.swift | 9 - .../ImportTSTests/ArrayParameter.Macros.swift | 13 - .../ImportTSTests/ArrayParameter.swift | 51 - .../ImportTSTests/Async.Macros.swift | 21 - .../__Snapshots__/ImportTSTests/Async.swift | 124 -- .../ImportTSTests/Interface.Macros.swift | 14 - .../ImportTSTests/Interface.swift | 55 - .../InvalidPropertyNames.Macros.swift | 44 - .../MultipleImportedTypes.Macros.swift | 33 - .../ImportTSTests/MultipleImportedTypes.swift | 254 --- .../PrimitiveParameters.Macros.swift | 9 - .../ImportTSTests/PrimitiveParameters.swift | 17 - .../PrimitiveReturn.Macros.swift | 11 - .../ImportTSTests/PrimitiveReturn.swift | 33 - .../ImportTSTests/ReExportFrom.Macros.swift | 14 - .../ImportTSTests/ReExportFrom.swift | 53 - .../ImportTSTests/StringEnum.Macros.swift | 17 - .../ImportTSTests/StringEnum.swift | 33 - .../StringParameter.Macros.swift | 11 - .../ImportTSTests/StringReturn.Macros.swift | 9 - .../SwiftStructImports.ImportMacros.swift | 19 - .../TS2SkeletonLike.Macros.swift | 22 - .../ImportTSTests/TS2SkeletonLike.swift | 127 -- .../ImportTSTests/TypeAlias.Macros.swift | 9 - .../ImportTSTests/TypeAlias.swift | 16 - .../TypeScriptClass.Macros.swift | 16 - .../VoidParameterVoidReturn.Macros.swift | 9 - package-lock.json | 1397 +++++++++++++-- package.json | 3 +- 319 files changed, 16721 insertions(+), 18314 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/ArrayParameter.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/Async.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/Interface.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/InvalidPropertyNames.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/MultipleImportedTypes.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/PrimitiveParameters.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/PrimitiveReturn.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/ReExportFrom.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/StringEnum.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/StringParameter.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/StringReturn.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/Support/ReExportTarget.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/TS2SkeletonLike.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/TypeAlias.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/TypeScriptClass.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/VoidParameterVoidReturn.d.ts (100%) rename Plugins/BridgeJS/{Tests/BridgeJSToolTests/Inputs => Sources/TS2Swift/JavaScript/test/fixtures}/tsconfig.json (100%) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/vitest.config.js create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/ArrayTypes.swift (88%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/Async.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/DefaultParameters.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/EnumAssociatedValue.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/EnumCase.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/EnumNamespace.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/EnumRawType.swift (91%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{ImportMacroInputs => Inputs/MacroSwift}/GlobalGetter.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{ImportMacroInputs => Inputs/MacroSwift}/GlobalThisImports.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/ImportedTypeInExportedInterface.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/InvalidPropertyNames.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClass.swift rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/MixedGlobal.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/MixedPrivate.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{MultifileInputs => Inputs/MacroSwift/Multifile}/CrossFileClassA.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{MultifileInputs => Inputs/MacroSwift/Multifile}/CrossFileClassB.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{MultifileInputs => Inputs/MacroSwift/Multifile}/CrossFileFunctionA.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{MultifileInputs => Inputs/MacroSwift/Multifile}/CrossFileFunctionB.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/Namespaces.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/Optionals.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveParameters.swift rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/PrimitiveReturn.swift (65%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/PropertyTypes.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/Protocol.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/StaticFunctions.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/StaticProperties.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringParameter.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringReturn.swift rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/SwiftClass.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/SwiftClosure.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{ImportMacroInputs => Inputs/MacroSwift}/SwiftClosureImports.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/SwiftStruct.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/{ImportMacroInputs => Inputs/MacroSwift}/SwiftStructImports.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/Throws.swift (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/{ => MacroSwift}/UnsafePointer.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/VoidParameterVoidReturn.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/ArrayTypes.swift (91%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Async.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/CrossFileFunctionTypes.ReverseOrder.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/CrossFileFunctionTypes.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/CrossFileTypeResolution.ReverseOrder.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/CrossFileTypeResolution.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/DefaultParameters.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/EnumAssociatedValue.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/EnumCase.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/EnumNamespace.Global.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/EnumNamespace.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/EnumRawType.swift (90%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests/GlobalGetter.ImportMacros.swift => BridgeJSCodegenTests/GlobalGetter.swift} (88%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests/GlobalThisImports.ImportMacros.swift => BridgeJSCodegenTests/GlobalThisImports.swift} (88%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/ImportedTypeInExportedInterface.swift (62%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests => BridgeJSCodegenTests}/InvalidPropertyNames.swift (77%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests/TypeScriptClass.swift => BridgeJSCodegenTests/JSClass.swift} (55%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/MixedGlobal.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/MixedPrivate.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Namespaces.Global.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Namespaces.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Optionals.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/PrimitiveReturn.swift (59%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/PropertyTypes.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Protocol.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/StaticFunctions.Global.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/StaticFunctions.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/StaticProperties.Global.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/StaticProperties.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests => BridgeJSCodegenTests}/StringParameter.swift (54%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests => BridgeJSCodegenTests}/StringReturn.swift (53%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/SwiftClass.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/SwiftClosure.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests/SwiftClosureImports.ImportMacros.swift => BridgeJSCodegenTests/SwiftClosureImports.swift} (62%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/SwiftStruct.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/Throws.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ExportSwiftTests => BridgeJSCodegenTests}/UnsafePointer.swift (100%) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/{ImportTSTests => BridgeJSCodegenTests}/VoidParameterVoidReturn.swift (54%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{ArrayTypes.Export.d.ts => ArrayTypes.d.ts} (96%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{ArrayTypes.Export.js => ArrayTypes.js} (97%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Async.Export.d.ts => Async.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Async.Export.js => Async.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{DefaultParameters.Export.d.ts => DefaultParameters.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{DefaultParameters.Export.js => DefaultParameters.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumAssociatedValue.Export.d.ts => EnumAssociatedValue.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumAssociatedValue.Export.js => EnumAssociatedValue.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumCase.Export.d.ts => EnumCase.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumCase.Export.js => EnumCase.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace.Global.Export.d.ts => EnumNamespace.Global.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace.Global.Export.js => EnumNamespace.Global.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace.Export.d.ts => EnumNamespace.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumNamespace.Export.js => EnumNamespace.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumRawType.Export.d.ts => EnumRawType.d.ts} (98%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{EnumRawType.Export.js => EnumRawType.js} (91%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{GlobalGetter.ImportMacros.d.ts => GlobalGetter.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{GlobalGetter.ImportMacros.js => GlobalGetter.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{GlobalThisImports.ImportMacros.d.ts => GlobalThisImports.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{GlobalThisImports.ImportMacros.js => GlobalThisImports.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{ImportedTypeInExportedInterface.Export.d.ts => ImportedTypeInExportedInterface.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{ImportedTypeInExportedInterface.Export.js => ImportedTypeInExportedInterface.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{InvalidPropertyNames.Import.d.ts => InvalidPropertyNames.d.ts} (85%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{InvalidPropertyNames.Import.js => InvalidPropertyNames.js} (93%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{TypeScriptClass.Import.d.ts => JSClass.d.ts} (81%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{TypeScriptClass.Import.js => JSClass.js} (89%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedGlobal.Export.d.ts => MixedGlobal.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedGlobal.Export.js => MixedGlobal.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedModules.Export.d.ts => MixedModules.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedModules.Export.js => MixedModules.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedPrivate.Export.d.ts => MixedPrivate.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{MixedPrivate.Export.js => MixedPrivate.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces.Global.Export.d.ts => Namespaces.Global.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces.Global.Export.js => Namespaces.Global.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces.Export.d.ts => Namespaces.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Namespaces.Export.js => Namespaces.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Optionals.Export.d.ts => Optionals.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Optionals.Export.js => Optionals.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.d.ts rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PrimitiveParameters.Export.d.ts => PrimitiveParameters.d.ts} (93%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PrimitiveParameters.Import.js => PrimitiveParameters.js} (98%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PrimitiveReturn.Export.d.ts => PrimitiveReturn.d.ts} (91%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PrimitiveReturn.Export.js => PrimitiveReturn.js} (92%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PropertyTypes.Export.d.ts => PropertyTypes.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{PropertyTypes.Export.js => PropertyTypes.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Protocol.Export.d.ts => Protocol.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Protocol.Export.js => Protocol.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions.Global.Export.d.ts => StaticFunctions.Global.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions.Global.Export.js => StaticFunctions.Global.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions.Export.d.ts => StaticFunctions.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticFunctions.Export.js => StaticFunctions.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties.Global.Export.d.ts => StaticProperties.Global.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties.Global.Export.js => StaticProperties.Global.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties.Export.d.ts => StaticProperties.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StaticProperties.Export.js => StaticProperties.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StringParameter.Import.d.ts => StringParameter.d.ts} (89%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StringParameter.Import.js => StringParameter.js} (92%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.d.ts rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StringReturn.Export.d.ts => StringReturn.d.ts} (95%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{StringReturn.Import.js => StringReturn.js} (97%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClass.Export.d.ts => SwiftClass.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClass.Export.js => SwiftClass.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClosure.Export.d.ts => SwiftClosure.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClosure.Export.js => SwiftClosure.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClosureImports.ImportMacros.d.ts => SwiftClosureImports.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftClosureImports.ImportMacros.js => SwiftClosureImports.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftStruct.Export.d.ts => SwiftStruct.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftStruct.Export.js => SwiftStruct.js} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftStructImports.ImportMacros.d.ts => SwiftStructImports.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{SwiftStructImports.ImportMacros.js => SwiftStructImports.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Throws.Export.d.ts => Throws.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{Throws.Export.js => Throws.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{UnsafePointer.Export.d.ts => UnsafePointer.d.ts} (100%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{UnsafePointer.Export.js => UnsafePointer.js} (100%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.d.ts delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{VoidParameterVoidReturn.Import.d.ts => VoidParameterVoidReturn.d.ts} (96%) rename Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/{VoidParameterVoidReturn.Import.js => VoidParameterVoidReturn.js} (98%) delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift delete mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b5ace046..2859b7043 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,7 +86,7 @@ jobs: with: node-version: '20' - name: Install TypeScript - run: npm install --prefix Plugins/BridgeJS/Sources/TS2Swift/JavaScript + run: npm install - name: Run BridgeJS tests # NOTE: Seems like the prebuilt SwiftSyntax binaries are not compatible with # non-macro dependents, so disable experimental prebuilts for now. diff --git a/.gitignore b/.gitignore index 8dba07278..c34d4dfe2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ xcuserdata/ Examples/*/Bundle Examples/*/package-lock.json Package.resolved -Plugins/BridgeJS/Sources/JavaScript/package-lock.json +Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package-lock.json Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/**/*.actual bridge-js.config.local.json _site/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 339a268ee..d984555e6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,6 +60,12 @@ Tests for `BridgeJS` plugin: swift test --package-path ./Plugins/BridgeJS ``` +This runs both the TS2Swift Vitest suite (TypeScript `.d.ts` -> Swift macro output) and the Swift codegen/link tests. For fast iteration on the ts2swift tool only, run Vitest directly: + +```bash +cd Plugins/BridgeJS/Sources/TS2Swift/JavaScript && npm test +``` + To update snapshot test files when expected output changes: ```bash diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index a03172f17..49aa161c9 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -59,7 +59,7 @@ let package = Package( "BridgeJSLink", "TS2Swift", ], - exclude: ["__Snapshots__", "Inputs", "MultifileInputs", "ImportMacroInputs"] + exclude: ["__Snapshots__", "Inputs"] ), .macro( name: "BridgeJSMacros", diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 0e84674ac..0559dc3fb 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -100,7 +100,7 @@ graph LR | `Foundation.URL` | `string` | - | [#496](https://github.com/swiftwasm/JavaScriptKit/issues/496) | | Generics | - | - | [#398](https://github.com/swiftwasm/JavaScriptKit/issues/398) | -### Import-specific (TypeScript → Swift) +### Import-specific (TypeScript -> Swift) | TypeScript Type | Swift Type | Status | |:----------------|:-----------|:-------| @@ -163,6 +163,12 @@ Return values use direct Wasm returns for primitives, and imported intrinsic fun For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#How-It-Works) in the user documentation. +## Testing + +- **Full BridgeJS tests** (Swift + TS2Swift Vitest): `swift test --package-path ./Plugins/BridgeJS` +- **TS2Swift only** (fast iteration on `.d.ts` -> Swift): `npm -C Sources/TS2Swift/JavaScript test` +- **Regenerate snapshot artifacts**: `UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS` + ## Debug utilities `BridgeJSToolInternal` exposes pipeline stages for debugging: diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json index d6b34558d..de3af1ab8 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json @@ -5,5 +5,8 @@ }, "bin": { "ts2swift": "./bin/ts2swift.js" + }, + "scripts": { + "test": "vitest run" } } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 922b8dbbc..766cd0432 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -76,13 +76,80 @@ function printUsage() { console.error('Usage: ts2swift -p [--global ]... [-o output.swift]'); } +/** + * Run ts2swift for a single input file (programmatic API, no process I/O). + * @param {string} filePath - Path to the .d.ts file + * @param {{ tsconfigPath: string, logLevel?: string, globalFiles?: string[] }} options + * @returns {string} Generated Swift source + * @throws {Error} on parse/type-check errors (diagnostics are included in the message) + */ +export function run(filePath, options) { + const { tsconfigPath, logLevel = 'info', globalFiles: globalFilesOpt = [] } = options; + const globalFiles = Array.isArray(globalFilesOpt) ? globalFilesOpt : (globalFilesOpt ? [globalFilesOpt] : []); + + const diagnosticEngine = new DiagnosticEngine(logLevel); + + const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile); + const configParseResult = ts.parseJsonConfigFileContent( + configFile.config, + ts.sys, + path.dirname(path.resolve(tsconfigPath)) + ); + + if (configParseResult.errors.length > 0) { + const message = ts.formatDiagnosticsWithColorAndContext(configParseResult.errors, { + getCanonicalFileName: (fileName) => fileName, + getNewLine: () => ts.sys.newLine, + getCurrentDirectory: () => ts.sys.getCurrentDirectory(), + }); + throw new Error(`TypeScript config/parse errors:\n${message}`); + } + + const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options); + const diagnostics = program.getSemanticDiagnostics(); + if (diagnostics.length > 0) { + const message = ts.formatDiagnosticsWithColorAndContext(diagnostics, { + getCanonicalFileName: (fileName) => fileName, + getNewLine: () => ts.sys.newLine, + getCurrentDirectory: () => ts.sys.getCurrentDirectory(), + }); + throw new Error(`TypeScript semantic errors:\n${message}`); + } + + const prelude = [ + "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,", + "// DO NOT EDIT.", + "//", + "// To update this file, just rebuild your project or run", + "// `swift package bridge-js`.", + "", + "@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit", + "", + "", + ].join("\n"); + + /** @type {string[]} */ + const bodies = []; + const globalFileSet = new Set(globalFiles); + for (const inputPath of [filePath, ...globalFiles]) { + const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, { + defaultImportFromGlobal: globalFileSet.has(inputPath), + }); + const result = processor.processTypeDeclarations(program, inputPath); + const body = result.content.trim(); + if (body.length > 0) bodies.push(body); + } + + const hasAny = bodies.length > 0; + return hasAny ? prelude + bodies.join("\n\n") + "\n" : ""; +} + /** * Main function to run the CLI * @param {string[]} args - Command-line arguments * @returns {void} */ export function main(args) { - // Parse command line arguments const options = parseArgs({ args, options: { @@ -118,64 +185,24 @@ export function main(args) { } const filePath = options.positionals[0]; - const diagnosticEngine = new DiagnosticEngine(options.values["log-level"] || "info"); - - diagnosticEngine.print("verbose", `Processing ${filePath}...`); - - // Create TypeScript program and process declarations - const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile); - const configParseResult = ts.parseJsonConfigFileContent( - configFile.config, - ts.sys, - path.dirname(path.resolve(tsconfigPath)) - ); - - if (configParseResult.errors.length > 0) { - diagnosticEngine.tsDiagnose(configParseResult.errors); - process.exit(1); - } - + const logLevel = options.values["log-level"] || "info"; /** @type {string[]} */ const globalFiles = Array.isArray(options.values.global) ? options.values.global : (options.values.global ? [options.values.global] : []); - const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options); - const diagnostics = program.getSemanticDiagnostics(); - if (diagnostics.length > 0) { - diagnosticEngine.tsDiagnose(diagnostics); - process.exit(1); - } - - const prelude = [ - "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,", - "// DO NOT EDIT.", - "//", - "// To update this file, just rebuild your project or run", - "// `swift package bridge-js`.", - "", - "@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit", - "", - "", - ].join("\n"); + const diagnosticEngine = new DiagnosticEngine(logLevel); + diagnosticEngine.print("verbose", `Processing ${filePath}...`); - /** @type {string[]} */ - const bodies = []; - const globalFileSet = new Set(globalFiles); - for (const inputPath of [filePath, ...globalFiles]) { - const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, { - defaultImportFromGlobal: globalFileSet.has(inputPath), - }); - const result = processor.processTypeDeclarations(program, inputPath); - const body = result.content.trim(); - if (body.length > 0) bodies.push(body); + let swiftOutput; + try { + swiftOutput = run(filePath, { tsconfigPath, logLevel, globalFiles }); + } catch (err) { + console.error(err.message); + process.exit(1); } - - const hasAny = bodies.length > 0; - const swiftOutput = hasAny ? prelude + bodies.join("\n\n") + "\n" : ""; - if (options.values.output) { - if (hasAny) { + if (swiftOutput.length > 0) { fs.mkdirSync(path.dirname(options.values.output), { recursive: true }); fs.writeFileSync(options.values.output, swiftOutput); } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap new file mode 100644 index 000000000..5b5316a40 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -0,0 +1,313 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`ts2swift > snapshots Swift output for ArrayParameter.d.ts > ArrayParameter 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void + +@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws (JSException) -> Void + +@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void +" +`; + +exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripInt(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripString(_ v: String) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripBool(_ v: Bool) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripFloat(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripDouble(_ v: Double) throws (JSException) -> JSPromise + +@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws (JSException) -> JSPromise +" +`; + +exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func returnAnimatable() throws (JSException) -> Animatable + +@JSClass struct Animatable { + @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject + @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject +} +" +`; + +exports[`ts2swift > snapshots Swift output for InvalidPropertyNames.d.ts > InvalidPropertyNames 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike + +@JSClass struct ArrayBufferLike { + @JSGetter var byteLength: Double + @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike +} + +@JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming + +@JSClass struct WeirdNaming { + @JSGetter var normalProperty: String + @JSSetter func setNormalProperty(_ value: String) throws (JSException) + @JSGetter(jsName: "property-with-dashes") var property_with_dashes: Double + @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws (JSException) + @JSGetter(jsName: "123invalidStart") var _123invalidStart: Bool + @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws (JSException) + @JSGetter(jsName: "property with spaces") var property_with_spaces: String + @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws (JSException) + @JSGetter(jsName: "@specialChar") var _specialChar: Double + @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws (JSException) + @JSGetter var constructor: String + @JSSetter func setConstructor(_ value: String) throws (JSException) + @JSGetter var \`for\`: String + @JSSetter func setFor(_ value: String) throws (JSException) + @JSGetter var \`Any\`: String + @JSSetter(jsName: "Any") func setAny(_ value: String) throws (JSException) + @JSFunction func \`as\`() throws (JSException) -> Void + @JSFunction func \`try\`() throws (JSException) -> Void +} + +@JSClass(jsName: "$Weird") struct _Weird { + @JSFunction init() throws (JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> Void +} + +@JSFunction func createWeirdClass() throws (JSException) -> _Weird +" +`; + +exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > MultipleImportedTypes 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection + +@JSClass struct DatabaseConnection { + @JSFunction func connect(_ url: String) throws (JSException) -> Void + @JSFunction func execute(_ query: String) throws (JSException) -> JSObject + @JSGetter var isConnected: Bool + @JSGetter var connectionTimeout: Double + @JSSetter func setConnectionTimeout(_ value: Double) throws (JSException) +} + +@JSFunction func createLogger(_ level: String) throws (JSException) -> Logger + +@JSClass struct Logger { + @JSFunction func log(_ message: String) throws (JSException) -> Void + @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void + @JSGetter var level: String +} + +@JSFunction func getConfigManager() throws (JSException) -> ConfigManager + +@JSClass struct ConfigManager { + @JSFunction func get(_ key: String) throws (JSException) -> JSObject + @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void + @JSGetter var configPath: String +} +" +`; + +exports[`ts2swift > snapshots Swift output for PrimitiveParameters.d.ts > PrimitiveParameters 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void +" +`; + +exports[`ts2swift > snapshots Swift output for PrimitiveReturn.d.ts > PrimitiveReturn 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func checkNumber() throws (JSException) -> Double + +@JSFunction func checkBoolean() throws (JSException) -> Bool +" +`; + +exports[`ts2swift > snapshots Swift output for ReExportFrom.d.ts > ReExportFrom 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double + +@JSClass struct JsGreeter { + @JSFunction init(_ name: String) throws (JSException) + @JSFunction func greet() throws (JSException) -> String +} +" +`; + +exports[`ts2swift > snapshots Swift output for StringEnum.d.ts > StringEnum 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +enum FeatureFlag: String { + case foo = "foo" + case bar = "bar" +} +extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} + +@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> Void + +@JSFunction func returnsFeatureFlag() throws (JSException) -> FeatureFlag +" +`; + +exports[`ts2swift > snapshots Swift output for StringParameter.d.ts > StringParameter 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func checkString(_ a: String) throws (JSException) -> Void + +@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws (JSException) -> Void +" +`; + +exports[`ts2swift > snapshots Swift output for StringReturn.d.ts > StringReturn 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func checkString() throws (JSException) -> String +" +`; + +exports[`ts2swift > snapshots Swift output for TS2SkeletonLike.d.ts > TS2SkeletonLike 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor + +@JSClass struct TypeScriptProcessor { + @JSFunction func convert(_ ts: String) throws (JSException) -> String + @JSFunction func validate(_ ts: String) throws (JSException) -> Bool + @JSGetter var version: String +} + +@JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator + +@JSClass struct CodeGenerator { + @JSFunction func generate(_ input: JSObject) throws (JSException) -> String + @JSGetter var outputFormat: String +} +" +`; + +exports[`ts2swift > snapshots Swift output for TypeAlias.d.ts > TypeAlias 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void +" +`; + +exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScriptClass 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSClass struct Greeter { + @JSGetter var name: String + @JSSetter func setName(_ value: String) throws (JSException) + @JSGetter var age: Double + @JSFunction init(_ name: String) throws (JSException) + @JSFunction func greet() throws (JSException) -> String + @JSFunction func changeName(_ name: String) throws (JSException) -> Void +} +" +`; + +exports[`ts2swift > snapshots Swift output for VoidParameterVoidReturn.d.ts > VoidParameterVoidReturn 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func check() throws (JSException) -> Void +" +`; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayParameter.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayParameter.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Async.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Async.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Async.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Async.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Interface.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Interface.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Interface.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Interface.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/InvalidPropertyNames.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/InvalidPropertyNames.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/InvalidPropertyNames.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MultipleImportedTypes.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/MultipleImportedTypes.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MultipleImportedTypes.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/MultipleImportedTypes.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/PrimitiveParameters.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/PrimitiveParameters.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/PrimitiveReturn.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/PrimitiveReturn.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ReExportFrom.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ReExportFrom.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ReExportFrom.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringEnum.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringEnum.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringEnum.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringParameter.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringParameter.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringReturn.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringReturn.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Support/ReExportTarget.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Support/ReExportTarget.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Support/ReExportTarget.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TS2SkeletonLike.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TS2SkeletonLike.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TS2SkeletonLike.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TS2SkeletonLike.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TypeAlias.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAlias.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TypeAlias.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAlias.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TypeScriptClass.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TypeScriptClass.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/VoidParameterVoidReturn.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.d.ts rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/VoidParameterVoidReturn.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/tsconfig.json b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/tsconfig.json similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/tsconfig.json rename to Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/tsconfig.json diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js new file mode 100644 index 000000000..a65386924 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js @@ -0,0 +1,41 @@ +// @ts-check +import { describe, it, expect } from 'vitest'; +import { readdirSync } from 'fs'; +import { fileURLToPath } from 'url'; +import path from 'path'; +import { run } from '../src/cli.js'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +/** Path to BridgeJSToolTests/Inputs/TypeScript (.d.ts fixtures and tsconfig). */ +const inputsDir = path.resolve(__dirname, 'fixtures'); +const tsconfigPath = path.join(inputsDir, 'tsconfig.json'); + +function runTs2Swift(dtsPath) { + return run(dtsPath, { tsconfigPath, logLevel: 'error' }); +} + +function collectDtsInputs() { + const entries = readdirSync(inputsDir, { withFileTypes: true }); + return entries + .filter((e) => e.isFile() && e.name.endsWith('.d.ts')) + .map((e) => e.name) + .sort(); +} + +describe('ts2swift', () => { + const dtsFiles = collectDtsInputs(); + if (dtsFiles.length === 0) { + it.skip('no .d.ts fixtures found in BridgeJSToolTests/Inputs', () => {}); + return; + } + + for (const dtsFile of dtsFiles) { + it(`snapshots Swift output for ${dtsFile}`, () => { + const dtsPath = path.join(inputsDir, dtsFile); + const swiftOutput = runTs2Swift(dtsPath); + const name = dtsFile.replace(/\.d\.ts$/, ''); + expect(swiftOutput).toMatchSnapshot(name); + }); + } +}); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/vitest.config.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/vitest.config.js new file mode 100644 index 000000000..d5d33a7e1 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/vitest.config.js @@ -0,0 +1,9 @@ +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + test: { + snapshotFormat: { + escapeString: false, + }, + }, +}); diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift index 2796c1014..6e47475b1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift @@ -270,7 +270,7 @@ import BridgeJSMacros ) } - #if canImport(SwiftSyntax601) + #if canImport(SwiftSyntax602) // https://github.com/swiftlang/swift-syntax/pull/2722 @Test func variableWithTrailingComment() { TestSupport.assertMacroExpansion( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift new file mode 100644 index 000000000..ed83bc074 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift @@ -0,0 +1,169 @@ +import Foundation +import SwiftSyntax +import SwiftParser +import Testing + +@testable import BridgeJSCore +@testable import BridgeJSSkeleton + +@Suite struct BridgeJSCodegenTests { + static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( + "Inputs" + ).appendingPathComponent("MacroSwift") + static let multifileInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() + .appendingPathComponent("Inputs").appendingPathComponent("MacroSwift").appendingPathComponent("Multifile") + + private func snapshotCodegen( + skeleton: BridgeJSSkeleton, + name: String, + filePath: String = #filePath, + function: String = #function, + sourceLocation: Testing.SourceLocation = #_sourceLocation + ) throws { + var swiftParts: [String] = [] + if let closureSupport = try ClosureCodegen().renderSupport(for: skeleton) { + swiftParts.append(closureSupport) + } + if let exported = skeleton.exported { + let exportSwift = ExportSwift( + progress: .silent, + moduleName: skeleton.moduleName, + skeleton: exported + ) + if let s = try exportSwift.finalize() { + swiftParts.append(s) + } + } + if let imported = skeleton.imported { + let importTS = ImportTS(progress: .silent, moduleName: skeleton.moduleName, skeleton: imported) + if let s = try importTS.finalize() { + swiftParts.append(s) + } + } + let combinedSwift = + swiftParts + .map { $0.trimmingCharacters(in: .newlines) } + .filter { !$0.isEmpty } + .joined(separator: "\n\n") + try assertSnapshot( + name: name, + filePath: filePath, + function: function, + sourceLocation: sourceLocation, + input: combinedSwift.data(using: String.Encoding.utf8)!, + fileExtension: "swift" + ) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let skeletonData = try encoder.encode(skeleton) + try assertSnapshot( + name: name, + filePath: filePath, + function: function, + sourceLocation: sourceLocation, + input: skeletonData, + fileExtension: "json" + ) + } + + static func collectInputs() -> [String] { + let fileManager = FileManager.default + let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path) + return inputs.filter { $0.hasSuffix(".swift") }.sorted() + } + + @Test(arguments: collectInputs()) + func codegenSnapshot(input: String) throws { + let url = Self.inputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().lastPathComponent + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + swiftAPI.addSourceFile(sourceFile, inputFilePath: input) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: name) + } + + @Test(arguments: [ + "Namespaces.swift", + "StaticFunctions.swift", + "StaticProperties.swift", + "EnumNamespace.swift", + ]) + func codegenSnapshotWithGlobal(input: String) throws { + let url = Self.inputsDirectory.appendingPathComponent(input) + let name = url.deletingPathExtension().lastPathComponent + let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) + swiftAPI.addSourceFile(sourceFile, inputFilePath: input) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: name + ".Global") + } + + @Test + func codegenCrossFileTypeResolution() throws { + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)), + inputFilePath: "CrossFileClassB.swift" + ) + let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)), + inputFilePath: "CrossFileClassA.swift" + ) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: "CrossFileTypeResolution") + } + + @Test + func codegenCrossFileTypeResolutionReverseOrder() throws { + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)), + inputFilePath: "CrossFileClassA.swift" + ) + let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)), + inputFilePath: "CrossFileClassB.swift" + ) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: "CrossFileTypeResolution.ReverseOrder") + } + + @Test + func codegenCrossFileFunctionTypes() throws { + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)), + inputFilePath: "CrossFileFunctionB.swift" + ) + let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)), + inputFilePath: "CrossFileFunctionA.swift" + ) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: "CrossFileFunctionTypes") + } + + @Test + func codegenCrossFileFunctionTypesReverseOrder() throws { + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)), + inputFilePath: "CrossFileFunctionA.swift" + ) + let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)), + inputFilePath: "CrossFileFunctionB.swift" + ) + let skeleton = try swiftAPI.finalize() + try snapshotCodegen(skeleton: skeleton, name: "CrossFileFunctionTypes.ReverseOrder") + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift index 16de8617e..711b04512 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift @@ -4,7 +4,6 @@ import SwiftParser import Testing @testable import BridgeJSLink @testable import BridgeJSCore -@testable import TS2Swift @testable import BridgeJSSkeleton @Suite struct BridgeJSLinkTests { @@ -36,10 +35,7 @@ import Testing static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( "Inputs" - ) - - static let importMacroInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() - .appendingPathComponent("ImportMacroInputs") + ).appendingPathComponent("MacroSwift") static func collectInputs(extension: String) -> [String] { let fileManager = FileManager.default @@ -47,56 +43,9 @@ import Testing return inputs.filter { $0.hasSuffix(`extension`) } } - static func collectImportMacroInputs() -> [String] { - let fileManager = FileManager.default - let inputs = try! fileManager.contentsOfDirectory(atPath: Self.importMacroInputsDirectory.path) - return inputs.filter { $0.hasSuffix(".swift") } - } - @Test(arguments: collectInputs(extension: ".swift")) - func snapshotExport(input: String) throws { + func snapshot(input: String) throws { let url = Self.inputsDirectory.appendingPathComponent(input) - let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - swiftAPI.addSourceFile(sourceFile, inputFilePath: input) - let name = url.deletingPathExtension().lastPathComponent - - let outputSkeleton = try swiftAPI.finalize() - let bridgeJSLink: BridgeJSLink = BridgeJSLink( - skeletons: [outputSkeleton], - sharedMemory: false - ) - try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Export") - } - - @Test(arguments: collectInputs(extension: ".d.ts")) - func snapshotImport(input: String) throws { - let url = Self.inputsDirectory.appendingPathComponent(input) - let name = url.deletingPathExtension().deletingPathExtension().lastPathComponent - let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json") - - let nodePath = try #require(which("node")) - let swiftSource = try invokeTS2Swift( - dtsFile: url.path, - tsconfigPath: tsconfigPath.path, - nodePath: nodePath, - progress: .silent - ) - - let sourceFile = Parser.parse(source: swiftSource) - let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).Macros.swift") - let skeleton = try importSwift.finalize() - let bridgeJSLink = BridgeJSLink( - skeletons: [skeleton], - sharedMemory: false - ) - try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Import") - } - - @Test(arguments: collectImportMacroInputs()) - func snapshotImportMacroInput(input: String) throws { - let url = Self.importMacroInputsDirectory.appendingPathComponent(input) let name = url.deletingPathExtension().lastPathComponent let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) @@ -108,7 +57,7 @@ import Testing encoder.outputFormatting = [.prettyPrinted, .sortedKeys] let unifiedData = try encoder.encode(importResult) try bridgeJSLink.addSkeletonFile(data: unifiedData) - try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".ImportMacros") + try snapshot(bridgeJSLink: bridgeJSLink, name: name) } @Test(arguments: [ @@ -130,7 +79,7 @@ import Testing ], sharedMemory: false ) - try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global.Export") + try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global") } @Test @@ -154,6 +103,6 @@ import Testing ], sharedMemory: false ) - try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules.Export") + try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules") } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift deleted file mode 100644 index fb31ac837..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportSwiftTests.swift +++ /dev/null @@ -1,158 +0,0 @@ -import Foundation -import SwiftSyntax -import SwiftParser -import Testing - -@testable import BridgeJSCore -@testable import BridgeJSSkeleton - -@Suite struct ExportSwiftTests { - private func snapshot( - skeleton: BridgeJSSkeleton, - name: String? = nil, - filePath: String = #filePath, - function: String = #function, - sourceLocation: Testing.SourceLocation = #_sourceLocation - ) throws { - guard let exported = skeleton.exported else { return } - let exportSwift = ExportSwift( - progress: .silent, - moduleName: skeleton.moduleName, - skeleton: exported - ) - let closureSupport = try ClosureCodegen().renderSupport(for: skeleton) - let exportResult = try #require(try exportSwift.finalize()) - let outputSwift = ([closureSupport, exportResult] as [String?]) - .compactMap { $0?.trimmingCharacters(in: .newlines) } - .filter { !$0.isEmpty } - .joined(separator: "\n\n") - try assertSnapshot( - name: name, - filePath: filePath, - function: function, - sourceLocation: sourceLocation, - input: outputSwift.data(using: .utf8)!, - fileExtension: "swift" - ) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let outputSkeletonData = try encoder.encode(exported) - try assertSnapshot( - name: name, - filePath: filePath, - function: function, - sourceLocation: sourceLocation, - input: outputSkeletonData, - fileExtension: "json" - ) - } - - static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( - "Inputs" - ) - - static let multifileInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() - .appendingPathComponent( - "MultifileInputs" - ) - - static func collectInputs() -> [String] { - let fileManager = FileManager.default - let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path) - return inputs.filter { $0.hasSuffix(".swift") } - } - - @Test(arguments: collectInputs()) - func snapshot(input: String) throws { - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - let url = Self.inputsDirectory.appendingPathComponent(input) - let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - swiftAPI.addSourceFile(sourceFile, inputFilePath: input) - let name = url.deletingPathExtension().lastPathComponent - try snapshot(skeleton: swiftAPI.finalize(), name: name) - } - - @Test(arguments: [ - "Namespaces.swift", - "StaticFunctions.swift", - "StaticProperties.swift", - "EnumNamespace.swift", - ]) - func snapshotWithGlobal(input: String) throws { - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: true) - let url = Self.inputsDirectory.appendingPathComponent(input) - let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - swiftAPI.addSourceFile(sourceFile, inputFilePath: input) - let name = url.deletingPathExtension().lastPathComponent - try snapshot(skeleton: swiftAPI.finalize(), name: name + ".Global") - } - - @Test - func snapshotCrossFileTypeResolution() throws { - // Test that types defined in one file can be referenced from another file - // This tests the fix for cross-file type resolution in BridgeJS - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - - // Add ClassB first, then ClassA (which references ClassB) - let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") - let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) - swiftAPI.addSourceFile(classBSourceFile, inputFilePath: "CrossFileClassB.swift") - - let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") - let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) - swiftAPI.addSourceFile(classASourceFile, inputFilePath: "CrossFileClassA.swift") - - try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileTypeResolution") - } - - @Test - func snapshotCrossFileTypeResolutionReverseOrder() throws { - // Test that types can be resolved regardless of the order files are added - // Add ClassA first (which references ClassB), then ClassB - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - - let classAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassA.swift") - let classASourceFile = Parser.parse(source: try String(contentsOf: classAURL, encoding: .utf8)) - swiftAPI.addSourceFile(classASourceFile, inputFilePath: "CrossFileClassA.swift") - - let classBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileClassB.swift") - let classBSourceFile = Parser.parse(source: try String(contentsOf: classBURL, encoding: .utf8)) - swiftAPI.addSourceFile(classBSourceFile, inputFilePath: "CrossFileClassB.swift") - - try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileTypeResolution.ReverseOrder") - } - - @Test - func snapshotCrossFileFunctionTypes() throws { - // Test that functions and methods can use cross-file types as parameters and return types - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - - // Add FunctionB first, then FunctionA (which references FunctionB in methods and functions) - let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") - let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) - swiftAPI.addSourceFile(functionBSourceFile, inputFilePath: "CrossFileFunctionB.swift") - - let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") - let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) - swiftAPI.addSourceFile(functionASourceFile, inputFilePath: "CrossFileFunctionA.swift") - - try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileFunctionTypes") - } - - @Test - func snapshotCrossFileFunctionTypesReverseOrder() throws { - // Test that function types can be resolved regardless of the order files are added - let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) - - // Add FunctionA first (which references FunctionB), then FunctionB - let functionAURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionA.swift") - let functionASourceFile = Parser.parse(source: try String(contentsOf: functionAURL, encoding: .utf8)) - swiftAPI.addSourceFile(functionASourceFile, inputFilePath: "CrossFileFunctionA.swift") - - let functionBURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileFunctionB.swift") - let functionBSourceFile = Parser.parse(source: try String(contentsOf: functionBURL, encoding: .utf8)) - swiftAPI.addSourceFile(functionBSourceFile, inputFilePath: "CrossFileFunctionB.swift") - - try snapshot(skeleton: swiftAPI.finalize(), name: "CrossFileFunctionTypes.ReverseOrder") - } -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift deleted file mode 100644 index 89c7dd11d..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportTSTests.swift +++ /dev/null @@ -1,101 +0,0 @@ -import Testing -import Foundation -import SwiftParser -@testable import BridgeJSCore -@testable import TS2Swift -@testable import BridgeJSSkeleton - -@Suite struct ImportTSTests { - static let inputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().appendingPathComponent( - "Inputs" - ) - static let importMacroInputsDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() - .appendingPathComponent("ImportMacroInputs") - - static func collectInputs() -> [String] { - let fileManager = FileManager.default - let inputs = try! fileManager.contentsOfDirectory(atPath: Self.inputsDirectory.path) - return inputs.filter { $0.hasSuffix(".d.ts") } - } - - static func collectImportMacroInputs() -> [String] { - let fileManager = FileManager.default - let inputs = try! fileManager.contentsOfDirectory(atPath: Self.importMacroInputsDirectory.path) - return inputs.filter { $0.hasSuffix(".swift") } - } - - @Test(arguments: collectInputs()) - func snapshot(input: String) throws { - let url = Self.inputsDirectory.appendingPathComponent(input) - let name = url.deletingPathExtension().deletingPathExtension().deletingPathExtension().lastPathComponent - let nodePath = try #require(which("node")) - let tsconfigPath = url.deletingLastPathComponent().appendingPathComponent("tsconfig.json") - - let swiftSource = try invokeTS2Swift( - dtsFile: url.path, - tsconfigPath: tsconfigPath.path, - nodePath: nodePath, - progress: .silent - ) - try assertSnapshot( - name: name + ".Macros", - filePath: #filePath, - function: #function, - input: swiftSource.data(using: .utf8)!, - fileExtension: "swift" - ) - - let sourceFile = Parser.parse(source: swiftSource) - let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "Check", exposeToGlobal: false) - importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).Macros.swift") - let skeleton = try importSwift.finalize() - - guard let imported = skeleton.imported else { return } - - let importTS = ImportTS(progress: .silent, moduleName: "Check", skeleton: imported) - let importResult = try #require(try importTS.finalize()) - let closureSupport = try ClosureCodegen().renderSupport( - for: BridgeJSSkeleton(moduleName: "Check", imported: imported) - ) - let outputSwift = ([closureSupport, importResult] as [String?]) - .compactMap { $0?.trimmingCharacters(in: .newlines) } - .filter { !$0.isEmpty } - .joined(separator: "\n\n") - try assertSnapshot( - name: name, - filePath: #filePath, - function: #function, - input: outputSwift.data(using: .utf8)!, - fileExtension: "swift" - ) - } - - @Test(arguments: collectImportMacroInputs()) - func snapshotImportMacroInput(input: String) throws { - let url = Self.importMacroInputsDirectory.appendingPathComponent(input) - let name = url.deletingPathExtension().lastPathComponent - - let sourceFile = Parser.parse(source: try String(contentsOf: url, encoding: .utf8)) - let importSwift = SwiftToSkeleton(progress: .silent, moduleName: "Check", exposeToGlobal: false) - importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift") - let skeleton = try importSwift.finalize() - - guard let imported = skeleton.imported else { return } - let importTS = ImportTS(progress: .silent, moduleName: "Check", skeleton: imported) - let importResult = try #require(try importTS.finalize()) - let closureSupport = try ClosureCodegen().renderSupport( - for: BridgeJSSkeleton(moduleName: "Check", imported: imported) - ) - let outputSwift = ([closureSupport, importResult] as [String?]) - .compactMap { $0?.trimmingCharacters(in: .newlines) } - .filter { !$0.isEmpty } - .joined(separator: "\n\n") - try assertSnapshot( - name: name + ".ImportMacros", - filePath: #filePath, - function: #function, - input: outputSwift.data(using: .utf8)!, - fileExtension: "swift" - ) - } -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift similarity index 88% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift index 8454b7520..678bc3698 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift @@ -54,3 +54,7 @@ @JS func processItemArray(_ items: [Item]) -> [Item] @JS func processNestedItemArray(_ items: [[Item]]) -> [[Item]] + +@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void +@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void +@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Async.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Async.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DefaultParameters.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/DefaultParameters.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DefaultParameters.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumAssociatedValue.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumCase.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumCase.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumCase.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumNamespace.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumRawType.swift similarity index 91% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumRawType.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumRawType.swift index 13b502eac..6e18c913c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumRawType.swift @@ -124,3 +124,13 @@ @JS func processTheme(_ theme: Theme) -> HttpStatus @JS func convertPriority(_ status: HttpStatus) -> Priority @JS func validateSession(_ session: SessionId) -> Theme + +enum FeatureFlag: String { + case foo = "foo" + case bar = "bar" +} +extension FeatureFlag: _BridgedSwiftEnumNoPayload {} + +@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void + +@JSFunction func returnsFeatureFlag() throws(JSException) -> FeatureFlag diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GlobalGetter.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalGetter.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GlobalGetter.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GlobalThisImports.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/GlobalThisImports.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GlobalThisImports.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/ImportedTypeInExportedInterface.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/InvalidPropertyNames.swift new file mode 100644 index 000000000..ea5755dec --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/InvalidPropertyNames.swift @@ -0,0 +1,29 @@ +@JSFunction func createWeirdObject() throws(JSException) -> WeirdNaming + +@JSClass struct WeirdNaming { + @JSGetter var normalProperty: String + @JSSetter func setNormalProperty(_ value: String) throws(JSException) + @JSGetter(jsName: "property-with-dashes") var property_with_dashes: Double + @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws(JSException) + @JSGetter(jsName: "123invalidStart") var _123invalidStart: Bool + @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws(JSException) + @JSGetter(jsName: "property with spaces") var property_with_spaces: String + @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws(JSException) + @JSGetter(jsName: "@specialChar") var _specialChar: Double + @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws(JSException) + @JSGetter var constructor: String + @JSSetter func setConstructor(_ value: String) throws(JSException) + @JSGetter var `for`: String + @JSSetter func setFor(_ value: String) throws(JSException) + @JSGetter var `Any`: String + @JSSetter(jsName: "Any") func setAny(_ value: String) throws(JSException) + @JSFunction func `as`() throws(JSException) -> Void + @JSFunction func `try`() throws(JSException) -> Void +} + +@JSClass(jsName: "$Weird") struct _Weird { + @JSFunction init() throws(JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws(JSException) -> Void +} + +@JSFunction func createWeirdClass() throws(JSException) -> _Weird diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClass.swift new file mode 100644 index 000000000..6459f5354 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClass.swift @@ -0,0 +1,15 @@ +@JSClass struct Greeter { + @JSGetter var name: String + @JSSetter func setName(_ value: String) throws(JSException) + @JSGetter var age: Double + @JSFunction init(_ name: String) throws(JSException) + @JSFunction func greet() throws(JSException) -> String + @JSFunction func changeName(_ name: String) throws(JSException) -> Void +} + +@JSFunction func returnAnimatable() throws(JSException) -> Animatable + +@JSClass struct Animatable { + @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject + @JSFunction func getAnimations(_ options: JSObject) throws(JSException) -> JSObject +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/MixedGlobal.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedGlobal.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/MixedGlobal.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/MixedPrivate.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MixedPrivate.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/MixedPrivate.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileClassA.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassA.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileClassA.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileClassB.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileClassB.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileClassB.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileFunctionA.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionA.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileFunctionA.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileFunctionB.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/MultifileInputs/CrossFileFunctionB.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileFunctionB.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Namespaces.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Optionals.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveParameters.swift new file mode 100644 index 000000000..97495d947 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveParameters.swift @@ -0,0 +1,2 @@ +@JS func check(a: Int, b: UInt, c: Float, d: Double, e: Bool) {} +@JSFunction func check(_ a: Double, _ b: Bool) throws(JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveReturn.swift similarity index 65% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveReturn.swift index 144a759ec..d2a65faef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PrimitiveReturn.swift @@ -3,3 +3,6 @@ @JS func checkFloat() -> Float { fatalError() } @JS func checkDouble() -> Double { fatalError() } @JS func checkBool() -> Bool { fatalError() } + +@JSFunction func checkNumber() throws(JSException) -> Double +@JSFunction func checkBoolean() throws(JSException) -> Bool diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PropertyTypes.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PropertyTypes.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/PropertyTypes.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Protocol.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StaticFunctions.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StaticFunctions.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StaticFunctions.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StaticProperties.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StaticProperties.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StaticProperties.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringParameter.swift new file mode 100644 index 000000000..32fc62f32 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringParameter.swift @@ -0,0 +1,5 @@ +@JS func checkString(a: String) {} +@JS func roundtripString(a: String) -> String { return a } + +@JSFunction func checkString(_ a: String) throws(JSException) -> Void +@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringReturn.swift new file mode 100644 index 000000000..4b5bc088a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StringReturn.swift @@ -0,0 +1,2 @@ +@JS func checkString() -> String { fatalError() } +@JSFunction func checkString() throws(JSException) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClass.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftClosure.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftClosureImports.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosureImports.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/SwiftStruct.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportMacroInputs/SwiftStructImports.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStructImports.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Throws.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Throws.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Throws.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Throws.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/UnsafePointer.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/UnsafePointer.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/UnsafePointer.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/VoidParameterVoidReturn.swift new file mode 100644 index 000000000..4b9cd0d02 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/VoidParameterVoidReturn.swift @@ -0,0 +1,2 @@ +@JS func check() {} +@JSFunction func check() throws(JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift deleted file mode 100644 index a0d4353eb..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/PrimitiveParameters.swift +++ /dev/null @@ -1 +0,0 @@ -@JS func check(a: Int, b: UInt, c: Float, d: Double, e: Bool) {} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.swift deleted file mode 100644 index c735c56f7..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringParameter.swift +++ /dev/null @@ -1,2 +0,0 @@ -@JS func checkString(a: String) {} -@JS func roundtripString(a: String) -> String { return a } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.swift deleted file mode 100644 index fe070f0db..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringReturn.swift +++ /dev/null @@ -1 +0,0 @@ -@JS func checkString() -> String { fatalError() } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.swift deleted file mode 100644 index ba0cf5d23..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/VoidParameterVoidReturn.swift +++ /dev/null @@ -1 +0,0 @@ -@JS func check() {} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift new file mode 100644 index 000000000..bb3d2e0a4 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift @@ -0,0 +1,34 @@ +import Foundation +import Testing + +/// Runs the TS2Swift JavaScript test suite (Vitest) so that `swift test --package-path ./Plugins/BridgeJS` +/// validates both the TypeScript ts2swift output and the Swift codegen. For fast iteration on ts2swift, +/// run `npm test` directly in `Sources/TS2Swift/JavaScript`. +@Suite struct TS2SwiftVitestTests { + @Test + func ts2SwiftVitestSuitePasses() throws { + let testFileURL = URL(fileURLWithPath: #filePath) + let ts2SwiftJSDir = + testFileURL + .deletingLastPathComponent() // BridgeJSToolTests + .deletingLastPathComponent() // Tests + .deletingLastPathComponent() // BridgeJS package root + .appendingPathComponent("Sources") + .appendingPathComponent("TS2Swift") + .appendingPathComponent("JavaScript") + let process = Process() + process.executableURL = URL(fileURLWithPath: "/usr/bin/env") + var arguments = ["npm", "run", "test"] + if ProcessInfo.processInfo.environment["UPDATE_SNAPSHOTS"] != nil { + arguments.append(contentsOf: ["--", "--update"]) + } + process.arguments = arguments + process.currentDirectoryURL = ts2SwiftJSDir + try process.run() + process.waitUntilExit() + #expect( + process.terminationStatus == 0, + "TS2Swift Vitest suite failed (exit code \(process.terminationStatus)). Run `cd Sources/TS2Swift/JavaScript && npm test` for details." + ) + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json new file mode 100644 index 000000000..c90347177 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json @@ -0,0 +1,1059 @@ +{ + "exported" : { + "classes" : [ + { + "methods" : [ + + ], + "name" : "Item", + "properties" : [ + + ], + "swiftCallName" : "Item" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "pending", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "active", + "rawValue" : "1" + }, + { + "associatedValues" : [ + + ], + "name" : "completed", + "rawValue" : "2" + } + ], + "emitStyle" : "const", + "name" : "Status", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Status", + "tsFullPath" : "Status" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_processIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processDoubleArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDoubleArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processBoolArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processBoolArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "abiName" : "bjs_processDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_processStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "statuses", + "type" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_sumIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sumIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_findFirstPoint", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "findFirstPoint", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + }, + { + "label" : "matching", + "name" : "matching", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Point" + } + } + }, + { + "abiName" : "bjs_processUnsafeRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processUnsafeRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processUnsafeMutableRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processUnsafeMutableRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processOpaquePointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOpaquePointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalDirectionArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirectionArray", + "parameters" : [ + { + "label" : "_", + "name" : "directions", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalStatusArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalStatusArray", + "parameters" : [ + { + "label" : "_", + "name" : "statuses", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Status", + "_1" : "Int" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedIntArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedStringArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedStringArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedPointArray", + "parameters" : [ + { + "label" : "_", + "name" : "points", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processItemArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processItemArray", + "parameters" : [ + { + "label" : "_", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + }, + { + "abiName" : "bjs_processNestedItemArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedItemArray", + "parameters" : [ + { + "label" : "_", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Item" + } + } + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "methods" : [ + + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "Point" + } + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "checkArray", + "parameters" : [ + { + "name" : "a", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "checkArrayWithLength", + "parameters" : [ + { + "name" : "a", + "type" : { + "jsObject" : { + + } + } + }, + { + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "checkArray", + "parameters" : [ + { + "name" : "a", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift similarity index 91% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 55a6258b0..4452446b9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -488,4 +488,56 @@ fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_checkArray") +fileprivate func bjs_checkArray(_ a: Int32) -> Void +#else +fileprivate func bjs_checkArray(_ a: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$checkArray(_ a: JSObject) throws(JSException) -> Void { + let aValue = a.bridgeJSLowerParameter() + bjs_checkArray(aValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_checkArrayWithLength") +fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void +#else +fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { + let aValue = a.bridgeJSLowerParameter() + let bValue = b.bridgeJSLowerParameter() + bjs_checkArrayWithLength(aValue, bValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_checkArray") +fileprivate func bjs_checkArray(_ a: Int32) -> Void +#else +fileprivate func bjs_checkArray(_ a: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$checkArray(_ a: JSObject) throws(JSException) -> Void { + let aValue = a.bridgeJSLowerParameter() + bjs_checkArray(aValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json new file mode 100644 index 000000000..a780871ba --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.json @@ -0,0 +1,187 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_asyncReturnVoid", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncReturnVoid", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripInt", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripInt", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripString", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripString", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripBool", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripBool", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripFloat", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripFloat", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripDouble", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripDouble", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_asyncRoundTripJSObject", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "asyncRoundTripJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json new file mode 100644 index 000000000..9b056b650 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.json @@ -0,0 +1,152 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_FunctionA_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_FunctionA_processB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processB", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_FunctionA_createB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createB", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "name" : "FunctionA", + "properties" : [ + + ], + "swiftCallName" : "FunctionA" + }, + { + "constructor" : { + "abiName" : "bjs_FunctionB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "FunctionB", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "FunctionB" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_standaloneFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "standaloneFunction", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json new file mode 100644 index 000000000..d76a1622d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.json @@ -0,0 +1,152 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_FunctionB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "FunctionB", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "FunctionB" + }, + { + "constructor" : { + "abiName" : "bjs_FunctionA_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_FunctionA_processB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processB", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_FunctionA_createB", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createB", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "name" : "FunctionA", + "properties" : [ + + ], + "swiftCallName" : "FunctionA" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_standaloneFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "standaloneFunction", + "parameters" : [ + { + "label" : "b", + "name" : "b", + "type" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "FunctionB" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json new file mode 100644 index 000000000..7f21c86cf --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json @@ -0,0 +1,64 @@ +{ + "exported" : { + "classes" : [ + { + "methods" : [ + + ], + "name" : "ClassA", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "linkedB", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "ClassB" + } + } + } + } + } + ], + "swiftCallName" : "ClassA" + }, + { + "constructor" : { + "abiName" : "bjs_ClassB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "ClassB", + "properties" : [ + + ], + "swiftCallName" : "ClassB" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json new file mode 100644 index 000000000..3f8129109 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json @@ -0,0 +1,64 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_ClassB_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "ClassB", + "properties" : [ + + ], + "swiftCallName" : "ClassB" + }, + { + "methods" : [ + + ], + "name" : "ClassA", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "linkedB", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "ClassB" + } + } + } + } + } + ], + "swiftCallName" : "ClassA" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json new file mode 100644 index 000000000..64cc1a845 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json @@ -0,0 +1,1273 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_DefaultGreeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "DefaultGreeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "DefaultGreeter" + }, + { + "constructor" : { + "abiName" : "bjs_EmptyGreeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "EmptyGreeter", + "properties" : [ + + ], + "swiftCallName" : "EmptyGreeter" + }, + { + "constructor" : { + "abiName" : "bjs_ConstructorDefaults_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Default" + } + }, + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "int" : { + "_0" : 42 + } + }, + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + }, + { + "defaultValue" : { + "enumCase" : { + "_0" : "Status", + "_1" : "active" + } + }, + "label" : "status", + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "tag", + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "ConstructorDefaults", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "enabled", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "tag", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "ConstructorDefaults" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "active" + }, + { + "associatedValues" : [ + + ], + "name" : "inactive" + }, + { + "associatedValues" : [ + + ], + "name" : "pending" + } + ], + "emitStyle" : "const", + "explicitAccessControl" : "public", + "name" : "Status", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Status", + "tsFullPath" : "Status" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_testStringDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStringDefault", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Hello World" + } + }, + "label" : "message", + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testNegativeIntDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testNegativeIntDefault", + "parameters" : [ + { + "defaultValue" : { + "int" : { + "_0" : -42 + } + }, + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_testBoolDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testBoolDefault", + "parameters" : [ + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "flag", + "name" : "flag", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_testNegativeFloatDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testNegativeFloatDefault", + "parameters" : [ + { + "defaultValue" : { + "float" : { + "_0" : -273.15 + } + }, + "label" : "temp", + "name" : "temp", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_testDoubleDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testDoubleDefault", + "parameters" : [ + { + "defaultValue" : { + "double" : { + "_0" : 2.718 + } + }, + "label" : "precision", + "name" : "precision", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_testOptionalDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testOptionalStringDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalStringDefault", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Hi" + } + }, + "label" : "greeting", + "name" : "greeting", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testMultipleDefaults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testMultipleDefaults", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "Default Title" + } + }, + "label" : "title", + "name" : "title", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "int" : { + "_0" : 10 + } + }, + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : false + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_testEnumDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testEnumDefault", + "parameters" : [ + { + "defaultValue" : { + "enumCase" : { + "_0" : "Status", + "_1" : "active" + } + }, + "label" : "status", + "name" : "status", + "type" : { + "caseEnum" : { + "_0" : "Status" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "abiName" : "bjs_testComplexInit", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testComplexInit", + "parameters" : [ + { + "defaultValue" : { + "objectWithArguments" : { + "_0" : "DefaultGreeter", + "_1" : [ + { + "string" : { + "_0" : "DefaultUser" + } + } + ] + } + }, + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "DefaultGreeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "DefaultGreeter" + } + } + }, + { + "abiName" : "bjs_testEmptyInit", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testEmptyInit", + "parameters" : [ + { + "defaultValue" : { + "object" : { + "_0" : "EmptyGreeter" + } + }, + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "EmptyGreeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "EmptyGreeter" + } + } + }, + { + "abiName" : "bjs_testOptionalStructDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalStructDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + + } + }, + "label" : "point", + "name" : "point", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + }, + { + "abiName" : "bjs_testOptionalStructWithValueDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalStructWithValueDefault", + "parameters" : [ + { + "defaultValue" : { + "structLiteral" : { + "_0" : "Config", + "_1" : [ + { + "name" : "name", + "value" : { + "string" : { + "_0" : "default" + } + } + }, + { + "name" : "value", + "value" : { + "int" : { + "_0" : 42 + } + } + }, + { + "name" : "enabled", + "value" : { + "bool" : { + "_0" : true + } + } + } + ] + } + }, + "label" : "point", + "name" : "point", + "type" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + } + } + } + }, + { + "abiName" : "bjs_testIntArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testIntArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 1 + } + }, + { + "int" : { + "_0" : 2 + } + }, + { + "int" : { + "_0" : 3 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testStringArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testStringArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "string" : { + "_0" : "a" + } + }, + { + "string" : { + "_0" : "b" + } + }, + { + "string" : { + "_0" : "c" + } + } + ] + } + }, + "label" : "names", + "name" : "names", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testDoubleArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testDoubleArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "double" : { + "_0" : 1.5 + } + }, + { + "double" : { + "_0" : 2.5 + } + }, + { + "double" : { + "_0" : 3.5 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testBoolArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testBoolArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "bool" : { + "_0" : true + } + }, + { + "bool" : { + "_0" : false + } + }, + { + "bool" : { + "_0" : true + } + } + ] + } + }, + "label" : "flags", + "name" : "flags", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testEmptyArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testEmptyArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "array" : { + "_0" : [ + + ] + } + }, + "label" : "items", + "name" : "items", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testMixedWithArrayDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testMixedWithArrayDefault", + "parameters" : [ + { + "defaultValue" : { + "string" : { + "_0" : "test" + } + }, + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 10 + } + }, + { + "int" : { + "_0" : 20 + } + }, + { + "int" : { + "_0" : 30 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "enabled", + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "methods" : [ + + ], + "name" : "Config", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "enabled", + "type" : { + "bool" : { + + } + } + } + ], + "swiftCallName" : "Config" + }, + { + "constructor" : { + "abiName" : "bjs_MathOperations_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "defaultValue" : { + "double" : { + "_0" : 0 + } + }, + "label" : "baseValue", + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathOperations_add", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "defaultValue" : { + "double" : { + "_0" : 10 + } + }, + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_MathOperations_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "defaultValue" : { + "double" : { + "_0" : 5 + } + }, + "label" : "b", + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "MathOperations" + } + } + } + ], + "name" : "MathOperations", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "baseValue", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "MathOperations" + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json new file mode 100644 index 000000000..ecf045c3c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json @@ -0,0 +1,847 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ + { + "type" : { + "float" : { + + } + } + } + ], + "name" : "rate" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "error" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "status" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "coordinates" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "double" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "comprehensive" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "ComplexResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "ComplexResult", + "tsFullPath" : "ComplexResult" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utilities", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utilities", + "tsFullPath" : "Utilities" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + }, + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "status" + } + ], + "emitStyle" : "const", + "name" : "Result", + "namespace" : [ + "Utilities" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utilities.Result", + "tsFullPath" : "Utilities.Result" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + }, + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "NetworkingResult", + "namespace" : [ + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "NetworkingResult", + "tsFullPath" : "API.NetworkingResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "name" : "status" + } + ], + "emitStyle" : "const", + "name" : "APIOptionalResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIOptionalResult", + "tsFullPath" : "APIOptionalResult" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_handle", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handle", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_roundtripAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAPIResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAPIResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + }, + { + "abiName" : "bjs_handleComplex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleComplex", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getComplexResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getComplexResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_roundtripComplexResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripComplexResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalComplexResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalComplexResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "ComplexResult" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalUtilitiesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalUtilitiesResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "Utilities.Result" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalNetworkingResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalNetworkingResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "NetworkingResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "NetworkingResult" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAPIOptionalResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAPIOptionalResult", + "parameters" : [ + { + "label" : "result", + "name" : "result", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + }, + { + "abiName" : "bjs_compareAPIResults", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "compareAPIResults", + "parameters" : [ + { + "label" : "result1", + "name" : "result1", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + }, + { + "label" : "result2", + "name" : "result2", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIOptionalResult" + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json new file mode 100644 index 000000000..2d5d5f2fa --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json @@ -0,0 +1,323 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "loading" + }, + { + "associatedValues" : [ + + ], + "name" : "success" + }, + { + "associatedValues" : [ + + ], + "name" : "error" + } + ], + "emitStyle" : "const", + "name" : "Status", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Status", + "tsFullPath" : "Status" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "tsEnum", + "name" : "TSDirection", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TSDirection", + "tsFullPath" : "TSDirection" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "success" + } + ], + "emitStyle" : "const", + "explicitAccessControl" : "public", + "name" : "PublicStatus", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "PublicStatus", + "tsFullPath" : "PublicStatus" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_setDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getDirection", + "parameters" : [ + + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "abiName" : "bjs_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Status" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "abiName" : "bjs_setTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTSDirection", + "parameters" : [ + { + "label" : "_", + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTSDirection", + "parameters" : [ + + ], + "returnType" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTSDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTSDirection", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "TSDirection" + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json new file mode 100644 index 000000000..65b8ba350 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json @@ -0,0 +1,541 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "Utils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils" + ], + "properties" : [ + + ], + "swiftCallName" : "Utils.Converter" + }, + { + "constructor" : { + "abiName" : "bjs_HTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_HTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "HTTPServer", + "namespace" : [ + "Networking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "Networking.API.HTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestServer", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestServer" + } + ], + "enums" : [ + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Networking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "Networking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "Method", + "namespace" : [ + "Networking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Configuration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "LogLevel", + "namespace" : [ + "Configuration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "Port", + "namespace" : [ + "Configuration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "Networking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedMethod", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GraphOperations", + "namespace" : [ + "Services", + "Graph" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "createGraph", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "rootId", + "name" : "rootId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "nodeCount", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : true + }, + "name" : "validate", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GraphOperations", + "tsFullPath" : "Services.Graph.GraphOperations" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json new file mode 100644 index 000000000..9b800c743 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json @@ -0,0 +1,541 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "namespace" : [ + "Utils" + ], + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils" + ], + "properties" : [ + + ], + "swiftCallName" : "Utils.Converter" + }, + { + "constructor" : { + "abiName" : "bjs_HTTPServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_HTTPServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "API" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Networking.API.Method" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "HTTPServer", + "namespace" : [ + "Networking", + "API" + ], + "properties" : [ + + ], + "swiftCallName" : "Networking.API.HTTPServer" + }, + { + "constructor" : { + "abiName" : "bjs_TestServer_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestServer_call", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "call", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "parameters" : [ + { + "label" : "_", + "name" : "method", + "type" : { + "caseEnum" : { + "_0" : "Internal.SupportedMethod" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "TestServer", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "properties" : [ + + ], + "swiftCallName" : "Internal.TestServer" + } + ], + "enums" : [ + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Networking", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking", + "tsFullPath" : "Networking" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "API", + "namespace" : [ + "Networking" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API", + "tsFullPath" : "Networking.API" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + }, + { + "associatedValues" : [ + + ], + "name" : "put" + }, + { + "associatedValues" : [ + + ], + "name" : "delete" + } + ], + "emitStyle" : "const", + "name" : "Method", + "namespace" : [ + "Networking", + "API" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Networking.API.Method", + "tsFullPath" : "Networking.API.Method" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Configuration", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration", + "tsFullPath" : "Configuration" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "debug", + "rawValue" : "debug" + }, + { + "associatedValues" : [ + + ], + "name" : "info", + "rawValue" : "info" + }, + { + "associatedValues" : [ + + ], + "name" : "warning", + "rawValue" : "warning" + }, + { + "associatedValues" : [ + + ], + "name" : "error", + "rawValue" : "error" + } + ], + "emitStyle" : "const", + "name" : "LogLevel", + "namespace" : [ + "Configuration" + ], + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.LogLevel", + "tsFullPath" : "Configuration.LogLevel" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "http", + "rawValue" : "80" + }, + { + "associatedValues" : [ + + ], + "name" : "https", + "rawValue" : "443" + }, + { + "associatedValues" : [ + + ], + "name" : "development", + "rawValue" : "3000" + } + ], + "emitStyle" : "const", + "name" : "Port", + "namespace" : [ + "Configuration" + ], + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Configuration.Port", + "tsFullPath" : "Configuration.Port" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Internal", + "namespace" : [ + "Networking", + "APIV2" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal", + "tsFullPath" : "Networking.APIV2.Internal" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "get" + }, + { + "associatedValues" : [ + + ], + "name" : "post" + } + ], + "emitStyle" : "const", + "name" : "SupportedMethod", + "namespace" : [ + "Networking", + "APIV2", + "Internal" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Internal.SupportedMethod", + "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "GraphOperations", + "namespace" : [ + "Services", + "Graph" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "createGraph", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "rootId", + "name" : "rootId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "nodeCount", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + }, + { + "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : true + }, + "name" : "validate", + "namespace" : [ + "Services", + "Graph", + "GraphOperations" + ], + "parameters" : [ + { + "label" : "graphId", + "name" : "graphId", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "GraphOperations" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "GraphOperations", + "tsFullPath" : "Services.Graph.GraphOperations" + } + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json new file mode 100644 index 000000000..20ef1f42f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json @@ -0,0 +1,1543 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "const", + "name" : "Theme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "tsEnum", + "name" : "TSTheme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TSTheme", + "tsFullPath" : "TSTheme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "enabled", + "rawValue" : "true" + }, + { + "associatedValues" : [ + + ], + "name" : "disabled", + "rawValue" : "false" + } + ], + "emitStyle" : "const", + "name" : "FeatureFlag", + "rawType" : "Bool", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "FeatureFlag", + "tsFullPath" : "FeatureFlag" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + } + ], + "emitStyle" : "const", + "name" : "HttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + } + ], + "emitStyle" : "tsEnum", + "name" : "TSHttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TSHttpStatus", + "tsFullPath" : "TSHttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "lowest", + "rawValue" : "-1" + }, + { + "associatedValues" : [ + + ], + "name" : "low", + "rawValue" : "2" + }, + { + "associatedValues" : [ + + ], + "name" : "medium", + "rawValue" : "3" + }, + { + "associatedValues" : [ + + ], + "name" : "high", + "rawValue" : "4" + }, + { + "associatedValues" : [ + + ], + "name" : "highest", + "rawValue" : "5" + } + ], + "emitStyle" : "const", + "name" : "Priority", + "rawType" : "Int32", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Priority", + "tsFullPath" : "Priority" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "tiny", + "rawValue" : "1024" + }, + { + "associatedValues" : [ + + ], + "name" : "small", + "rawValue" : "10240" + }, + { + "associatedValues" : [ + + ], + "name" : "medium", + "rawValue" : "102400" + }, + { + "associatedValues" : [ + + ], + "name" : "large", + "rawValue" : "1048576" + } + ], + "emitStyle" : "const", + "name" : "FileSize", + "rawType" : "Int64", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "FileSize", + "tsFullPath" : "FileSize" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "guest", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "user", + "rawValue" : "1000" + }, + { + "associatedValues" : [ + + ], + "name" : "admin", + "rawValue" : "9999" + } + ], + "emitStyle" : "const", + "name" : "UserId", + "rawType" : "UInt", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "UserId", + "tsFullPath" : "UserId" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "invalid", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "session", + "rawValue" : "12345" + }, + { + "associatedValues" : [ + + ], + "name" : "refresh", + "rawValue" : "67890" + } + ], + "emitStyle" : "const", + "name" : "TokenId", + "rawType" : "UInt32", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TokenId", + "tsFullPath" : "TokenId" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "none", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "active", + "rawValue" : "9876543210" + }, + { + "associatedValues" : [ + + ], + "name" : "expired", + "rawValue" : "1234567890" + } + ], + "emitStyle" : "const", + "name" : "SessionId", + "rawType" : "UInt64", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "SessionId", + "tsFullPath" : "SessionId" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "rough", + "rawValue" : "0.1" + }, + { + "associatedValues" : [ + + ], + "name" : "normal", + "rawValue" : "0.01" + }, + { + "associatedValues" : [ + + ], + "name" : "fine", + "rawValue" : "0.001" + } + ], + "emitStyle" : "const", + "name" : "Precision", + "rawType" : "Float", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "quarter", + "rawValue" : "0.25" + }, + { + "associatedValues" : [ + + ], + "name" : "half", + "rawValue" : "0.5" + }, + { + "associatedValues" : [ + + ], + "name" : "golden", + "rawValue" : "1.618" + }, + { + "associatedValues" : [ + + ], + "name" : "pi", + "rawValue" : "3.14159" + } + ], + "emitStyle" : "const", + "name" : "Ratio", + "rawType" : "Double", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Ratio", + "tsFullPath" : "Ratio" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_setTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTheme", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_setTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTSTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTSTheme", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTSTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTSTheme", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_setFeatureFlag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setFeatureFlag", + "parameters" : [ + { + "label" : "_", + "name" : "flag", + "type" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getFeatureFlag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getFeatureFlag", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalFeatureFlag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalFeatureFlag", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + } + }, + { + "abiName" : "bjs_setHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getHttpStatus", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_setTSHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTSHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "rawValueEnum" : { + "_0" : "TSHttpStatus", + "_1" : "Int" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getTSHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTSHttpStatus", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "TSHttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSHttpStatus", + "_1" : "Int" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TSHttpStatus", + "_1" : "Int" + } + } + } + } + }, + { + "abiName" : "bjs_setPriority", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setPriority", + "parameters" : [ + { + "label" : "_", + "name" : "priority", + "type" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int32" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getPriority", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getPriority", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int32" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPriority", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPriority", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int32" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int32" + } + } + } + } + }, + { + "abiName" : "bjs_setFileSize", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setFileSize", + "parameters" : [ + { + "label" : "_", + "name" : "size", + "type" : { + "rawValueEnum" : { + "_0" : "FileSize", + "_1" : "Int64" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getFileSize", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getFileSize", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "FileSize", + "_1" : "Int64" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalFileSize", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalFileSize", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "FileSize", + "_1" : "Int64" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "FileSize", + "_1" : "Int64" + } + } + } + } + }, + { + "abiName" : "bjs_setUserId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setUserId", + "parameters" : [ + { + "label" : "_", + "name" : "id", + "type" : { + "rawValueEnum" : { + "_0" : "UserId", + "_1" : "UInt" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getUserId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getUserId", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "UserId", + "_1" : "UInt" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalUserId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalUserId", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "UserId", + "_1" : "UInt" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "UserId", + "_1" : "UInt" + } + } + } + } + }, + { + "abiName" : "bjs_setTokenId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setTokenId", + "parameters" : [ + { + "label" : "_", + "name" : "token", + "type" : { + "rawValueEnum" : { + "_0" : "TokenId", + "_1" : "UInt32" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getTokenId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTokenId", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "TokenId", + "_1" : "UInt32" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTokenId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTokenId", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TokenId", + "_1" : "UInt32" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "TokenId", + "_1" : "UInt32" + } + } + } + } + }, + { + "abiName" : "bjs_setSessionId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setSessionId", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "rawValueEnum" : { + "_0" : "SessionId", + "_1" : "UInt64" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getSessionId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getSessionId", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "SessionId", + "_1" : "UInt64" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalSessionId", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalSessionId", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "SessionId", + "_1" : "UInt64" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "SessionId", + "_1" : "UInt64" + } + } + } + } + }, + { + "abiName" : "bjs_setPrecision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setPrecision", + "parameters" : [ + { + "label" : "_", + "name" : "precision", + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getPrecision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getPrecision", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPrecision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPrecision", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + }, + { + "abiName" : "bjs_setRatio", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "setRatio", + "parameters" : [ + { + "label" : "_", + "name" : "ratio", + "type" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_getRatio", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getRatio", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalRatio", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalRatio", + "parameters" : [ + { + "label" : "_", + "name" : "input", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Ratio", + "_1" : "Double" + } + } + } + } + }, + { + "abiName" : "bjs_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "theme", + "type" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + { + "abiName" : "bjs_convertPriority", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "convertPriority", + "parameters" : [ + { + "label" : "_", + "name" : "status", + "type" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int32" + } + } + }, + { + "abiName" : "bjs_validateSession", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "validateSession", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "rawValueEnum" : { + "_0" : "SessionId", + "_1" : "UInt64" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "takesFeatureFlag", + "parameters" : [ + { + "name" : "flag", + "type" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "returnsFeatureFlag", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift similarity index 90% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift index 55c902af0..210361b3b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift @@ -100,9 +100,9 @@ public func _bjs_roundTripOptionalTSTheme(_ inputIsSome: Int32, _ inputBytes: In @_expose(wasm, "bjs_setFeatureFlag") @_cdecl("bjs_setFeatureFlag") -public func _bjs_setFeatureFlag(_ flag: Int32) -> Void { +public func _bjs_setFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Void { #if arch(wasm32) - setFeatureFlag(_: FeatureFlag.bridgeJSLiftParameter(flag)) + setFeatureFlag(_: FeatureFlag.bridgeJSLiftParameter(flagBytes, flagLength)) #else fatalError("Only available on WebAssembly") #endif @@ -110,7 +110,7 @@ public func _bjs_setFeatureFlag(_ flag: Int32) -> Void { @_expose(wasm, "bjs_getFeatureFlag") @_cdecl("bjs_getFeatureFlag") -public func _bjs_getFeatureFlag() -> Int32 { +public func _bjs_getFeatureFlag() -> Void { #if arch(wasm32) let ret = getFeatureFlag() return ret.bridgeJSLowerReturn() @@ -121,9 +121,9 @@ public func _bjs_getFeatureFlag() -> Int32 { @_expose(wasm, "bjs_roundTripOptionalFeatureFlag") @_cdecl("bjs_roundTripOptionalFeatureFlag") -public func _bjs_roundTripOptionalFeatureFlag(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { +public func _bjs_roundTripOptionalFeatureFlag(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalFeatureFlag(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let ret = roundTripOptionalFeatureFlag(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -449,4 +449,38 @@ public func _bjs_validateSession(_ session: Int32) -> Void { #else fatalError("Only available on WebAssembly") #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_takesFeatureFlag") +fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void +#else +fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { + let flagValue = flag.bridgeJSLowerParameter() + bjs_takesFeatureFlag(flagValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_returnsFeatureFlag") +fileprivate func bjs_returnsFeatureFlag() -> Int32 +#else +fileprivate func bjs_returnsFeatureFlag() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$returnsFeatureFlag() throws(JSException) -> FeatureFlag { + let ret = bjs_returnsFeatureFlag() + if let error = _swift_js_take_exception() { + throw error + } + return FeatureFlag.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json new file mode 100644 index 000000000..c9be60d8a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json @@ -0,0 +1,71 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "globalGetters" : [ + { + "name" : "console", + "type" : { + "jsObject" : { + "_0" : "JSConsole" + } + } + } + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + { + "name" : "log", + "parameters" : [ + { + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "JSConsole", + "setters" : [ + + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift similarity index 88% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift index b5442b09e..da3f1367b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalGetter.ImportMacros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift @@ -1,5 +1,5 @@ #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_console_get") +@_extern(wasm, module: "TestModule", name: "bjs_console_get") fileprivate func bjs_console_get() -> Int32 #else fileprivate func bjs_console_get() -> Int32 { @@ -16,7 +16,7 @@ func _$console_get() throws(JSException) -> JSConsole { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_JSConsole_log") +@_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void #else fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json new file mode 100644 index 000000000..5cec23259 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json @@ -0,0 +1,126 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "from" : "global", + "jsName" : "parseInt", + "name" : "parseInt", + "parameters" : [ + { + "name" : "string", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + } + ], + "globalGetters" : [ + { + "from" : "global", + "name" : "console", + "type" : { + "jsObject" : { + "_0" : "JSConsole" + } + } + } + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + { + "name" : "log", + "parameters" : [ + { + "name" : "message", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "JSConsole", + "setters" : [ + + ] + }, + { + "constructor" : { + "parameters" : [ + { + "name" : "url", + "type" : { + "string" : { + + } + } + } + ] + }, + "from" : "global", + "getters" : [ + + ], + "methods" : [ + { + "name" : "close", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "WebSocket", + "setters" : [ + + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift similarity index 88% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift index 503da6189..56353b253 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/GlobalThisImports.ImportMacros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift @@ -1,5 +1,5 @@ #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_console_get") +@_extern(wasm, module: "TestModule", name: "bjs_console_get") fileprivate func bjs_console_get() -> Int32 #else fileprivate func bjs_console_get() -> Int32 { @@ -16,7 +16,7 @@ func _$console_get() throws(JSException) -> JSConsole { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_parseInt") +@_extern(wasm, module: "TestModule", name: "bjs_parseInt") fileprivate func bjs_parseInt(_ string: Int32) -> Float64 #else fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { @@ -34,7 +34,7 @@ func _$parseInt(_ string: String) throws(JSException) -> Double { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_JSConsole_log") +@_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void #else fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { @@ -52,7 +52,7 @@ func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WebSocket_init") +@_extern(wasm, module: "TestModule", name: "bjs_WebSocket_init") fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 #else fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 { @@ -61,7 +61,7 @@ fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WebSocket_close") +@_extern(wasm, module: "TestModule", name: "bjs_WebSocket_close") fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void #else fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json new file mode 100644 index 000000000..10a18983b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json @@ -0,0 +1,65 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_makeFoo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "makeFoo", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + + ] + }, + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "Foo", + "setters" : [ + + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift similarity index 62% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index 0bebd4e73..29b615b0f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -21,4 +21,21 @@ public func _bjs_makeFoo() -> Int32 { #else fatalError("Only available on WebAssembly") #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Foo_init") +fileprivate func bjs_Foo_init() -> Int32 +#else +fileprivate func bjs_Foo_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$Foo_init() throws(JSException) -> JSObject { + let ret = bjs_Foo_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json new file mode 100644 index 000000000..40b97c12b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json @@ -0,0 +1,258 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "createWeirdObject", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "WeirdNaming" + } + } + }, + { + "name" : "createWeirdClass", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "_Weird" + } + } + } + ], + "types" : [ + { + "getters" : [ + { + "name" : "normalProperty", + "type" : { + "string" : { + + } + } + }, + { + "jsName" : "property-with-dashes", + "name" : "property_with_dashes", + "type" : { + "double" : { + + } + } + }, + { + "jsName" : "123invalidStart", + "name" : "_123invalidStart", + "type" : { + "bool" : { + + } + } + }, + { + "jsName" : "property with spaces", + "name" : "property_with_spaces", + "type" : { + "string" : { + + } + } + }, + { + "jsName" : "@specialChar", + "name" : "_specialChar", + "type" : { + "double" : { + + } + } + }, + { + "name" : "constructor", + "type" : { + "string" : { + + } + } + }, + { + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "name" : "Any", + "type" : { + "string" : { + + } + } + } + ], + "methods" : [ + { + "name" : "as", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "try", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "WeirdNaming", + "setters" : [ + { + "functionName" : "normalProperty_set", + "name" : "normalProperty", + "type" : { + "string" : { + + } + } + }, + { + "functionName" : "property_with_dashes_set", + "jsName" : "property-with-dashes", + "name" : "property_with_dashes", + "type" : { + "double" : { + + } + } + }, + { + "functionName" : "_123invalidStart_set", + "jsName" : "123invalidStart", + "name" : "_123invalidStart", + "type" : { + "bool" : { + + } + } + }, + { + "functionName" : "property_with_spaces_set", + "jsName" : "property with spaces", + "name" : "property_with_spaces", + "type" : { + "string" : { + + } + } + }, + { + "functionName" : "_specialChar_set", + "jsName" : "@specialChar", + "name" : "_specialChar", + "type" : { + "double" : { + + } + } + }, + { + "functionName" : "constructor_set", + "name" : "constructor", + "type" : { + "string" : { + + } + } + }, + { + "functionName" : "for_set", + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "functionName" : "any_set", + "jsName" : "Any", + "name" : "any", + "type" : { + "string" : { + + } + } + } + ] + }, + { + "constructor" : { + "parameters" : [ + + ] + }, + "getters" : [ + + ], + "jsName" : "$Weird", + "methods" : [ + { + "jsName" : "method-with-dashes", + "name" : "method_with_dashes", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "_Weird", + "setters" : [ + + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift similarity index 77% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift index 0ef52d4d7..86e72bb53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift @@ -1,22 +1,5 @@ #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createArrayBuffer") -fileprivate func bjs_createArrayBuffer() -> Int32 -#else -fileprivate func bjs_createArrayBuffer() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$createArrayBuffer() throws(JSException) -> ArrayBufferLike { - let ret = bjs_createArrayBuffer() - if let error = _swift_js_take_exception() { - throw error - } - return ArrayBufferLike.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createWeirdObject") +@_extern(wasm, module: "TestModule", name: "bjs_createWeirdObject") fileprivate func bjs_createWeirdObject() -> Int32 #else fileprivate func bjs_createWeirdObject() -> Int32 { @@ -33,7 +16,7 @@ func _$createWeirdObject() throws(JSException) -> WeirdNaming { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createWeirdClass") +@_extern(wasm, module: "TestModule", name: "bjs_createWeirdClass") fileprivate func bjs_createWeirdClass() -> Int32 #else fileprivate func bjs_createWeirdClass() -> Int32 { @@ -50,45 +33,7 @@ func _$createWeirdClass() throws(JSException) -> _Weird { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_byteLength_get") -fileprivate func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 -#else -fileprivate func bjs_ArrayBufferLike_byteLength_get(_ self: Int32) -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_ArrayBufferLike_slice") -fileprivate func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 -#else -fileprivate func bjs_ArrayBufferLike_slice(_ self: Int32, _ begin: Float64, _ end: Float64) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$ArrayBufferLike_byteLength_get(_ self: JSObject) throws(JSException) -> Double { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_ArrayBufferLike_byteLength_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -func _$ArrayBufferLike_slice(_ self: JSObject, _ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike { - let selfValue = self.bridgeJSLowerParameter() - let beginValue = begin.bridgeJSLowerParameter() - let endValue = end.bridgeJSLowerParameter() - let ret = bjs_ArrayBufferLike_slice(selfValue, beginValue, endValue) - if let error = _swift_js_take_exception() { - throw error - } - return ArrayBufferLike.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_normalProperty_get") fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { @@ -97,7 +42,7 @@ fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_dashes_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_dashes_get") fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 #else fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 { @@ -106,7 +51,7 @@ fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Floa #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__123invalidStart_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__123invalidStart_get") fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 { @@ -115,7 +60,7 @@ fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_spaces_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_spaces_get") fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 { @@ -124,7 +69,7 @@ fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int3 #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__specialChar_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__specialChar_get") fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 #else fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 { @@ -133,7 +78,7 @@ fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_constructor_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_constructor_get") fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 { @@ -142,7 +87,7 @@ fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_for_get") fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { @@ -151,7 +96,7 @@ fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_Any_get") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_Any_get") fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 #else fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { @@ -160,7 +105,7 @@ fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_normalProperty_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_normalProperty_set") fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -169,7 +114,7 @@ fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: I #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_dashes_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_dashes_set") fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void #else fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void { @@ -178,7 +123,7 @@ fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newVa #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__123invalidStart_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__123invalidStart_set") fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -187,7 +132,7 @@ fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_property_with_spaces_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_spaces_set") fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -196,7 +141,7 @@ fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newVa #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming__specialChar_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__specialChar_set") fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void #else fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void { @@ -205,7 +150,7 @@ fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Flo #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_constructor_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_constructor_set") fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -214,7 +159,7 @@ fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int3 #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_for_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_for_set") fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -223,7 +168,7 @@ fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Vo #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_any_set") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_any_set") fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -232,7 +177,7 @@ fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Vo #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_as") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_as") fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void #else fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { @@ -241,7 +186,7 @@ fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_WeirdNaming_try") +@_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_try") fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void #else fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void { @@ -410,7 +355,7 @@ func _$WeirdNaming_try(_ self: JSObject) throws(JSException) -> Void { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs__Weird_init") +@_extern(wasm, module: "TestModule", name: "bjs__Weird_init") fileprivate func bjs__Weird_init() -> Int32 #else fileprivate func bjs__Weird_init() -> Int32 { @@ -419,7 +364,7 @@ fileprivate func bjs__Weird_init() -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs__Weird_method_with_dashes") +@_extern(wasm, module: "TestModule", name: "bjs__Weird_method_with_dashes") fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void #else fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json new file mode 100644 index 000000000..07906a404 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json @@ -0,0 +1,172 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "returnAnimatable", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "Animatable" + } + } + } + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "getters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "age", + "type" : { + "double" : { + + } + } + } + ], + "methods" : [ + { + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "changeName", + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "Greeter", + "setters" : [ + { + "functionName" : "name_set", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + { + "getters" : [ + + ], + "methods" : [ + { + "name" : "animate", + "parameters" : [ + { + "name" : "keyframes", + "type" : { + "jsObject" : { + + } + } + }, + { + "name" : "options", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "name" : "getAnimations", + "parameters" : [ + { + "name" : "options", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + } + ], + "name" : "Animatable", + "setters" : [ + + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift similarity index 55% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift index 67c778975..09e828fba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift @@ -1,5 +1,22 @@ #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_init") +@_extern(wasm, module: "TestModule", name: "bjs_returnAnimatable") +fileprivate func bjs_returnAnimatable() -> Int32 +#else +fileprivate func bjs_returnAnimatable() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$returnAnimatable() throws(JSException) -> Animatable { + let ret = bjs_returnAnimatable() + if let error = _swift_js_take_exception() { + throw error + } + return Animatable.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_init") fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 #else fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 { @@ -8,7 +25,7 @@ fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_name_get") +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_name_get") fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 #else fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { @@ -17,7 +34,7 @@ fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_age_get") +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_age_get") fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 #else fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { @@ -26,7 +43,7 @@ fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_name_set") +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_name_set") fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void #else fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { @@ -35,7 +52,7 @@ fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_greet") +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_greet") fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 #else fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 { @@ -44,7 +61,7 @@ fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 { #endif #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Greeter_changeName") +@_extern(wasm, module: "TestModule", name: "bjs_Greeter_changeName") fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void #else fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { @@ -104,4 +121,43 @@ func _$Greeter_changeName(_ self: JSObject, _ name: String) throws(JSException) if let error = _swift_js_take_exception() { throw error } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Animatable_animate") +fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 +#else +fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Animatable_getAnimations") +fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 +#else +fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let keyframesValue = keyframes.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$Animatable_getAnimations(_ self: JSObject, _ options: JSObject) throws(JSException) -> JSObject { + let selfValue = self.bridgeJSLowerParameter() + let optionsValue = options.bridgeJSLowerParameter() + let ret = bjs_Animatable_getAnimations(selfValue, optionsValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json new file mode 100644 index 000000000..1241c232d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json @@ -0,0 +1,79 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_GlobalClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_GlobalClass_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "GlobalClass", + "namespace" : [ + "GlobalAPI" + ], + "properties" : [ + + ], + "swiftCallName" : "GlobalClass" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_GlobalAPI_globalFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "globalFunction", + "namespace" : [ + "GlobalAPI" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json new file mode 100644 index 000000000..96e188fd2 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json @@ -0,0 +1,79 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PrivateClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_PrivateClass_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PrivateClass", + "namespace" : [ + "PrivateAPI" + ], + "properties" : [ + + ], + "swiftCallName" : "PrivateClass" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_PrivateAPI_privateFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "privateFunction", + "namespace" : [ + "PrivateAPI" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json new file mode 100644 index 000000000..a87bffa6b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json @@ -0,0 +1,185 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Greeter", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "Greeter" + }, + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils", + "Converters" + ], + "properties" : [ + + ], + "swiftCallName" : "Converter" + }, + { + "methods" : [ + { + "abiName" : "bjs_UUID_uuidString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "uuidString", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "UUID", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "UUID" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : true, + "functions" : [ + { + "abiName" : "bjs_plainFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "plainFunction", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyModule_Utils_namespacedFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "namespacedFunction", + "namespace" : [ + "MyModule", + "Utils" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json new file mode 100644 index 000000000..766d93a5d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json @@ -0,0 +1,185 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Greeter", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "Greeter" + }, + { + "constructor" : { + "abiName" : "bjs_Converter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_Converter_toString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "toString", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Converter", + "namespace" : [ + "Utils", + "Converters" + ], + "properties" : [ + + ], + "swiftCallName" : "Converter" + }, + { + "methods" : [ + { + "abiName" : "bjs_UUID_uuidString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "uuidString", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "UUID", + "namespace" : [ + "__Swift", + "Foundation" + ], + "properties" : [ + + ], + "swiftCallName" : "UUID" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_plainFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "plainFunction", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyModule_Utils_namespacedFunction", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "namespacedFunction", + "namespace" : [ + "MyModule", + "Utils" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json new file mode 100644 index 000000000..2af32886b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json @@ -0,0 +1,702 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_changeName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "changeName", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "Greeter" + }, + { + "constructor" : { + "abiName" : "bjs_OptionalPropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "OptionalPropertyHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalAge", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalGreeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "swiftCallName" : "OptionalPropertyHolder" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundTripOptionalClass", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalClass", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_testOptionalPropertyRoundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testOptionalPropertyRoundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "holder", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "OptionalPropertyHolder" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "OptionalPropertyHolder" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripString", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripInt", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripBool", + "parameters" : [ + { + "label" : "flag", + "name" : "flag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripFloat", + "parameters" : [ + { + "label" : "number", + "name" : "number", + "type" : { + "optional" : { + "_0" : { + "float" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "float" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDouble", + "parameters" : [ + { + "label" : "precision", + "name" : "precision", + "type" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripMixSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripMixSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripSwiftSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSwiftSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripMixedSwiftSyntax", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripMixedSwiftSyntax", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripWithSpaces", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripWithSpaces", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripAlias", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripAlias", + "parameters" : [ + { + "label" : "age", + "name" : "age", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAlias", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAlias", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "abiName" : "bjs_testMixedOptionals", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testMixedOptionals", + "parameters" : [ + { + "label" : "firstName", + "name" : "firstName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "label" : "lastName", + "name" : "lastName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "label" : "age", + "name" : "age", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "label" : "active", + "name" : "active", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json new file mode 100644 index 000000000..8b586dbe0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.json @@ -0,0 +1,118 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_check", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "check", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "uint" : { + + } + } + }, + { + "label" : "c", + "name" : "c", + "type" : { + "float" : { + + } + } + }, + { + "label" : "d", + "name" : "d", + "type" : { + "double" : { + + } + } + }, + { + "label" : "e", + "name" : "e", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "check", + "parameters" : [ + { + "name" : "a", + "type" : { + "double" : { + + } + } + }, + { + "name" : "b", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift new file mode 100644 index 000000000..763cf8ca4 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift @@ -0,0 +1,27 @@ +@_expose(wasm, "bjs_check") +@_cdecl("bjs_check") +public func _bjs_check(_ a: Int32, _ b: Int32, _ c: Float32, _ d: Float64, _ e: Int32) -> Void { + #if arch(wasm32) + check(a: Int.bridgeJSLiftParameter(a), b: UInt.bridgeJSLiftParameter(b), c: Float.bridgeJSLiftParameter(c), d: Double.bridgeJSLiftParameter(d), e: Bool.bridgeJSLiftParameter(e)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_check") +fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void +#else +fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$check(_ a: Double, _ b: Bool) throws(JSException) -> Void { + let aValue = a.bridgeJSLowerParameter() + let bValue = b.bridgeJSLowerParameter() + bjs_check(aValue, bValue) + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json new file mode 100644 index 000000000..aae09ea49 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.json @@ -0,0 +1,138 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_checkInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkInt", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_checkUInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkUInt", + "parameters" : [ + + ], + "returnType" : { + "uint" : { + + } + } + }, + { + "abiName" : "bjs_checkFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkFloat", + "parameters" : [ + + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_checkDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkDouble", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_checkBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkBool", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "checkNumber", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "checkBoolean", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift similarity index 59% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift index 74ee7b1c3..3bbb2809b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift @@ -51,4 +51,38 @@ public func _bjs_checkBool() -> Int32 { #else fatalError("Only available on WebAssembly") #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_checkNumber") +fileprivate func bjs_checkNumber() -> Float64 +#else +fileprivate func bjs_checkNumber() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$checkNumber() throws(JSException) -> Double { + let ret = bjs_checkNumber() + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_checkBoolean") +fileprivate func bjs_checkBoolean() -> Int32 +#else +fileprivate func bjs_checkBoolean() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$checkBoolean() throws(JSException) -> Bool { + let ret = bjs_checkBoolean() + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json new file mode 100644 index 000000000..1c71b2b8f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.json @@ -0,0 +1,363 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "intValue", + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "label" : "floatValue", + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "label" : "doubleValue", + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "label" : "boolValue", + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "stringValue", + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "label" : "jsObject", + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_PropertyHolder_getAllValues", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getAllValues", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "PropertyHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyInt", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyFloat", + "type" : { + "float" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyDouble", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyBool", + "type" : { + "bool" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "readonlyString", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "sibling", + "type" : { + "swiftHeapObject" : { + "_0" : "PropertyHolder" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "lazyValue", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "computedReadonly", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "computedReadWrite", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "observedProperty", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "PropertyHolder" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_createPropertyHolder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createPropertyHolder", + "parameters" : [ + { + "label" : "intValue", + "name" : "intValue", + "type" : { + "int" : { + + } + } + }, + { + "label" : "floatValue", + "name" : "floatValue", + "type" : { + "float" : { + + } + } + }, + { + "label" : "doubleValue", + "name" : "doubleValue", + "type" : { + "double" : { + + } + } + }, + { + "label" : "boolValue", + "name" : "boolValue", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "stringValue", + "name" : "stringValue", + "type" : { + "string" : { + + } + } + }, + { + "label" : "jsObject", + "name" : "jsObject", + "type" : { + "jsObject" : { + + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "PropertyHolder" + } + } + }, + { + "abiName" : "bjs_testPropertyHolder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "testPropertyHolder", + "parameters" : [ + { + "label" : "holder", + "name" : "holder", + "type" : { + "swiftHeapObject" : { + "_0" : "PropertyHolder" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json new file mode 100644 index 000000000..5713a2898 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -0,0 +1,901 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Helper_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Helper_increment", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "increment", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "Helper", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Helper" + }, + { + "constructor" : { + "abiName" : "bjs_MyViewController_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "delegate", + "name" : "delegate", + "type" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_MyViewController_triggerEvent", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "triggerEvent", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateCount", + "parameters" : [ + { + "label" : "_", + "name" : "count", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_updateLabel", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "updateLabel", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_checkEvenCount", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEvenCount", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_sendHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sendHelper", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "MyViewController", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "delegate", + "type" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "secondDelegate", + "type" : { + "optional" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "swiftCallName" : "MyViewController" + }, + { + "constructor" : { + "abiName" : "bjs_DelegateManager_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "delegates", + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_DelegateManager_notifyAll", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "notifyAll", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "DelegateManager", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "swiftCallName" : "DelegateManager" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "test", + "rawValue" : "test" + }, + { + "associatedValues" : [ + + ], + "name" : "test2", + "rawValue" : "test2" + } + ], + "emitStyle" : "const", + "name" : "ExampleEnum", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "ExampleEnum", + "tsFullPath" : "ExampleEnum" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "Result", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Result", + "tsFullPath" : "Result" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "low", + "rawValue" : "-1" + }, + { + "associatedValues" : [ + + ], + "name" : "medium", + "rawValue" : "0" + }, + { + "associatedValues" : [ + + ], + "name" : "high", + "rawValue" : "1" + } + ], + "emitStyle" : "const", + "name" : "Priority", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Priority", + "tsFullPath" : "Priority" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_processDelegates", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDelegates", + "parameters" : [ + { + "label" : "_", + "name" : "delegates", + "type" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } + } + } + } + ], + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_MyViewControllerDelegate_onSomethingHappened", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onSomethingHappened", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onValueChanged", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onValueChanged", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onCountUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onCountUpdated", + "parameters" : [ + { + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onLabelUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onLabelUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_isCountEven", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "isCountEven", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onHelperUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onHelperUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createHelper", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_onOptionalHelperUpdated", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "onOptionalHelperUpdated", + "parameters" : [ + { + "label" : "_", + "name" : "helper", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createOptionalHelper", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createOptionalHelper", + "parameters" : [ + + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Helper" + } + } + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_createEnum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "createEnum", + "parameters" : [ + + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_handleResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handleResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_getResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getResult", + "parameters" : [ + + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + } + ], + "name" : "MyViewControllerDelegate", + "properties" : [ + { + "isReadonly" : false, + "name" : "eventCount", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "name" : "delegateName", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "name" : "optionalName", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "optionalRawEnum", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "rawStringEnum", + "type" : { + "rawValueEnum" : { + "_0" : "ExampleEnum", + "_1" : "String" + } + } + }, + { + "isReadonly" : false, + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + }, + { + "isReadonly" : false, + "name" : "optionalResult", + "type" : { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "Result" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "direction", + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + }, + { + "isReadonly" : false, + "name" : "directionOptional", + "type" : { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + }, + { + "isReadonly" : false, + "name" : "priority", + "type" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int" + } + } + }, + { + "isReadonly" : false, + "name" : "priorityOptional", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Priority", + "_1" : "Int" + } + } + } + } + } + ] + } + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json new file mode 100644 index 000000000..b0eac3313 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.json @@ -0,0 +1,339 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_MathUtils_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathUtils_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_static_add", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + } + ], + "name" : "MathUtils", + "properties" : [ + + ], + "swiftCallName" : "MathUtils" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "scientific" + }, + { + "associatedValues" : [ + + ], + "name" : "basic" + } + ], + "emitStyle" : "const", + "name" : "Calculator", + "staticMethods" : [ + { + "abiName" : "bjs_Calculator_static_square", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "square", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "enumName" : { + "_0" : "Calculator" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Calculator", + "tsFullPath" : "Calculator" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + { + "abiName" : "bjs_APIResult_static_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "staticContext" : { + "enumName" : { + "_0" : "APIResult" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "String", + "namespace" : [ + "Utils" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Utils_String_static_uppercase", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "uppercase", + "namespace" : [ + "Utils", + "String" + ], + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "Utils.String" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils.String", + "tsFullPath" : "Utils.String" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json new file mode 100644 index 000000000..e4ec22855 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.json @@ -0,0 +1,339 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_MathUtils_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + { + "abiName" : "bjs_MathUtils_static_subtract", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "subtract", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_static_add", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "add", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "int" : { + + } + } + }, + { + "label" : "b", + "name" : "b", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "className" : { + "_0" : "MathUtils" + } + } + }, + { + "abiName" : "bjs_MathUtils_multiply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "multiply", + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + } + } + ], + "name" : "MathUtils", + "properties" : [ + + ], + "swiftCallName" : "MathUtils" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "scientific" + }, + { + "associatedValues" : [ + + ], + "name" : "basic" + } + ], + "emitStyle" : "const", + "name" : "Calculator", + "staticMethods" : [ + { + "abiName" : "bjs_Calculator_static_square", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "square", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "int" : { + + } + }, + "staticContext" : { + "enumName" : { + "_0" : "Calculator" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Calculator", + "tsFullPath" : "Calculator" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + { + "abiName" : "bjs_APIResult_static_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "staticContext" : { + "enumName" : { + "_0" : "APIResult" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Utils", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils", + "tsFullPath" : "Utils" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "String", + "namespace" : [ + "Utils" + ], + "staticMethods" : [ + { + "abiName" : "bjs_Utils_String_static_uppercase", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "uppercase", + "namespace" : [ + "Utils", + "String" + ], + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "Utils.String" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Utils.String", + "tsFullPath" : "Utils.String" + } + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json new file mode 100644 index 000000000..9b1d0d6b8 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json @@ -0,0 +1,342 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PropertyClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "PropertyClass", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "staticConstant", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "jsObjectProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "classVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "readOnlyComputed", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "optionalProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "PropertyClass" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "value1" + }, + { + "associatedValues" : [ + + ], + "name" : "value2" + } + ], + "emitStyle" : "const", + "name" : "PropertyEnum", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumProperty", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "enumConstant", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedEnum", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyEnum", + "tsFullPath" : "PropertyEnum" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "PropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace", + "tsFullPath" : "PropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Nested", + "namespace" : [ + "PropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace.Nested", + "tsFullPath" : "PropertyNamespace.Nested" + } + ], + "exposeToGlobal" : true, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json new file mode 100644 index 000000000..b3ccf7e93 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json @@ -0,0 +1,342 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_PropertyClass_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "methods" : [ + + ], + "name" : "PropertyClass", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "staticConstant", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "staticVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "jsObjectProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "classVariable", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "readOnlyComputed", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "optionalProperty", + "staticContext" : { + "className" : { + "_0" : "PropertyClass" + } + }, + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "PropertyClass" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "value1" + }, + { + "associatedValues" : [ + + ], + "name" : "value2" + } + ], + "emitStyle" : "const", + "name" : "PropertyEnum", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "enumProperty", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "enumConstant", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "computedEnum", + "staticContext" : { + "enumName" : { + "_0" : "PropertyEnum" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyEnum", + "tsFullPath" : "PropertyEnum" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "PropertyNamespace", + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "namespaceProperty", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "namespaceConstant", + "namespace" : [ + "PropertyNamespace" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace", + "tsFullPath" : "PropertyNamespace" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "Nested", + "namespace" : [ + "PropertyNamespace" + ], + "staticMethods" : [ + + ], + "staticProperties" : [ + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedProperty", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "nestedConstant", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "nestedDouble", + "namespace" : [ + "PropertyNamespace", + "Nested" + ], + "staticContext" : { + "namespaceEnum" : { + "_0" : "PropertyNamespace.Nested" + } + }, + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "PropertyNamespace.Nested", + "tsFullPath" : "PropertyNamespace.Nested" + } + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json new file mode 100644 index 000000000..b0aa8c35b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.json @@ -0,0 +1,125 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_checkString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkString", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_roundtripString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripString", + "parameters" : [ + { + "label" : "a", + "name" : "a", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "checkString", + "parameters" : [ + { + "name" : "a", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "checkStringWithLength", + "parameters" : [ + { + "name" : "a", + "type" : { + "string" : { + + } + } + }, + { + "name" : "b", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift similarity index 54% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift index 694c44e06..e9e3c2d89 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift @@ -1,5 +1,26 @@ +@_expose(wasm, "bjs_checkString") +@_cdecl("bjs_checkString") +public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { + #if arch(wasm32) + checkString(a: String.bridgeJSLiftParameter(aBytes, aLength)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundtripString") +@_cdecl("bjs_roundtripString") +public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { + #if arch(wasm32) + let ret = roundtripString(a: String.bridgeJSLiftParameter(aBytes, aLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkString") +@_extern(wasm, module: "TestModule", name: "bjs_checkString") fileprivate func bjs_checkString(_ a: Int32) -> Void #else fileprivate func bjs_checkString(_ a: Int32) -> Void { @@ -16,7 +37,7 @@ func _$checkString(_ a: String) throws(JSException) -> Void { } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkStringWithLength") +@_extern(wasm, module: "TestModule", name: "bjs_checkStringWithLength") fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void #else fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json new file mode 100644 index 000000000..3f9271592 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.json @@ -0,0 +1,59 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_checkString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkString", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "checkString", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift similarity index 53% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift index bde90ea74..9de24ef73 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift @@ -1,5 +1,16 @@ +@_expose(wasm, "bjs_checkString") +@_cdecl("bjs_checkString") +public func _bjs_checkString() -> Void { + #if arch(wasm32) + let ret = checkString() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkString") +@_extern(wasm, module: "TestModule", name: "bjs_checkString") fileprivate func bjs_checkString() -> Int32 #else fileprivate func bjs_checkString() -> Int32 { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json new file mode 100644 index 000000000..9fe717651 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json @@ -0,0 +1,145 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_changeName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "changeName", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "Greeter" + }, + { + "explicitAccessControl" : "public", + "methods" : [ + + ], + "name" : "PublicGreeter", + "properties" : [ + + ], + "swiftCallName" : "PublicGreeter" + }, + { + "explicitAccessControl" : "package", + "methods" : [ + + ], + "name" : "PackageGreeter", + "properties" : [ + + ], + "swiftCallName" : "PackageGreeter" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_takeGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeGreeter", + "parameters" : [ + { + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json new file mode 100644 index 000000000..345582e86 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json @@ -0,0 +1,1078 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Person_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "explicitAccessControl" : "public", + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + + ], + "swiftCallName" : "Person" + }, + { + "constructor" : { + "abiName" : "bjs_TestProcessor_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_TestProcessor_getTransform", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "getTransform", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processWithCustom", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processWithCustom", + "parameters" : [ + { + "label" : "_", + "name" : "text", + "type" : { + "string" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_printTogether", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "printTogether", + "parameters" : [ + { + "label" : "person", + "name" : "person", + "type" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + }, + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "label" : "ratio", + "name" : "ratio", + "type" : { + "double" : { + + } + } + }, + { + "label" : "customTransform", + "name" : "customTransform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq6PersonCSqSSSqSd_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + }, + { + "optional" : { + "_0" : { + "string" : { + + } + } + } + }, + { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule6PersonC_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule6PersonC_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_roundtripOptional", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptional", + "parameters" : [ + { + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq6PersonC_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq6PersonC_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9DirectionO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule5ThemeO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule10HttpStatusO_Si", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9APIResultO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeDirectionChecker", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeDirectionChecker", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9DirectionO_Sb", + "moduleName" : "TestModule", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeThemeValidator", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeThemeValidator", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule5ThemeO_Sb", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "bool" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeStatusCodeExtractor", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeStatusCodeExtractor", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule10HttpStatusO_Si", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeAPIResultHandler", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAPIResultHandler", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9APIResultO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq5ThemeO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_processOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9APIResultO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_TestProcessor_makeOptionalDirectionFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalDirectionFormatter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "optional" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + } + } + } + ], + "name" : "TestProcessor", + "properties" : [ + + ], + "swiftCallName" : "TestProcessor" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ + + ], + "name" : "dark", + "rawValue" : "dark" + }, + { + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "const", + "name" : "Theme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + }, + { + "associatedValues" : [ + + ], + "name" : "unknown", + "rawValue" : "-1" + } + ], + "emitStyle" : "const", + "name" : "HttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "string" : { + + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "int" : { + + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "bool" : { + + } + } + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ + { + "type" : { + "float" : { + + } + } + } + ], + "name" : "rate" + }, + { + "associatedValues" : [ + { + "type" : { + "double" : { + + } + } + } + ], + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + } + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json new file mode 100644 index 000000000..12f76a912 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json @@ -0,0 +1,110 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "applyInt", + "parameters" : [ + { + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSi_Si", + "moduleName" : "TestModule", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "makeAdder", + "parameters" : [ + { + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSi_Si", + "moduleName" : "TestModule", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift similarity index 62% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift index 9e0959157..c833a54d1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftClosureImports.ImportMacros.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift @@ -1,22 +1,22 @@ #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_Check_5CheckSi_Si") -fileprivate func invoke_js_callback_Check_5CheckSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSi_Si") +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_Check_5CheckSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private final class _BJS_ClosureBox_5CheckSi_Si: _BridgedSwiftClosureBox { +private final class _BJS_ClosureBox_10TestModuleSi_Si: _BridgedSwiftClosureBox { let closure: (Int) -> Int init(_ closure: @escaping (Int) -> Int) { self.closure = closure } } -private enum _BJS_Closure_5CheckSi_Si { +private enum _BJS_Closure_10TestModuleSi_Si { static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_5CheckSi_Si(closure) + let box = _BJS_ClosureBox_10TestModuleSi_Si(closure) return Unmanaged.passRetained(box).toOpaque() } static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { @@ -25,7 +25,7 @@ private enum _BJS_Closure_5CheckSi_Si { #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_Check_5CheckSi_Si(callbackValue, param0Value) + let ret = invoke_js_callback_TestModule_10TestModuleSi_Si(callbackValue, param0Value) return Int.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") @@ -34,11 +34,11 @@ private enum _BJS_Closure_5CheckSi_Si { } } -@_expose(wasm, "invoke_swift_closure_Check_5CheckSi_Si") -@_cdecl("invoke_swift_closure_Check_5CheckSi_Si") -public func _invoke_swift_closure_Check_5CheckSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSi_Si") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSi_Si") +public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_5CheckSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() + let box = Unmanaged<_BJS_ClosureBox_10TestModuleSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() let result = box.closure(Int.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else @@ -47,7 +47,7 @@ public func _invoke_swift_closure_Check_5CheckSi_Si(_ boxPtr: UnsafeMutableRawPo } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_applyInt") +@_extern(wasm, module: "TestModule", name: "bjs_applyInt") fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 #else fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { @@ -57,7 +57,7 @@ fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPoint func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { let valueValue = value.bridgeJSLowerParameter() - let transformPointer = _BJS_Closure_5CheckSi_Si.bridgeJSLower(transform) + let transformPointer = _BJS_Closure_10TestModuleSi_Si.bridgeJSLower(transform) let ret = bjs_applyInt(valueValue, transformPointer) if let error = _swift_js_take_exception() { throw error @@ -66,7 +66,7 @@ func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSExce } #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_makeAdder") +@_extern(wasm, module: "TestModule", name: "bjs_makeAdder") fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 #else fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 { @@ -80,5 +80,5 @@ func _$makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int { if let error = _swift_js_take_exception() { throw error } - return _BJS_Closure_5CheckSi_Si.bridgeJSLift(ret) + return _BJS_Closure_10TestModuleSi_Si.bridgeJSLift(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json new file mode 100644 index 000000000..fa5f333f0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json @@ -0,0 +1,523 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_Greeter_greet", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greet", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "Greeter" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "rough", + "rawValue" : "0.1" + }, + { + "associatedValues" : [ + + ], + "name" : "fine", + "rawValue" : "0.001" + } + ], + "emitStyle" : "const", + "name" : "Precision", + "rawType" : "Float", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundtrip", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtrip", + "parameters" : [ + { + "label" : "_", + "name" : "session", + "type" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Person" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_DataPoint_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "label" : "label", + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "label" : "optCount", + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "label" : "optFlag", + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "DataPoint", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "label", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optCount", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optFlag", + "type" : { + "optional" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "swiftCallName" : "DataPoint" + }, + { + "methods" : [ + + ], + "name" : "Address", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "street", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "city", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "zipCode", + "type" : { + "optional" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "swiftCallName" : "Address" + }, + { + "methods" : [ + + ], + "name" : "Person", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "age", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "address", + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "email", + "type" : { + "optional" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "swiftCallName" : "Person" + }, + { + "methods" : [ + + ], + "name" : "Session", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "id", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "owner", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "swiftCallName" : "Session" + }, + { + "methods" : [ + + ], + "name" : "Measurement", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "precision", + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalPrecision", + "type" : { + "optional" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + } + } + ], + "swiftCallName" : "Measurement" + }, + { + "methods" : [ + { + "abiName" : "bjs_ConfigStruct_static_update", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "update", + "parameters" : [ + { + "label" : "_", + "name" : "timeout", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + }, + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + } + } + ], + "name" : "ConfigStruct", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : true, + "name" : "maxRetries", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "defaultConfig", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : true, + "name" : "timeout", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : true, + "name" : "computedSetting", + "staticContext" : { + "structName" : { + "_0" : "ConfigStruct" + } + }, + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "ConfigStruct" + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json new file mode 100644 index 000000000..50af441a9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.json @@ -0,0 +1,94 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + { + "methods" : [ + + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "Point" + } + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "translate", + "parameters" : [ + { + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "Point" + } + } + }, + { + "name" : "dx", + "type" : { + "int" : { + + } + } + }, + { + "name" : "dy", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift new file mode 100644 index 000000000..187f3369a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift @@ -0,0 +1,64 @@ +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Int.bridgeJSLiftParameter() + let x = Int.bridgeJSLiftParameter() + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 +#else +fileprivate func _bjs_struct_lift_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_translate") +fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 +#else +fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$translate(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { + let pointObjectId = point.bridgeJSLowerParameter() + let dxValue = dx.bridgeJSLowerParameter() + let dyValue = dy.bridgeJSLowerParameter() + let ret = bjs_translate(pointObjectId, dxValue, dyValue) + if let error = _swift_js_take_exception() { + throw error + } + return Point.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json new file mode 100644 index 000000000..02796479f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.json @@ -0,0 +1,37 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_throwsSomething", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsSomething", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Throws.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json new file mode 100644 index 000000000..1eb9e47ec --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.json @@ -0,0 +1,416 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_takeUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeRawPointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeMutableRawPointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOpaquePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_takeUnsafeMutablePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeUnsafeMutablePointer", + "parameters" : [ + { + "label" : "_", + "name" : "p", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_returnUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeRawPointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeMutableRawPointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "abiName" : "bjs_returnOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnOpaquePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "abiName" : "bjs_returnUnsafeMutablePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "returnUnsafeMutablePointer", + "parameters" : [ + + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "abiName" : "bjs_roundTripPointerFields", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPointerFields", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "PointerFields" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + { + "constructor" : { + "abiName" : "bjs_PointerFields_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "raw", + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "label" : "mutRaw", + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "label" : "opaque", + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "label" : "ptr", + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "label" : "mutPtr", + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "PointerFields", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "raw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutRaw", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "opaque", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ptr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "mutPtr", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } + } + } + } + ], + "swiftCallName" : "PointerFields" + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json new file mode 100644 index 000000000..14da32841 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.json @@ -0,0 +1,59 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_check", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "check", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "check", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift similarity index 54% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift index 2a2622ce0..3fa9619f8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift @@ -1,5 +1,15 @@ +@_expose(wasm, "bjs_check") +@_cdecl("bjs_check") +public func _bjs_check() -> Void { + #if arch(wasm32) + check() + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_check") +@_extern(wasm, module: "TestModule", name: "bjs_check") fileprivate func bjs_check() -> Void #else fileprivate func bjs_check() -> Void { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.d.ts deleted file mode 100644 index 2a6771ca7..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - checkArray(a: any): void; - checkArrayWithLength(a: any, b: number): void; - checkArray(a: any): void; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js deleted file mode 100644 index 8add18b9f..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js +++ /dev/null @@ -1,245 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_checkArray"] = function bjs_checkArray(a) { - try { - imports.checkArray(swift.memory.getObject(a)); - } catch (error) { - setException(error); - } - } - TestModule["bjs_checkArrayWithLength"] = function bjs_checkArrayWithLength(a, b) { - try { - imports.checkArrayWithLength(swift.memory.getObject(a), b); - } catch (error) { - setException(error); - } - } - TestModule["bjs_checkArray"] = function bjs_checkArray(a) { - try { - imports.checkArray(swift.memory.getObject(a)); - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts similarity index 96% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts index 988626f3e..1bb9ff18c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts @@ -66,6 +66,9 @@ export type Exports = { Status: StatusObject } export type Imports = { + checkArray(a: any): void; + checkArrayWithLength(a: any, b: number): void; + checkArray(a: any): void; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js similarity index 97% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 7388f4150..3cb11c794 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -69,6 +69,7 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); @@ -247,6 +248,28 @@ export async function createInstantiator(options, swift) { const obj = Item.__construct(pointer); return swift.memory.retain(obj); }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_checkArray"] = function bjs_checkArray(a) { + try { + imports.checkArray(swift.memory.getObject(a)); + } catch (error) { + setException(error); + } + } + TestModule["bjs_checkArrayWithLength"] = function bjs_checkArrayWithLength(a, b) { + try { + imports.checkArrayWithLength(swift.memory.getObject(a), b); + } catch (error) { + setException(error); + } + } + TestModule["bjs_checkArray"] = function bjs_checkArray(a) { + try { + imports.checkArray(swift.memory.getObject(a)); + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.d.ts deleted file mode 100644 index dea0bd186..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - asyncReturnVoid(): JSPromise; - asyncRoundTripInt(v: number): JSPromise; - asyncRoundTripString(v: string): JSPromise; - asyncRoundTripBool(v: boolean): JSPromise; - asyncRoundTripFloat(v: number): JSPromise; - asyncRoundTripDouble(v: number): JSPromise; - asyncRoundTripJSObject(v: any): JSPromise; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js deleted file mode 100644 index 981cecbe5..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js +++ /dev/null @@ -1,289 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_asyncReturnVoid"] = function bjs_asyncReturnVoid() { - try { - let ret = imports.asyncReturnVoid(); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripInt"] = function bjs_asyncRoundTripInt(v) { - try { - let ret = imports.asyncRoundTripInt(v); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripString"] = function bjs_asyncRoundTripString(v) { - try { - const vObject = swift.memory.getObject(v); - swift.memory.release(v); - let ret = imports.asyncRoundTripString(vObject); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripBool"] = function bjs_asyncRoundTripBool(v) { - try { - let ret = imports.asyncRoundTripBool(v !== 0); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripFloat"] = function bjs_asyncRoundTripFloat(v) { - try { - let ret = imports.asyncRoundTripFloat(v); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripDouble"] = function bjs_asyncRoundTripDouble(v) { - try { - let ret = imports.asyncRoundTripDouble(v); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_asyncRoundTripJSObject"] = function bjs_asyncRoundTripJSObject(v) { - try { - let ret = imports.asyncRoundTripJSObject(swift.memory.getObject(v)); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts similarity index 98% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts index d321b99fb..170d7f07d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts @@ -161,6 +161,8 @@ export type Exports = { Ratio: RatioObject } export type Imports = { + takesFeatureFlag(flag: FeatureFlagTag): void; + returnsFeatureFlag(): FeatureFlagTag; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js similarity index 91% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index c1865adfc..1e137e6eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -117,6 +117,7 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); @@ -276,6 +277,25 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flag) { + try { + const flagObject = swift.memory.getObject(flag); + swift.memory.release(flag); + imports.takesFeatureFlag(flagObject); + } catch (error) { + setException(error); + } + } + TestModule["bjs_returnsFeatureFlag"] = function bjs_returnsFeatureFlag() { + try { + let ret = imports.returnsFeatureFlag(); + tmpRetBytes = textEncoder.encode(ret); + return tmpRetBytes.length; + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; @@ -344,17 +364,30 @@ export async function createInstantiator(options, swift) { return optResult; }, setFeatureFlag: function bjs_setFeatureFlag(flag) { - instance.exports.bjs_setFeatureFlag(flag); + const flagBytes = textEncoder.encode(flag); + const flagId = swift.memory.retain(flagBytes); + instance.exports.bjs_setFeatureFlag(flagId, flagBytes.length); + swift.memory.release(flagId); }, getFeatureFlag: function bjs_getFeatureFlag() { - const ret = instance.exports.bjs_getFeatureFlag(); - return ret !== 0; + instance.exports.bjs_getFeatureFlag(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }, roundTripOptionalFeatureFlag: function bjs_roundTripOptionalFeatureFlag(input) { const isSome = input != null; - instance.exports.bjs_roundTripOptionalFeatureFlag(+isSome, isSome ? input : 0); - const optResult = tmpRetOptionalBool; - tmpRetOptionalBool = undefined; + let inputId, inputBytes; + if (isSome) { + inputBytes = textEncoder.encode(input); + inputId = swift.memory.retain(inputBytes); + } + instance.exports.bjs_roundTripOptionalFeatureFlag(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); + const optResult = tmpRetString; + tmpRetString = undefined; + if (inputId != undefined) { + swift.memory.release(inputId); + } return optResult; }, setHttpStatus: function bjs_setHttpStatus(status) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.ImportMacros.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.ImportMacros.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.d.ts deleted file mode 100644 index ccd371b71..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export interface Animatable { - animate(keyframes: any, options: any): any; - getAnimations(options: any): any; -} -export type Exports = { -} -export type Imports = { - returnAnimatable(): Animatable; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js deleted file mode 100644 index 1d25a2954..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Interface.Import.js +++ /dev/null @@ -1,251 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_returnAnimatable"] = function bjs_returnAnimatable() { - try { - let ret = imports.returnAnimatable(); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_Animatable_animate"] = function bjs_Animatable_animate(self, keyframes, options) { - try { - let ret = swift.memory.getObject(self).animate(swift.memory.getObject(keyframes), swift.memory.getObject(options)); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_Animatable_getAnimations"] = function bjs_Animatable_getAnimations(self, options) { - try { - let ret = swift.memory.getObject(self).getAnimations(swift.memory.getObject(options)); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.d.ts similarity index 85% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.d.ts index 2efd24317..ac0e05a91 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.d.ts @@ -4,10 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -export interface ArrayBufferLike { - slice(begin: number, end: number): ArrayBufferLike; - readonly byteLength: number; -} export interface WeirdNaming { as(): void; try(): void; @@ -26,7 +22,6 @@ export interface _Weird { export type Exports = { } export type Imports = { - createArrayBuffer(): ArrayBufferLike; createWeirdObject(): WeirdNaming; createWeirdClass(): _Weird; _Weird: { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js similarity index 93% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 833436226..ab030062a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -203,15 +203,6 @@ export async function createInstantiator(options, swift) { return pointer || 0; } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_createArrayBuffer"] = function bjs_createArrayBuffer() { - try { - let ret = imports.createArrayBuffer(); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } TestModule["bjs_createWeirdObject"] = function bjs_createWeirdObject() { try { let ret = imports.createWeirdObject(); @@ -230,24 +221,6 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_ArrayBufferLike_byteLength_get"] = function bjs_ArrayBufferLike_byteLength_get(self) { - try { - let ret = swift.memory.getObject(self).byteLength; - return ret; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_ArrayBufferLike_slice"] = function bjs_ArrayBufferLike_slice(self, begin, end) { - try { - let ret = swift.memory.getObject(self).slice(begin, end); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } TestModule["bjs_WeirdNaming_normalProperty_get"] = function bjs_WeirdNaming_normalProperty_get(self) { try { let ret = swift.memory.getObject(self).normalProperty; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.d.ts similarity index 81% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.d.ts index 24d3d8fac..aaf227cf7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.d.ts @@ -10,9 +10,14 @@ export interface Greeter { name: string; readonly age: number; } +export interface Animatable { + animate(keyframes: any, options: any): any; + getAnimations(options: any): any; +} export type Exports = { } export type Imports = { + returnAnimatable(): Animatable; Greeter: { new(name: string): Greeter; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js similarity index 89% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index d83919051..5b7541b1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -203,6 +203,15 @@ export async function createInstantiator(options, swift) { return pointer || 0; } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_returnAnimatable"] = function bjs_returnAnimatable() { + try { + let ret = imports.returnAnimatable(); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } TestModule["bjs_Greeter_init"] = function bjs_Greeter_init(name) { try { const nameObject = swift.memory.getObject(name); @@ -258,6 +267,24 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_Animatable_animate"] = function bjs_Animatable_animate(self, keyframes, options) { + try { + let ret = swift.memory.getObject(self).animate(swift.memory.getObject(keyframes), swift.memory.getObject(options)); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_Animatable_getAnimations"] = function bjs_Animatable_getAnimations(self, options) { + try { + let ret = swift.memory.getObject(self).getAnimations(swift.memory.getObject(options)); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.d.ts deleted file mode 100644 index 83fe3c141..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export interface DatabaseConnection { - connect(url: string): void; - execute(query: string): any; - readonly isConnected: boolean; - connectionTimeout: number; -} -export interface Logger { - log(message: string): void; - error(message: string, error: any): void; - readonly level: string; -} -export interface ConfigManager { - get(key: string): any; - set(key: string, value: any): void; - readonly configPath: string; -} -export type Exports = { -} -export type Imports = { - createDatabaseConnection(config: any): DatabaseConnection; - createLogger(level: string): Logger; - getConfigManager(): ConfigManager; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js deleted file mode 100644 index f8cfd7366..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MultipleImportedTypes.Import.js +++ /dev/null @@ -1,354 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_createDatabaseConnection"] = function bjs_createDatabaseConnection(config) { - try { - let ret = imports.createDatabaseConnection(swift.memory.getObject(config)); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_createLogger"] = function bjs_createLogger(level) { - try { - const levelObject = swift.memory.getObject(level); - swift.memory.release(level); - let ret = imports.createLogger(levelObject); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_getConfigManager"] = function bjs_getConfigManager() { - try { - let ret = imports.getConfigManager(); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_DatabaseConnection_isConnected_get"] = function bjs_DatabaseConnection_isConnected_get(self) { - try { - let ret = swift.memory.getObject(self).isConnected; - return ret ? 1 : 0; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_DatabaseConnection_connectionTimeout_get"] = function bjs_DatabaseConnection_connectionTimeout_get(self) { - try { - let ret = swift.memory.getObject(self).connectionTimeout; - return ret; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_DatabaseConnection_connectionTimeout_set"] = function bjs_DatabaseConnection_connectionTimeout_set(self, newValue) { - try { - swift.memory.getObject(self).connectionTimeout = newValue; - } catch (error) { - setException(error); - } - } - TestModule["bjs_DatabaseConnection_connect"] = function bjs_DatabaseConnection_connect(self, url) { - try { - const urlObject = swift.memory.getObject(url); - swift.memory.release(url); - swift.memory.getObject(self).connect(urlObject); - } catch (error) { - setException(error); - } - } - TestModule["bjs_DatabaseConnection_execute"] = function bjs_DatabaseConnection_execute(self, query) { - try { - const queryObject = swift.memory.getObject(query); - swift.memory.release(query); - let ret = swift.memory.getObject(self).execute(queryObject); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_Logger_level_get"] = function bjs_Logger_level_get(self) { - try { - let ret = swift.memory.getObject(self).level; - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - TestModule["bjs_Logger_log"] = function bjs_Logger_log(self, message) { - try { - const messageObject = swift.memory.getObject(message); - swift.memory.release(message); - swift.memory.getObject(self).log(messageObject); - } catch (error) { - setException(error); - } - } - TestModule["bjs_Logger_error"] = function bjs_Logger_error(self, message, error) { - try { - const messageObject = swift.memory.getObject(message); - swift.memory.release(message); - swift.memory.getObject(self).error(messageObject, swift.memory.getObject(error)); - } catch (error) { - setException(error); - } - } - TestModule["bjs_ConfigManager_configPath_get"] = function bjs_ConfigManager_configPath_get(self) { - try { - let ret = swift.memory.getObject(self).configPath; - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - TestModule["bjs_ConfigManager_get"] = function bjs_ConfigManager_get(self, key) { - try { - const keyObject = swift.memory.getObject(key); - swift.memory.release(key); - let ret = swift.memory.getObject(self).get(keyObject); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_ConfigManager_set"] = function bjs_ConfigManager_set(self, key, value) { - try { - const keyObject = swift.memory.getObject(key); - swift.memory.release(key); - swift.memory.getObject(self).set(keyObject, swift.memory.getObject(value)); - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js deleted file mode 100644 index 0a92510f7..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.js +++ /dev/null @@ -1,225 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - check: function bjs_check(a, b, c, d, e) { - instance.exports.bjs_check(a, b, c, d, e); - }, - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.d.ts deleted file mode 100644 index 5442ebfa2..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - check(a: number, b: boolean): void; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.d.ts similarity index 93% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.d.ts index 9bf0e1e35..961f97635 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.d.ts @@ -8,6 +8,7 @@ export type Exports = { check(a: number, b: number, c: number, d: number, e: boolean): void; } export type Imports = { + check(a: number, b: boolean): void; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js similarity index 98% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index fe6c3ae04..97e03063a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -223,6 +223,9 @@ export async function createInstantiator(options, swift) { createExports: (instance) => { const js = swift.memory.heap; const exports = { + check: function bjs_check(a, b, c, d, e) { + instance.exports.bjs_check(a, b, c, d, e); + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.d.ts deleted file mode 100644 index ad63bd7d0..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - checkNumber(): number; - checkBoolean(): boolean; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js deleted file mode 100644 index e3263af05..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Import.js +++ /dev/null @@ -1,242 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_checkNumber"] = function bjs_checkNumber() { - try { - let ret = imports.checkNumber(); - return ret; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_checkBoolean"] = function bjs_checkBoolean() { - try { - let ret = imports.checkBoolean(); - return ret ? 1 : 0; - } catch (error) { - setException(error); - return 0 - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.d.ts similarity index 91% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.d.ts index c726e1f5a..77e269d16 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.d.ts @@ -12,6 +12,8 @@ export type Exports = { checkBool(): boolean; } export type Imports = { + checkNumber(): number; + checkBoolean(): boolean; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js similarity index 92% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index 836a82f21..871310bb8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.Export.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -42,6 +42,7 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); @@ -201,6 +202,25 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_checkNumber"] = function bjs_checkNumber() { + try { + let ret = imports.checkNumber(); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_checkBoolean"] = function bjs_checkBoolean() { + try { + let ret = imports.checkBoolean(); + return ret ? 1 : 0; + } catch (error) { + setException(error); + return 0 + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts deleted file mode 100644 index db6d2be05..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export interface JsGreeter { - greet(): string; -} -export type Exports = { -} -export type Imports = { - jsRoundTripNumber(v: number): number; - JsGreeter: { - new(name: string): JsGreeter; - } -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js deleted file mode 100644 index 94e22ffc4..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReExportFrom.Import.js +++ /dev/null @@ -1,252 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_jsRoundTripNumber"] = function bjs_jsRoundTripNumber(v) { - try { - let ret = imports.jsRoundTripNumber(v); - return ret; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_JsGreeter_init"] = function bjs_JsGreeter_init(name) { - try { - const nameObject = swift.memory.getObject(name); - swift.memory.release(name); - return swift.memory.retain(new imports.JsGreeter(nameObject)); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_JsGreeter_greet"] = function bjs_JsGreeter_greet(self) { - try { - let ret = swift.memory.getObject(self).greet(); - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts deleted file mode 100644 index bb9f163cc..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - takesFeatureFlag(flag: FeatureFlagTag): void; - returnsFeatureFlag(): FeatureFlagTag; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js deleted file mode 100644 index 373b433b6..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringEnum.Import.js +++ /dev/null @@ -1,242 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flag) { - try { - const flagObject = swift.memory.getObject(flag); - swift.memory.release(flag); - imports.takesFeatureFlag(flagObject); - } catch (error) { - setException(error); - } - } - TestModule["bjs_returnsFeatureFlag"] = function bjs_returnsFeatureFlag() { - try { - let ret = imports.returnsFeatureFlag(); - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.d.ts deleted file mode 100644 index 229436712..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { - checkString(a: string): void; - roundtripString(a: string): string; -} -export type Imports = { -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js deleted file mode 100644 index 021adcba3..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Export.js +++ /dev/null @@ -1,237 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - checkString: function bjs_checkString(a) { - const aBytes = textEncoder.encode(a); - const aId = swift.memory.retain(aBytes); - instance.exports.bjs_checkString(aId, aBytes.length); - swift.memory.release(aId); - }, - roundtripString: function bjs_roundtripString(a) { - const aBytes = textEncoder.encode(a); - const aId = swift.memory.retain(aBytes); - instance.exports.bjs_roundtripString(aId, aBytes.length); - const ret = tmpRetString; - tmpRetString = undefined; - swift.memory.release(aId); - return ret; - }, - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.d.ts similarity index 89% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.d.ts index 09fd7b638..5e45162a1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.d.ts @@ -5,6 +5,8 @@ // `swift package bridge-js`. export type Exports = { + checkString(a: string): void; + roundtripString(a: string): string; } export type Imports = { checkString(a: string): void; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js similarity index 92% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index 718f776c7..03a4bc9b1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -234,6 +234,21 @@ export async function createInstantiator(options, swift) { createExports: (instance) => { const js = swift.memory.heap; const exports = { + checkString: function bjs_checkString(a) { + const aBytes = textEncoder.encode(a); + const aId = swift.memory.retain(aBytes); + instance.exports.bjs_checkString(aId, aBytes.length); + swift.memory.release(aId); + }, + roundtripString: function bjs_roundtripString(a) { + const aBytes = textEncoder.encode(a); + const aId = swift.memory.retain(aBytes); + instance.exports.bjs_roundtripString(aId, aBytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(aId); + return ret; + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js deleted file mode 100644 index 479b313dd..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.js +++ /dev/null @@ -1,228 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - checkString: function bjs_checkString() { - instance.exports.bjs_checkString(); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - }, - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.d.ts deleted file mode 100644 index cb7783667..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - checkString(): string; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.d.ts similarity index 95% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.d.ts index c6a9f65a4..b43ff062c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Export.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.d.ts @@ -8,6 +8,7 @@ export type Exports = { checkString(): string; } export type Imports = { + checkString(): string; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js similarity index 97% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index bb5278068..98ea9fa4a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -225,6 +225,12 @@ export async function createInstantiator(options, swift) { createExports: (instance) => { const js = swift.memory.heap; const exports = { + checkString: function bjs_checkString() { + instance.exports.bjs_checkString(); + const ret = tmpRetString; + tmpRetString = undefined; + return ret; + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.ImportMacros.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.ImportMacros.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.d.ts deleted file mode 100644 index 26d56fb6c..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export interface TypeScriptProcessor { - convert(ts: string): string; - validate(ts: string): boolean; - readonly version: string; -} -export interface CodeGenerator { - generate(input: any): string; - readonly outputFormat: string; -} -export type Exports = { -} -export type Imports = { - createTS2Skeleton(): TypeScriptProcessor; - createCodeGenerator(format: string): CodeGenerator; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js deleted file mode 100644 index 45c273115..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TS2SkeletonLike.Import.js +++ /dev/null @@ -1,293 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_createTS2Skeleton"] = function bjs_createTS2Skeleton() { - try { - let ret = imports.createTS2Skeleton(); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_createCodeGenerator"] = function bjs_createCodeGenerator(format) { - try { - const formatObject = swift.memory.getObject(format); - swift.memory.release(format); - let ret = imports.createCodeGenerator(formatObject); - return swift.memory.retain(ret); - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_TypeScriptProcessor_version_get"] = function bjs_TypeScriptProcessor_version_get(self) { - try { - let ret = swift.memory.getObject(self).version; - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - TestModule["bjs_TypeScriptProcessor_convert"] = function bjs_TypeScriptProcessor_convert(self, ts) { - try { - const tsObject = swift.memory.getObject(ts); - swift.memory.release(ts); - let ret = swift.memory.getObject(self).convert(tsObject); - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - TestModule["bjs_TypeScriptProcessor_validate"] = function bjs_TypeScriptProcessor_validate(self, ts) { - try { - const tsObject = swift.memory.getObject(ts); - swift.memory.release(ts); - let ret = swift.memory.getObject(self).validate(tsObject); - return ret ? 1 : 0; - } catch (error) { - setException(error); - return 0 - } - } - TestModule["bjs_CodeGenerator_outputFormat_get"] = function bjs_CodeGenerator_outputFormat_get(self) { - try { - let ret = swift.memory.getObject(self).outputFormat; - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - TestModule["bjs_CodeGenerator_generate"] = function bjs_CodeGenerator_generate(self, input) { - try { - let ret = swift.memory.getObject(self).generate(swift.memory.getObject(input)); - tmpRetBytes = textEncoder.encode(ret); - return tmpRetBytes.length; - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.d.ts deleted file mode 100644 index da5dfb076..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { -} -export type Imports = { - checkSimple(a: number): void; -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js deleted file mode 100644 index 406d7f0f3..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeAlias.Import.js +++ /dev/null @@ -1,231 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_checkSimple"] = function bjs_checkSimple(a) { - try { - imports.checkSimple(a); - } catch (error) { - setException(error); - } - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.d.ts diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js similarity index 100% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.Export.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.d.ts deleted file mode 100644 index be85a00fd..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export type Exports = { - check(): void; -} -export type Imports = { -} -export function createInstantiator(options: { - imports: Imports; -}, swift: any): Promise<{ - addImports: (importObject: WebAssembly.Imports) => void; - setInstance: (instance: WebAssembly.Instance) => void; - createExports: (instance: WebAssembly.Instance) => Exports; -}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js deleted file mode 100644 index 8a2fabca9..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Export.js +++ /dev/null @@ -1,225 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -export async function createInstantiator(options, swift) { - let instance; - let memory; - let setException; - const textDecoder = new TextDecoder("utf-8"); - const textEncoder = new TextEncoder("utf-8"); - let tmpRetString; - let tmpRetBytes; - let tmpRetException; - let tmpRetOptionalBool; - let tmpRetOptionalInt; - let tmpRetOptionalFloat; - let tmpRetOptionalDouble; - let tmpRetOptionalHeapObject; - let tmpRetTag; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; - let tmpStructCleanups = []; - const enumHelpers = {}; - const structHelpers = {}; - - let _exports = null; - let bjs = null; - - return { - /** - * @param {WebAssembly.Imports} importObject - */ - addImports: (importObject, importsContext) => { - bjs = {}; - importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { - const source = swift.memory.getObject(sourceId); - const bytes = new Uint8Array(memory.buffer, bytesPtr); - bytes.set(source); - } - bjs["swift_js_make_js_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - return swift.memory.retain(textDecoder.decode(bytes)); - } - bjs["swift_js_init_memory_with_result"] = function(ptr, len) { - const target = new Uint8Array(memory.buffer, ptr, len); - target.set(tmpRetBytes); - tmpRetBytes = undefined; - } - bjs["swift_js_throw"] = function(id) { - tmpRetException = swift.memory.retainByRef(id); - } - bjs["swift_js_retain"] = function(id) { - return swift.memory.retainByRef(id); - } - bjs["swift_js_release"] = function(id) { - swift.memory.release(id); - } - bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; - } - bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); - } - bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); - } - bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); - } - bjs["swift_js_push_string"] = function(ptr, len) { - const bytes = new Uint8Array(memory.buffer, ptr, len); - const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); - } - bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); - } - bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); - } - bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); - } - bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); - } - bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); - } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } - bjs["swift_js_return_optional_bool"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalBool = null; - } else { - tmpRetOptionalBool = value !== 0; - } - } - bjs["swift_js_return_optional_int"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalInt = null; - } else { - tmpRetOptionalInt = value | 0; - } - } - bjs["swift_js_return_optional_float"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalFloat = null; - } else { - tmpRetOptionalFloat = Math.fround(value); - } - } - bjs["swift_js_return_optional_double"] = function(isSome, value) { - if (isSome === 0) { - tmpRetOptionalDouble = null; - } else { - tmpRetOptionalDouble = value; - } - } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { - if (isSome === 0) { - tmpRetString = null; - } else { - const bytes = new Uint8Array(memory.buffer, ptr, len); - tmpRetString = textDecoder.decode(bytes); - } - } - bjs["swift_js_return_optional_object"] = function(isSome, objectId) { - if (isSome === 0) { - tmpRetString = null; - } else { - tmpRetString = swift.memory.getObject(objectId); - } - } - bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { - if (isSome === 0) { - tmpRetOptionalHeapObject = null; - } else { - tmpRetOptionalHeapObject = pointer; - } - } - bjs["swift_js_get_optional_int_presence"] = function() { - return tmpRetOptionalInt != null ? 1 : 0; - } - bjs["swift_js_get_optional_int_value"] = function() { - const value = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; - return value; - } - bjs["swift_js_get_optional_string"] = function() { - const str = tmpRetString; - tmpRetString = undefined; - if (str == null) { - return -1; - } else { - const bytes = textEncoder.encode(str); - tmpRetBytes = bytes; - return bytes.length; - } - } - bjs["swift_js_get_optional_float_presence"] = function() { - return tmpRetOptionalFloat != null ? 1 : 0; - } - bjs["swift_js_get_optional_float_value"] = function() { - const value = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; - return value; - } - bjs["swift_js_get_optional_double_presence"] = function() { - return tmpRetOptionalDouble != null ? 1 : 0; - } - bjs["swift_js_get_optional_double_value"] = function() { - const value = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; - return value; - } - bjs["swift_js_get_optional_heap_object_pointer"] = function() { - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - return pointer || 0; - } - }, - setInstance: (i) => { - instance = i; - memory = instance.exports.memory; - - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; - const exports = { - check: function bjs_check() { - instance.exports.bjs_check(); - }, - }; - _exports = exports; - return exports; - }, - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.d.ts similarity index 96% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.d.ts rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.d.ts index 8cd1e806e..7acba67a0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.d.ts @@ -5,6 +5,7 @@ // `swift package bridge-js`. export type Exports = { + check(): void; } export type Imports = { check(): void; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js similarity index 98% rename from Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js rename to Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 2944bcf5a..f37cbd90b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.Import.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -223,6 +223,9 @@ export async function createInstantiator(options, swift) { createExports: (instance) => { const js = swift.memory.heap; const exports = { + check: function bjs_check() { + instance.exports.bjs_check(); + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json deleted file mode 100644 index c796433dd..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ArrayTypes.json +++ /dev/null @@ -1,983 +0,0 @@ -{ - "classes" : [ - { - "methods" : [ - - ], - "name" : "Item", - "properties" : [ - - ], - "swiftCallName" : "Item" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "pending", - "rawValue" : "0" - }, - { - "associatedValues" : [ - - ], - "name" : "active", - "rawValue" : "1" - }, - { - "associatedValues" : [ - - ], - "name" : "completed", - "rawValue" : "2" - } - ], - "emitStyle" : "const", - "name" : "Status", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Status", - "tsFullPath" : "Status" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_processIntArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processIntArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_processStringArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processStringArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_processDoubleArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDoubleArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_processBoolArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processBoolArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "abiName" : "bjs_processPointArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processPointArray", - "parameters" : [ - { - "label" : "_", - "name" : "points", - "type" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - }, - { - "abiName" : "bjs_processDirectionArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirectionArray", - "parameters" : [ - { - "label" : "_", - "name" : "directions", - "type" : { - "array" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "abiName" : "bjs_processStatusArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processStatusArray", - "parameters" : [ - { - "label" : "_", - "name" : "statuses", - "type" : { - "array" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Status", - "_1" : "Int" - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Status", - "_1" : "Int" - } - } - } - } - }, - { - "abiName" : "bjs_sumIntArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "sumIntArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_findFirstPoint", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "findFirstPoint", - "parameters" : [ - { - "label" : "_", - "name" : "points", - "type" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - }, - { - "label" : "matching", - "name" : "matching", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Point" - } - } - }, - { - "abiName" : "bjs_processUnsafeRawPointerArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processUnsafeRawPointerArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - } - } - }, - { - "abiName" : "bjs_processUnsafeMutableRawPointerArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processUnsafeMutableRawPointerArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - } - } - }, - { - "abiName" : "bjs_processOpaquePointerArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOpaquePointerArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalIntArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalIntArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalStringArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalStringArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "optional" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalPointArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalPointArray", - "parameters" : [ - { - "label" : "_", - "name" : "points", - "type" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalDirectionArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalDirectionArray", - "parameters" : [ - { - "label" : "_", - "name" : "directions", - "type" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processOptionalStatusArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalStatusArray", - "parameters" : [ - { - "label" : "_", - "name" : "statuses", - "type" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Status", - "_1" : "Int" - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Status", - "_1" : "Int" - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processNestedIntArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processNestedIntArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processNestedStringArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processNestedStringArray", - "parameters" : [ - { - "label" : "_", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processNestedPointArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processNestedPointArray", - "parameters" : [ - { - "label" : "_", - "name" : "points", - "type" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "Point" - } - } - } - } - } - } - }, - { - "abiName" : "bjs_processItemArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processItemArray", - "parameters" : [ - { - "label" : "_", - "name" : "items", - "type" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Item" - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Item" - } - } - } - } - }, - { - "abiName" : "bjs_processNestedItemArray", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processNestedItemArray", - "parameters" : [ - { - "label" : "_", - "name" : "items", - "type" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Item" - } - } - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Item" - } - } - } - } - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - { - "methods" : [ - - ], - "name" : "Point", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "y", - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "Point" - } - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json deleted file mode 100644 index 77c5b3678..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Async.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_asyncReturnVoid", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncReturnVoid", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripInt", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripInt", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripString", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripString", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripBool", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripBool", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripFloat", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripFloat", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "float" : { - - } - } - } - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripDouble", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripDouble", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_asyncRoundTripJSObject", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : false - }, - "name" : "asyncRoundTripJSObject", - "parameters" : [ - { - "label" : "_", - "name" : "v", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "jsObject" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json deleted file mode 100644 index 97def2060..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.ReverseOrder.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_FunctionA_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_FunctionA_processB", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processB", - "parameters" : [ - { - "label" : "b", - "name" : "b", - "type" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_FunctionA_createB", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createB", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "name" : "FunctionA", - "properties" : [ - - ], - "swiftCallName" : "FunctionA" - }, - { - "constructor" : { - "abiName" : "bjs_FunctionB_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "FunctionB", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "FunctionB" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_standaloneFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "standaloneFunction", - "parameters" : [ - { - "label" : "b", - "name" : "b", - "type" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json deleted file mode 100644 index acfa4c9ef..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileFunctionTypes.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_FunctionB_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "FunctionB", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "FunctionB" - }, - { - "constructor" : { - "abiName" : "bjs_FunctionA_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_FunctionA_processB", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processB", - "parameters" : [ - { - "label" : "b", - "name" : "b", - "type" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_FunctionA_createB", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createB", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "name" : "FunctionA", - "properties" : [ - - ], - "swiftCallName" : "FunctionA" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_standaloneFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "standaloneFunction", - "parameters" : [ - { - "label" : "b", - "name" : "b", - "type" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "FunctionB" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json deleted file mode 100644 index de5fb19b0..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.ReverseOrder.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "classes" : [ - { - "methods" : [ - - ], - "name" : "ClassA", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "linkedB", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "ClassB" - } - } - } - } - } - ], - "swiftCallName" : "ClassA" - }, - { - "constructor" : { - "abiName" : "bjs_ClassB_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "ClassB", - "properties" : [ - - ], - "swiftCallName" : "ClassB" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json deleted file mode 100644 index 53a5f858c..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/CrossFileTypeResolution.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_ClassB_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "ClassB", - "properties" : [ - - ], - "swiftCallName" : "ClassB" - }, - { - "methods" : [ - - ], - "name" : "ClassA", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "linkedB", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "ClassB" - } - } - } - } - } - ], - "swiftCallName" : "ClassA" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json deleted file mode 100644 index f2e6a4e2e..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.json +++ /dev/null @@ -1,1270 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_DefaultGreeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "DefaultGreeter", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "DefaultGreeter" - }, - { - "constructor" : { - "abiName" : "bjs_EmptyGreeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "EmptyGreeter", - "properties" : [ - - ], - "swiftCallName" : "EmptyGreeter" - }, - { - "constructor" : { - "abiName" : "bjs_ConstructorDefaults_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Default" - } - }, - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "int" : { - "_0" : 42 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "enabled", - "name" : "enabled", - "type" : { - "bool" : { - - } - } - }, - { - "defaultValue" : { - "enumCase" : { - "_0" : "Status", - "_1" : "active" - } - }, - "label" : "status", - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "tag", - "name" : "tag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "ConstructorDefaults", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "enabled", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "tag", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "ConstructorDefaults" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "active" - }, - { - "associatedValues" : [ - - ], - "name" : "inactive" - }, - { - "associatedValues" : [ - - ], - "name" : "pending" - } - ], - "emitStyle" : "const", - "explicitAccessControl" : "public", - "name" : "Status", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Status", - "tsFullPath" : "Status" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_testStringDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testStringDefault", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Hello World" - } - }, - "label" : "message", - "name" : "message", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testNegativeIntDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testNegativeIntDefault", - "parameters" : [ - { - "defaultValue" : { - "int" : { - "_0" : -42 - } - }, - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_testBoolDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testBoolDefault", - "parameters" : [ - { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "flag", - "name" : "flag", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_testNegativeFloatDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testNegativeFloatDefault", - "parameters" : [ - { - "defaultValue" : { - "float" : { - "_0" : -273.15 - } - }, - "label" : "temp", - "name" : "temp", - "type" : { - "float" : { - - } - } - } - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_testDoubleDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testDoubleDefault", - "parameters" : [ - { - "defaultValue" : { - "double" : { - "_0" : 2.718 - } - }, - "label" : "precision", - "name" : "precision", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_testOptionalDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalDefault", - "parameters" : [ - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testOptionalStringDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalStringDefault", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Hi" - } - }, - "label" : "greeting", - "name" : "greeting", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testMultipleDefaults", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testMultipleDefaults", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "Default Title" - } - }, - "label" : "title", - "name" : "title", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "int" : { - "_0" : 10 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : false - } - }, - "label" : "enabled", - "name" : "enabled", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_testEnumDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testEnumDefault", - "parameters" : [ - { - "defaultValue" : { - "enumCase" : { - "_0" : "Status", - "_1" : "active" - } - }, - "label" : "status", - "name" : "status", - "type" : { - "caseEnum" : { - "_0" : "Status" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "abiName" : "bjs_testComplexInit", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testComplexInit", - "parameters" : [ - { - "defaultValue" : { - "objectWithArguments" : { - "_0" : "DefaultGreeter", - "_1" : [ - { - "string" : { - "_0" : "DefaultUser" - } - } - ] - } - }, - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "DefaultGreeter" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "DefaultGreeter" - } - } - }, - { - "abiName" : "bjs_testEmptyInit", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testEmptyInit", - "parameters" : [ - { - "defaultValue" : { - "object" : { - "_0" : "EmptyGreeter" - } - }, - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "EmptyGreeter" - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "EmptyGreeter" - } - } - }, - { - "abiName" : "bjs_testOptionalStructDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalStructDefault", - "parameters" : [ - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "point", - "name" : "point", - "type" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - }, - { - "abiName" : "bjs_testOptionalStructWithValueDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalStructWithValueDefault", - "parameters" : [ - { - "defaultValue" : { - "structLiteral" : { - "_0" : "Config", - "_1" : [ - { - "name" : "name", - "value" : { - "string" : { - "_0" : "default" - } - } - }, - { - "name" : "value", - "value" : { - "int" : { - "_0" : 42 - } - } - }, - { - "name" : "enabled", - "value" : { - "bool" : { - "_0" : true - } - } - } - ] - } - }, - "label" : "point", - "name" : "point", - "type" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftStruct" : { - "_0" : "Config" - } - } - } - } - }, - { - "abiName" : "bjs_testIntArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testIntArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "array" : { - "_0" : [ - { - "int" : { - "_0" : 1 - } - }, - { - "int" : { - "_0" : 2 - } - }, - { - "int" : { - "_0" : 3 - } - } - ] - } - }, - "label" : "values", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testStringArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testStringArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "array" : { - "_0" : [ - { - "string" : { - "_0" : "a" - } - }, - { - "string" : { - "_0" : "b" - } - }, - { - "string" : { - "_0" : "c" - } - } - ] - } - }, - "label" : "names", - "name" : "names", - "type" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testDoubleArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testDoubleArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "array" : { - "_0" : [ - { - "double" : { - "_0" : 1.5 - } - }, - { - "double" : { - "_0" : 2.5 - } - }, - { - "double" : { - "_0" : 3.5 - } - } - ] - } - }, - "label" : "values", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testBoolArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testBoolArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "array" : { - "_0" : [ - { - "bool" : { - "_0" : true - } - }, - { - "bool" : { - "_0" : false - } - }, - { - "bool" : { - "_0" : true - } - } - ] - } - }, - "label" : "flags", - "name" : "flags", - "type" : { - "array" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testEmptyArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testEmptyArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "array" : { - "_0" : [ - - ] - } - }, - "label" : "items", - "name" : "items", - "type" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testMixedWithArrayDefault", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testMixedWithArrayDefault", - "parameters" : [ - { - "defaultValue" : { - "string" : { - "_0" : "test" - } - }, - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "array" : { - "_0" : [ - { - "int" : { - "_0" : 10 - } - }, - { - "int" : { - "_0" : 20 - } - }, - { - "int" : { - "_0" : 30 - } - } - ] - } - }, - "label" : "values", - "name" : "values", - "type" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "enabled", - "name" : "enabled", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - { - "methods" : [ - - ], - "name" : "Config", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "value", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "enabled", - "type" : { - "bool" : { - - } - } - } - ], - "swiftCallName" : "Config" - }, - { - "constructor" : { - "abiName" : "bjs_MathOperations_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "defaultValue" : { - "double" : { - "_0" : 0 - } - }, - "label" : "baseValue", - "name" : "baseValue", - "type" : { - "double" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_MathOperations_add", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "defaultValue" : { - "double" : { - "_0" : 10 - } - }, - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_MathOperations_multiply", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "multiply", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_MathOperations_static_subtract", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "subtract", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "double" : { - - } - } - }, - { - "defaultValue" : { - "double" : { - "_0" : 5 - } - }, - "label" : "b", - "name" : "b", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - }, - "staticContext" : { - "structName" : { - "_0" : "MathOperations" - } - } - } - ], - "name" : "MathOperations", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "baseValue", - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "MathOperations" - } - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json deleted file mode 100644 index ab7fbfd9d..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumAssociatedValue.json +++ /dev/null @@ -1,844 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - } - ], - "name" : "flag" - }, - { - "associatedValues" : [ - { - "type" : { - "float" : { - - } - } - } - ], - "name" : "rate" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "precise" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "error" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "status" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "coordinates" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "double" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "comprehensive" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "ComplexResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "ComplexResult", - "tsFullPath" : "ComplexResult" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utilities", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utilities", - "tsFullPath" : "Utilities" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - }, - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "status" - } - ], - "emitStyle" : "const", - "name" : "Result", - "namespace" : [ - "Utilities" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utilities.Result", - "tsFullPath" : "Utilities.Result" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - }, - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - } - ], - "emitStyle" : "const", - "name" : "NetworkingResult", - "namespace" : [ - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "NetworkingResult", - "tsFullPath" : "API.NetworkingResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "name" : "status" - } - ], - "emitStyle" : "const", - "name" : "APIOptionalResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIOptionalResult", - "tsFullPath" : "APIOptionalResult" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_handle", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "handle", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getResult", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_roundtripAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripAPIResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalAPIResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - }, - { - "abiName" : "bjs_handleComplex", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "handleComplex", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getComplexResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getComplexResult", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_roundtripComplexResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripComplexResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalComplexResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalComplexResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalUtilitiesResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalUtilitiesResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "Utilities.Result" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalNetworkingResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalNetworkingResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "NetworkingResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "NetworkingResult" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalAPIOptionalResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalAPIOptionalResult", - "parameters" : [ - { - "label" : "result", - "name" : "result", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - }, - { - "abiName" : "bjs_compareAPIResults", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "compareAPIResults", - "parameters" : [ - { - "label" : "result1", - "name" : "result1", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - }, - { - "label" : "result2", - "name" : "result2", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" - } - } - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json deleted file mode 100644 index ca6fabceb..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumCase.json +++ /dev/null @@ -1,320 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "loading" - }, - { - "associatedValues" : [ - - ], - "name" : "success" - }, - { - "associatedValues" : [ - - ], - "name" : "error" - } - ], - "emitStyle" : "const", - "name" : "Status", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Status", - "tsFullPath" : "Status" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "tsEnum", - "name" : "TSDirection", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TSDirection", - "tsFullPath" : "TSDirection" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "success" - } - ], - "emitStyle" : "const", - "explicitAccessControl" : "public", - "name" : "PublicStatus", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "PublicStatus", - "tsFullPath" : "PublicStatus" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_setDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setDirection", - "parameters" : [ - { - "label" : "_", - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getDirection", - "parameters" : [ - - ], - "returnType" : { - "caseEnum" : { - "_0" : "Direction" - } - } - }, - { - "abiName" : "bjs_processDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirection", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "returnType" : { - "caseEnum" : { - "_0" : "Status" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalDirection", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "abiName" : "bjs_setTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTSDirection", - "parameters" : [ - { - "label" : "_", - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTSDirection", - "parameters" : [ - - ], - "returnType" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTSDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTSDirection", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" - } - } - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json deleted file mode 100644 index 135908d7f..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.Global.json +++ /dev/null @@ -1,538 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Converter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_Converter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "namespace" : [ - "Utils" - ], - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Converter", - "namespace" : [ - "Utils" - ], - "properties" : [ - - ], - "swiftCallName" : "Utils.Converter" - }, - { - "constructor" : { - "abiName" : "bjs_HTTPServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_HTTPServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "API" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "HTTPServer", - "namespace" : [ - "Networking", - "API" - ], - "properties" : [ - - ], - "swiftCallName" : "Networking.API.HTTPServer" - }, - { - "constructor" : { - "abiName" : "bjs_TestServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Internal.SupportedMethod" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "TestServer", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "properties" : [ - - ], - "swiftCallName" : "Internal.TestServer" - } - ], - "enums" : [ - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils", - "tsFullPath" : "Utils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Networking", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking", - "tsFullPath" : "Networking" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "API", - "namespace" : [ - "Networking" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API", - "tsFullPath" : "Networking.API" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - }, - { - "associatedValues" : [ - - ], - "name" : "put" - }, - { - "associatedValues" : [ - - ], - "name" : "delete" - } - ], - "emitStyle" : "const", - "name" : "Method", - "namespace" : [ - "Networking", - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API.Method", - "tsFullPath" : "Networking.API.Method" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Configuration", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration", - "tsFullPath" : "Configuration" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "debug", - "rawValue" : "debug" - }, - { - "associatedValues" : [ - - ], - "name" : "info", - "rawValue" : "info" - }, - { - "associatedValues" : [ - - ], - "name" : "warning", - "rawValue" : "warning" - }, - { - "associatedValues" : [ - - ], - "name" : "error", - "rawValue" : "error" - } - ], - "emitStyle" : "const", - "name" : "LogLevel", - "namespace" : [ - "Configuration" - ], - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.LogLevel", - "tsFullPath" : "Configuration.LogLevel" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "http", - "rawValue" : "80" - }, - { - "associatedValues" : [ - - ], - "name" : "https", - "rawValue" : "443" - }, - { - "associatedValues" : [ - - ], - "name" : "development", - "rawValue" : "3000" - } - ], - "emitStyle" : "const", - "name" : "Port", - "namespace" : [ - "Configuration" - ], - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.Port", - "tsFullPath" : "Configuration.Port" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Internal", - "namespace" : [ - "Networking", - "APIV2" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal", - "tsFullPath" : "Networking.APIV2.Internal" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - } - ], - "emitStyle" : "const", - "name" : "SupportedMethod", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal.SupportedMethod", - "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GraphOperations", - "namespace" : [ - "Services", - "Graph" - ], - "staticMethods" : [ - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "createGraph", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "rootId", - "name" : "rootId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - }, - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "nodeCount", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "graphId", - "name" : "graphId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - }, - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : true - }, - "name" : "validate", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "graphId", - "name" : "graphId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GraphOperations", - "tsFullPath" : "Services.Graph.GraphOperations" - } - ], - "exposeToGlobal" : true, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json deleted file mode 100644 index 374ae13f4..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumNamespace.json +++ /dev/null @@ -1,538 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Converter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_Converter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "namespace" : [ - "Utils" - ], - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Converter", - "namespace" : [ - "Utils" - ], - "properties" : [ - - ], - "swiftCallName" : "Utils.Converter" - }, - { - "constructor" : { - "abiName" : "bjs_HTTPServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_HTTPServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "API" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "HTTPServer", - "namespace" : [ - "Networking", - "API" - ], - "properties" : [ - - ], - "swiftCallName" : "Networking.API.HTTPServer" - }, - { - "constructor" : { - "abiName" : "bjs_TestServer_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestServer_call", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "call", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "parameters" : [ - { - "label" : "_", - "name" : "method", - "type" : { - "caseEnum" : { - "_0" : "Internal.SupportedMethod" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "TestServer", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "properties" : [ - - ], - "swiftCallName" : "Internal.TestServer" - } - ], - "enums" : [ - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils", - "tsFullPath" : "Utils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Networking", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking", - "tsFullPath" : "Networking" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "API", - "namespace" : [ - "Networking" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API", - "tsFullPath" : "Networking.API" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - }, - { - "associatedValues" : [ - - ], - "name" : "put" - }, - { - "associatedValues" : [ - - ], - "name" : "delete" - } - ], - "emitStyle" : "const", - "name" : "Method", - "namespace" : [ - "Networking", - "API" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Networking.API.Method", - "tsFullPath" : "Networking.API.Method" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Configuration", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration", - "tsFullPath" : "Configuration" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "debug", - "rawValue" : "debug" - }, - { - "associatedValues" : [ - - ], - "name" : "info", - "rawValue" : "info" - }, - { - "associatedValues" : [ - - ], - "name" : "warning", - "rawValue" : "warning" - }, - { - "associatedValues" : [ - - ], - "name" : "error", - "rawValue" : "error" - } - ], - "emitStyle" : "const", - "name" : "LogLevel", - "namespace" : [ - "Configuration" - ], - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.LogLevel", - "tsFullPath" : "Configuration.LogLevel" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "http", - "rawValue" : "80" - }, - { - "associatedValues" : [ - - ], - "name" : "https", - "rawValue" : "443" - }, - { - "associatedValues" : [ - - ], - "name" : "development", - "rawValue" : "3000" - } - ], - "emitStyle" : "const", - "name" : "Port", - "namespace" : [ - "Configuration" - ], - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Configuration.Port", - "tsFullPath" : "Configuration.Port" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Internal", - "namespace" : [ - "Networking", - "APIV2" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal", - "tsFullPath" : "Networking.APIV2.Internal" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "get" - }, - { - "associatedValues" : [ - - ], - "name" : "post" - } - ], - "emitStyle" : "const", - "name" : "SupportedMethod", - "namespace" : [ - "Networking", - "APIV2", - "Internal" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Internal.SupportedMethod", - "tsFullPath" : "Networking.APIV2.Internal.SupportedMethod" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "GraphOperations", - "namespace" : [ - "Services", - "Graph" - ], - "staticMethods" : [ - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_createGraph", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "createGraph", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "rootId", - "name" : "rootId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - }, - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_nodeCount", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "nodeCount", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "graphId", - "name" : "graphId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - }, - { - "abiName" : "bjs_Services_Graph_GraphOperations_static_validate", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : true - }, - "name" : "validate", - "namespace" : [ - "Services", - "Graph", - "GraphOperations" - ], - "parameters" : [ - { - "label" : "graphId", - "name" : "graphId", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "GraphOperations" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "GraphOperations", - "tsFullPath" : "Services.Graph.GraphOperations" - } - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json deleted file mode 100644 index 078772ff2..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/EnumRawType.json +++ /dev/null @@ -1,1498 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, - { - "associatedValues" : [ - - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ - - ], - "name" : "auto", - "rawValue" : "auto" - } - ], - "emitStyle" : "const", - "name" : "Theme", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Theme", - "tsFullPath" : "Theme" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, - { - "associatedValues" : [ - - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ - - ], - "name" : "auto", - "rawValue" : "auto" - } - ], - "emitStyle" : "tsEnum", - "name" : "TSTheme", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TSTheme", - "tsFullPath" : "TSTheme" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "enabled", - "rawValue" : "true" - }, - { - "associatedValues" : [ - - ], - "name" : "disabled", - "rawValue" : "false" - } - ], - "emitStyle" : "const", - "name" : "FeatureFlag", - "rawType" : "Bool", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "FeatureFlag", - "tsFullPath" : "FeatureFlag" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "ok", - "rawValue" : "200" - }, - { - "associatedValues" : [ - - ], - "name" : "notFound", - "rawValue" : "404" - }, - { - "associatedValues" : [ - - ], - "name" : "serverError", - "rawValue" : "500" - } - ], - "emitStyle" : "const", - "name" : "HttpStatus", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "HttpStatus", - "tsFullPath" : "HttpStatus" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "ok", - "rawValue" : "200" - }, - { - "associatedValues" : [ - - ], - "name" : "notFound", - "rawValue" : "404" - }, - { - "associatedValues" : [ - - ], - "name" : "serverError", - "rawValue" : "500" - } - ], - "emitStyle" : "tsEnum", - "name" : "TSHttpStatus", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TSHttpStatus", - "tsFullPath" : "TSHttpStatus" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "lowest", - "rawValue" : "-1" - }, - { - "associatedValues" : [ - - ], - "name" : "low", - "rawValue" : "2" - }, - { - "associatedValues" : [ - - ], - "name" : "medium", - "rawValue" : "3" - }, - { - "associatedValues" : [ - - ], - "name" : "high", - "rawValue" : "4" - }, - { - "associatedValues" : [ - - ], - "name" : "highest", - "rawValue" : "5" - } - ], - "emitStyle" : "const", - "name" : "Priority", - "rawType" : "Int32", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Priority", - "tsFullPath" : "Priority" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "tiny", - "rawValue" : "1024" - }, - { - "associatedValues" : [ - - ], - "name" : "small", - "rawValue" : "10240" - }, - { - "associatedValues" : [ - - ], - "name" : "medium", - "rawValue" : "102400" - }, - { - "associatedValues" : [ - - ], - "name" : "large", - "rawValue" : "1048576" - } - ], - "emitStyle" : "const", - "name" : "FileSize", - "rawType" : "Int64", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "FileSize", - "tsFullPath" : "FileSize" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "guest", - "rawValue" : "0" - }, - { - "associatedValues" : [ - - ], - "name" : "user", - "rawValue" : "1000" - }, - { - "associatedValues" : [ - - ], - "name" : "admin", - "rawValue" : "9999" - } - ], - "emitStyle" : "const", - "name" : "UserId", - "rawType" : "UInt", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "UserId", - "tsFullPath" : "UserId" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "invalid", - "rawValue" : "0" - }, - { - "associatedValues" : [ - - ], - "name" : "session", - "rawValue" : "12345" - }, - { - "associatedValues" : [ - - ], - "name" : "refresh", - "rawValue" : "67890" - } - ], - "emitStyle" : "const", - "name" : "TokenId", - "rawType" : "UInt32", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TokenId", - "tsFullPath" : "TokenId" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "none", - "rawValue" : "0" - }, - { - "associatedValues" : [ - - ], - "name" : "active", - "rawValue" : "9876543210" - }, - { - "associatedValues" : [ - - ], - "name" : "expired", - "rawValue" : "1234567890" - } - ], - "emitStyle" : "const", - "name" : "SessionId", - "rawType" : "UInt64", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "SessionId", - "tsFullPath" : "SessionId" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "rough", - "rawValue" : "0.1" - }, - { - "associatedValues" : [ - - ], - "name" : "normal", - "rawValue" : "0.01" - }, - { - "associatedValues" : [ - - ], - "name" : "fine", - "rawValue" : "0.001" - } - ], - "emitStyle" : "const", - "name" : "Precision", - "rawType" : "Float", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Precision", - "tsFullPath" : "Precision" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "quarter", - "rawValue" : "0.25" - }, - { - "associatedValues" : [ - - ], - "name" : "half", - "rawValue" : "0.5" - }, - { - "associatedValues" : [ - - ], - "name" : "golden", - "rawValue" : "1.618" - }, - { - "associatedValues" : [ - - ], - "name" : "pi", - "rawValue" : "3.14159" - } - ], - "emitStyle" : "const", - "name" : "Ratio", - "rawType" : "Double", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Ratio", - "tsFullPath" : "Ratio" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_setTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTheme", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTheme", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - }, - { - "abiName" : "bjs_setTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTSTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTSTheme", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTSTheme", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - } - } - } - }, - { - "abiName" : "bjs_setFeatureFlag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setFeatureFlag", - "parameters" : [ - { - "label" : "_", - "name" : "flag", - "type" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "Bool" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getFeatureFlag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getFeatureFlag", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "Bool" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalFeatureFlag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalFeatureFlag", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "Bool" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "Bool" - } - } - } - } - }, - { - "abiName" : "bjs_setHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "status", - "type" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getHttpStatus", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "abiName" : "bjs_setTSHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTSHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "status", - "type" : { - "rawValueEnum" : { - "_0" : "TSHttpStatus", - "_1" : "Int" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getTSHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTSHttpStatus", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "TSHttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSHttpStatus", - "_1" : "Int" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSHttpStatus", - "_1" : "Int" - } - } - } - } - }, - { - "abiName" : "bjs_setPriority", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setPriority", - "parameters" : [ - { - "label" : "_", - "name" : "priority", - "type" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int32" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getPriority", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getPriority", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int32" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalPriority", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalPriority", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int32" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int32" - } - } - } - } - }, - { - "abiName" : "bjs_setFileSize", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setFileSize", - "parameters" : [ - { - "label" : "_", - "name" : "size", - "type" : { - "rawValueEnum" : { - "_0" : "FileSize", - "_1" : "Int64" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getFileSize", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getFileSize", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "FileSize", - "_1" : "Int64" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalFileSize", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalFileSize", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "FileSize", - "_1" : "Int64" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "FileSize", - "_1" : "Int64" - } - } - } - } - }, - { - "abiName" : "bjs_setUserId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setUserId", - "parameters" : [ - { - "label" : "_", - "name" : "id", - "type" : { - "rawValueEnum" : { - "_0" : "UserId", - "_1" : "UInt" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getUserId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getUserId", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "UserId", - "_1" : "UInt" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalUserId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalUserId", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "UserId", - "_1" : "UInt" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "UserId", - "_1" : "UInt" - } - } - } - } - }, - { - "abiName" : "bjs_setTokenId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setTokenId", - "parameters" : [ - { - "label" : "_", - "name" : "token", - "type" : { - "rawValueEnum" : { - "_0" : "TokenId", - "_1" : "UInt32" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getTokenId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTokenId", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "TokenId", - "_1" : "UInt32" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTokenId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTokenId", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TokenId", - "_1" : "UInt32" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TokenId", - "_1" : "UInt32" - } - } - } - } - }, - { - "abiName" : "bjs_setSessionId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setSessionId", - "parameters" : [ - { - "label" : "_", - "name" : "session", - "type" : { - "rawValueEnum" : { - "_0" : "SessionId", - "_1" : "UInt64" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getSessionId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getSessionId", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "SessionId", - "_1" : "UInt64" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalSessionId", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalSessionId", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "SessionId", - "_1" : "UInt64" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "SessionId", - "_1" : "UInt64" - } - } - } - } - }, - { - "abiName" : "bjs_setPrecision", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setPrecision", - "parameters" : [ - { - "label" : "_", - "name" : "precision", - "type" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getPrecision", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getPrecision", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalPrecision", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalPrecision", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - } - }, - { - "abiName" : "bjs_setRatio", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "setRatio", - "parameters" : [ - { - "label" : "_", - "name" : "ratio", - "type" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_getRatio", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getRatio", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalRatio", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalRatio", - "parameters" : [ - { - "label" : "_", - "name" : "input", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Ratio", - "_1" : "Double" - } - } - } - } - }, - { - "abiName" : "bjs_processTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processTheme", - "parameters" : [ - { - "label" : "_", - "name" : "theme", - "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - }, - { - "abiName" : "bjs_convertPriority", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "convertPriority", - "parameters" : [ - { - "label" : "_", - "name" : "status", - "type" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int32" - } - } - }, - { - "abiName" : "bjs_validateSession", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "validateSession", - "parameters" : [ - { - "label" : "_", - "name" : "session", - "type" : { - "rawValueEnum" : { - "_0" : "SessionId", - "_1" : "UInt64" - } - } - } - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json deleted file mode 100644 index 6ee073ca8..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/ImportedTypeInExportedInterface.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_makeFoo", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "makeFoo", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "Foo" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json deleted file mode 100644 index 5409a400e..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedGlobal.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_GlobalClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_GlobalClass_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "GlobalClass", - "namespace" : [ - "GlobalAPI" - ], - "properties" : [ - - ], - "swiftCallName" : "GlobalClass" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_GlobalAPI_globalFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "globalFunction", - "namespace" : [ - "GlobalAPI" - ], - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json deleted file mode 100644 index bc58d985e..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/MixedPrivate.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_PrivateClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_PrivateClass_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "PrivateClass", - "namespace" : [ - "PrivateAPI" - ], - "properties" : [ - - ], - "swiftCallName" : "PrivateClass" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_PrivateAPI_privateFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "privateFunction", - "namespace" : [ - "PrivateAPI" - ], - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json deleted file mode 100644 index eb11e983f..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.Global.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Greeter", - "namespace" : [ - "__Swift", - "Foundation" - ], - "properties" : [ - - ], - "swiftCallName" : "Greeter" - }, - { - "constructor" : { - "abiName" : "bjs_Converter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_Converter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Converter", - "namespace" : [ - "Utils", - "Converters" - ], - "properties" : [ - - ], - "swiftCallName" : "Converter" - }, - { - "methods" : [ - { - "abiName" : "bjs_UUID_uuidString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "uuidString", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "UUID", - "namespace" : [ - "__Swift", - "Foundation" - ], - "properties" : [ - - ], - "swiftCallName" : "UUID" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : true, - "functions" : [ - { - "abiName" : "bjs_plainFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "plainFunction", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_MyModule_Utils_namespacedFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "namespacedFunction", - "namespace" : [ - "MyModule", - "Utils" - ], - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json deleted file mode 100644 index 914b7b894..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Greeter", - "namespace" : [ - "__Swift", - "Foundation" - ], - "properties" : [ - - ], - "swiftCallName" : "Greeter" - }, - { - "constructor" : { - "abiName" : "bjs_Converter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_Converter_toString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "toString", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Converter", - "namespace" : [ - "Utils", - "Converters" - ], - "properties" : [ - - ], - "swiftCallName" : "Converter" - }, - { - "methods" : [ - { - "abiName" : "bjs_UUID_uuidString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "uuidString", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "UUID", - "namespace" : [ - "__Swift", - "Foundation" - ], - "properties" : [ - - ], - "swiftCallName" : "UUID" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_plainFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "plainFunction", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_MyModule_Utils_namespacedFunction", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "namespacedFunction", - "namespace" : [ - "MyModule", - "Utils" - ], - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json deleted file mode 100644 index b3a4fc2c0..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Optionals.json +++ /dev/null @@ -1,699 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_Greeter_changeName", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "changeName", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "Greeter", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "Greeter" - }, - { - "constructor" : { - "abiName" : "bjs_OptionalPropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "OptionalPropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalAge", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalGreeter", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "swiftCallName" : "OptionalPropertyHolder" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_roundTripOptionalClass", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalClass", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - } - }, - { - "abiName" : "bjs_testOptionalPropertyRoundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testOptionalPropertyRoundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "holder", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "OptionalPropertyHolder" - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "OptionalPropertyHolder" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripString", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripInt", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripBool", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripBool", - "parameters" : [ - { - "label" : "flag", - "name" : "flag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripFloat", - "parameters" : [ - { - "label" : "number", - "name" : "number", - "type" : { - "optional" : { - "_0" : { - "float" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "float" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripDouble", - "parameters" : [ - { - "label" : "precision", - "name" : "precision", - "type" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripMixSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripMixSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripSwiftSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripSwiftSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripMixedSwiftSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripMixedSwiftSyntax", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripWithSpaces", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripWithSpaces", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripAlias", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripAlias", - "parameters" : [ - { - "label" : "age", - "name" : "age", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "abiName" : "bjs_roundTripOptionalAlias", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalAlias", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "abiName" : "bjs_testMixedOptionals", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testMixedOptionals", - "parameters" : [ - { - "label" : "firstName", - "name" : "firstName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "label" : "lastName", - "name" : "lastName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "label" : "age", - "name" : "age", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "label" : "active", - "name" : "active", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json deleted file mode 100644 index 3b45bf30f..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_check", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "check", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "uint" : { - - } - } - }, - { - "label" : "c", - "name" : "c", - "type" : { - "float" : { - - } - } - }, - { - "label" : "d", - "name" : "d", - "type" : { - "double" : { - - } - } - }, - { - "label" : "e", - "name" : "e", - "type" : { - "bool" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift deleted file mode 100644 index f91e1e213..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveParameters.swift +++ /dev/null @@ -1,9 +0,0 @@ -@_expose(wasm, "bjs_check") -@_cdecl("bjs_check") -public func _bjs_check(_ a: Int32, _ b: Int32, _ c: Float32, _ d: Float64, _ e: Int32) -> Void { - #if arch(wasm32) - check(a: Int.bridgeJSLiftParameter(a), b: UInt.bridgeJSLiftParameter(b), c: Float.bridgeJSLiftParameter(c), d: Double.bridgeJSLiftParameter(d), e: Bool.bridgeJSLiftParameter(e)) - #else - fatalError("Only available on WebAssembly") - #endif -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json deleted file mode 100644 index d70b0c9b5..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PrimitiveReturn.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_checkInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkInt", - "parameters" : [ - - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_checkUInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkUInt", - "parameters" : [ - - ], - "returnType" : { - "uint" : { - - } - } - }, - { - "abiName" : "bjs_checkFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkFloat", - "parameters" : [ - - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_checkDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkDouble", - "parameters" : [ - - ], - "returnType" : { - "double" : { - - } - } - }, - { - "abiName" : "bjs_checkBool", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkBool", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json deleted file mode 100644 index 43d05d9fa..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/PropertyTypes.json +++ /dev/null @@ -1,360 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_PropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "intValue", - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "label" : "floatValue", - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "label" : "doubleValue", - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "label" : "boolValue", - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "stringValue", - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "label" : "jsObject", - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_PropertyHolder_getAllValues", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getAllValues", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "PropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyInt", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyFloat", - "type" : { - "float" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyDouble", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyBool", - "type" : { - "bool" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "readonlyString", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "sibling", - "type" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "lazyValue", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "computedReadonly", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "computedReadWrite", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "observedProperty", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "PropertyHolder" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_createPropertyHolder", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createPropertyHolder", - "parameters" : [ - { - "label" : "intValue", - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "label" : "floatValue", - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "label" : "doubleValue", - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "label" : "boolValue", - "name" : "boolValue", - "type" : { - "bool" : { - - } - } - }, - { - "label" : "stringValue", - "name" : "stringValue", - "type" : { - "string" : { - - } - } - }, - { - "label" : "jsObject", - "name" : "jsObject", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" - } - } - }, - { - "abiName" : "bjs_testPropertyHolder", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testPropertyHolder", - "parameters" : [ - { - "label" : "holder", - "name" : "holder", - "type" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json deleted file mode 100644 index eb8f2426a..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Protocol.json +++ /dev/null @@ -1,898 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Helper_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Helper_increment", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "increment", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "Helper", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "swiftCallName" : "Helper" - }, - { - "constructor" : { - "abiName" : "bjs_MyViewController_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "delegate", - "name" : "delegate", - "type" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_MyViewController_triggerEvent", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "triggerEvent", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewController_updateValue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "updateValue", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewController_updateCount", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "updateCount", - "parameters" : [ - { - "label" : "_", - "name" : "count", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_MyViewController_updateLabel", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "updateLabel", - "parameters" : [ - { - "label" : "_", - "name" : "prefix", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "suffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewController_checkEvenCount", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkEvenCount", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_MyViewController_sendHelper", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "sendHelper", - "parameters" : [ - { - "label" : "_", - "name" : "helper", - "type" : { - "swiftHeapObject" : { - "_0" : "Helper" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "MyViewController", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "delegate", - "type" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "secondDelegate", - "type" : { - "optional" : { - "_0" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - } - } - ], - "swiftCallName" : "MyViewController" - }, - { - "constructor" : { - "abiName" : "bjs_DelegateManager_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "delegates", - "name" : "delegates", - "type" : { - "array" : { - "_0" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_DelegateManager_notifyAll", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "notifyAll", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "DelegateManager", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "delegates", - "type" : { - "array" : { - "_0" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - } - } - ], - "swiftCallName" : "DelegateManager" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "test", - "rawValue" : "test" - }, - { - "associatedValues" : [ - - ], - "name" : "test2", - "rawValue" : "test2" - } - ], - "emitStyle" : "const", - "name" : "ExampleEnum", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "ExampleEnum", - "tsFullPath" : "ExampleEnum" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - } - ], - "emitStyle" : "const", - "name" : "Result", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Result", - "tsFullPath" : "Result" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "low", - "rawValue" : "-1" - }, - { - "associatedValues" : [ - - ], - "name" : "medium", - "rawValue" : "0" - }, - { - "associatedValues" : [ - - ], - "name" : "high", - "rawValue" : "1" - } - ], - "emitStyle" : "const", - "name" : "Priority", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Priority", - "tsFullPath" : "Priority" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_processDelegates", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDelegates", - "parameters" : [ - { - "label" : "_", - "name" : "delegates", - "type" : { - "array" : { - "_0" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - } - } - ], - "returnType" : { - "array" : { - "_0" : { - "swiftProtocol" : { - "_0" : "MyViewControllerDelegate" - } - } - } - } - } - ], - "protocols" : [ - { - "methods" : [ - { - "abiName" : "bjs_MyViewControllerDelegate_onSomethingHappened", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onSomethingHappened", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_onValueChanged", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onValueChanged", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_onCountUpdated", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onCountUpdated", - "parameters" : [ - { - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_onLabelUpdated", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onLabelUpdated", - "parameters" : [ - { - "label" : "_", - "name" : "prefix", - "type" : { - "string" : { - - } - } - }, - { - "label" : "_", - "name" : "suffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_isCountEven", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "isCountEven", - "parameters" : [ - - ], - "returnType" : { - "bool" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_onHelperUpdated", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onHelperUpdated", - "parameters" : [ - { - "label" : "_", - "name" : "helper", - "type" : { - "swiftHeapObject" : { - "_0" : "Helper" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_createHelper", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createHelper", - "parameters" : [ - - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "Helper" - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_onOptionalHelperUpdated", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "onOptionalHelperUpdated", - "parameters" : [ - { - "label" : "_", - "name" : "helper", - "type" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Helper" - } - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_createOptionalHelper", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createOptionalHelper", - "parameters" : [ - - ], - "returnType" : { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Helper" - } - } - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_createEnum", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "createEnum", - "parameters" : [ - - ], - "returnType" : { - "rawValueEnum" : { - "_0" : "ExampleEnum", - "_1" : "String" - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_handleResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "handleResult", - "parameters" : [ - { - "label" : "_", - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "Result" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_MyViewControllerDelegate_getResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getResult", - "parameters" : [ - - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "Result" - } - } - } - ], - "name" : "MyViewControllerDelegate", - "properties" : [ - { - "isReadonly" : false, - "name" : "eventCount", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "name" : "delegateName", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "name" : "optionalName", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "optionalRawEnum", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "ExampleEnum", - "_1" : "String" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "rawStringEnum", - "type" : { - "rawValueEnum" : { - "_0" : "ExampleEnum", - "_1" : "String" - } - } - }, - { - "isReadonly" : false, - "name" : "result", - "type" : { - "associatedValueEnum" : { - "_0" : "Result" - } - } - }, - { - "isReadonly" : false, - "name" : "optionalResult", - "type" : { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "Result" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "direction", - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - }, - { - "isReadonly" : false, - "name" : "directionOptional", - "type" : { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - }, - { - "isReadonly" : false, - "name" : "priority", - "type" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int" - } - } - }, - { - "isReadonly" : false, - "name" : "priorityOptional", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Priority", - "_1" : "Int" - } - } - } - } - } - ] - } - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json deleted file mode 100644 index 0eec726c8..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.Global.json +++ /dev/null @@ -1,336 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_MathUtils_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_MathUtils_static_subtract", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "subtract", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - }, - { - "abiName" : "bjs_MathUtils_static_add", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - }, - { - "abiName" : "bjs_MathUtils_multiply", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "multiply", - "parameters" : [ - { - "label" : "x", - "name" : "x", - "type" : { - "int" : { - - } - } - }, - { - "label" : "y", - "name" : "y", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - } - ], - "name" : "MathUtils", - "properties" : [ - - ], - "swiftCallName" : "MathUtils" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "scientific" - }, - { - "associatedValues" : [ - - ], - "name" : "basic" - } - ], - "emitStyle" : "const", - "name" : "Calculator", - "staticMethods" : [ - { - "abiName" : "bjs_Calculator_static_square", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "square", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "enumName" : { - "_0" : "Calculator" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Calculator", - "tsFullPath" : "Calculator" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - { - "abiName" : "bjs_APIResult_static_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "staticContext" : { - "enumName" : { - "_0" : "APIResult" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils", - "tsFullPath" : "Utils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "String", - "namespace" : [ - "Utils" - ], - "staticMethods" : [ - { - "abiName" : "bjs_Utils_String_static_uppercase", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "uppercase", - "namespace" : [ - "Utils", - "String" - ], - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "Utils.String" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils.String", - "tsFullPath" : "Utils.String" - } - ], - "exposeToGlobal" : true, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json deleted file mode 100644 index 372504135..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticFunctions.json +++ /dev/null @@ -1,336 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_MathUtils_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - { - "abiName" : "bjs_MathUtils_static_subtract", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "subtract", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - }, - { - "abiName" : "bjs_MathUtils_static_add", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "add", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "int" : { - - } - } - }, - { - "label" : "b", - "name" : "b", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "className" : { - "_0" : "MathUtils" - } - } - }, - { - "abiName" : "bjs_MathUtils_multiply", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "multiply", - "parameters" : [ - { - "label" : "x", - "name" : "x", - "type" : { - "int" : { - - } - } - }, - { - "label" : "y", - "name" : "y", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - } - } - ], - "name" : "MathUtils", - "properties" : [ - - ], - "swiftCallName" : "MathUtils" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "scientific" - }, - { - "associatedValues" : [ - - ], - "name" : "basic" - } - ], - "emitStyle" : "const", - "name" : "Calculator", - "staticMethods" : [ - { - "abiName" : "bjs_Calculator_static_square", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "square", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "int" : { - - } - }, - "staticContext" : { - "enumName" : { - "_0" : "Calculator" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Calculator", - "tsFullPath" : "Calculator" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - { - "abiName" : "bjs_APIResult_static_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "staticContext" : { - "enumName" : { - "_0" : "APIResult" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Utils", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils", - "tsFullPath" : "Utils" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "String", - "namespace" : [ - "Utils" - ], - "staticMethods" : [ - { - "abiName" : "bjs_Utils_String_static_uppercase", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "uppercase", - "namespace" : [ - "Utils", - "String" - ], - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - }, - "staticContext" : { - "namespaceEnum" : { - "_0" : "Utils.String" - } - } - } - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Utils.String", - "tsFullPath" : "Utils.String" - } - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json deleted file mode 100644 index 28457fb63..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.Global.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_PropertyClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "PropertyClass", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : true, - "name" : "staticConstant", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticVariable", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "jsObjectProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "jsObject" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "classVariable", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "readOnlyComputed", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "optionalProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "PropertyClass" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "value1" - }, - { - "associatedValues" : [ - - ], - "name" : "value2" - } - ], - "emitStyle" : "const", - "name" : "PropertyEnum", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "enumProperty", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "enumConstant", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedEnum", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "PropertyEnum", - "tsFullPath" : "PropertyEnum" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "PropertyNamespace", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "namespaceProperty", - "namespace" : [ - "PropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "namespaceConstant", - "namespace" : [ - "PropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "PropertyNamespace", - "tsFullPath" : "PropertyNamespace" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Nested", - "namespace" : [ - "PropertyNamespace" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedProperty", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "nestedConstant", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedDouble", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "PropertyNamespace.Nested", - "tsFullPath" : "PropertyNamespace.Nested" - } - ], - "exposeToGlobal" : true, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json deleted file mode 100644 index 829c20718..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StaticProperties.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_PropertyClass_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - - ] - }, - "methods" : [ - - ], - "name" : "PropertyClass", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : true, - "name" : "staticConstant", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "staticVariable", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "jsObjectProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "jsObject" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "classVariable", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "readOnlyComputed", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "optionalProperty", - "staticContext" : { - "className" : { - "_0" : "PropertyClass" - } - }, - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "PropertyClass" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "value1" - }, - { - "associatedValues" : [ - - ], - "name" : "value2" - } - ], - "emitStyle" : "const", - "name" : "PropertyEnum", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "enumProperty", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "enumConstant", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "computedEnum", - "staticContext" : { - "enumName" : { - "_0" : "PropertyEnum" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "PropertyEnum", - "tsFullPath" : "PropertyEnum" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "PropertyNamespace", - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "namespaceProperty", - "namespace" : [ - "PropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "namespaceConstant", - "namespace" : [ - "PropertyNamespace" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "PropertyNamespace", - "tsFullPath" : "PropertyNamespace" - }, - { - "cases" : [ - - ], - "emitStyle" : "const", - "name" : "Nested", - "namespace" : [ - "PropertyNamespace" - ], - "staticMethods" : [ - - ], - "staticProperties" : [ - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedProperty", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "nestedConstant", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "nestedDouble", - "namespace" : [ - "PropertyNamespace", - "Nested" - ], - "staticContext" : { - "namespaceEnum" : { - "_0" : "PropertyNamespace.Nested" - } - }, - "type" : { - "double" : { - - } - } - } - ], - "swiftCallName" : "PropertyNamespace.Nested", - "tsFullPath" : "PropertyNamespace.Nested" - } - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json deleted file mode 100644 index 9116fd482..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_checkString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkString", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_roundtripString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripString", - "parameters" : [ - { - "label" : "a", - "name" : "a", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift deleted file mode 100644 index d980f5bc6..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringParameter.swift +++ /dev/null @@ -1,20 +0,0 @@ -@_expose(wasm, "bjs_checkString") -@_cdecl("bjs_checkString") -public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { - #if arch(wasm32) - checkString(a: String.bridgeJSLiftParameter(aBytes, aLength)) - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundtripString") -@_cdecl("bjs_roundtripString") -public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { - #if arch(wasm32) - let ret = roundtripString(a: String.bridgeJSLiftParameter(aBytes, aLength)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json deleted file mode 100644 index 01f9ca4b7..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_checkString", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "checkString", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift deleted file mode 100644 index 1c260ec55..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/StringReturn.swift +++ /dev/null @@ -1,10 +0,0 @@ -@_expose(wasm, "bjs_checkString") -@_cdecl("bjs_checkString") -public func _bjs_checkString() -> Void { - #if arch(wasm32) - let ret = checkString() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json deleted file mode 100644 index b8f908c2d..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClass.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_Greeter_changeName", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "changeName", - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "name" : "Greeter", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "Greeter" - }, - { - "explicitAccessControl" : "public", - "methods" : [ - - ], - "name" : "PublicGreeter", - "properties" : [ - - ], - "swiftCallName" : "PublicGreeter" - }, - { - "explicitAccessControl" : "package", - "methods" : [ - - ], - "name" : "PackageGreeter", - "properties" : [ - - ], - "swiftCallName" : "PackageGreeter" - } - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_takeGreeter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeGreeter", - "parameters" : [ - { - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "returnType" : { - "void" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json deleted file mode 100644 index 27627407b..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftClosure.json +++ /dev/null @@ -1,1075 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Person_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "explicitAccessControl" : "public", - "methods" : [ - - ], - "name" : "Person", - "properties" : [ - - ], - "swiftCallName" : "Person" - }, - { - "constructor" : { - "abiName" : "bjs_TestProcessor_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "transform", - "name" : "transform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSS_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_TestProcessor_getTransform", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTransform", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSS_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_processWithCustom", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processWithCustom", - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { - - } - } - }, - { - "label" : "customTransform", - "name" : "customTransform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSS_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_printTogether", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "printTogether", - "parameters" : [ - { - "label" : "person", - "name" : "person", - "type" : { - "swiftHeapObject" : { - "_0" : "Person" - } - } - }, - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "label" : "ratio", - "name" : "ratio", - "type" : { - "double" : { - - } - } - }, - { - "label" : "customTransform", - "name" : "customTransform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonCSqSSSqSd_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - } - } - }, - { - "optional" : { - "_0" : { - "string" : { - - } - } - } - }, - { - "optional" : { - "_0" : { - "double" : { - - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "personClosure", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Person" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Person" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_roundtripOptional", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripOptional", - "parameters" : [ - { - "label" : "_", - "name" : "personClosure", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_processDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9DirectionO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "caseEnum" : { - "_0" : "Direction" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule5ThemeO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule10HttpStatusO_Si", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9APIResultO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_makeDirectionChecker", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeDirectionChecker", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9DirectionO_Sb", - "moduleName" : "TestModule", - "parameters" : [ - { - "caseEnum" : { - "_0" : "Direction" - } - } - ], - "returnType" : { - "bool" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_makeThemeValidator", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeThemeValidator", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule5ThemeO_Sb", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - ], - "returnType" : { - "bool" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_makeStatusCodeExtractor", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeStatusCodeExtractor", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule10HttpStatusO_Si", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_makeAPIResultHandler", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultHandler", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9APIResultO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalDirection", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq9DirectionO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq5ThemeO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalAPIResult", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq9APIResultO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_makeOptionalDirectionFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeOptionalDirectionFormatter", - "parameters" : [ - - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq9DirectionO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "optional" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "name" : "TestProcessor", - "properties" : [ - - ], - "swiftCallName" : "TestProcessor" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ - - ], - "name" : "east" - }, - { - "associatedValues" : [ - - ], - "name" : "west" - } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, - { - "associatedValues" : [ - - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ - - ], - "name" : "auto", - "rawValue" : "auto" - } - ], - "emitStyle" : "const", - "name" : "Theme", - "rawType" : "String", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Theme", - "tsFullPath" : "Theme" - }, - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "ok", - "rawValue" : "200" - }, - { - "associatedValues" : [ - - ], - "name" : "notFound", - "rawValue" : "404" - }, - { - "associatedValues" : [ - - ], - "name" : "serverError", - "rawValue" : "500" - }, - { - "associatedValues" : [ - - ], - "name" : "unknown", - "rawValue" : "-1" - } - ], - "emitStyle" : "const", - "name" : "HttpStatus", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "HttpStatus", - "tsFullPath" : "HttpStatus" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "string" : { - - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "int" : { - - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "bool" : { - - } - } - } - ], - "name" : "flag" - }, - { - "associatedValues" : [ - { - "type" : { - "float" : { - - } - } - } - ], - "name" : "rate" - }, - { - "associatedValues" : [ - { - "type" : { - "double" : { - - } - } - } - ], - "name" : "precise" - }, - { - "associatedValues" : [ - - ], - "name" : "info" - } - ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" - } - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json deleted file mode 100644 index ca8f7c625..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.json +++ /dev/null @@ -1,520 +0,0 @@ -{ - "classes" : [ - { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "methods" : [ - { - "abiName" : "bjs_Greeter_greet", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "greet", - "parameters" : [ - - ], - "returnType" : { - "string" : { - - } - } - } - ], - "name" : "Greeter", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "Greeter" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "rough", - "rawValue" : "0.1" - }, - { - "associatedValues" : [ - - ], - "name" : "fine", - "rawValue" : "0.001" - } - ], - "emitStyle" : "const", - "name" : "Precision", - "rawType" : "Float", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Precision", - "tsFullPath" : "Precision" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ - { - "label" : "_", - "name" : "session", - "type" : { - "swiftStruct" : { - "_0" : "Person" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "Person" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - { - "constructor" : { - "abiName" : "bjs_DataPoint_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "x", - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "label" : "y", - "name" : "y", - "type" : { - "double" : { - - } - } - }, - { - "label" : "label", - "name" : "label", - "type" : { - "string" : { - - } - } - }, - { - "label" : "optCount", - "name" : "optCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "label" : "optFlag", - "name" : "optFlag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "DataPoint", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "x", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "y", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "label", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optCount", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optFlag", - "type" : { - "optional" : { - "_0" : { - "bool" : { - - } - } - } - } - } - ], - "swiftCallName" : "DataPoint" - }, - { - "methods" : [ - - ], - "name" : "Address", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "street", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "city", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "zipCode", - "type" : { - "optional" : { - "_0" : { - "int" : { - - } - } - } - } - } - ], - "swiftCallName" : "Address" - }, - { - "methods" : [ - - ], - "name" : "Person", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "age", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "address", - "type" : { - "swiftStruct" : { - "_0" : "Address" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "email", - "type" : { - "optional" : { - "_0" : { - "string" : { - - } - } - } - } - } - ], - "swiftCallName" : "Person" - }, - { - "methods" : [ - - ], - "name" : "Session", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "id", - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "owner", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - } - ], - "swiftCallName" : "Session" - }, - { - "methods" : [ - - ], - "name" : "Measurement", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "value", - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "precision", - "type" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optionalPrecision", - "type" : { - "optional" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - } - } - ], - "swiftCallName" : "Measurement" - }, - { - "methods" : [ - { - "abiName" : "bjs_ConfigStruct_static_update", - "effects" : { - "isAsync" : false, - "isStatic" : true, - "isThrows" : false - }, - "name" : "update", - "parameters" : [ - { - "label" : "_", - "name" : "timeout", - "type" : { - "double" : { - - } - } - } - ], - "returnType" : { - "double" : { - - } - }, - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - } - } - ], - "name" : "ConfigStruct", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : true, - "name" : "maxRetries", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "int" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "defaultConfig", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "string" : { - - } - } - }, - { - "isReadonly" : false, - "isStatic" : true, - "name" : "timeout", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "double" : { - - } - } - }, - { - "isReadonly" : true, - "isStatic" : true, - "name" : "computedSetting", - "staticContext" : { - "structName" : { - "_0" : "ConfigStruct" - } - }, - "type" : { - "string" : { - - } - } - } - ], - "swiftCallName" : "ConfigStruct" - } - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json deleted file mode 100644 index ad47cbf0b..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Throws.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_throwsSomething", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : true - }, - "name" : "throwsSomething", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json deleted file mode 100644 index f38cd9440..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.json +++ /dev/null @@ -1,413 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_takeUnsafeRawPointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeUnsafeRawPointer", - "parameters" : [ - { - "label" : "_", - "name" : "p", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_takeUnsafeMutableRawPointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeUnsafeMutableRawPointer", - "parameters" : [ - { - "label" : "_", - "name" : "p", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_takeOpaquePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeOpaquePointer", - "parameters" : [ - { - "label" : "_", - "name" : "p", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_takeUnsafePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeUnsafePointer", - "parameters" : [ - { - "label" : "_", - "name" : "p", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_takeUnsafeMutablePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "takeUnsafeMutablePointer", - "parameters" : [ - { - "label" : "_", - "name" : "p", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } - } - ], - "returnType" : { - "void" : { - - } - } - }, - { - "abiName" : "bjs_returnUnsafeRawPointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "returnUnsafeRawPointer", - "parameters" : [ - - ], - "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - }, - { - "abiName" : "bjs_returnUnsafeMutableRawPointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "returnUnsafeMutableRawPointer", - "parameters" : [ - - ], - "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - }, - { - "abiName" : "bjs_returnOpaquePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "returnOpaquePointer", - "parameters" : [ - - ], - "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - }, - { - "abiName" : "bjs_returnUnsafePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "returnUnsafePointer", - "parameters" : [ - - ], - "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } - } - } - }, - { - "abiName" : "bjs_returnUnsafeMutablePointer", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "returnUnsafeMutablePointer", - "parameters" : [ - - ], - "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } - }, - { - "abiName" : "bjs_roundTripPointerFields", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripPointerFields", - "parameters" : [ - { - "label" : "_", - "name" : "value", - "type" : { - "swiftStruct" : { - "_0" : "PointerFields" - } - } - } - ], - "returnType" : { - "swiftStruct" : { - "_0" : "PointerFields" - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - { - "constructor" : { - "abiName" : "bjs_PointerFields_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "raw", - "name" : "raw", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - }, - { - "label" : "mutRaw", - "name" : "mutRaw", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - }, - { - "label" : "opaque", - "name" : "opaque", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - }, - { - "label" : "ptr", - "name" : "ptr", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } - } - } - }, - { - "label" : "mutPtr", - "name" : "mutPtr", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "PointerFields", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "raw", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "mutRaw", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "opaque", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "ptr", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "mutPtr", - "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } - } - ], - "swiftCallName" : "PointerFields" - } - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json deleted file mode 100644 index b6b9c7bcb..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_check", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "check", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } - } - ], - "protocols" : [ - - ], - "structs" : [ - - ] -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift deleted file mode 100644 index d5bc03b15..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/VoidParameterVoidReturn.swift +++ /dev/null @@ -1,9 +0,0 @@ -@_expose(wasm, "bjs_check") -@_cdecl("bjs_check") -public func _bjs_check() -> Void { - #if arch(wasm32) - check() - #else - fatalError("Only available on WebAssembly") - #endif -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift deleted file mode 100644 index 551385093..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.Macros.swift +++ /dev/null @@ -1,13 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void - -@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws (JSException) -> Void - -@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift deleted file mode 100644 index 4e2cec8dc..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ArrayParameter.swift +++ /dev/null @@ -1,51 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkArray") -fileprivate func bjs_checkArray(_ a: Int32) -> Void -#else -fileprivate func bjs_checkArray(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkArray(_ a: JSObject) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - bjs_checkArray(aValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkArrayWithLength") -fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void -#else -fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - let bValue = b.bridgeJSLowerParameter() - bjs_checkArrayWithLength(aValue, bValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkArray") -fileprivate func bjs_checkArray(_ a: Int32) -> Void -#else -fileprivate func bjs_checkArray(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkArray(_ a: JSObject) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - bjs_checkArray(aValue) - if let error = _swift_js_take_exception() { - throw error - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift deleted file mode 100644 index 032fcadfc..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.Macros.swift +++ /dev/null @@ -1,21 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripInt(_ v: Double) throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripString(_ v: String) throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripBool(_ v: Bool) throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripFloat(_ v: Double) throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripDouble(_ v: Double) throws (JSException) -> JSPromise - -@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws (JSException) -> JSPromise diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift deleted file mode 100644 index 1cc954b0d..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Async.swift +++ /dev/null @@ -1,124 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncReturnVoid") -fileprivate func bjs_asyncReturnVoid() -> Int32 -#else -fileprivate func bjs_asyncReturnVoid() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncReturnVoid() throws(JSException) -> JSPromise { - let ret = bjs_asyncReturnVoid() - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripInt") -fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 -#else -fileprivate func bjs_asyncRoundTripInt(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripInt(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripString") -fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 -#else -fileprivate func bjs_asyncRoundTripString(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripString(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripBool") -fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 -#else -fileprivate func bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripBool(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripFloat") -fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 -#else -fileprivate func bjs_asyncRoundTripFloat(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripFloat(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripDouble") -fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 -#else -fileprivate func bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripDouble(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_asyncRoundTripJSObject") -fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 -#else -fileprivate func bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_asyncRoundTripJSObject(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSPromise.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift deleted file mode 100644 index 8c60cd218..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.Macros.swift +++ /dev/null @@ -1,14 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func returnAnimatable() throws (JSException) -> Animatable - -@JSClass struct Animatable { - @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject - @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift deleted file mode 100644 index fd16bd0d8..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/Interface.swift +++ /dev/null @@ -1,55 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_returnAnimatable") -fileprivate func bjs_returnAnimatable() -> Int32 -#else -fileprivate func bjs_returnAnimatable() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$returnAnimatable() throws(JSException) -> Animatable { - let ret = bjs_returnAnimatable() - if let error = _swift_js_take_exception() { - throw error - } - return Animatable.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Animatable_animate") -fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 -#else -fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Animatable_getAnimations") -fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 -#else -fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let keyframesValue = keyframes.bridgeJSLowerParameter() - let optionsValue = options.bridgeJSLowerParameter() - let ret = bjs_Animatable_animate(selfValue, keyframesValue, optionsValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) -} - -func _$Animatable_getAnimations(_ self: JSObject, _ options: JSObject) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let optionsValue = options.bridgeJSLowerParameter() - let ret = bjs_Animatable_getAnimations(selfValue, optionsValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift deleted file mode 100644 index 37ccd0287..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/InvalidPropertyNames.Macros.swift +++ /dev/null @@ -1,44 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike - -@JSClass struct ArrayBufferLike { - @JSGetter var byteLength: Double - @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike -} - -@JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming - -@JSClass struct WeirdNaming { - @JSGetter var normalProperty: String - @JSSetter func setNormalProperty(_ value: String) throws (JSException) - @JSGetter(jsName: "property-with-dashes") var property_with_dashes: Double - @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws (JSException) - @JSGetter(jsName: "123invalidStart") var _123invalidStart: Bool - @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws (JSException) - @JSGetter(jsName: "property with spaces") var property_with_spaces: String - @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws (JSException) - @JSGetter(jsName: "@specialChar") var _specialChar: Double - @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws (JSException) - @JSGetter var constructor: String - @JSSetter func setConstructor(_ value: String) throws (JSException) - @JSGetter var `for`: String - @JSSetter func setFor(_ value: String) throws (JSException) - @JSGetter var `Any`: String - @JSSetter(jsName: "Any") func setAny(_ value: String) throws (JSException) - @JSFunction func `as`() throws (JSException) -> Void - @JSFunction func `try`() throws (JSException) -> Void -} - -@JSClass(jsName: "$Weird") struct _Weird { - @JSFunction init() throws (JSException) - @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> Void -} - -@JSFunction func createWeirdClass() throws (JSException) -> _Weird diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift deleted file mode 100644 index f7b2ebc3b..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.Macros.swift +++ /dev/null @@ -1,33 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection - -@JSClass struct DatabaseConnection { - @JSFunction func connect(_ url: String) throws (JSException) -> Void - @JSFunction func execute(_ query: String) throws (JSException) -> JSObject - @JSGetter var isConnected: Bool - @JSGetter var connectionTimeout: Double - @JSSetter func setConnectionTimeout(_ value: Double) throws (JSException) -} - -@JSFunction func createLogger(_ level: String) throws (JSException) -> Logger - -@JSClass struct Logger { - @JSFunction func log(_ message: String) throws (JSException) -> Void - @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void - @JSGetter var level: String -} - -@JSFunction func getConfigManager() throws (JSException) -> ConfigManager - -@JSClass struct ConfigManager { - @JSFunction func get(_ key: String) throws (JSException) -> JSObject - @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void - @JSGetter var configPath: String -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift deleted file mode 100644 index 1c1418af8..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/MultipleImportedTypes.swift +++ /dev/null @@ -1,254 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createDatabaseConnection") -fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 -#else -fileprivate func bjs_createDatabaseConnection(_ config: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection { - let configValue = config.bridgeJSLowerParameter() - let ret = bjs_createDatabaseConnection(configValue) - if let error = _swift_js_take_exception() { - throw error - } - return DatabaseConnection.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createLogger") -fileprivate func bjs_createLogger(_ level: Int32) -> Int32 -#else -fileprivate func bjs_createLogger(_ level: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$createLogger(_ level: String) throws(JSException) -> Logger { - let levelValue = level.bridgeJSLowerParameter() - let ret = bjs_createLogger(levelValue) - if let error = _swift_js_take_exception() { - throw error - } - return Logger.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_getConfigManager") -fileprivate func bjs_getConfigManager() -> Int32 -#else -fileprivate func bjs_getConfigManager() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$getConfigManager() throws(JSException) -> ConfigManager { - let ret = bjs_getConfigManager() - if let error = _swift_js_take_exception() { - throw error - } - return ConfigManager.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_isConnected_get") -fileprivate func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_DatabaseConnection_isConnected_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_get") -fileprivate func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 -#else -fileprivate func bjs_DatabaseConnection_connectionTimeout_get(_ self: Int32) -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connectionTimeout_set") -fileprivate func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void -#else -fileprivate func bjs_DatabaseConnection_connectionTimeout_set(_ self: Int32, _ newValue: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_connect") -fileprivate func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void -#else -fileprivate func bjs_DatabaseConnection_connect(_ self: Int32, _ url: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_DatabaseConnection_execute") -fileprivate func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 -#else -fileprivate func bjs_DatabaseConnection_execute(_ self: Int32, _ query: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$DatabaseConnection_isConnected_get(_ self: JSObject) throws(JSException) -> Bool { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_isConnected_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) -} - -func _$DatabaseConnection_connectionTimeout_get(_ self: JSObject) throws(JSException) -> Double { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_connectionTimeout_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -func _$DatabaseConnection_connectionTimeout_set(_ self: JSObject, _ newValue: Double) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let newValueValue = newValue.bridgeJSLowerParameter() - bjs_DatabaseConnection_connectionTimeout_set(selfValue, newValueValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -func _$DatabaseConnection_connect(_ self: JSObject, _ url: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let urlValue = url.bridgeJSLowerParameter() - bjs_DatabaseConnection_connect(selfValue, urlValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -func _$DatabaseConnection_execute(_ self: JSObject, _ query: String) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let queryValue = query.bridgeJSLowerParameter() - let ret = bjs_DatabaseConnection_execute(selfValue, queryValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Logger_level_get") -fileprivate func bjs_Logger_level_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_Logger_level_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Logger_log") -fileprivate func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void -#else -fileprivate func bjs_Logger_log(_ self: Int32, _ message: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_Logger_error") -fileprivate func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void -#else -fileprivate func bjs_Logger_error(_ self: Int32, _ message: Int32, _ error: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$Logger_level_get(_ self: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_Logger_level_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -func _$Logger_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let messageValue = message.bridgeJSLowerParameter() - bjs_Logger_log(selfValue, messageValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -func _$Logger_error(_ self: JSObject, _ message: String, _ error: JSObject) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let messageValue = message.bridgeJSLowerParameter() - let errorValue = error.bridgeJSLowerParameter() - bjs_Logger_error(selfValue, messageValue, errorValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_ConfigManager_configPath_get") -fileprivate func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_ConfigManager_configPath_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_ConfigManager_get") -fileprivate func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 -#else -fileprivate func bjs_ConfigManager_get(_ self: Int32, _ key: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_ConfigManager_set") -fileprivate func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void -#else -fileprivate func bjs_ConfigManager_set(_ self: Int32, _ key: Int32, _ value: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$ConfigManager_configPath_get(_ self: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_ConfigManager_configPath_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -func _$ConfigManager_get(_ self: JSObject, _ key: String) throws(JSException) -> JSObject { - let selfValue = self.bridgeJSLowerParameter() - let keyValue = key.bridgeJSLowerParameter() - let ret = bjs_ConfigManager_get(selfValue, keyValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) -} - -func _$ConfigManager_set(_ self: JSObject, _ key: String, _ value: JSObject) throws(JSException) -> Void { - let selfValue = self.bridgeJSLowerParameter() - let keyValue = key.bridgeJSLowerParameter() - let valueValue = value.bridgeJSLowerParameter() - bjs_ConfigManager_set(selfValue, keyValue, valueValue) - if let error = _swift_js_take_exception() { - throw error - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift deleted file mode 100644 index 72f503afa..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.Macros.swift +++ /dev/null @@ -1,9 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift deleted file mode 100644 index 6d59ca52f..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveParameters.swift +++ /dev/null @@ -1,17 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_check") -fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void -#else -fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$check(_ a: Double, _ b: Bool) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - let bValue = b.bridgeJSLowerParameter() - bjs_check(aValue, bValue) - if let error = _swift_js_take_exception() { - throw error - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift deleted file mode 100644 index 1f24ec359..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.Macros.swift +++ /dev/null @@ -1,11 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func checkNumber() throws (JSException) -> Double - -@JSFunction func checkBoolean() throws (JSException) -> Bool diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift deleted file mode 100644 index 17f536ba5..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/PrimitiveReturn.swift +++ /dev/null @@ -1,33 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkNumber") -fileprivate func bjs_checkNumber() -> Float64 -#else -fileprivate func bjs_checkNumber() -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkNumber() throws(JSException) -> Double { - let ret = bjs_checkNumber() - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkBoolean") -fileprivate func bjs_checkBoolean() -> Int32 -#else -fileprivate func bjs_checkBoolean() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkBoolean() throws(JSException) -> Bool { - let ret = bjs_checkBoolean() - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift deleted file mode 100644 index f71778e26..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.Macros.swift +++ /dev/null @@ -1,14 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double - -@JSClass struct JsGreeter { - @JSFunction init(_ name: String) throws (JSException) - @JSFunction func greet() throws (JSException) -> String -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift deleted file mode 100644 index 01c2b1e6e..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/ReExportFrom.swift +++ /dev/null @@ -1,53 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_jsRoundTripNumber") -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 -#else -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { - let vValue = v.bridgeJSLowerParameter() - let ret = bjs_jsRoundTripNumber(vValue) - if let error = _swift_js_take_exception() { - throw error - } - return Double.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_JsGreeter_init") -fileprivate func bjs_JsGreeter_init(_ name: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_init(_ name: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_JsGreeter_greet") -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 -#else -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$JsGreeter_init(_ name: String) throws(JSException) -> JSObject { - let nameValue = name.bridgeJSLowerParameter() - let ret = bjs_JsGreeter_init(nameValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSObject.bridgeJSLiftReturn(ret) -} - -func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_JsGreeter_greet(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift deleted file mode 100644 index 7140ecac7..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.Macros.swift +++ /dev/null @@ -1,17 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -enum FeatureFlag: String { - case foo = "foo" - case bar = "bar" -} -extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} - -@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> Void - -@JSFunction func returnsFeatureFlag() throws (JSException) -> FeatureFlag diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift deleted file mode 100644 index 3059865ac..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringEnum.swift +++ /dev/null @@ -1,33 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_takesFeatureFlag") -fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void -#else -fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { - let flagValue = flag.bridgeJSLowerParameter() - bjs_takesFeatureFlag(flagValue) - if let error = _swift_js_take_exception() { - throw error - } -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_returnsFeatureFlag") -fileprivate func bjs_returnsFeatureFlag() -> Int32 -#else -fileprivate func bjs_returnsFeatureFlag() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$returnsFeatureFlag() throws(JSException) -> FeatureFlag { - let ret = bjs_returnsFeatureFlag() - if let error = _swift_js_take_exception() { - throw error - } - return FeatureFlag.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift deleted file mode 100644 index 75ba0eefd..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringParameter.Macros.swift +++ /dev/null @@ -1,11 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func checkString(_ a: String) throws (JSException) -> Void - -@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift deleted file mode 100644 index c7618d7ac..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/StringReturn.Macros.swift +++ /dev/null @@ -1,9 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func checkString() throws (JSException) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift deleted file mode 100644 index 54470e5de..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/SwiftStructImports.ImportMacros.swift +++ /dev/null @@ -1,19 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_translate") -fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 -#else -fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$translate(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { - let pointObjectId = point.bridgeJSLowerParameter() - let dxValue = dx.bridgeJSLowerParameter() - let dyValue = dy.bridgeJSLowerParameter() - let ret = bjs_translate(pointObjectId, dxValue, dyValue) - if let error = _swift_js_take_exception() { - throw error - } - return Point.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift deleted file mode 100644 index eab06f1db..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.Macros.swift +++ /dev/null @@ -1,22 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor - -@JSClass struct TypeScriptProcessor { - @JSFunction func convert(_ ts: String) throws (JSException) -> String - @JSFunction func validate(_ ts: String) throws (JSException) -> Bool - @JSGetter var version: String -} - -@JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator - -@JSClass struct CodeGenerator { - @JSFunction func generate(_ input: JSObject) throws (JSException) -> String - @JSGetter var outputFormat: String -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift deleted file mode 100644 index 54d3b9156..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TS2SkeletonLike.swift +++ /dev/null @@ -1,127 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createTS2Skeleton") -fileprivate func bjs_createTS2Skeleton() -> Int32 -#else -fileprivate func bjs_createTS2Skeleton() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$createTS2Skeleton() throws(JSException) -> TypeScriptProcessor { - let ret = bjs_createTS2Skeleton() - if let error = _swift_js_take_exception() { - throw error - } - return TypeScriptProcessor.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_createCodeGenerator") -fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 -#else -fileprivate func bjs_createCodeGenerator(_ format: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator { - let formatValue = format.bridgeJSLowerParameter() - let ret = bjs_createCodeGenerator(formatValue) - if let error = _swift_js_take_exception() { - throw error - } - return CodeGenerator.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_version_get") -fileprivate func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_TypeScriptProcessor_version_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_convert") -fileprivate func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 -#else -fileprivate func bjs_TypeScriptProcessor_convert(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_TypeScriptProcessor_validate") -fileprivate func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 -#else -fileprivate func bjs_TypeScriptProcessor_validate(_ self: Int32, _ ts: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$TypeScriptProcessor_version_get(_ self: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_version_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -func _$TypeScriptProcessor_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let tsValue = ts.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_convert(selfValue, tsValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -func _$TypeScriptProcessor_validate(_ self: JSObject, _ ts: String) throws(JSException) -> Bool { - let selfValue = self.bridgeJSLowerParameter() - let tsValue = ts.bridgeJSLowerParameter() - let ret = bjs_TypeScriptProcessor_validate(selfValue, tsValue) - if let error = _swift_js_take_exception() { - throw error - } - return Bool.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_CodeGenerator_outputFormat_get") -fileprivate func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 -#else -fileprivate func bjs_CodeGenerator_outputFormat_get(_ self: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_CodeGenerator_generate") -fileprivate func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 -#else -fileprivate func bjs_CodeGenerator_generate(_ self: Int32, _ input: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$CodeGenerator_outputFormat_get(_ self: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_CodeGenerator_outputFormat_get(selfValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -func _$CodeGenerator_generate(_ self: JSObject, _ input: JSObject) throws(JSException) -> String { - let selfValue = self.bridgeJSLowerParameter() - let inputValue = input.bridgeJSLowerParameter() - let ret = bjs_CodeGenerator_generate(selfValue, inputValue) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift deleted file mode 100644 index ef9500566..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.Macros.swift +++ /dev/null @@ -1,9 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift deleted file mode 100644 index 0b5d0c40d..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeAlias.swift +++ /dev/null @@ -1,16 +0,0 @@ -#if arch(wasm32) -@_extern(wasm, module: "Check", name: "bjs_checkSimple") -fileprivate func bjs_checkSimple(_ a: Float64) -> Void -#else -fileprivate func bjs_checkSimple(_ a: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkSimple(_ a: Double) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - bjs_checkSimple(aValue) - if let error = _swift_js_take_exception() { - throw error - } -} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift deleted file mode 100644 index a0857a57e..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.Macros.swift +++ /dev/null @@ -1,16 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSClass struct Greeter { - @JSGetter var name: String - @JSSetter func setName(_ value: String) throws (JSException) - @JSGetter var age: Double - @JSFunction init(_ name: String) throws (JSException) - @JSFunction func greet() throws (JSException) -> String - @JSFunction func changeName(_ name: String) throws (JSException) -> Void -} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift deleted file mode 100644 index 7247e3aff..000000000 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/VoidParameterVoidReturn.Macros.swift +++ /dev/null @@ -1,9 +0,0 @@ -// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, -// DO NOT EDIT. -// -// To update this file, just rebuild your project or run -// `swift package bridge-js`. - -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit - -@JSFunction func check() throws (JSException) -> Void diff --git a/package-lock.json b/package-lock.json index bf7f36315..9366b618d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,8 @@ "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", "tslib": "^2.8.1", - "typescript": "^5.8.2" + "typescript": "^5.8.2", + "vitest": "^4.0.18" } }, "node_modules/@babel/code-frame": { @@ -51,11 +52,454 @@ "integrity": "sha512-54kpBQX69TZ8I1zyDC8sziv/zPT1zoIadv3CmdIZNZ5WDF1houMjAzRZ3dwWvhXObiEBjOxXyS8Ja7vA0EfGEQ==", "dev": true }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", + "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", + "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", + "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", + "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", + "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", + "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", + "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", + "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", + "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", + "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", + "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", + "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", + "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", + "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", + "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", + "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", + "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", + "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", + "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", + "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", + "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", + "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", + "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", + "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", + "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", + "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" }, "node_modules/@rollup/plugin-typescript": { "version": "12.1.2", @@ -108,9 +552,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.37.0.tgz", - "integrity": "sha512-l7StVw6WAa8l3vA1ov80jyetOAEo1FtHvZDbzXDO/02Sq/QVvqlHkYoFwDJPIMj0GKiistsBudfx5tGFnwYWDQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz", + "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==", "cpu": [ "arm" ], @@ -122,9 +566,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.37.0.tgz", - "integrity": "sha512-6U3SlVyMxezt8Y+/iEBcbp945uZjJwjZimu76xoG7tO1av9VO691z8PkhzQ85ith2I8R2RddEPeSfcbyPfD4hA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz", + "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==", "cpu": [ "arm64" ], @@ -136,9 +580,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.37.0.tgz", - "integrity": "sha512-+iTQ5YHuGmPt10NTzEyMPbayiNTcOZDWsbxZYR1ZnmLnZxG17ivrPSWFO9j6GalY0+gV3Jtwrrs12DBscxnlYA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz", + "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==", "cpu": [ "arm64" ], @@ -150,9 +594,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.37.0.tgz", - "integrity": "sha512-m8W2UbxLDcmRKVjgl5J/k4B8d7qX2EcJve3Sut7YGrQoPtCIQGPH5AMzuFvYRWZi0FVS0zEY4c8uttPfX6bwYQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz", + "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==", "cpu": [ "x64" ], @@ -164,9 +608,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.37.0.tgz", - "integrity": "sha512-FOMXGmH15OmtQWEt174v9P1JqqhlgYge/bUjIbiVD1nI1NeJ30HYT9SJlZMqdo1uQFyt9cz748F1BHghWaDnVA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz", + "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==", "cpu": [ "arm64" ], @@ -178,9 +622,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.37.0.tgz", - "integrity": "sha512-SZMxNttjPKvV14Hjck5t70xS3l63sbVwl98g3FlVVx2YIDmfUIy29jQrsw06ewEYQ8lQSuY9mpAPlmgRD2iSsA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz", + "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==", "cpu": [ "x64" ], @@ -192,9 +636,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.37.0.tgz", - "integrity": "sha512-hhAALKJPidCwZcj+g+iN+38SIOkhK2a9bqtJR+EtyxrKKSt1ynCBeqrQy31z0oWU6thRZzdx53hVgEbRkuI19w==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz", + "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==", "cpu": [ "arm" ], @@ -206,9 +650,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.37.0.tgz", - "integrity": "sha512-jUb/kmn/Gd8epbHKEqkRAxq5c2EwRt0DqhSGWjPFxLeFvldFdHQs/n8lQ9x85oAeVb6bHcS8irhTJX2FCOd8Ag==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz", + "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==", "cpu": [ "arm" ], @@ -220,9 +664,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.37.0.tgz", - "integrity": "sha512-oNrJxcQT9IcbcmKlkF+Yz2tmOxZgG9D9GRq+1OE6XCQwCVwxixYAa38Z8qqPzQvzt1FCfmrHX03E0pWoXm1DqA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz", + "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==", "cpu": [ "arm64" ], @@ -234,9 +678,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.37.0.tgz", - "integrity": "sha512-pfxLBMls+28Ey2enpX3JvjEjaJMBX5XlPCZNGxj4kdJyHduPBXtxYeb8alo0a7bqOoWZW2uKynhHxF/MWoHaGQ==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz", + "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==", "cpu": [ "arm64" ], @@ -247,10 +691,24 @@ "linux" ] }, - "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.37.0.tgz", - "integrity": "sha512-yCE0NnutTC/7IGUq/PUHmoeZbIwq3KRh02e9SfFh7Vmc1Z7atuJRYWhRME5fKgT8aS20mwi1RyChA23qSyRGpA==", + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz", + "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz", + "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==", "cpu": [ "loong64" ], @@ -261,10 +719,24 @@ "linux" ] }, - "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.37.0.tgz", - "integrity": "sha512-NxcICptHk06E2Lh3a4Pu+2PEdZ6ahNHuK7o6Np9zcWkrBMuv21j10SQDJW3C9Yf/A/P7cutWoC/DptNLVsZ0VQ==", + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz", + "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz", + "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==", "cpu": [ "ppc64" ], @@ -276,9 +748,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.37.0.tgz", - "integrity": "sha512-PpWwHMPCVpFZLTfLq7EWJWvrmEuLdGn1GMYcm5MV7PaRgwCEYJAwiN94uBuZev0/J/hFIIJCsYw4nLmXA9J7Pw==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz", + "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==", "cpu": [ "riscv64" ], @@ -290,9 +762,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.37.0.tgz", - "integrity": "sha512-DTNwl6a3CfhGTAOYZ4KtYbdS8b+275LSLqJVJIrPa5/JuIufWWZ/QFvkxp52gpmguN95eujrM68ZG+zVxa8zHA==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz", + "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==", "cpu": [ "riscv64" ], @@ -304,103 +776,361 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.37.0.tgz", - "integrity": "sha512-hZDDU5fgWvDdHFuExN1gBOhCuzo/8TMpidfOR+1cPZJflcEzXdCy1LjnklQdW8/Et9sryOPJAKAQRw8Jq7Tg+A==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz", + "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==", "cpu": [ "s390x" ], "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz", + "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz", + "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz", + "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz", + "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz", + "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz", + "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz", + "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz", + "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@standard-schema/spec": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/chai": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", + "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/deep-eql": "*", + "assertion-error": "^2.0.1" + } + }, + "node_modules/@types/deep-eql": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", + "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.13.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", + "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", + "dev": true, + "peer": true, + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@vitest/expect": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz", + "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@standard-schema/spec": "^1.0.0", + "@types/chai": "^5.2.2", + "@vitest/spy": "4.0.18", + "@vitest/utils": "4.0.18", + "chai": "^6.2.1", + "tinyrainbow": "^3.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/mocker": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz", + "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "4.0.18", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.21" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^6.0.0 || ^7.0.0-0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } + } + }, + "node_modules/@vitest/mocker/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, + "node_modules/@vitest/pretty-format": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz", + "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyrainbow": "^3.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz", + "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "4.0.18", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.37.0.tgz", - "integrity": "sha512-pKivGpgJM5g8dwj0ywBwe/HeVAUSuVVJhUTa/URXjxvoyTT/AxsLTAbkHkDHG7qQxLoW2s3apEIl26uUe08LVQ==", - "cpu": [ - "x64" - ], + "node_modules/@vitest/snapshot": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz", + "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "dependencies": { + "@vitest/pretty-format": "4.0.18", + "magic-string": "^0.30.21", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.37.0.tgz", - "integrity": "sha512-E2lPrLKE8sQbY/2bEkVTGDEk4/49UYRVWgj90MY8yPjpnGBQ+Xi1Qnr7b7UIWw1NOggdFQFOLZ8+5CzCiz143w==", - "cpu": [ - "x64" - ], + "node_modules/@vitest/spy": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz", + "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "funding": { + "url": "https://opencollective.com/vitest" + } }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.37.0.tgz", - "integrity": "sha512-Jm7biMazjNzTU4PrQtr7VS8ibeys9Pn29/1bm4ph7CP2kf21950LgN+BaE2mJ1QujnvOc6p54eWWiVvn05SOBg==", - "cpu": [ - "arm64" - ], + "node_modules/@vitest/utils": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz", + "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "dependencies": { + "@vitest/pretty-format": "4.0.18", + "tinyrainbow": "^3.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.37.0.tgz", - "integrity": "sha512-e3/1SFm1OjefWICB2Ucstg2dxYDkDTZGDYgwufcbsxTHyqQps1UQf33dFEChBNmeSsTOyrjw2JJq0zbG5GF6RA==", - "cpu": [ - "ia32" - ], + "node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "engines": { + "node": ">=12" + } }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.37.0.tgz", - "integrity": "sha512-LWbXUBwn/bcLx2sSsqy7pK5o+Nr+VCoRoAohfJ5C/aBio9nfJmGQqHAhU6pwxV/RmyTk5AqdySma7uwWGlmeuA==", - "cpu": [ - "x64" - ], + "node_modules/chai": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", + "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "engines": { + "node": ">=18" + } }, - "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "node_modules/es-module-lexer": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", "dev": true, "license": "MIT" }, - "node_modules/@types/node": { - "version": "22.13.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz", - "integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==", + "node_modules/esbuild": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", + "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", "dev": true, - "dependencies": { - "undici-types": "~6.20.0" + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.27.2", + "@esbuild/android-arm": "0.27.2", + "@esbuild/android-arm64": "0.27.2", + "@esbuild/android-x64": "0.27.2", + "@esbuild/darwin-arm64": "0.27.2", + "@esbuild/darwin-x64": "0.27.2", + "@esbuild/freebsd-arm64": "0.27.2", + "@esbuild/freebsd-x64": "0.27.2", + "@esbuild/linux-arm": "0.27.2", + "@esbuild/linux-arm64": "0.27.2", + "@esbuild/linux-ia32": "0.27.2", + "@esbuild/linux-loong64": "0.27.2", + "@esbuild/linux-mips64el": "0.27.2", + "@esbuild/linux-ppc64": "0.27.2", + "@esbuild/linux-riscv64": "0.27.2", + "@esbuild/linux-s390x": "0.27.2", + "@esbuild/linux-x64": "0.27.2", + "@esbuild/netbsd-arm64": "0.27.2", + "@esbuild/netbsd-x64": "0.27.2", + "@esbuild/openbsd-arm64": "0.27.2", + "@esbuild/openbsd-x64": "0.27.2", + "@esbuild/openharmony-arm64": "0.27.2", + "@esbuild/sunos-x64": "0.27.2", + "@esbuild/win32-arm64": "0.27.2", + "@esbuild/win32-ia32": "0.27.2", + "@esbuild/win32-x64": "0.27.2" } }, "node_modules/estree-walker": { @@ -410,6 +1140,34 @@ "dev": true, "license": "MIT" }, + "node_modules/expect-type": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", + "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -472,14 +1230,45 @@ "optional": true }, "node_modules/magic-string": { - "version": "0.30.17", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", - "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0" + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/obug": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", + "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==", + "dev": true, + "funding": [ + "https://github.com/sponsors/sxzz", + "https://opencollective.com/debug" + ], + "license": "MIT" + }, "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", @@ -487,17 +1276,23 @@ "dev": true, "license": "MIT" }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", + "dev": true, + "license": "MIT" + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "optional": true + "dev": true }, "node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", "engines": { @@ -539,6 +1334,35 @@ "node": ">=18" } }, + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/prettier": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", @@ -577,14 +1401,14 @@ } }, "node_modules/rollup": { - "version": "4.37.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.37.0.tgz", - "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==", + "version": "4.57.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz", + "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/estree": "1.0.6" + "@types/estree": "1.0.8" }, "bin": { "rollup": "dist/bin/rollup" @@ -594,26 +1418,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.37.0", - "@rollup/rollup-android-arm64": "4.37.0", - "@rollup/rollup-darwin-arm64": "4.37.0", - "@rollup/rollup-darwin-x64": "4.37.0", - "@rollup/rollup-freebsd-arm64": "4.37.0", - "@rollup/rollup-freebsd-x64": "4.37.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.37.0", - "@rollup/rollup-linux-arm-musleabihf": "4.37.0", - "@rollup/rollup-linux-arm64-gnu": "4.37.0", - "@rollup/rollup-linux-arm64-musl": "4.37.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.37.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.37.0", - "@rollup/rollup-linux-riscv64-gnu": "4.37.0", - "@rollup/rollup-linux-riscv64-musl": "4.37.0", - "@rollup/rollup-linux-s390x-gnu": "4.37.0", - "@rollup/rollup-linux-x64-gnu": "4.37.0", - "@rollup/rollup-linux-x64-musl": "4.37.0", - "@rollup/rollup-win32-arm64-msvc": "4.37.0", - "@rollup/rollup-win32-ia32-msvc": "4.37.0", - "@rollup/rollup-win32-x64-msvc": "4.37.0", + "@rollup/rollup-android-arm-eabi": "4.57.1", + "@rollup/rollup-android-arm64": "4.57.1", + "@rollup/rollup-darwin-arm64": "4.57.1", + "@rollup/rollup-darwin-x64": "4.57.1", + "@rollup/rollup-freebsd-arm64": "4.57.1", + "@rollup/rollup-freebsd-x64": "4.57.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.57.1", + "@rollup/rollup-linux-arm-musleabihf": "4.57.1", + "@rollup/rollup-linux-arm64-gnu": "4.57.1", + "@rollup/rollup-linux-arm64-musl": "4.57.1", + "@rollup/rollup-linux-loong64-gnu": "4.57.1", + "@rollup/rollup-linux-loong64-musl": "4.57.1", + "@rollup/rollup-linux-ppc64-gnu": "4.57.1", + "@rollup/rollup-linux-ppc64-musl": "4.57.1", + "@rollup/rollup-linux-riscv64-gnu": "4.57.1", + "@rollup/rollup-linux-riscv64-musl": "4.57.1", + "@rollup/rollup-linux-s390x-gnu": "4.57.1", + "@rollup/rollup-linux-x64-gnu": "4.57.1", + "@rollup/rollup-linux-x64-musl": "4.57.1", + "@rollup/rollup-openbsd-x64": "4.57.1", + "@rollup/rollup-openharmony-arm64": "4.57.1", + "@rollup/rollup-win32-arm64-msvc": "4.57.1", + "@rollup/rollup-win32-ia32-msvc": "4.57.1", + "@rollup/rollup-win32-x64-gnu": "4.57.1", + "@rollup/rollup-win32-x64-msvc": "4.57.1", "fsevents": "~2.3.2" } }, @@ -639,6 +1468,37 @@ "typescript": "^4.5 || ^5.0" } }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/std-env": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", + "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", + "dev": true, + "license": "MIT" + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -652,6 +1512,50 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyexec": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", + "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.3" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyrainbow": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz", + "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -680,6 +1584,191 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true + }, + "node_modules/vite": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", + "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.27.0", + "fdir": "^6.5.0", + "picomatch": "^4.0.3", + "postcss": "^8.5.6", + "rollup": "^4.43.0", + "tinyglobby": "^0.2.15" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^20.19.0 || >=22.12.0", + "jiti": ">=1.21.0", + "less": "^4.0.0", + "lightningcss": "^1.21.0", + "sass": "^1.70.0", + "sass-embedded": "^1.70.0", + "stylus": ">=0.54.8", + "sugarss": "^5.0.0", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/vitest": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz", + "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/expect": "4.0.18", + "@vitest/mocker": "4.0.18", + "@vitest/pretty-format": "4.0.18", + "@vitest/runner": "4.0.18", + "@vitest/snapshot": "4.0.18", + "@vitest/spy": "4.0.18", + "@vitest/utils": "4.0.18", + "es-module-lexer": "^1.7.0", + "expect-type": "^1.2.2", + "magic-string": "^0.30.21", + "obug": "^2.1.1", + "pathe": "^2.0.3", + "picomatch": "^4.0.3", + "std-env": "^3.10.0", + "tinybench": "^2.9.0", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tinyrainbow": "^3.0.3", + "vite": "^6.0.0 || ^7.0.0", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@opentelemetry/api": "^1.9.0", + "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", + "@vitest/browser-playwright": "4.0.18", + "@vitest/browser-preview": "4.0.18", + "@vitest/browser-webdriverio": "4.0.18", + "@vitest/ui": "4.0.18", + "happy-dom": "*", + "jsdom": "*" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser-playwright": { + "optional": true + }, + "@vitest/browser-preview": { + "optional": true + }, + "@vitest/browser-webdriverio": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + } + } + }, + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, + "engines": { + "node": ">=8" + } } } } diff --git a/package.json b/package.json index da7d5356d..1f3f1871b 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "rollup": "^4.37.0", "rollup-plugin-dts": "^6.2.1", "tslib": "^2.8.1", - "typescript": "^5.8.2" + "typescript": "^5.8.2", + "vitest": "^4.0.18" } } From d4da0e3e7981b8b8db5b7a86d10724e3d7aab58f Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 3 Feb 2026 11:07:28 +0100 Subject: [PATCH 129/252] BridgeJS: Exception checking on protocol wrapper methods BridgeJS: Enforce throws(JSException) on @JS protocol methods --- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../Sources/BridgeJSCore/ImportTS.swift | 32 +-- .../BridgeJSCore/SwiftToSkeleton.swift | 9 + .../Sources/BridgeJSLink/JSGlueGen.swift | 20 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 1 + .../Inputs/MacroSwift/Protocol.swift | 24 +- .../BridgeJSCodegenTests/Protocol.json | 24 +- .../BridgeJSCodegenTests/Protocol.swift | 60 ++++- .../Exporting-Swift-Protocols.md | 30 +-- .../BridgeJSRuntimeTests/ExportAPITests.swift | 60 ++--- .../Generated/BridgeJS.swift | 209 +++++++++++++++--- .../Generated/JavaScript/BridgeJS.json | 40 ++-- 12 files changed, 359 insertions(+), 154 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 0c5debeac..85aeee131 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1346,7 +1346,7 @@ struct ProtocolCodegen { let builder = ImportTS.CallJSEmission( moduleName: moduleName, abiName: "_extern_\(method.name)", - context: .exportSwift + context: .exportSwiftProtocol ) try builder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil))) for param in method.parameters { @@ -1359,7 +1359,7 @@ struct ProtocolCodegen { let signature = SwiftSignatureBuilder.buildFunctionSignature( parameters: method.parameters, returnType: method.returnType, - effects: nil + effects: method.effects ) // Build extern declaration using helper function diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 7c391eea0..70dda3848 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -187,8 +187,8 @@ public struct ImportTS { body.append("let ret = \(raw: callExpr)") } - // Add exception check for ImportTS context - if context == .importTS { + // Add exception check for contexts that call INTO JavaScript + if context == .importTS || context == .exportSwiftProtocol { body.append("if let error = _swift_js_take_exception() { throw error }") } } @@ -887,7 +887,7 @@ extension BridgeType { Swift classes can only be used in @JS protocols where Swift owns the instance. """ ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) } case .swiftProtocol: @@ -896,14 +896,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LoweringParameterInfo(loweredParameters: [("value", .i32)]) } case .rawValueEnum(_, let rawType): switch context { case .importTS: return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: // For protocol export we return .i32 for String raw value type instead of nil return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) } @@ -911,7 +911,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LoweringParameterInfo(loweredParameters: [("caseId", .i32)]) } case .swiftStruct: @@ -919,7 +919,7 @@ extension BridgeType { case .importTS: // Swift structs are bridged as JS objects (object IDs) in imported signatures. return LoweringParameterInfo(loweredParameters: [("objectId", .i32)]) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LoweringParameterInfo(loweredParameters: []) } case .namespaceEnum: @@ -928,7 +928,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) var params = [("isSome", WasmCoreType.i32)] params.append(contentsOf: wrappedInfo.loweredParameters) @@ -938,7 +938,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LoweringParameterInfo(loweredParameters: []) } } @@ -981,7 +981,7 @@ extension BridgeType { JavaScript cannot create Swift heap objects. """ ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LiftingReturnInfo(valueToLift: .pointer) } case .swiftProtocol: @@ -990,14 +990,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LiftingReturnInfo(valueToLift: .i32) } case .rawValueEnum(_, let rawType): switch context { case .importTS: return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: // For protocol export we return .i32 for String raw value type instead of nil return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) } @@ -1005,7 +1005,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LiftingReturnInfo(valueToLift: .i32) } case .swiftStruct: @@ -1013,7 +1013,7 @@ extension BridgeType { case .importTS: // Swift structs are bridged as JS objects (object IDs) in imported signatures. return LiftingReturnInfo(valueToLift: .i32) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LiftingReturnInfo(valueToLift: nil) } case .namespaceEnum: @@ -1022,7 +1022,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) } @@ -1030,7 +1030,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return LiftingReturnInfo(valueToLift: nil) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index b780012f0..edcb0a391 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1608,6 +1608,15 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return nil } + guard effects.isThrows else { + diagnose( + node: node, + message: "@JS protocol methods must be throws.", + hint: "Declare the method as 'throws(JSException)'." + ) + return nil + } + return ExportedFunction( name: name, abiName: abiName, diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 28f756a43..9a1979491 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1477,7 +1477,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return .swiftHeapObjectLiftParameter(name) } case .swiftProtocol: return .jsObjectLiftParameter @@ -1491,7 +1491,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return try .optionalLiftParameter(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -1508,7 +1508,7 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be passed as parameters to imported JS functions: \(fullName)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["caseId"], @@ -1526,7 +1526,7 @@ struct IntrinsicJSFragment: Sendable { switch context { case .importTS: return .jsObjectLiftRetainedObjectId - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: [], @@ -1558,7 +1558,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Arrays are not yet supported to be passed as parameters to imported JS functions" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return try arrayLift(elementType: elementType) } } @@ -1578,7 +1578,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return .swiftHeapObjectLowerReturn } case .swiftProtocol: return .jsObjectLowerReturn @@ -1589,7 +1589,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return try .optionalLowerReturn(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -1606,7 +1606,7 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be returned from imported JS functions: \(fullName)" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return associatedValueLowerReturn(fullName: fullName) } case .swiftStruct(let fullName): @@ -1614,7 +1614,7 @@ struct IntrinsicJSFragment: Sendable { case .importTS: // ImportTS expects Swift structs to come back as a retained JS object ID. return .jsObjectLowerReturn - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return swiftStructLowerReturn(fullName: fullName) } case .closure: @@ -1640,7 +1640,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Arrays are not yet supported to be returned from imported JS functions" ) - case .exportSwift: + case .exportSwift, .exportSwiftProtocol: return try arrayLower(elementType: elementType) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 5013dda66..01382e642 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -71,6 +71,7 @@ public struct ABINameGenerator { public enum BridgeContext: Sendable { case importTS case exportSwift + case exportSwiftProtocol } public struct ClosureSignature: Codable, Equatable, Hashable, Sendable { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift index fbbad0615..3e8df7405 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift @@ -47,18 +47,18 @@ import JavaScriptKit var directionOptional: Direction? { get set } var priority: Priority { get set } var priorityOptional: Priority? { get set } - func onSomethingHappened() - func onValueChanged(_ value: String) - func onCountUpdated(count: Int) -> Bool - func onLabelUpdated(_ prefix: String, _ suffix: String) - func isCountEven() -> Bool - func onHelperUpdated(_ helper: Helper) - func createHelper() -> Helper - func onOptionalHelperUpdated(_ helper: Helper?) - func createOptionalHelper() -> Helper? - func createEnum() -> ExampleEnum - func handleResult(_ result: Result) - func getResult() -> Result + func onSomethingHappened() throws(JSException) + func onValueChanged(_ value: String) throws(JSException) + func onCountUpdated(count: Int) throws(JSException) -> Bool + func onLabelUpdated(_ prefix: String, _ suffix: String) throws(JSException) + func isCountEven() throws(JSException) -> Bool + func onHelperUpdated(_ helper: Helper) throws(JSException) + func createHelper() throws(JSException) -> Helper + func onOptionalHelperUpdated(_ helper: Helper?) throws(JSException) + func createOptionalHelper() throws(JSException) -> Helper? + func createEnum() throws(JSException) -> ExampleEnum + func handleResult(_ result: Result) throws(JSException) + func getResult() throws(JSException) -> Result } @JS class MyViewController { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json index 5713a2898..2f9c27ace 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -499,7 +499,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onSomethingHappened", "parameters" : [ @@ -516,7 +516,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onValueChanged", "parameters" : [ @@ -541,7 +541,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onCountUpdated", "parameters" : [ @@ -566,7 +566,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onLabelUpdated", "parameters" : [ @@ -600,7 +600,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "isCountEven", "parameters" : [ @@ -617,7 +617,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onHelperUpdated", "parameters" : [ @@ -642,7 +642,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "createHelper", "parameters" : [ @@ -659,7 +659,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "onOptionalHelperUpdated", "parameters" : [ @@ -688,7 +688,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "createOptionalHelper", "parameters" : [ @@ -709,7 +709,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "createEnum", "parameters" : [ @@ -727,7 +727,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "handleResult", "parameters" : [ @@ -752,7 +752,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getResult", "parameters" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 21178521d..91efeda7f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -1,76 +1,112 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func onSomethingHappened() -> Void { + func onSomethingHappened() throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() _extern_onSomethingHappened(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } } - func onValueChanged(_ value: String) -> Void { + func onValueChanged(_ value: String) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let valueValue = value.bridgeJSLowerParameter() _extern_onValueChanged(jsObjectValue, valueValue) + if let error = _swift_js_take_exception() { + throw error + } } - func onCountUpdated(count: Int) -> Bool { + func onCountUpdated(count: Int) throws(JSException) -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let countValue = count.bridgeJSLowerParameter() let ret = _extern_onCountUpdated(jsObjectValue, countValue) + if let error = _swift_js_take_exception() { + throw error + } return Bool.bridgeJSLiftReturn(ret) } - func onLabelUpdated(_ prefix: String, _ suffix: String) -> Void { + func onLabelUpdated(_ prefix: String, _ suffix: String) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let prefixValue = prefix.bridgeJSLowerParameter() let suffixValue = suffix.bridgeJSLowerParameter() _extern_onLabelUpdated(jsObjectValue, prefixValue, suffixValue) + if let error = _swift_js_take_exception() { + throw error + } } - func isCountEven() -> Bool { + func isCountEven() throws(JSException) -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_isCountEven(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Bool.bridgeJSLiftReturn(ret) } - func onHelperUpdated(_ helper: Helper) -> Void { + func onHelperUpdated(_ helper: Helper) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let helperPointer = helper.bridgeJSLowerParameter() _extern_onHelperUpdated(jsObjectValue, helperPointer) + if let error = _swift_js_take_exception() { + throw error + } } - func createHelper() -> Helper { + func createHelper() throws(JSException) -> Helper { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createHelper(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Helper.bridgeJSLiftReturn(ret) } - func onOptionalHelperUpdated(_ helper: Optional) -> Void { + func onOptionalHelperUpdated(_ helper: Optional) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameter() _extern_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer) + if let error = _swift_js_take_exception() { + throw error + } } - func createOptionalHelper() -> Optional { + func createOptionalHelper() throws(JSException) -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createOptionalHelper(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Optional.bridgeJSLiftReturn(ret) } - func createEnum() -> ExampleEnum { + func createEnum() throws(JSException) -> ExampleEnum { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createEnum(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return ExampleEnum.bridgeJSLiftReturn(ret) } - func handleResult(_ result: Result) -> Void { + func handleResult(_ result: Result) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let resultCaseId = result.bridgeJSLowerParameter() _extern_handleResult(jsObjectValue, resultCaseId) + if let error = _swift_js_take_exception() { + throw error + } } - func getResult() -> Result { + func getResult() throws(JSException) -> Result { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getResult(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Result.bridgeJSLiftReturn(ret) } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 111b1f052..4b58276ea 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -15,7 +15,7 @@ When you mark a protocol with `@JS`, BridgeJS generates: ## Example: Counter Protocol -Mark a Swift protocol with `@JS` to expose it: +Mark a Swift protocol with `@JS` to expose it. Protocol methods must declare `throws(JSException)` to align with the import side error handling: ```swift import JavaScriptKit @@ -24,9 +24,9 @@ import JavaScriptKit var count: Int { get set } var name: String { get } var label: String? { get set } - func increment(by amount: Int) - func reset() - func getValue() -> Int + func increment(by amount: Int) throws(JSException) + func reset() throws(JSException) + func getValue() throws(JSException) -> Int } @JS class CounterManager { @@ -122,24 +122,24 @@ You can also implement protocols in Swift and use them from JavaScript: @JS protocol Counter { var count: Int { get set } var name: String { get } - func increment(by amount: Int) - func reset() - func getValue() -> Int + func increment(by amount: Int) throws(JSException) + func reset() throws(JSException) + func getValue() throws(JSException) -> Int } final class SwiftCounter: Counter { var count = 0 let name = "SwiftCounter" - - func increment(by amount: Int) { + + func increment(by amount: Int) throws(JSException) { count += amount } - - func reset() { + + func reset() throws(JSException) { count = 0 } - - func getValue() -> Int { + + func getValue() throws(JSException) -> Int { return count } } @@ -195,7 +195,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { } } - func increment(by amount: Int) { + func increment(by amount: Int) throws(JSException) { @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") func _extern_increment(this: Int32, amount: Int32) _extern_increment( @@ -212,7 +212,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { | Swift Feature | Status | |:--------------|:-------| -| Method requirements: `func foo(_ param: String?) -> FooClass?` | ✅ | +| Method requirements: `func foo(_ param: String?) throws(JSException) -> FooClass?` | ✅ | | Property requirements: `var property: Type { get }` / `var property: Type { get set }` | ✅ | | Optional parameters / return values in methods | ✅ | | Optional properties | ✅ | diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 711a42e2d..520fe8298 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -988,17 +988,17 @@ enum GraphOperations { var apiResult: APIResult? { get set } var helper: Greeter { get set } var optionalHelper: Greeter? { get set } - func increment(by amount: Int) - func getValue() -> Int - func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) - func getLabel() -> String - func isEven() -> Bool - func processGreeter(_ greeter: Greeter) -> String - func createGreeter() -> Greeter - func processOptionalGreeter(_ greeter: Greeter?) -> String - func createOptionalGreeter() -> Greeter? - func handleAPIResult(_ result: APIResult?) - func getAPIResult() -> APIResult? + func increment(by amount: Int) throws(JSException) + func getValue() throws(JSException) -> Int + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) throws(JSException) + func getLabel() throws(JSException) -> String + func isEven() throws(JSException) -> Bool + func processGreeter(_ greeter: Greeter) throws(JSException) -> String + func createGreeter() throws(JSException) -> Greeter + func processOptionalGreeter(_ greeter: Greeter?) throws(JSException) -> String + func createOptionalGreeter() throws(JSException) -> Greeter? + func handleAPIResult(_ result: APIResult?) throws(JSException) + func getAPIResult() throws(JSException) -> APIResult? } @JS class DataProcessorManager { @@ -1011,33 +1011,33 @@ enum GraphOperations { self.backupProcessor = nil } - @JS func incrementByAmount(_ amount: Int) { - processor.increment(by: amount) + @JS func incrementByAmount(_ amount: Int) throws(JSException) { + try processor.increment(by: amount) } - @JS func setProcessorLabel(_ prefix: String, _ suffix: String) { - processor.setLabelElements(prefix, suffix) + @JS func setProcessorLabel(_ prefix: String, _ suffix: String) throws(JSException) { + try processor.setLabelElements(prefix, suffix) } - @JS func isProcessorEven() -> Bool { - return processor.isEven() + @JS func isProcessorEven() throws(JSException) -> Bool { + return try processor.isEven() } - @JS func getProcessorLabel() -> String { - return processor.getLabel() + @JS func getProcessorLabel() throws(JSException) -> String { + return try processor.getLabel() } - @JS func getCurrentValue() -> Int { - return processor.getValue() + @JS func getCurrentValue() throws(JSException) -> Int { + return try processor.getValue() } - @JS func incrementBoth() { - processor.increment(by: 1) - backupProcessor?.increment(by: 1) + @JS func incrementBoth() throws(JSException) { + try processor.increment(by: 1) + try backupProcessor?.increment(by: 1) } - @JS func getBackupValue() -> Int? { - return backupProcessor?.getValue() + @JS func getBackupValue() throws(JSException) -> Int? { + return try backupProcessor?.getValue() } @JS func hasBackup() -> Bool { @@ -1084,12 +1084,12 @@ enum GraphOperations { processor.httpStatus = status } - @JS func getProcessorAPIResult() -> APIResult? { - return processor.getAPIResult() + @JS func getProcessorAPIResult() throws(JSException) -> APIResult? { + return try processor.getAPIResult() } - @JS func setProcessorAPIResult(_ apiResult: APIResult?) { - processor.handleAPIResult(apiResult) + @JS func setProcessorAPIResult(_ apiResult: APIResult?) throws(JSException) { + try processor.handleAPIResult(apiResult) } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 55a77466e..b9b7dc1dc 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -921,72 +921,105 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_S struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func increment(by amount: Int) -> Void { + func increment(by amount: Int) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let amountValue = amount.bridgeJSLowerParameter() _extern_increment(jsObjectValue, amountValue) + if let error = _swift_js_take_exception() { + throw error + } } - func getValue() -> Int { + func getValue() throws(JSException) -> Int { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getValue(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Int.bridgeJSLiftReturn(ret) } - func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void { + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let labelPrefixValue = labelPrefix.bridgeJSLowerParameter() let labelSuffixValue = labelSuffix.bridgeJSLowerParameter() _extern_setLabelElements(jsObjectValue, labelPrefixValue, labelSuffixValue) + if let error = _swift_js_take_exception() { + throw error + } } - func getLabel() -> String { + func getLabel() throws(JSException) -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getLabel(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return String.bridgeJSLiftReturn(ret) } - func isEven() -> Bool { + func isEven() throws(JSException) -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_isEven(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Bool.bridgeJSLiftReturn(ret) } - func processGreeter(_ greeter: Greeter) -> String { + func processGreeter(_ greeter: Greeter) throws(JSException) -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let greeterPointer = greeter.bridgeJSLowerParameter() let ret = _extern_processGreeter(jsObjectValue, greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } return String.bridgeJSLiftReturn(ret) } - func createGreeter() -> Greeter { + func createGreeter() throws(JSException) -> Greeter { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createGreeter(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Greeter.bridgeJSLiftReturn(ret) } - func processOptionalGreeter(_ greeter: Optional) -> String { + func processOptionalGreeter(_ greeter: Optional) throws(JSException) -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } return String.bridgeJSLiftReturn(ret) } - func createOptionalGreeter() -> Optional { + func createOptionalGreeter() throws(JSException) -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createOptionalGreeter(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Optional.bridgeJSLiftReturn(ret) } - func handleAPIResult(_ result: Optional) -> Void { + func handleAPIResult(_ result: Optional) throws(JSException) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter() _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId) + if let error = _swift_js_take_exception() { + throw error + } } - func getAPIResult() -> Optional { + func getAPIResult() throws(JSException) -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getAPIResult(jsObjectValue) + if let error = _swift_js_take_exception() { + throw error + } return Optional.bridgeJSLiftReturn(ret) } @@ -6559,7 +6592,21 @@ public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableR @_cdecl("bjs_DataProcessorManager_incrementByAmount") public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) + do { + try DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6569,7 +6616,21 @@ public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_setProcessorLabel") public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + do { + try DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6579,8 +6640,22 @@ public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_isProcessorEven") public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() - return ret.bridgeJSLowerReturn() + do { + let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } #else fatalError("Only available on WebAssembly") #endif @@ -6590,8 +6665,22 @@ public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_getProcessorLabel") public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() - return ret.bridgeJSLowerReturn() + do { + let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6601,8 +6690,22 @@ public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_getCurrentValue") public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() - return ret.bridgeJSLowerReturn() + do { + let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } #else fatalError("Only available on WebAssembly") #endif @@ -6612,7 +6715,21 @@ public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_incrementBoth") public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() + do { + try DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6622,8 +6739,22 @@ public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_getBackupValue") public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() - return ret.bridgeJSLowerReturn() + do { + let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6749,8 +6880,22 @@ public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMuta @_cdecl("bjs_DataProcessorManager_getProcessorAPIResult") public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() - return ret.bridgeJSLowerReturn() + do { + let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif @@ -6760,7 +6905,21 @@ public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_setProcessorAPIResult") public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) + do { + try DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: String(describing: error)) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index e31c69a51..83845dd45 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -1365,7 +1365,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "incrementByAmount", "parameters" : [ @@ -1390,7 +1390,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "setProcessorLabel", "parameters" : [ @@ -1424,7 +1424,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "isProcessorEven", "parameters" : [ @@ -1441,7 +1441,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getProcessorLabel", "parameters" : [ @@ -1458,7 +1458,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getCurrentValue", "parameters" : [ @@ -1475,7 +1475,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "incrementBoth", "parameters" : [ @@ -1492,7 +1492,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getBackupValue", "parameters" : [ @@ -1784,7 +1784,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getProcessorAPIResult", "parameters" : [ @@ -1805,7 +1805,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "setProcessorAPIResult", "parameters" : [ @@ -9844,7 +9844,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "increment", "parameters" : [ @@ -9869,7 +9869,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getValue", "parameters" : [ @@ -9886,7 +9886,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "setLabelElements", "parameters" : [ @@ -9920,7 +9920,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getLabel", "parameters" : [ @@ -9937,7 +9937,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "isEven", "parameters" : [ @@ -9954,7 +9954,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "processGreeter", "parameters" : [ @@ -9979,7 +9979,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "createGreeter", "parameters" : [ @@ -9996,7 +9996,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "processOptionalGreeter", "parameters" : [ @@ -10025,7 +10025,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "createOptionalGreeter", "parameters" : [ @@ -10046,7 +10046,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "handleAPIResult", "parameters" : [ @@ -10075,7 +10075,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : false + "isThrows" : true }, "name" : "getAPIResult", "parameters" : [ From 1714f28643d04ef6c078675ba61f6efede1f65ff Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 29 Jan 2026 13:58:18 +0400 Subject: [PATCH 130/252] BridgeJS: Add JSObject and @JSClass struct support for arrays and struct --- .../Sources/BridgeJSCore/ExportSwift.swift | 24 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 1 - .../Inputs/MacroSwift/ArrayTypes.swift | 5 +- .../ImportedTypeInExportedInterface.swift | 10 + .../Inputs/MacroSwift/SwiftStruct.swift | 7 + .../BridgeJSCodegenTests/ArrayTypes.json | 133 +++++++-- .../BridgeJSCodegenTests/ArrayTypes.swift | 75 +++-- .../ImportedTypeInExportedInterface.json | 131 +++++++++ .../ImportedTypeInExportedInterface.swift | 111 ++++++++ .../BridgeJSCodegenTests/SwiftStruct.json | 58 ++++ .../BridgeJSCodegenTests/SwiftStruct.swift | 60 ++++ .../BridgeJSLinkTests/ArrayTypes.d.ts | 4 +- .../BridgeJSLinkTests/ArrayTypes.js | 93 +++++- .../ImportedTypeInExportedInterface.d.ts | 7 + .../ImportedTypeInExportedInterface.js | 138 +++++++++ .../BridgeJSLinkTests/SwiftStruct.d.ts | 5 + .../BridgeJSLinkTests/SwiftStruct.js | 85 ++++++ .../Exporting-Swift/Exporting-Swift-Array.md | 2 + .../Exporting-Swift/Exporting-Swift-Struct.md | 2 + .../BridgeJSRuntimeTests/ExportAPITests.swift | 16 ++ .../Generated/BridgeJS.swift | 207 ++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 264 ++++++++++++++++++ Tests/BridgeJSRuntimeTests/StructAPIs.swift | 20 ++ Tests/prelude.mjs | 56 ++++ 24 files changed, 1463 insertions(+), 51 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 85aeee131..33c455642 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -794,8 +794,10 @@ struct StackCodegen { func liftExpression(for type: BridgeType) -> ExprSyntax { switch type { case .string, .int, .uint, .bool, .float, .double, - .jsObject, .swiftStruct, .swiftHeapObject: + .jsObject(nil), .swiftStruct, .swiftHeapObject: return "\(raw: type.swiftType).bridgeJSLiftParameter()" + case .jsObject(let className?): + return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSLiftParameter())" case .unsafePointer: return "\(raw: type.swiftType).bridgeJSLiftParameter()" case .swiftProtocol(let protocolName): @@ -830,9 +832,11 @@ struct StackCodegen { func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { switch elementType { case .int, .uint, .float, .double, .string, .bool, - .jsObject, .swiftStruct, .caseEnum, .swiftHeapObject, + .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, .unsafePointer, .rawValueEnum, .associatedValueEnum: return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" + case .jsObject(_?): + return liftArrayExpressionInline(elementType: elementType) case .swiftProtocol(let protocolName): return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" case .optional, .array, .closure: @@ -861,9 +865,11 @@ struct StackCodegen { private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { switch wrappedType { - case .string, .int, .uint, .bool, .float, .double, .jsObject, + case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: return "Optional<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" + case .jsObject(let className?): + return "Optional.bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" case .array(let elementType): let arrayLift = liftArrayExpression(elementType: elementType) let swiftTypeName = elementType.swiftType @@ -896,8 +902,10 @@ struct StackCodegen { switch type { case .string, .int, .uint, .bool, .float, .double: return ["\(raw: accessor).bridgeJSLowerStackReturn()"] - case .jsObject: + case .jsObject(nil): return ["\(raw: accessor).bridgeJSLowerStackReturn()"] + case .jsObject(_?): + return ["\(raw: accessor).jsObject.bridgeJSLowerStackReturn()"] case .swiftHeapObject, .unsafePointer, .closure: return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .swiftProtocol(let protocolName): @@ -923,9 +931,11 @@ struct StackCodegen { ) -> [CodeBlockItemSyntax] { switch elementType { case .int, .uint, .float, .double, .string, .bool, - .jsObject, .swiftStruct, .caseEnum, .swiftHeapObject, + .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, .unsafePointer, .rawValueEnum, .associatedValueEnum: return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .jsObject(_?): + return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] case .optional, .array, .closure: @@ -1003,8 +1013,10 @@ struct StackCodegen { case .associatedValueEnum: // Push payloads via bridgeJSLowerParameter(), then push the returned case ID return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .jsObject: + case .jsObject(nil): return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] + case .jsObject(_?): + return ["\(raw: unwrappedVar).jsObject.bridgeJSLowerStackReturn()"] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) default: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9a1979491..791bb8a8d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2474,7 +2474,6 @@ struct IntrinsicJSFragment: Sendable { let idVar = scope.variable("objId") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [] } ) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift index 678bc3698..c1980cbc2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift @@ -55,6 +55,9 @@ @JS func processItemArray(_ items: [Item]) -> [Item] @JS func processNestedItemArray(_ items: [[Item]]) -> [[Item]] +@JS func processJSObjectArray(_ objects: [JSObject]) -> [JSObject] +@JS func processOptionalJSObjectArray(_ objects: [JSObject?]) -> [JSObject?] +@JS func processNestedJSObjectArray(_ objects: [[JSObject]]) -> [[JSObject]] + @JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void @JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void -@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift index 9e3524284..db167c5a9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportedTypeInExportedInterface.swift @@ -5,3 +5,13 @@ @JS func makeFoo() throws(JSException) -> Foo { return try Foo() } + +@JS func processFooArray(_ foos: [Foo]) -> [Foo] +@JS func processOptionalFooArray(_ foos: [Foo?]) -> [Foo?] + +@JS struct FooContainer { + var foo: Foo + var optionalFoo: Foo? +} + +@JS func roundtripFooContainer(_ container: FooContainer) -> FooContainer diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift index ac316a05a..0d84f4736 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift @@ -53,3 +53,10 @@ @JS static var computedSetting: String { "Config: \(defaultConfig)" } @JS static func update(_ timeout: Double) -> Double } + +@JS struct Container { + var object: JSObject + var optionalObject: JSObject? +} + +@JS func roundtripContainer(_ container: Container) -> Container diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json index c90347177..7950cb66a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json @@ -945,6 +945,121 @@ } } } + }, + { + "abiName" : "bjs_processJSObjectArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processJSObjectArray", + "parameters" : [ + { + "label" : "_", + "name" : "objects", + "type" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalJSObjectArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalJSObjectArray", + "parameters" : [ + { + "label" : "_", + "name" : "objects", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_processNestedJSObjectArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processNestedJSObjectArray", + "parameters" : [ + { + "label" : "_", + "name" : "objects", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } } ], "protocols" : [ @@ -1027,24 +1142,6 @@ "returnType" : { "void" : { - } - } - }, - { - "name" : "checkArray", - "parameters" : [ - { - "name" : "a", - "type" : { - "jsObject" : { - - } - } - } - ], - "returnType" : { - "void" : { - } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 4452446b9..c7c80c3b2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -465,6 +465,64 @@ public func _bjs_processNestedItemArray() -> Void { #endif } +@_expose(wasm, "bjs_processJSObjectArray") +@_cdecl("bjs_processJSObjectArray") +public func _bjs_processJSObjectArray() -> Void { + #if arch(wasm32) + let ret = processJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalJSObjectArray") +@_cdecl("bjs_processOptionalJSObjectArray") +public func _bjs_processOptionalJSObjectArray() -> Void { + #if arch(wasm32) + let ret = processOptionalJSObjectArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processNestedJSObjectArray") +@_cdecl("bjs_processNestedJSObjectArray") +public func _bjs_processNestedJSObjectArray() -> Void { + #if arch(wasm32) + let ret = processNestedJSObjectArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[JSObject]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([JSObject].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Item_deinit") @_cdecl("bjs_Item_deinit") public func _bjs_Item_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { @@ -523,21 +581,4 @@ func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> V if let error = _swift_js_take_exception() { throw error } -} - -#if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_checkArray") -fileprivate func bjs_checkArray(_ a: Int32) -> Void -#else -fileprivate func bjs_checkArray(_ a: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$checkArray(_ a: JSObject) throws(JSException) -> Void { - let aValue = a.bridgeJSLowerParameter() - bjs_checkArray(aValue) - if let error = _swift_js_take_exception() { - throw error - } } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json index 10a18983b..c40f0dc82 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json @@ -24,13 +24,144 @@ "_0" : "Foo" } } + }, + { + "abiName" : "bjs_processFooArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processFooArray", + "parameters" : [ + { + "label" : "_", + "name" : "foos", + "type" : { + "array" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + }, + { + "abiName" : "bjs_processOptionalFooArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "processOptionalFooArray", + "parameters" : [ + { + "label" : "_", + "name" : "foos", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundtripFooContainer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripFooContainer", + "parameters" : [ + { + "label" : "_", + "name" : "container", + "type" : { + "swiftStruct" : { + "_0" : "FooContainer" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "FooContainer" + } + } } ], "protocols" : [ ], "structs" : [ + { + "methods" : [ + ], + "name" : "FooContainer", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "foo", + "type" : { + "jsObject" : { + "_0" : "Foo" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalFoo", + "type" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + ], + "swiftCallName" : "FooContainer" + } ] }, "imported" : { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index 29b615b0f..6d9bee080 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -1,3 +1,54 @@ +extension FooContainer: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { + let optionalFoo = Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + } + let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) + return FooContainer(foo: foo, optionalFoo: optionalFoo) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.foo.jsObject.bridgeJSLowerStackReturn() + let __bjs_isSome_optionalFoo = self.optionalFoo != nil + if let __bjs_unwrapped_optionalFoo = self.optionalFoo { + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer") +fileprivate func _bjs_struct_lift_FooContainer() -> Int32 +#else +fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_makeFoo") @_cdecl("bjs_makeFoo") public func _bjs_makeFoo() -> Int32 { @@ -23,6 +74,66 @@ public func _bjs_makeFoo() -> Int32 { #endif } +@_expose(wasm, "bjs_processFooArray") +@_cdecl("bjs_processFooArray") +public func _bjs_processFooArray() -> Void { + #if arch(wasm32) + let ret = processFooArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Foo] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) + } + __result.reverse() + return __result + }()) + ret.map { + $0.jsObject + } .bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_processOptionalFooArray") +@_cdecl("bjs_processOptionalFooArray") +public func _bjs_processOptionalFooArray() -> Void { + #if arch(wasm32) + let ret = processOptionalFooArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + }) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundtripFooContainer") +@_cdecl("bjs_roundtripFooContainer") +public func _bjs_roundtripFooContainer() -> Void { + #if arch(wasm32) + let ret = roundtripFooContainer(_: FooContainer.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Foo_init") fileprivate func bjs_Foo_init() -> Int32 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json index fa5f333f0..1b2dc531f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json @@ -113,6 +113,31 @@ "_0" : "Person" } } + }, + { + "abiName" : "bjs_roundtripContainer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripContainer", + "parameters" : [ + { + "label" : "_", + "name" : "container", + "type" : { + "swiftStruct" : { + "_0" : "Container" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "Container" + } + } } ], "protocols" : [ @@ -516,6 +541,39 @@ } ], "swiftCallName" : "ConfigStruct" + }, + { + "methods" : [ + + ], + "name" : "Container", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "object", + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalObject", + "type" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + ], + "swiftCallName" : "Container" } ] }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index 9b7ddd024..ca2467249 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -388,6 +388,55 @@ public func _bjs_ConfigStruct_static_update(_ timeout: Float64) -> Float64 { #endif } +extension Container: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Container { + let optionalObject = Optional.bridgeJSLiftParameter() + let object = JSObject.bridgeJSLiftParameter() + return Container(object: object, optionalObject: optionalObject) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.object.bridgeJSLowerStackReturn() + let __bjs_isSome_optionalObject = self.optionalObject != nil + if let __bjs_unwrapped_optionalObject = self.optionalObject { + __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Container(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Container())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Container") +fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Container") +fileprivate func _bjs_struct_lift_Container() -> Int32 +#else +fileprivate func _bjs_struct_lift_Container() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_roundtrip") @_cdecl("bjs_roundtrip") public func _bjs_roundtrip() -> Void { @@ -399,6 +448,17 @@ public func _bjs_roundtrip() -> Void { #endif } +@_expose(wasm, "bjs_roundtripContainer") +@_cdecl("bjs_roundtripContainer") +public func _bjs_roundtripContainer() -> Void { + #if arch(wasm32) + let ret = roundtripContainer(_: Container.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts index 1bb9ff18c..3316cd7c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts @@ -62,13 +62,15 @@ export type Exports = { processNestedPointArray(points: Point[][]): Point[][]; processItemArray(items: Item[]): Item[]; processNestedItemArray(items: Item[][]): Item[][]; + processJSObjectArray(objects: any[]): any[]; + processOptionalJSObjectArray(objects: (any | null)[]): (any | null)[]; + processNestedJSObjectArray(objects: any[][]): any[][]; Direction: DirectionObject Status: StatusObject } export type Imports = { checkArray(a: any): void; checkArrayWithLength(a: any, b: number): void; - checkArray(a: any): void; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 3cb11c794..da5920660 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -263,13 +263,6 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_checkArray"] = function bjs_checkArray(a) { - try { - imports.checkArray(swift.memory.getObject(a)); - } catch (error) { - setException(error); - } - } }, setInstance: (i) => { instance = i; @@ -850,6 +843,92 @@ export async function createInstantiator(options, swift) { for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, + processJSObjectArray: function bjs_processJSObjectArray(objects) { + const arrayCleanups = []; + for (const elem of objects) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } + tmpParamInts.push(objects.length); + instance.exports.bjs_processJSObjectArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + arrayResult.push(obj); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalJSObjectArray: function bjs_processOptionalJSObjectArray(objects) { + const arrayCleanups = []; + for (const elem of objects) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamInts.push(objects.length); + instance.exports.bjs_processOptionalJSObjectArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + optValue = obj; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processNestedJSObjectArray: function bjs_processNestedJSObjectArray(objects) { + const arrayCleanups = []; + for (const elem of objects) { + const arrayCleanups1 = []; + for (const elem1 of elem) { + const objId = swift.memory.retain(elem1); + tmpParamInts.push(objId); + } + tmpParamInts.push(elem.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamInts.push(objects.length); + instance.exports.bjs_processNestedJSObjectArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const arrayLen1 = tmpRetInts.pop(); + const arrayResult1 = []; + for (let i1 = 0; i1 < arrayLen1; i1++) { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + arrayResult1.push(obj); + } + arrayResult1.reverse(); + arrayResult.push(arrayResult1); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, Direction: DirectionValues, Status: StatusValues, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts index 654b4bc04..22b4e6a1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.d.ts @@ -4,10 +4,17 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export interface FooContainer { + foo: Foo; + optionalFoo: Foo | null; +} export interface Foo { } export type Exports = { makeFoo(): Foo; + processFooArray(foos: Foo[]): Foo[]; + processOptionalFooArray(foos: (Foo | null)[]): (Foo | null)[]; + roundtripFooContainer(container: FooContainer): FooContainer; } export type Imports = { Foo: { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 094c2241d..e4ce9e8fe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -34,6 +34,70 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createFooContainerHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + let id; + if (value.foo != null) { + id = swift.memory.retain(value.foo); + } else { + id = undefined; + } + tmpParamInts.push(id !== undefined ? id : 0); + const isSome = value.optionalFoo != null; + let id1; + if (isSome) { + id1 = swift.memory.retain(value.optionalFoo); + tmpParamInts.push(id1); + } else { + id1 = undefined; + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if(id !== undefined && id !== 0) { + try { + swift.memory.getObject(id); + swift.memory.release(id); + } catch(e) {} + } + if(id1 !== undefined && id1 !== 0) { + try { + swift.memory.getObject(id1); + swift.memory.release(id1); + } catch(e) {} + } + }; + return { cleanup }; + }, + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const objectId = tmpRetInts.pop(); + let value; + if (objectId !== 0) { + value = swift.memory.getObject(objectId); + swift.memory.release(objectId); + } else { + value = null; + } + optional = value; + } else { + optional = null; + } + const objectId1 = tmpRetInts.pop(); + let value1; + if (objectId1 !== 0) { + value1 = swift.memory.getObject(objectId1); + swift.memory.release(objectId1); + } else { + value1 = null; + } + return { foo: value1, optionalFoo: optional }; + } + }); + }; return { /** @@ -112,6 +176,17 @@ export async function createInstantiator(options, swift) { tmpStructCleanups.pop(); } } + bjs["swift_js_struct_lower_FooContainer"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.FooContainer.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_lift_FooContainer"] = function() { + const value = structHelpers.FooContainer.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -223,6 +298,9 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const FooContainerHelpers = __bjs_createFooContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.FooContainer = FooContainerHelpers; + const exports = { makeFoo: function bjs_makeFoo() { const ret = instance.exports.bjs_makeFoo(); @@ -236,6 +314,66 @@ export async function createInstantiator(options, swift) { } return ret1; }, + processFooArray: function bjs_processFooArray(foos) { + const arrayCleanups = []; + for (const elem of foos) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } + tmpParamInts.push(foos.length); + instance.exports.bjs_processFooArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + arrayResult.push(obj); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + processOptionalFooArray: function bjs_processOptionalFooArray(foos) { + const arrayCleanups = []; + for (const elem of foos) { + const isSome = elem != null ? 1 : 0; + if (isSome) { + const objId = swift.memory.retain(elem); + tmpParamInts.push(objId); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamInts.push(foos.length); + instance.exports.bjs_processOptionalFooArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const objId1 = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId1); + swift.memory.release(objId1); + optValue = obj; + } + arrayResult.push(optValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + roundtripFooContainer: function bjs_roundtripFooContainer(container) { + const { cleanup: cleanup } = structHelpers.FooContainer.lower(container); + instance.exports.bjs_roundtripFooContainer(); + const structValue = structHelpers.FooContainer.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (cleanup) { cleanup(); } + return structValue; + }, }; _exports = exports; return exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts index 7769ebcbe..4a61a26e3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts @@ -39,6 +39,10 @@ export interface Measurement { } export interface ConfigStruct { } +export interface Container { + object: any; + optionalObject: any | null; +} export type PrecisionObject = typeof PrecisionValues; /// Represents a Swift heap object like a class instance or an actor instance. @@ -57,6 +61,7 @@ export type Exports = { new(name: string): Greeter; } roundtrip(session: Person): Person; + roundtripContainer(container: Container): Container; Precision: PrecisionObject DataPoint: { init(x: number, y: number, label: string, optCount: number | null, optFlag: boolean | null): DataPoint; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index a3d60d0bd..dbeb70e69 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -228,6 +228,70 @@ export async function createInstantiator(options, swift) { } }); }; + const __bjs_createContainerHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + let id; + if (value.object != null) { + id = swift.memory.retain(value.object); + } else { + id = undefined; + } + tmpParamInts.push(id !== undefined ? id : 0); + const isSome = value.optionalObject != null; + let id1; + if (isSome) { + id1 = swift.memory.retain(value.optionalObject); + tmpParamInts.push(id1); + } else { + id1 = undefined; + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if(id !== undefined && id !== 0) { + try { + swift.memory.getObject(id); + swift.memory.release(id); + } catch(e) {} + } + if(id1 !== undefined && id1 !== 0) { + try { + swift.memory.getObject(id1); + swift.memory.release(id1); + } catch(e) {} + } + }; + return { cleanup }; + }, + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const objectId = tmpRetInts.pop(); + let value; + if (objectId !== 0) { + value = swift.memory.getObject(objectId); + swift.memory.release(objectId); + } else { + value = null; + } + optional = value; + } else { + optional = null; + } + const objectId1 = tmpRetInts.pop(); + let value1; + if (objectId1 !== 0) { + value1 = swift.memory.getObject(objectId1); + swift.memory.release(objectId1); + } else { + value1 = null; + } + return { object: value1, optionalObject: optional }; + } + }); + }; return { /** @@ -371,6 +435,17 @@ export async function createInstantiator(options, swift) { const value = structHelpers.ConfigStruct.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return swift.memory.retain(value); } + bjs["swift_js_struct_lower_Container"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Container.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_lift_Container"] = function() { + const value = structHelpers.Container.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -549,6 +624,9 @@ export async function createInstantiator(options, swift) { const ConfigStructHelpers = __bjs_createConfigStructHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.ConfigStruct = ConfigStructHelpers; + const ContainerHelpers = __bjs_createContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Container = ContainerHelpers; + const exports = { Greeter, roundtrip: function bjs_roundtrip(session) { @@ -558,6 +636,13 @@ export async function createInstantiator(options, swift) { if (cleanup) { cleanup(); } return structValue; }, + roundtripContainer: function bjs_roundtripContainer(container) { + const { cleanup: cleanup } = structHelpers.Container.lower(container); + instance.exports.bjs_roundtripContainer(); + const structValue = structHelpers.Container.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (cleanup) { cleanup(); } + return structValue; + }, Precision: PrecisionValues, DataPoint: { init: function(x, y, label, optCount, optFlag) { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md index fed56618f..53d008068 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md @@ -119,6 +119,8 @@ const result = exports.processNumbers(original); | Struct arrays: `[MyStruct]` | ✅ | | Class arrays: `[MyClass]` | ✅ | | Enum arrays (case, raw value, associated value) | ✅ | +| `JSObject` arrays: `[JSObject]` | ✅ | +| `@JSClass struct` arrays: `[Foo]` | ✅ | | Nested arrays: `[[Int]]` | ✅ | | Optional arrays: `[Int]?` | ✅ | | Arrays of optionals: `[Int?]` | ✅ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md index 236b822ab..10babd9b6 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md @@ -160,6 +160,8 @@ This differs from classes, which use reference semantics and share state across | Stored fields with supported types | ✅ | | Optional fields | ✅ | | Nested structs | ✅ | +| `JSObject` fields | ✅ | +| `@JSClass struct` fields | ✅ | | Instance methods | ✅ | | Static methods | ✅ | | Static properties | ✅ | diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 520fe8298..b482fcdb1 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1443,6 +1443,22 @@ enum GraphOperations { return processors } +@JS func roundTripJSObjectArray(_ objects: [JSObject]) -> [JSObject] { + return objects +} + +@JS func roundTripOptionalJSObjectArray(_ objects: [JSObject?]) -> [JSObject?] { + return objects +} + +@JS func roundTripFooArray(_ foos: [Foo]) -> [Foo] { + return foos +} + +@JS func roundTripOptionalFooArray(_ foos: [Foo?]) -> [Foo?] { + return foos +} + class ExportAPITests: XCTestCase { func testAll() { var hasDeinitGreeter = false diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index b9b7dc1dc..fbd913c75 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3152,6 +3152,106 @@ public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { #endif } +extension JSObjectContainer: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> JSObjectContainer { + let optionalObject = Optional.bridgeJSLiftParameter() + let object = JSObject.bridgeJSLiftParameter() + return JSObjectContainer(object: object, optionalObject: optionalObject) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.object.bridgeJSLowerStackReturn() + let __bjs_isSome_optionalObject = self.optionalObject != nil + if let __bjs_unwrapped_optionalObject = self.optionalObject { + __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_JSObjectContainer(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSObjectContainer())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSObjectContainer") +fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSObjectContainer") +fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 +#else +fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension FooContainer: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { + let optionalFoo = Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + } + let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) + return FooContainer(foo: foo, optionalFoo: optionalFoo) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.foo.jsObject.bridgeJSLowerStackReturn() + let __bjs_isSome_optionalFoo = self.optionalFoo != nil + if let __bjs_unwrapped_optionalFoo = self.optionalFoo { + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer") +fileprivate func _bjs_struct_lift_FooContainer() -> Int32 +#else +fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_roundTripVoid") @_cdecl("bjs_roundTripVoid") public func _bjs_roundTripVoid() -> Void { @@ -5113,6 +5213,91 @@ public func _bjs_roundTripDataProcessorArrayType() -> Void { #endif } +@_expose(wasm, "bjs_roundTripJSObjectArray") +@_cdecl("bjs_roundTripJSObjectArray") +public func _bjs_roundTripJSObjectArray() -> Void { + #if arch(wasm32) + let ret = roundTripJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalJSObjectArray") +@_cdecl("bjs_roundTripOptionalJSObjectArray") +public func _bjs_roundTripOptionalJSObjectArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalJSObjectArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripFooArray") +@_cdecl("bjs_roundTripFooArray") +public func _bjs_roundTripFooArray() -> Void { + #if arch(wasm32) + let ret = roundTripFooArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Foo] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) + } + __result.reverse() + return __result + }()) + ret.map { + $0.jsObject + } .bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalFooArray") +@_cdecl("bjs_roundTripOptionalFooArray") +public func _bjs_roundTripOptionalFooArray() -> Void { + #if arch(wasm32) + let ret = roundTripOptionalFooArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + }) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripPointerFields") @_cdecl("bjs_roundTripPointerFields") public func _bjs_roundTripPointerFields() -> Void { @@ -5258,6 +5443,28 @@ public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer { #endif } +@_expose(wasm, "bjs_roundTripJSObjectContainer") +@_cdecl("bjs_roundTripJSObjectContainer") +public func _bjs_roundTripJSObjectContainer() -> Void { + #if arch(wasm32) + let ret = roundTripJSObjectContainer(_: JSObjectContainer.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripFooContainer") +@_cdecl("bjs_roundTripFooContainer") +public func _bjs_roundTripFooContainer() -> Void { + #if arch(wasm32) + let ret = roundTripFooContainer(_: FooContainer.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 83845dd45..646374778 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -9450,6 +9450,154 @@ } } }, + { + "abiName" : "bjs_roundTripJSObjectArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSObjectArray", + "parameters" : [ + { + "label" : "_", + "name" : "objects", + "type" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsObject" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalJSObjectArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalJSObjectArray", + "parameters" : [ + { + "label" : "_", + "name" : "objects", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripFooArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripFooArray", + "parameters" : [ + { + "label" : "_", + "name" : "foos", + "type" : { + "array" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalFooArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalFooArray", + "parameters" : [ + { + "label" : "_", + "name" : "foos", + "type" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + } + }, { "abiName" : "bjs_roundTripPointerFields", "effects" : { @@ -9834,6 +9982,56 @@ "_0" : "Container" } } + }, + { + "abiName" : "bjs_roundTripJSObjectContainer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSObjectContainer", + "parameters" : [ + { + "label" : "_", + "name" : "container", + "type" : { + "swiftStruct" : { + "_0" : "JSObjectContainer" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "JSObjectContainer" + } + } + }, + { + "abiName" : "bjs_roundTripFooContainer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripFooContainer", + "parameters" : [ + { + "label" : "_", + "name" : "container", + "type" : { + "swiftStruct" : { + "_0" : "FooContainer" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "FooContainer" + } + } } ], "protocols" : [ @@ -11365,6 +11563,72 @@ } ], "swiftCallName" : "ConfigStruct" + }, + { + "methods" : [ + + ], + "name" : "JSObjectContainer", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "object", + "type" : { + "jsObject" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalObject", + "type" : { + "optional" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + ], + "swiftCallName" : "JSObjectContainer" + }, + { + "methods" : [ + + ], + "name" : "FooContainer", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "foo", + "type" : { + "jsObject" : { + "_0" : "Foo" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optionalFoo", + "type" : { + "optional" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + } + } + ], + "swiftCallName" : "FooContainer" } ] }, diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift index 5c9fed511..c7de5d137 100644 --- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -214,3 +214,23 @@ @JS func testContainerWithStruct(_ point: DataPoint) -> Container { return Container(location: point, config: nil) } + +// Struct with JSObject fields +@JS struct JSObjectContainer { + var object: JSObject + var optionalObject: JSObject? +} + +@JS func roundTripJSObjectContainer(_ container: JSObjectContainer) -> JSObjectContainer { + return container +} + +// Struct with @JSClass fields (Foo is defined in ExportAPITests.swift) +@JS struct FooContainer { + var foo: Foo + var optionalFoo: Foo? +} + +@JS func roundTripFooContainer(_ container: FooContainer) -> FooContainer { + return container +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 684ff02fc..850b31b6e 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -1164,6 +1164,32 @@ function testStructSupport(exports) { optionalRatio: null }; assert.deepEqual(exports.roundTripMeasurementConfig(mc2), mc2); + + // Struct with JSObject field + const containerObj1 = { value: "hello", nested: { x: 1 } }; + const containerObj2 = { items: [1, 2, 3] }; + const container1 = { object: containerObj1, optionalObject: containerObj2 }; + const containerResult1 = exports.roundTripJSObjectContainer(container1); + assert.equal(containerResult1.object, containerObj1); + assert.equal(containerResult1.optionalObject, containerObj2); + + const container2 = { object: containerObj1, optionalObject: null }; + const containerResult2 = exports.roundTripJSObjectContainer(container2); + assert.equal(containerResult2.object, containerObj1); + assert.equal(containerResult2.optionalObject, null); + + // Struct with @JSClass field + const foo1 = new ImportedFoo("first"); + const foo2 = new ImportedFoo("second"); + const fooContainer1 = { foo: foo1, optionalFoo: foo2 }; + const fooContainerResult1 = exports.roundTripFooContainer(fooContainer1); + assert.equal(fooContainerResult1.foo.value, "first"); + assert.equal(fooContainerResult1.optionalFoo.value, "second"); + + const fooContainer2 = { foo: foo1, optionalFoo: null }; + const fooContainerResult2 = exports.roundTripFooContainer(fooContainer2); + assert.equal(fooContainerResult2.foo.value, "first"); + assert.equal(fooContainerResult2.optionalFoo, null); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ @@ -1437,6 +1463,36 @@ function testArraySupport(exports) { assert.equal(result[0].count, 1); helper1.release(); + + // JSObject arrays + const jsObj1 = { a: 1, b: "hello" }; + const jsObj2 = { x: [1, 2, 3], y: { nested: true } }; + const jsObjResult = exports.roundTripJSObjectArray([jsObj1, jsObj2]); + assert.equal(jsObjResult.length, 2); + assert.equal(jsObjResult[0], jsObj1); + assert.equal(jsObjResult[1], jsObj2); + assert.deepEqual(exports.roundTripJSObjectArray([]), []); + + const optJsResult = exports.roundTripOptionalJSObjectArray([jsObj1, null, jsObj2]); + assert.equal(optJsResult.length, 3); + assert.equal(optJsResult[0], jsObj1); + assert.equal(optJsResult[1], null); + assert.equal(optJsResult[2], jsObj2); + + // @JSClass struct arrays + const foo1 = new ImportedFoo("first"); + const foo2 = new ImportedFoo("second"); + const fooResult = exports.roundTripFooArray([foo1, foo2]); + assert.equal(fooResult.length, 2); + assert.equal(fooResult[0].value, "first"); + assert.equal(fooResult[1].value, "second"); + assert.deepEqual(exports.roundTripFooArray([]), []); + + const optFooResult = exports.roundTripOptionalFooArray([foo1, null, foo2]); + assert.equal(optFooResult.length, 3); + assert.equal(optFooResult[0].value, "first"); + assert.equal(optFooResult[1], null); + assert.equal(optFooResult[2].value, "second"); } /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ From 0662e3b2405e2f618b01e7de2989dba15afcaa22 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 3 Feb 2026 23:06:32 +0900 Subject: [PATCH 131/252] Revert "BridgeJS: Enforce throws(JSException) on @JS protocol methods" (#565) --- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../Sources/BridgeJSCore/ImportTS.swift | 32 +-- .../BridgeJSCore/SwiftToSkeleton.swift | 9 - .../Sources/BridgeJSLink/JSGlueGen.swift | 20 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 1 - .../Inputs/MacroSwift/Protocol.swift | 24 +- .../BridgeJSCodegenTests/Protocol.json | 24 +- .../BridgeJSCodegenTests/Protocol.swift | 60 +---- .../Exporting-Swift-Protocols.md | 30 +-- .../BridgeJSRuntimeTests/ExportAPITests.swift | 60 ++--- .../Generated/BridgeJS.swift | 209 +++--------------- .../Generated/JavaScript/BridgeJS.json | 40 ++-- 12 files changed, 154 insertions(+), 359 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 85aeee131..0c5debeac 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1346,7 +1346,7 @@ struct ProtocolCodegen { let builder = ImportTS.CallJSEmission( moduleName: moduleName, abiName: "_extern_\(method.name)", - context: .exportSwiftProtocol + context: .exportSwift ) try builder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil))) for param in method.parameters { @@ -1359,7 +1359,7 @@ struct ProtocolCodegen { let signature = SwiftSignatureBuilder.buildFunctionSignature( parameters: method.parameters, returnType: method.returnType, - effects: method.effects + effects: nil ) // Build extern declaration using helper function diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 70dda3848..7c391eea0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -187,8 +187,8 @@ public struct ImportTS { body.append("let ret = \(raw: callExpr)") } - // Add exception check for contexts that call INTO JavaScript - if context == .importTS || context == .exportSwiftProtocol { + // Add exception check for ImportTS context + if context == .importTS { body.append("if let error = _swift_js_take_exception() { throw error }") } } @@ -887,7 +887,7 @@ extension BridgeType { Swift classes can only be used in @JS protocols where Swift owns the instance. """ ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) } case .swiftProtocol: @@ -896,14 +896,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("value", .i32)]) } case .rawValueEnum(_, let rawType): switch context { case .importTS: return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) } @@ -911,7 +911,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LoweringParameterInfo(loweredParameters: [("caseId", .i32)]) } case .swiftStruct: @@ -919,7 +919,7 @@ extension BridgeType { case .importTS: // Swift structs are bridged as JS objects (object IDs) in imported signatures. return LoweringParameterInfo(loweredParameters: [("objectId", .i32)]) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LoweringParameterInfo(loweredParameters: []) } case .namespaceEnum: @@ -928,7 +928,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) var params = [("isSome", WasmCoreType.i32)] params.append(contentsOf: wrappedInfo.loweredParameters) @@ -938,7 +938,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LoweringParameterInfo(loweredParameters: []) } } @@ -981,7 +981,7 @@ extension BridgeType { JavaScript cannot create Swift heap objects. """ ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LiftingReturnInfo(valueToLift: .pointer) } case .swiftProtocol: @@ -990,14 +990,14 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LiftingReturnInfo(valueToLift: .i32) } case .rawValueEnum(_, let rawType): switch context { case .importTS: return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: // For protocol export we return .i32 for String raw value type instead of nil return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) } @@ -1005,7 +1005,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Enum types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LiftingReturnInfo(valueToLift: .i32) } case .swiftStruct: @@ -1013,7 +1013,7 @@ extension BridgeType { case .importTS: // Swift structs are bridged as JS objects (object IDs) in imported signatures. return LiftingReturnInfo(valueToLift: .i32) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LiftingReturnInfo(valueToLift: nil) } case .namespaceEnum: @@ -1022,7 +1022,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) } @@ -1030,7 +1030,7 @@ extension BridgeType { switch context { case .importTS: throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return LiftingReturnInfo(valueToLift: nil) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index edcb0a391..b780012f0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1608,15 +1608,6 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return nil } - guard effects.isThrows else { - diagnose( - node: node, - message: "@JS protocol methods must be throws.", - hint: "Declare the method as 'throws(JSException)'." - ) - return nil - } - return ExportedFunction( name: name, abiName: abiName, diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9a1979491..28f756a43 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1477,7 +1477,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return .swiftHeapObjectLiftParameter(name) } case .swiftProtocol: return .jsObjectLiftParameter @@ -1491,7 +1491,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return try .optionalLiftParameter(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -1508,7 +1508,7 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be passed as parameters to imported JS functions: \(fullName)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["caseId"], @@ -1526,7 +1526,7 @@ struct IntrinsicJSFragment: Sendable { switch context { case .importTS: return .jsObjectLiftRetainedObjectId - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: [], @@ -1558,7 +1558,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Arrays are not yet supported to be passed as parameters to imported JS functions" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return try arrayLift(elementType: elementType) } } @@ -1578,7 +1578,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return .swiftHeapObjectLowerReturn } case .swiftProtocol: return .jsObjectLowerReturn @@ -1589,7 +1589,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Optional types are not supported for imported JS functions: \(wrappedType)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return try .optionalLowerReturn(wrappedType: wrappedType) } case .caseEnum: return .identity @@ -1606,7 +1606,7 @@ struct IntrinsicJSFragment: Sendable { message: "Associated value enums are not supported to be returned from imported JS functions: \(fullName)" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return associatedValueLowerReturn(fullName: fullName) } case .swiftStruct(let fullName): @@ -1614,7 +1614,7 @@ struct IntrinsicJSFragment: Sendable { case .importTS: // ImportTS expects Swift structs to come back as a retained JS object ID. return .jsObjectLowerReturn - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return swiftStructLowerReturn(fullName: fullName) } case .closure: @@ -1640,7 +1640,7 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Arrays are not yet supported to be returned from imported JS functions" ) - case .exportSwift, .exportSwiftProtocol: + case .exportSwift: return try arrayLower(elementType: elementType) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 01382e642..5013dda66 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -71,7 +71,6 @@ public struct ABINameGenerator { public enum BridgeContext: Sendable { case importTS case exportSwift - case exportSwiftProtocol } public struct ClosureSignature: Codable, Equatable, Hashable, Sendable { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift index 3e8df7405..fbbad0615 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift @@ -47,18 +47,18 @@ import JavaScriptKit var directionOptional: Direction? { get set } var priority: Priority { get set } var priorityOptional: Priority? { get set } - func onSomethingHappened() throws(JSException) - func onValueChanged(_ value: String) throws(JSException) - func onCountUpdated(count: Int) throws(JSException) -> Bool - func onLabelUpdated(_ prefix: String, _ suffix: String) throws(JSException) - func isCountEven() throws(JSException) -> Bool - func onHelperUpdated(_ helper: Helper) throws(JSException) - func createHelper() throws(JSException) -> Helper - func onOptionalHelperUpdated(_ helper: Helper?) throws(JSException) - func createOptionalHelper() throws(JSException) -> Helper? - func createEnum() throws(JSException) -> ExampleEnum - func handleResult(_ result: Result) throws(JSException) - func getResult() throws(JSException) -> Result + func onSomethingHappened() + func onValueChanged(_ value: String) + func onCountUpdated(count: Int) -> Bool + func onLabelUpdated(_ prefix: String, _ suffix: String) + func isCountEven() -> Bool + func onHelperUpdated(_ helper: Helper) + func createHelper() -> Helper + func onOptionalHelperUpdated(_ helper: Helper?) + func createOptionalHelper() -> Helper? + func createEnum() -> ExampleEnum + func handleResult(_ result: Result) + func getResult() -> Result } @JS class MyViewController { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json index 2f9c27ace..5713a2898 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -499,7 +499,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onSomethingHappened", "parameters" : [ @@ -516,7 +516,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onValueChanged", "parameters" : [ @@ -541,7 +541,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onCountUpdated", "parameters" : [ @@ -566,7 +566,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onLabelUpdated", "parameters" : [ @@ -600,7 +600,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "isCountEven", "parameters" : [ @@ -617,7 +617,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onHelperUpdated", "parameters" : [ @@ -642,7 +642,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "createHelper", "parameters" : [ @@ -659,7 +659,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "onOptionalHelperUpdated", "parameters" : [ @@ -688,7 +688,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "createOptionalHelper", "parameters" : [ @@ -709,7 +709,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "createEnum", "parameters" : [ @@ -727,7 +727,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "handleResult", "parameters" : [ @@ -752,7 +752,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getResult", "parameters" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 91efeda7f..21178521d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -1,112 +1,76 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func onSomethingHappened() throws(JSException) -> Void { + func onSomethingHappened() -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() _extern_onSomethingHappened(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } } - func onValueChanged(_ value: String) throws(JSException) -> Void { + func onValueChanged(_ value: String) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let valueValue = value.bridgeJSLowerParameter() _extern_onValueChanged(jsObjectValue, valueValue) - if let error = _swift_js_take_exception() { - throw error - } } - func onCountUpdated(count: Int) throws(JSException) -> Bool { + func onCountUpdated(count: Int) -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let countValue = count.bridgeJSLowerParameter() let ret = _extern_onCountUpdated(jsObjectValue, countValue) - if let error = _swift_js_take_exception() { - throw error - } return Bool.bridgeJSLiftReturn(ret) } - func onLabelUpdated(_ prefix: String, _ suffix: String) throws(JSException) -> Void { + func onLabelUpdated(_ prefix: String, _ suffix: String) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let prefixValue = prefix.bridgeJSLowerParameter() let suffixValue = suffix.bridgeJSLowerParameter() _extern_onLabelUpdated(jsObjectValue, prefixValue, suffixValue) - if let error = _swift_js_take_exception() { - throw error - } } - func isCountEven() throws(JSException) -> Bool { + func isCountEven() -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_isCountEven(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Bool.bridgeJSLiftReturn(ret) } - func onHelperUpdated(_ helper: Helper) throws(JSException) -> Void { + func onHelperUpdated(_ helper: Helper) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let helperPointer = helper.bridgeJSLowerParameter() _extern_onHelperUpdated(jsObjectValue, helperPointer) - if let error = _swift_js_take_exception() { - throw error - } } - func createHelper() throws(JSException) -> Helper { + func createHelper() -> Helper { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createHelper(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Helper.bridgeJSLiftReturn(ret) } - func onOptionalHelperUpdated(_ helper: Optional) throws(JSException) -> Void { + func onOptionalHelperUpdated(_ helper: Optional) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameter() _extern_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer) - if let error = _swift_js_take_exception() { - throw error - } } - func createOptionalHelper() throws(JSException) -> Optional { + func createOptionalHelper() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createOptionalHelper(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Optional.bridgeJSLiftReturn(ret) } - func createEnum() throws(JSException) -> ExampleEnum { + func createEnum() -> ExampleEnum { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createEnum(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return ExampleEnum.bridgeJSLiftReturn(ret) } - func handleResult(_ result: Result) throws(JSException) -> Void { + func handleResult(_ result: Result) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let resultCaseId = result.bridgeJSLowerParameter() _extern_handleResult(jsObjectValue, resultCaseId) - if let error = _swift_js_take_exception() { - throw error - } } - func getResult() throws(JSException) -> Result { + func getResult() -> Result { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getResult(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Result.bridgeJSLiftReturn(ret) } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 4b58276ea..111b1f052 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -15,7 +15,7 @@ When you mark a protocol with `@JS`, BridgeJS generates: ## Example: Counter Protocol -Mark a Swift protocol with `@JS` to expose it. Protocol methods must declare `throws(JSException)` to align with the import side error handling: +Mark a Swift protocol with `@JS` to expose it: ```swift import JavaScriptKit @@ -24,9 +24,9 @@ import JavaScriptKit var count: Int { get set } var name: String { get } var label: String? { get set } - func increment(by amount: Int) throws(JSException) - func reset() throws(JSException) - func getValue() throws(JSException) -> Int + func increment(by amount: Int) + func reset() + func getValue() -> Int } @JS class CounterManager { @@ -122,24 +122,24 @@ You can also implement protocols in Swift and use them from JavaScript: @JS protocol Counter { var count: Int { get set } var name: String { get } - func increment(by amount: Int) throws(JSException) - func reset() throws(JSException) - func getValue() throws(JSException) -> Int + func increment(by amount: Int) + func reset() + func getValue() -> Int } final class SwiftCounter: Counter { var count = 0 let name = "SwiftCounter" - - func increment(by amount: Int) throws(JSException) { + + func increment(by amount: Int) { count += amount } - - func reset() throws(JSException) { + + func reset() { count = 0 } - - func getValue() throws(JSException) -> Int { + + func getValue() -> Int { return count } } @@ -195,7 +195,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { } } - func increment(by amount: Int) throws(JSException) { + func increment(by amount: Int) { @_extern(wasm, module: "TestModule", name: "bjs_Counter_increment") func _extern_increment(this: Int32, amount: Int32) _extern_increment( @@ -212,7 +212,7 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { | Swift Feature | Status | |:--------------|:-------| -| Method requirements: `func foo(_ param: String?) throws(JSException) -> FooClass?` | ✅ | +| Method requirements: `func foo(_ param: String?) -> FooClass?` | ✅ | | Property requirements: `var property: Type { get }` / `var property: Type { get set }` | ✅ | | Optional parameters / return values in methods | ✅ | | Optional properties | ✅ | diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 520fe8298..711a42e2d 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -988,17 +988,17 @@ enum GraphOperations { var apiResult: APIResult? { get set } var helper: Greeter { get set } var optionalHelper: Greeter? { get set } - func increment(by amount: Int) throws(JSException) - func getValue() throws(JSException) -> Int - func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) throws(JSException) - func getLabel() throws(JSException) -> String - func isEven() throws(JSException) -> Bool - func processGreeter(_ greeter: Greeter) throws(JSException) -> String - func createGreeter() throws(JSException) -> Greeter - func processOptionalGreeter(_ greeter: Greeter?) throws(JSException) -> String - func createOptionalGreeter() throws(JSException) -> Greeter? - func handleAPIResult(_ result: APIResult?) throws(JSException) - func getAPIResult() throws(JSException) -> APIResult? + func increment(by amount: Int) + func getValue() -> Int + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) + func getLabel() -> String + func isEven() -> Bool + func processGreeter(_ greeter: Greeter) -> String + func createGreeter() -> Greeter + func processOptionalGreeter(_ greeter: Greeter?) -> String + func createOptionalGreeter() -> Greeter? + func handleAPIResult(_ result: APIResult?) + func getAPIResult() -> APIResult? } @JS class DataProcessorManager { @@ -1011,33 +1011,33 @@ enum GraphOperations { self.backupProcessor = nil } - @JS func incrementByAmount(_ amount: Int) throws(JSException) { - try processor.increment(by: amount) + @JS func incrementByAmount(_ amount: Int) { + processor.increment(by: amount) } - @JS func setProcessorLabel(_ prefix: String, _ suffix: String) throws(JSException) { - try processor.setLabelElements(prefix, suffix) + @JS func setProcessorLabel(_ prefix: String, _ suffix: String) { + processor.setLabelElements(prefix, suffix) } - @JS func isProcessorEven() throws(JSException) -> Bool { - return try processor.isEven() + @JS func isProcessorEven() -> Bool { + return processor.isEven() } - @JS func getProcessorLabel() throws(JSException) -> String { - return try processor.getLabel() + @JS func getProcessorLabel() -> String { + return processor.getLabel() } - @JS func getCurrentValue() throws(JSException) -> Int { - return try processor.getValue() + @JS func getCurrentValue() -> Int { + return processor.getValue() } - @JS func incrementBoth() throws(JSException) { - try processor.increment(by: 1) - try backupProcessor?.increment(by: 1) + @JS func incrementBoth() { + processor.increment(by: 1) + backupProcessor?.increment(by: 1) } - @JS func getBackupValue() throws(JSException) -> Int? { - return try backupProcessor?.getValue() + @JS func getBackupValue() -> Int? { + return backupProcessor?.getValue() } @JS func hasBackup() -> Bool { @@ -1084,12 +1084,12 @@ enum GraphOperations { processor.httpStatus = status } - @JS func getProcessorAPIResult() throws(JSException) -> APIResult? { - return try processor.getAPIResult() + @JS func getProcessorAPIResult() -> APIResult? { + return processor.getAPIResult() } - @JS func setProcessorAPIResult(_ apiResult: APIResult?) throws(JSException) { - try processor.handleAPIResult(apiResult) + @JS func setProcessorAPIResult(_ apiResult: APIResult?) { + processor.handleAPIResult(apiResult) } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index b9b7dc1dc..55a77466e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -921,105 +921,72 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_S struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject - func increment(by amount: Int) throws(JSException) -> Void { + func increment(by amount: Int) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let amountValue = amount.bridgeJSLowerParameter() _extern_increment(jsObjectValue, amountValue) - if let error = _swift_js_take_exception() { - throw error - } } - func getValue() throws(JSException) -> Int { + func getValue() -> Int { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getValue(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Int.bridgeJSLiftReturn(ret) } - func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) throws(JSException) -> Void { + func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let labelPrefixValue = labelPrefix.bridgeJSLowerParameter() let labelSuffixValue = labelSuffix.bridgeJSLowerParameter() _extern_setLabelElements(jsObjectValue, labelPrefixValue, labelSuffixValue) - if let error = _swift_js_take_exception() { - throw error - } } - func getLabel() throws(JSException) -> String { + func getLabel() -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getLabel(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return String.bridgeJSLiftReturn(ret) } - func isEven() throws(JSException) -> Bool { + func isEven() -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_isEven(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Bool.bridgeJSLiftReturn(ret) } - func processGreeter(_ greeter: Greeter) throws(JSException) -> String { + func processGreeter(_ greeter: Greeter) -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let greeterPointer = greeter.bridgeJSLowerParameter() let ret = _extern_processGreeter(jsObjectValue, greeterPointer) - if let error = _swift_js_take_exception() { - throw error - } return String.bridgeJSLiftReturn(ret) } - func createGreeter() throws(JSException) -> Greeter { + func createGreeter() -> Greeter { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createGreeter(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Greeter.bridgeJSLiftReturn(ret) } - func processOptionalGreeter(_ greeter: Optional) throws(JSException) -> String { + func processOptionalGreeter(_ greeter: Optional) -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer) - if let error = _swift_js_take_exception() { - throw error - } return String.bridgeJSLiftReturn(ret) } - func createOptionalGreeter() throws(JSException) -> Optional { + func createOptionalGreeter() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_createOptionalGreeter(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Optional.bridgeJSLiftReturn(ret) } - func handleAPIResult(_ result: Optional) throws(JSException) -> Void { + func handleAPIResult(_ result: Optional) -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter() _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId) - if let error = _swift_js_take_exception() { - throw error - } } - func getAPIResult() throws(JSException) -> Optional { + func getAPIResult() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() let ret = _extern_getAPIResult(jsObjectValue) - if let error = _swift_js_take_exception() { - throw error - } return Optional.bridgeJSLiftReturn(ret) } @@ -6592,21 +6559,7 @@ public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableR @_cdecl("bjs_DataProcessorManager_incrementByAmount") public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) - do { - try DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) #else fatalError("Only available on WebAssembly") #endif @@ -6616,21 +6569,7 @@ public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_setProcessorLabel") public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - do { - try DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) #else fatalError("Only available on WebAssembly") #endif @@ -6640,22 +6579,8 @@ public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_isProcessorEven") public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - do { - let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() - return ret.bridgeJSLowerReturn() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return 0 - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6665,22 +6590,8 @@ public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_getProcessorLabel") public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - do { - let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() - return ret.bridgeJSLowerReturn() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6690,22 +6601,8 @@ public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_getCurrentValue") public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - do { - let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() - return ret.bridgeJSLowerReturn() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return 0 - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6715,21 +6612,7 @@ public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_incrementBoth") public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - do { - try DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() #else fatalError("Only available on WebAssembly") #endif @@ -6739,22 +6622,8 @@ public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_getBackupValue") public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - do { - let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() - return ret.bridgeJSLowerReturn() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6880,22 +6749,8 @@ public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMuta @_cdecl("bjs_DataProcessorManager_getProcessorAPIResult") public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - do { - let ret = try DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() - return ret.bridgeJSLowerReturn() - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6905,21 +6760,7 @@ public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_setProcessorAPIResult") public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void { #if arch(wasm32) - do { - try DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) - } catch let error { - if let error = error.thrownValue.object { - withExtendedLifetime(error) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } else { - let jsError = JSError(message: String(describing: error)) - withExtendedLifetime(jsError.jsObject) { - _swift_js_throw(Int32(bitPattern: $0.id)) - } - } - return - } + DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 83845dd45..e31c69a51 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -1365,7 +1365,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "incrementByAmount", "parameters" : [ @@ -1390,7 +1390,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "setProcessorLabel", "parameters" : [ @@ -1424,7 +1424,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "isProcessorEven", "parameters" : [ @@ -1441,7 +1441,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getProcessorLabel", "parameters" : [ @@ -1458,7 +1458,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getCurrentValue", "parameters" : [ @@ -1475,7 +1475,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "incrementBoth", "parameters" : [ @@ -1492,7 +1492,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getBackupValue", "parameters" : [ @@ -1784,7 +1784,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getProcessorAPIResult", "parameters" : [ @@ -1805,7 +1805,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "setProcessorAPIResult", "parameters" : [ @@ -9844,7 +9844,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "increment", "parameters" : [ @@ -9869,7 +9869,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getValue", "parameters" : [ @@ -9886,7 +9886,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "setLabelElements", "parameters" : [ @@ -9920,7 +9920,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getLabel", "parameters" : [ @@ -9937,7 +9937,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "isEven", "parameters" : [ @@ -9954,7 +9954,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "processGreeter", "parameters" : [ @@ -9979,7 +9979,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "createGreeter", "parameters" : [ @@ -9996,7 +9996,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "processOptionalGreeter", "parameters" : [ @@ -10025,7 +10025,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "createOptionalGreeter", "parameters" : [ @@ -10046,7 +10046,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "handleAPIResult", "parameters" : [ @@ -10075,7 +10075,7 @@ "effects" : { "isAsync" : false, "isStatic" : false, - "isThrows" : true + "isThrows" : false }, "name" : "getAPIResult", "parameters" : [ From bc6103856f61bc0fd9b6147d20bce3af8c366679 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 01:36:30 +0900 Subject: [PATCH 132/252] TS2Swift: Skip type checks when translating TS -> Swift (#567) --- .../BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 1d2d0f64f..776477580 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -27,7 +27,11 @@ export class TypeProcessor { static createProgram(filePaths, options) { const host = ts.createCompilerHost(options); const roots = Array.isArray(filePaths) ? filePaths : [filePaths]; - return ts.createProgram(roots, options, host); + return ts.createProgram(roots, { + ...options, + noCheck: true, + skipLibCheck: true, + }, host); } /** From edabb977f4e0e2a62703111dfdc27d537a695a2f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 02:45:26 +0900 Subject: [PATCH 133/252] BridgeJS: emit typed throws without extra space (#571) --- .../Sources/Generated/BridgeJS.Macros.swift | 6 +- .../Generated/BridgeJS.Macros.swift | 4 +- .../TS2Swift/JavaScript/src/processor.js | 2 +- .../test/__snapshots__/ts2swift.test.js.snap | 122 +++++++++--------- .../Generated/BridgeJS.Macros.swift | 48 +++---- 5 files changed, 91 insertions(+), 91 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift index edf727004..39a46d22c 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift @@ -6,8 +6,8 @@ @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func benchmarkHelperNoop() throws (JSException) -> Void +@JSFunction func benchmarkHelperNoop() throws(JSException) -> Void -@JSFunction func benchmarkHelperNoopWithNumber(_ n: Double) throws (JSException) -> Void +@JSFunction func benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void -@JSFunction func benchmarkRunner(_ name: String, _ body: JSObject) throws (JSException) -> Void +@JSFunction func benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift index cc62396ea..c619a8883 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -6,8 +6,8 @@ @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func createTS2Swift() throws (JSException) -> TS2Swift +@JSFunction func createTS2Swift() throws(JSException) -> TS2Swift @JSClass struct TS2Swift { - @JSFunction func convert(_ ts: String) throws (JSException) -> String + @JSFunction func convert(_ ts: String) throws(JSException) -> String } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 776477580..258334ee8 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -874,7 +874,7 @@ export class TypeProcessor { if (effects?.isAsync) { parts.push("async"); } - parts.push("throws (JSException)"); + parts.push("throws(JSException)"); return parts.join(" "); } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 5b5316a40..6add64de4 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -9,11 +9,11 @@ exports[`ts2swift > snapshots Swift output for ArrayParameter.d.ts > ArrayParame @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void +@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void -@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws (JSException) -> Void +@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void -@JSFunction func checkArray(_ a: JSObject) throws (JSException) -> Void +@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void " `; @@ -26,19 +26,19 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func asyncReturnVoid() throws (JSException) -> JSPromise +@JSFunction func asyncReturnVoid() throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripInt(_ v: Double) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripInt(_ v: Double) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripString(_ v: String) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripString(_ v: String) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripBool(_ v: Bool) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripBool(_ v: Bool) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripFloat(_ v: Double) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripFloat(_ v: Double) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripDouble(_ v: Double) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws (JSException) -> JSPromise +@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise " `; @@ -51,11 +51,11 @@ exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func returnAnimatable() throws (JSException) -> Animatable +@JSFunction func returnAnimatable() throws(JSException) -> Animatable @JSClass struct Animatable { - @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws (JSException) -> JSObject - @JSFunction func getAnimations(_ options: JSObject) throws (JSException) -> JSObject + @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject + @JSFunction func getAnimations(_ options: JSObject) throws(JSException) -> JSObject } " `; @@ -69,42 +69,42 @@ exports[`ts2swift > snapshots Swift output for InvalidPropertyNames.d.ts > Inval @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func createArrayBuffer() throws (JSException) -> ArrayBufferLike +@JSFunction func createArrayBuffer() throws(JSException) -> ArrayBufferLike @JSClass struct ArrayBufferLike { @JSGetter var byteLength: Double - @JSFunction func slice(_ begin: Double, _ end: Double) throws (JSException) -> ArrayBufferLike + @JSFunction func slice(_ begin: Double, _ end: Double) throws(JSException) -> ArrayBufferLike } -@JSFunction func createWeirdObject() throws (JSException) -> WeirdNaming +@JSFunction func createWeirdObject() throws(JSException) -> WeirdNaming @JSClass struct WeirdNaming { @JSGetter var normalProperty: String - @JSSetter func setNormalProperty(_ value: String) throws (JSException) + @JSSetter func setNormalProperty(_ value: String) throws(JSException) @JSGetter(jsName: "property-with-dashes") var property_with_dashes: Double - @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws (JSException) + @JSSetter(jsName: "property-with-dashes") func setProperty_with_dashes(_ value: Double) throws(JSException) @JSGetter(jsName: "123invalidStart") var _123invalidStart: Bool - @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws (JSException) + @JSSetter(jsName: "123invalidStart") func set_123invalidStart(_ value: Bool) throws(JSException) @JSGetter(jsName: "property with spaces") var property_with_spaces: String - @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws (JSException) + @JSSetter(jsName: "property with spaces") func setProperty_with_spaces(_ value: String) throws(JSException) @JSGetter(jsName: "@specialChar") var _specialChar: Double - @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws (JSException) + @JSSetter(jsName: "@specialChar") func set_specialChar(_ value: Double) throws(JSException) @JSGetter var constructor: String - @JSSetter func setConstructor(_ value: String) throws (JSException) + @JSSetter func setConstructor(_ value: String) throws(JSException) @JSGetter var \`for\`: String - @JSSetter func setFor(_ value: String) throws (JSException) + @JSSetter func setFor(_ value: String) throws(JSException) @JSGetter var \`Any\`: String - @JSSetter(jsName: "Any") func setAny(_ value: String) throws (JSException) - @JSFunction func \`as\`() throws (JSException) -> Void - @JSFunction func \`try\`() throws (JSException) -> Void + @JSSetter(jsName: "Any") func setAny(_ value: String) throws(JSException) + @JSFunction func \`as\`() throws(JSException) -> Void + @JSFunction func \`try\`() throws(JSException) -> Void } @JSClass(jsName: "$Weird") struct _Weird { - @JSFunction init() throws (JSException) - @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> Void + @JSFunction init() throws(JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws(JSException) -> Void } -@JSFunction func createWeirdClass() throws (JSException) -> _Weird +@JSFunction func createWeirdClass() throws(JSException) -> _Weird " `; @@ -117,29 +117,29 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func createDatabaseConnection(_ config: JSObject) throws (JSException) -> DatabaseConnection +@JSFunction func createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection @JSClass struct DatabaseConnection { - @JSFunction func connect(_ url: String) throws (JSException) -> Void - @JSFunction func execute(_ query: String) throws (JSException) -> JSObject + @JSFunction func connect(_ url: String) throws(JSException) -> Void + @JSFunction func execute(_ query: String) throws(JSException) -> JSObject @JSGetter var isConnected: Bool @JSGetter var connectionTimeout: Double - @JSSetter func setConnectionTimeout(_ value: Double) throws (JSException) + @JSSetter func setConnectionTimeout(_ value: Double) throws(JSException) } -@JSFunction func createLogger(_ level: String) throws (JSException) -> Logger +@JSFunction func createLogger(_ level: String) throws(JSException) -> Logger @JSClass struct Logger { - @JSFunction func log(_ message: String) throws (JSException) -> Void - @JSFunction func error(_ message: String, _ error: JSObject) throws (JSException) -> Void + @JSFunction func log(_ message: String) throws(JSException) -> Void + @JSFunction func error(_ message: String, _ error: JSObject) throws(JSException) -> Void @JSGetter var level: String } -@JSFunction func getConfigManager() throws (JSException) -> ConfigManager +@JSFunction func getConfigManager() throws(JSException) -> ConfigManager @JSClass struct ConfigManager { - @JSFunction func get(_ key: String) throws (JSException) -> JSObject - @JSFunction func set(_ key: String, _ value: JSObject) throws (JSException) -> Void + @JSFunction func get(_ key: String) throws(JSException) -> JSObject + @JSFunction func set(_ key: String, _ value: JSObject) throws(JSException) -> Void @JSGetter var configPath: String } " @@ -154,7 +154,7 @@ exports[`ts2swift > snapshots Swift output for PrimitiveParameters.d.ts > Primit @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func check(_ a: Double, _ b: Bool) throws (JSException) -> Void +@JSFunction func check(_ a: Double, _ b: Bool) throws(JSException) -> Void " `; @@ -167,9 +167,9 @@ exports[`ts2swift > snapshots Swift output for PrimitiveReturn.d.ts > PrimitiveR @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkNumber() throws (JSException) -> Double +@JSFunction func checkNumber() throws(JSException) -> Double -@JSFunction func checkBoolean() throws (JSException) -> Bool +@JSFunction func checkBoolean() throws(JSException) -> Bool " `; @@ -182,11 +182,11 @@ exports[`ts2swift > snapshots Swift output for ReExportFrom.d.ts > ReExportFrom @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double +@JSFunction func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double @JSClass struct JsGreeter { - @JSFunction init(_ name: String) throws (JSException) - @JSFunction func greet() throws (JSException) -> String + @JSFunction init(_ name: String) throws(JSException) + @JSFunction func greet() throws(JSException) -> String } " `; @@ -206,9 +206,9 @@ enum FeatureFlag: String { } extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} -@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> Void +@JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void -@JSFunction func returnsFeatureFlag() throws (JSException) -> FeatureFlag +@JSFunction func returnsFeatureFlag() throws(JSException) -> FeatureFlag " `; @@ -221,9 +221,9 @@ exports[`ts2swift > snapshots Swift output for StringParameter.d.ts > StringPara @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkString(_ a: String) throws (JSException) -> Void +@JSFunction func checkString(_ a: String) throws(JSException) -> Void -@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws (JSException) -> Void +@JSFunction func checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void " `; @@ -236,7 +236,7 @@ exports[`ts2swift > snapshots Swift output for StringReturn.d.ts > StringReturn @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkString() throws (JSException) -> String +@JSFunction func checkString() throws(JSException) -> String " `; @@ -249,18 +249,18 @@ exports[`ts2swift > snapshots Swift output for TS2SkeletonLike.d.ts > TS2Skeleto @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func createTS2Skeleton() throws (JSException) -> TypeScriptProcessor +@JSFunction func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor @JSClass struct TypeScriptProcessor { - @JSFunction func convert(_ ts: String) throws (JSException) -> String - @JSFunction func validate(_ ts: String) throws (JSException) -> Bool + @JSFunction func convert(_ ts: String) throws(JSException) -> String + @JSFunction func validate(_ ts: String) throws(JSException) -> Bool @JSGetter var version: String } -@JSFunction func createCodeGenerator(_ format: String) throws (JSException) -> CodeGenerator +@JSFunction func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator @JSClass struct CodeGenerator { - @JSFunction func generate(_ input: JSObject) throws (JSException) -> String + @JSFunction func generate(_ input: JSObject) throws(JSException) -> String @JSGetter var outputFormat: String } " @@ -275,7 +275,7 @@ exports[`ts2swift > snapshots Swift output for TypeAlias.d.ts > TypeAlias 1`] = @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkSimple(_ a: Double) throws (JSException) -> Void +@JSFunction func checkSimple(_ a: Double) throws(JSException) -> Void " `; @@ -290,11 +290,11 @@ exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScript @JSClass struct Greeter { @JSGetter var name: String - @JSSetter func setName(_ value: String) throws (JSException) + @JSSetter func setName(_ value: String) throws(JSException) @JSGetter var age: Double - @JSFunction init(_ name: String) throws (JSException) - @JSFunction func greet() throws (JSException) -> String - @JSFunction func changeName(_ name: String) throws (JSException) -> Void + @JSFunction init(_ name: String) throws(JSException) + @JSFunction func greet() throws(JSException) -> String + @JSFunction func changeName(_ name: String) throws(JSException) -> Void } " `; @@ -308,6 +308,6 @@ exports[`ts2swift > snapshots Swift output for VoidParameterVoidReturn.d.ts > Vo @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func check() throws (JSException) -> Void +@JSFunction func check() throws(JSException) -> Void " `; diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 6836000c6..e066ad272 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -6,21 +6,21 @@ @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func jsRoundTripVoid() throws (JSException) -> Void +@JSFunction func jsRoundTripVoid() throws(JSException) -> Void -@JSFunction func jsRoundTripNumber(_ v: Double) throws (JSException) -> Double +@JSFunction func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double -@JSFunction func jsRoundTripBool(_ v: Bool) throws (JSException) -> Bool +@JSFunction func jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool -@JSFunction func jsRoundTripString(_ v: String) throws (JSException) -> String +@JSFunction func jsRoundTripString(_ v: String) throws(JSException) -> String -@JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws (JSException) -> Void +@JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void -@JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws (JSException) -> Double +@JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double -@JSFunction func jsThrowOrBool(_ shouldThrow: Bool) throws (JSException) -> Bool +@JSFunction func jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool -@JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws (JSException) -> String +@JSFunction func jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String enum FeatureFlag: String { case foo = "foo" @@ -28,38 +28,38 @@ enum FeatureFlag: String { } extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} -@JSFunction func jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws (JSException) -> FeatureFlag +@JSFunction func jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag @JSClass struct JsGreeter { @JSGetter var name: String - @JSSetter func setName(_ value: String) throws (JSException) + @JSSetter func setName(_ value: String) throws(JSException) @JSGetter var `prefix`: String - @JSFunction init(_ name: String, _ `prefix`: String) throws (JSException) - @JSFunction func greet() throws (JSException) -> String - @JSFunction func changeName(_ name: String) throws (JSException) -> Void + @JSFunction init(_ name: String, _ `prefix`: String) throws(JSException) + @JSFunction func greet() throws(JSException) -> String + @JSFunction func changeName(_ name: String) throws(JSException) -> Void } -@JSFunction func runAsyncWorks() throws (JSException) -> JSPromise +@JSFunction func runAsyncWorks() throws(JSException) -> JSPromise -@JSFunction(jsName: "$jsWeirdFunction") func _jsWeirdFunction() throws (JSException) -> Double +@JSFunction(jsName: "$jsWeirdFunction") func _jsWeirdFunction() throws(JSException) -> Double @JSClass(jsName: "$WeirdClass") struct _WeirdClass { - @JSFunction init() throws (JSException) - @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws (JSException) -> String + @JSFunction init() throws(JSException) + @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws(JSException) -> String } -@JSFunction(from: .global) func parseInt(_ string: String) throws (JSException) -> Double +@JSFunction(from: .global) func parseInt(_ string: String) throws(JSException) -> Double @JSClass(from: .global) struct Animal { @JSGetter var name: String - @JSSetter func setName(_ value: String) throws (JSException) + @JSSetter func setName(_ value: String) throws(JSException) @JSGetter var age: Double - @JSSetter func setAge(_ value: Double) throws (JSException) + @JSSetter func setAge(_ value: Double) throws(JSException) @JSGetter var isCat: Bool - @JSSetter func setIsCat(_ value: Bool) throws (JSException) - @JSFunction init(_ name: String, _ age: Double, _ isCat: Bool) throws (JSException) - @JSFunction func bark() throws (JSException) -> String - @JSFunction func getIsCat() throws (JSException) -> Bool + @JSSetter func setIsCat(_ value: Bool) throws(JSException) + @JSFunction init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) + @JSFunction func bark() throws(JSException) -> String + @JSFunction func getIsCat() throws(JSException) -> Bool } @JSGetter(from: .global) var globalObject1: JSObject From 89ed56e9cccf5a41d07fba75e6fcb51b1c4ad64b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 11:34:58 +0900 Subject: [PATCH 134/252] CI: Cancel previous workflow runs on PRs --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2859b7043..06faa39f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,9 @@ on: pull_request: push: branches: [main] +concurrency: + group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} + cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }} jobs: test: name: Build and Test From 6990143e74bbd28f7e7bc8c99f22efd40e504c2c Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 01:22:49 +0900 Subject: [PATCH 135/252] BridgeJS: Support `@JSFunction static func` --- .../Generated/JavaScript/BridgeJS.json | 3 + .../Sources/BridgeJSCore/ImportTS.swift | 22 ++++ .../BridgeJSCore/SwiftToSkeleton.swift | 51 ++++++++- .../Sources/BridgeJSLink/BridgeJSLink.swift | 42 ++++++- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 11 +- .../TS2Swift/JavaScript/src/processor.js | 6 +- .../MacroSwift/JSClassStaticFunctions.swift | 13 +++ .../BridgeJSCodegenTests/GlobalGetter.json | 3 + .../GlobalThisImports.json | 6 + .../ImportedTypeInExportedInterface.json | 3 + .../InvalidPropertyNames.json | 6 + .../BridgeJSCodegenTests/JSClass.json | 6 + .../JSClassStaticFunctions.json | 108 ++++++++++++++++++ .../JSClassStaticFunctions.swift | 86 ++++++++++++++ .../Generated/BridgeJS.Macros.swift | 9 ++ .../Generated/BridgeJS.swift | 105 +++++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 100 ++++++++++++++++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 13 +++ Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 9 ++ Tests/prelude.mjs | 22 ++++ 20 files changed, 615 insertions(+), 9 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json index 1cf8e64c6..2952e2157 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json @@ -191,6 +191,9 @@ "name" : "TS2Swift", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 7c391eea0..234bdc66c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -398,6 +398,24 @@ public struct ImportTS { ] } + func renderStaticMethod(method: ImportedFunctionSkeleton) throws -> [DeclSyntax] { + let abiName = method.abiName(context: type, operation: "static") + let builder = CallJSEmission(moduleName: moduleName, abiName: abiName) + for param in method.parameters { + try builder.lowerParameter(param: param) + } + try builder.call(returnType: method.returnType) + try builder.liftReturnValue(returnType: method.returnType) + topLevelDecls.append(builder.renderImportDecl()) + return [ + builder.renderThunkDecl( + name: Self.thunkName(type: type, method: method), + parameters: method.parameters, + returnType: method.returnType + ) + ] + } + func renderConstructorDecl(constructor: ImportedConstructorSkeleton) throws -> [DeclSyntax] { let builder = CallJSEmission(moduleName: moduleName, abiName: constructor.abiName(context: type)) for param in constructor.parameters { @@ -462,6 +480,10 @@ public struct ImportTS { decls.append(contentsOf: try renderConstructorDecl(constructor: constructor)) } + for method in type.staticMethods { + decls.append(contentsOf: try renderStaticMethod(method: method)) + } + for getter in type.getters { decls.append(try renderGetterDecl(getter: getter)) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index b780012f0..7928a5c1b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1856,6 +1856,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private let inputFilePath: String private var jsClassNames: Set private let parent: SwiftToSkeleton + private var staticMethodsByType: [String: [ImportedFunctionSkeleton]] = [:] // MARK: - State Management @@ -1876,6 +1877,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { let from: JSImportFrom? var constructor: ImportedConstructorSkeleton? var methods: [ImportedFunctionSkeleton] + var staticMethods: [ImportedFunctionSkeleton] var getters: [ImportedGetterSkeleton] var setters: [ImportedSetterSkeleton] } @@ -2094,6 +2096,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { from: nil, constructor: nil, methods: [], + staticMethods: [], getters: [], setters: [] ) @@ -2107,6 +2110,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { from: from, constructor: nil, methods: [], + staticMethods: [], getters: [], setters: [] ) @@ -2114,6 +2118,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func exitJSClass() { if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName { + let externalStaticMethods = staticMethodsByType[type.name] ?? [] importedTypes.append( ImportedTypeSkeleton( name: type.name, @@ -2121,11 +2126,13 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { from: type.from, constructor: type.constructor, methods: type.methods, + staticMethods: type.staticMethods + externalStaticMethods, getters: type.getters, setters: type.setters, documentation: nil ) ) + staticMethodsByType[type.name] = nil currentType = nil } stateStack.removeLast() @@ -2217,8 +2224,14 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { ) -> Bool { if let jsFunction = AttributeChecker.firstJSFunctionAttribute(node.attributes) { if isStaticMember { - parseFunction(jsFunction, node, enclosingTypeName: typeName, isStaticMember: true).map { - importedFunctions.append($0) + parseFunction( + jsFunction, + node, + enclosingTypeName: typeName, + isStaticMember: true, + includeTypeNameForStatic: false + ).map { + type.staticMethods.append($0) } } else { parseFunction(jsFunction, node, enclosingTypeName: typeName, isStaticMember: false).map { @@ -2319,9 +2332,34 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { for member in members { if let function = member.decl.as(FunctionDeclSyntax.self) { if let jsFunction = AttributeChecker.firstJSFunctionAttribute(function.attributes), - let parsed = parseFunction(jsFunction, function, enclosingTypeName: typeName, isStaticMember: true) + let parsed = parseFunction( + jsFunction, + function, + enclosingTypeName: typeName, + isStaticMember: true, + includeTypeNameForStatic: !jsClassNames.contains(typeName) + ) { - importedFunctions.append(parsed) + if jsClassNames.contains(typeName) { + if let index = importedTypes.firstIndex(where: { $0.name == typeName }) { + let existing = importedTypes[index] + importedTypes[index] = ImportedTypeSkeleton( + name: existing.name, + jsName: existing.jsName, + from: existing.from, + constructor: existing.constructor, + methods: existing.methods, + staticMethods: existing.staticMethods + [parsed], + getters: existing.getters, + setters: existing.setters, + documentation: existing.documentation + ) + } else { + staticMethodsByType[typeName, default: []].append(parsed) + } + } else { + importedFunctions.append(parsed) + } } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { errors.append( DiagnosticError( @@ -2366,7 +2404,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { _ jsFunction: AttributeSyntax, _ node: FunctionDeclSyntax, enclosingTypeName: String?, - isStaticMember: Bool + isStaticMember: Bool, + includeTypeNameForStatic: Bool = true ) -> ImportedFunctionSkeleton? { guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil else { @@ -2377,7 +2416,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { let jsName = AttributeChecker.extractJSName(from: jsFunction) let from = AttributeChecker.extractJSImportFrom(from: jsFunction) let name: String - if isStaticMember, let enclosingTypeName { + if isStaticMember, includeTypeNameForStatic, let enclosingTypeName { name = "\(enclosingTypeName)_\(baseName)" } else { name = baseName diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 60b55cd47..c1b4d2e77 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -2246,6 +2246,14 @@ extension BridgeJSLink { ) } + func callStaticMethod(on objectExpr: String, name: String, returnType: BridgeType) throws -> String? { + let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) + return try call( + calleeExpr: calleeExpr, + returnType: returnType + ) + } + func callPropertyGetter(name: String, returnType: BridgeType) throws -> String? { let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" let accessExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) @@ -2318,7 +2326,7 @@ extension BridgeJSLink { return loweredValues.first } - private static func propertyAccessExpr(objectExpr: String, propertyName: String) -> String { + static func propertyAccessExpr(objectExpr: String, propertyName: String) -> String { if propertyName.range(of: #"^[$A-Z_][0-9A-Z_$]*$"#, options: [.regularExpression, .caseInsensitive]) != nil { return "\(objectExpr).\(propertyName)" @@ -3130,6 +3138,12 @@ extension BridgeJSLink { importObjectBuilder.assignToImportObject(name: setterAbiName, function: js) importObjectBuilder.appendDts(dts) } + for method in type.staticMethods { + let abiName = method.abiName(context: type, operation: "static") + let (js, dts) = try renderImportedStaticMethod(context: type, method: method) + importObjectBuilder.assignToImportObject(name: abiName, function: js) + importObjectBuilder.appendDts(dts) + } for method in type.methods { let (js, dts) = try renderImportedMethod(context: type, method: method) importObjectBuilder.assignToImportObject(name: method.abiName(context: type), function: js) @@ -3207,6 +3221,32 @@ extension BridgeJSLink { return (funcLines, []) } + func renderImportedStaticMethod( + context: ImportedTypeSkeleton, + method: ImportedFunctionSkeleton + ) throws -> (js: [String], dts: [String]) { + let thunkBuilder = ImportedThunkBuilder() + for param in method.parameters { + try thunkBuilder.liftParameter(param: param) + } + let importRootExpr = context.from == .global ? "globalThis" : "imports" + let constructorExpr = ImportedThunkBuilder.propertyAccessExpr( + objectExpr: importRootExpr, + propertyName: context.jsName ?? context.name + ) + let returnExpr = try thunkBuilder.callStaticMethod( + on: constructorExpr, + name: method.jsName ?? method.name, + returnType: method.returnType + ) + let funcLines = thunkBuilder.renderFunction( + name: method.abiName(context: context, operation: "static"), + returnExpr: returnExpr, + returnType: method.returnType + ) + return (funcLines, []) + } + func renderImportedMethod( context: ImportedTypeSkeleton, method: ImportedFunctionSkeleton diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 5013dda66..66dda6cb0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -640,9 +640,14 @@ public struct ImportedFunctionSkeleton: Codable { } public func abiName(context: ImportedTypeSkeleton?) -> String { + return abiName(context: context, operation: nil) + } + + public func abiName(context: ImportedTypeSkeleton?, operation: String?) -> String { return ABINameGenerator.generateImportedABIName( baseName: name, - context: context + context: context, + operation: operation ) } } @@ -752,6 +757,8 @@ public struct ImportedTypeSkeleton: Codable { public let from: JSImportFrom? public let constructor: ImportedConstructorSkeleton? public let methods: [ImportedFunctionSkeleton] + /// Static methods available on the JavaScript constructor. + public var staticMethods: [ImportedFunctionSkeleton] = [] public let getters: [ImportedGetterSkeleton] public let setters: [ImportedSetterSkeleton] public let documentation: String? @@ -762,6 +769,7 @@ public struct ImportedTypeSkeleton: Codable { from: JSImportFrom? = nil, constructor: ImportedConstructorSkeleton? = nil, methods: [ImportedFunctionSkeleton], + staticMethods: [ImportedFunctionSkeleton] = [], getters: [ImportedGetterSkeleton] = [], setters: [ImportedSetterSkeleton] = [], documentation: String? = nil @@ -771,6 +779,7 @@ public struct ImportedTypeSkeleton: Codable { self.from = from self.constructor = constructor self.methods = methods + self.staticMethods = staticMethods self.getters = getters self.setters = setters self.documentation = documentation diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 258334ee8..0bd17422b 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -821,8 +821,12 @@ export class TypeProcessor { const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); const swiftMethodName = this.renderIdentifier(swiftName); + const isStatic = node.modifiers?.some( + (modifier) => modifier.kind === ts.SyntaxKind.StaticKeyword + ) ?? false; + const staticKeyword = isStatic ? "static " : ""; - this.swiftLines.push(` ${annotation} func ${swiftMethodName}(${params}) ${effects} -> ${returnType}`); + this.swiftLines.push(` ${annotation} ${staticKeyword}func ${swiftMethodName}(${params}) ${effects} -> ${returnType}`); } /** diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift new file mode 100644 index 000000000..fdfe02003 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift @@ -0,0 +1,13 @@ +extension StaticBox { + @JSFunction static func makeDefault() throws(JSException) -> StaticBox +} + +@JSClass struct StaticBox { + @JSFunction static func create(_ value: Double) throws(JSException) -> StaticBox + @JSFunction func value() throws(JSException) -> Double + @JSFunction static func value() throws(JSException) -> Double +} + +extension StaticBox { + @JSFunction(jsName: "with-dashes") static func dashed() throws(JSException) -> StaticBox +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json index c9be60d8a..031870e57 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json @@ -61,6 +61,9 @@ "name" : "JSConsole", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json index 5cec23259..c75d9e011 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json @@ -81,6 +81,9 @@ "name" : "JSConsole", "setters" : [ + ], + "staticMethods" : [ + ] }, { @@ -116,6 +119,9 @@ "name" : "WebSocket", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json index c40f0dc82..659232d56 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json @@ -186,6 +186,9 @@ "name" : "Foo", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json index 40b97c12b..b983f27a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json @@ -219,6 +219,9 @@ } } } + ], + "staticMethods" : [ + ] }, { @@ -248,6 +251,9 @@ "name" : "_Weird", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json index 07906a404..be1d0f4cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json @@ -107,6 +107,9 @@ } } } + ], + "staticMethods" : [ + ] }, { @@ -162,6 +165,9 @@ "name" : "Animatable", "setters" : [ + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json new file mode 100644 index 000000000..55fdb844c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json @@ -0,0 +1,108 @@ +{ + "exported" : { + "classes" : [ + + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + { + "name" : "value", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + } + ], + "name" : "StaticBox", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "create", + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "name" : "value", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "makeDefault", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "jsName" : "with-dashes", + "name" : "dashed", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + } + ] + } + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift new file mode 100644 index 000000000..ed54edf9d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift @@ -0,0 +1,86 @@ +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +#else +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") +fileprivate func bjs_StaticBox_value_static() -> Float64 +#else +fileprivate func bjs_StaticBox_value_static() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +#else +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") +fileprivate func bjs_StaticBox_dashed_static() -> Int32 +#else +fileprivate func bjs_StaticBox_dashed_static() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value") +fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 +#else +fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$StaticBox_create(_ value: Double) throws(JSException) -> StaticBox { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_StaticBox_create_static(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_value() throws(JSException) -> Double { + let ret = bjs_StaticBox_value_static() + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_makeDefault_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_dashed() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_dashed_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_StaticBox_value(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index e066ad272..1e8737280 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -48,6 +48,15 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction(jsName: "method-with-dashes") func method_with_dashes() throws(JSException) -> String } +@JSClass struct StaticBox { + @JSFunction init(_ value: Double) throws(JSException) + @JSFunction func value() throws(JSException) -> Double + @JSFunction static func create(_ value: Double) throws(JSException) -> StaticBox + @JSFunction static func value() throws(JSException) -> Double + @JSFunction static func makeDefault() throws(JSException) -> StaticBox + @JSFunction(jsName: "with-dashes") static func with_dashes() throws(JSException) -> StaticBox +} + @JSFunction(from: .global) func parseInt(_ string: String) throws(JSException) -> Double @JSClass(from: .global) struct Animal { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 94359a709..556409c07 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -8140,6 +8140,111 @@ func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> S return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_init") +fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 +#else +fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_create_static") +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +#else +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value_static") +fileprivate func bjs_StaticBox_value_static() -> Float64 +#else +fileprivate func bjs_StaticBox_value_static() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_makeDefault_static") +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +#else +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_with_dashes_static") +fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 +#else +fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value") +fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 +#else +fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$StaticBox_init(_ value: Double) throws(JSException) -> JSObject { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_StaticBox_init(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_create(_ value: Double) throws(JSException) -> StaticBox { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_StaticBox_create_static(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_value() throws(JSException) -> Double { + let ret = bjs_StaticBox_value_static() + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_makeDefault_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_with_dashes() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_with_dashes_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_StaticBox_value(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init") fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 4b8ac7c7b..a2e4310d9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -11668,6 +11668,9 @@ "name" : "Foo", "setters" : [ + ], + "staticMethods" : [ + ] } ] @@ -11967,6 +11970,9 @@ } } } + ], + "staticMethods" : [ + ] }, { @@ -11996,6 +12002,97 @@ "name" : "_WeirdClass", "setters" : [ + ], + "staticMethods" : [ + + ] + }, + { + "constructor" : { + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + } + ] + }, + "getters" : [ + + ], + "methods" : [ + { + "name" : "value", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + } + ], + "name" : "StaticBox", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "create", + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "name" : "value", + "parameters" : [ + + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "makeDefault", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "jsName" : "with-dashes", + "name" : "with_dashes", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + } ] }, { @@ -12107,6 +12204,9 @@ } } } + ], + "staticMethods" : [ + ] } ] diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index ea9f8c68f..b43a711e2 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -127,4 +127,17 @@ class ImportAPITests: XCTestCase { let obj = try _WeirdClass() XCTAssertEqual(try obj.method_with_dashes(), "ok") } + + func testJSClassStaticFunctions() throws { + let created = try StaticBox.create(10) + XCTAssertEqual(try created.value(), 10) + + let defaultBox = try StaticBox.makeDefault() + XCTAssertEqual(try defaultBox.value(), 0) + + XCTAssertEqual(try StaticBox.value(), 99) + + let dashed = try StaticBox.with_dashes() + XCTAssertEqual(try dashed.value(), 7) + } } diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 983d6052d..e38445805 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -31,3 +31,12 @@ export class $WeirdClass { constructor(); "method-with-dashes"(): string; } + +export class StaticBox { + constructor(value: number); + value(): number; + static create(value: number): StaticBox; + static value(): number; + static makeDefault(): StaticBox; + static "with-dashes"(): StaticBox; +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 850b31b6e..58a85acc2 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -9,6 +9,27 @@ export async function setupOptions(options, context) { Error.stackTraceLimit = 100; setupTestGlobals(globalThis); + class StaticBox { + constructor(value) { + this._value = value; + } + value() { + return this._value; + } + static create(value) { + return new StaticBox(value); + } + static value() { + return 99; + } + static makeDefault() { + return new StaticBox(0); + } + static ["with-dashes"]() { + return new StaticBox(7); + } + } + return { ...options, getImports: (importsContext) => { @@ -78,6 +99,7 @@ export async function setupOptions(options, context) { return "ok"; } }, + StaticBox, Foo: ImportedFoo, runAsyncWorks: async () => { const exports = importsContext.getExports(); From a2aa6e1d07e60f8397bf02fd7b8acc51c9d058c7 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 11:19:11 +0900 Subject: [PATCH 136/252] BridgeJS: Cover static methods in ts2swift tests --- .../JavaScript/test/__snapshots__/ts2swift.test.js.snap | 1 + .../TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 6add64de4..c7f3b6652 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -295,6 +295,7 @@ exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScript @JSFunction init(_ name: String) throws(JSException) @JSFunction func greet() throws(JSException) -> String @JSFunction func changeName(_ name: String) throws(JSException) -> Void + @JSFunction static func staticMethod(_ p1: Double, _ p2: String) throws(JSException) -> String } " `; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts index 074772f24..0745de1f9 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeScriptClass.d.ts @@ -4,4 +4,6 @@ export class Greeter { constructor(name: string); greet(): string; changeName(name: string): void; + + static staticMethod(p1: number, p2: string): string; } From 4e3f02b623375316981153bcaf9280bda115bb99 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 11:33:10 +0900 Subject: [PATCH 137/252] BridgeJS: Fix d.ts rendering of static methods --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 32 +- .../MacroSwift/JSClassStaticFunctions.swift | 5 + .../JSClassStaticFunctions.json | 44 +++ .../JSClassStaticFunctions.swift | 36 +++ .../JSClassStaticFunctions.d.ts | 32 ++ .../JSClassStaticFunctions.js | 286 ++++++++++++++++++ 6 files changed, 422 insertions(+), 13 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index c1b4d2e77..d39b524b5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3144,6 +3144,25 @@ extension BridgeJSLink { importObjectBuilder.assignToImportObject(name: abiName, function: js) importObjectBuilder.appendDts(dts) } + if type.from == nil, type.constructor != nil || !type.staticMethods.isEmpty { + let dtsPrinter = CodeFragmentPrinter() + dtsPrinter.write("\(type.name): {") + dtsPrinter.indent { + if let constructor = type.constructor { + let returnType = BridgeType.jsObject(type.name) + dtsPrinter.write( + "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));" + ) + } + for method in type.staticMethods { + let methodName = method.jsName ?? method.name + let signature = "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));" + dtsPrinter.write(signature) + } + } + dtsPrinter.write("}") + importObjectBuilder.appendDts(dtsPrinter.lines) + } for method in type.methods { let (js, dts) = try renderImportedMethod(context: type, method: method) importObjectBuilder.assignToImportObject(name: method.abiName(context: type), function: js) @@ -3174,19 +3193,6 @@ extension BridgeJSLink { returnType: returnType ) importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) - - if type.from == nil { - let dtsPrinter = CodeFragmentPrinter() - dtsPrinter.write("\(type.name): {") - dtsPrinter.indent { - dtsPrinter.write( - "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));" - ) - } - dtsPrinter.write("}") - - importObjectBuilder.appendDts(dtsPrinter.lines) - } } func renderImportedGetter( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift index fdfe02003..ecf1b2473 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift @@ -11,3 +11,8 @@ extension StaticBox { extension StaticBox { @JSFunction(jsName: "with-dashes") static func dashed() throws(JSException) -> StaticBox } + +@JSClass struct WithCtor { + @JSFunction init(_ value: Double) throws(JSException) + @JSFunction static func create(_ value: Double) throws(JSException) -> WithCtor +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json index 55fdb844c..df3d3829e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json @@ -99,6 +99,50 @@ } } ] + }, + { + "constructor" : { + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + } + ] + }, + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "WithCtor", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "create", + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "WithCtor" + } + } + } + ] } ] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift index ed54edf9d..5e297f929 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift @@ -83,4 +83,40 @@ func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { throw error } return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithCtor_init") +fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 +#else +fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithCtor_create_static") +fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 +#else +fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$WithCtor_init(_ value: Double) throws(JSException) -> JSObject { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_WithCtor_init(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$WithCtor_create(_ value: Double) throws(JSException) -> WithCtor { + let valueValue = value.bridgeJSLowerParameter() + let ret = bjs_WithCtor_create_static(valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return WithCtor.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts new file mode 100644 index 000000000..3b2b5de99 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts @@ -0,0 +1,32 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface StaticBox { + value(): number; +} +export interface WithCtor { +} +export type Exports = { +} +export type Imports = { + StaticBox: { + create(value: number): StaticBox; + value(): number; + makeDefault(): StaticBox; + "with-dashes"(): StaticBox; + } + WithCtor: { + new(value: number): WithCtor; + create(value: number): WithCtor; + } +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js new file mode 100644 index 000000000..f8f0ba86f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -0,0 +1,286 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_i32"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { + try { + let ret = imports.StaticBox.create(value); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() { + try { + let ret = imports.StaticBox.value(); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() { + try { + let ret = imports.StaticBox.makeDefault(); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() { + try { + let ret = imports.StaticBox["with-dashes"](); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_StaticBox_value"] = function bjs_StaticBox_value(self) { + try { + let ret = swift.memory.getObject(self).value(); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WithCtor_init"] = function bjs_WithCtor_init(value) { + try { + return swift.memory.retain(new imports.WithCtor(value)); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WithCtor_create_static"] = function bjs_WithCtor_create_static(value) { + try { + let ret = imports.WithCtor.create(value); + return swift.memory.retain(ret); + } catch (error) { + setException(error); + return 0 + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file From 0c3cb258e028fd10bc1c2bad2255074cd80ed04e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 11:36:11 +0900 Subject: [PATCH 138/252] ./Utilities/format.swift --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 3 ++- .../Inputs/MacroSwift/JSClassStaticFunctions.swift | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index d39b524b5..fd5faee24 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3156,7 +3156,8 @@ extension BridgeJSLink { } for method in type.staticMethods { let methodName = method.jsName ?? method.name - let signature = "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));" + let signature = + "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));" dtsPrinter.write(signature) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift index ecf1b2473..891eab118 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift @@ -15,4 +15,4 @@ extension StaticBox { @JSClass struct WithCtor { @JSFunction init(_ value: Double) throws(JSException) @JSFunction static func create(_ value: Double) throws(JSException) -> WithCtor -} \ No newline at end of file +} From cf6c745538acdea29e2c30f114f894ec3b2704fa Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 12:22:20 +0900 Subject: [PATCH 139/252] BridgeJS: Simplify static method naming --- .../BridgeJSCore/SwiftToSkeleton.swift | 54 ++++------------- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 4 +- .../JSClassStaticFunctions.json | 60 ++++++++++++------- .../JSClassStaticFunctions.swift | 56 ++++++++--------- .../JSClassStaticFunctions.d.ts | 8 ++- .../JSClassStaticFunctions.js | 20 +++---- 6 files changed, 93 insertions(+), 109 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 7928a5c1b..d84d30506 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -2198,7 +2198,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func handleTopLevelFunction(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { if let jsFunction = AttributeChecker.firstJSFunctionAttribute(node.attributes), - let function = parseFunction(jsFunction, node, enclosingTypeName: nil, isStaticMember: true) + let function = parseFunction(jsFunction, node) { importedFunctions.append(function) return .skipChildren @@ -2223,19 +2223,11 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { type: inout CurrentType ) -> Bool { if let jsFunction = AttributeChecker.firstJSFunctionAttribute(node.attributes) { - if isStaticMember { - parseFunction( - jsFunction, - node, - enclosingTypeName: typeName, - isStaticMember: true, - includeTypeNameForStatic: false - ).map { - type.staticMethods.append($0) - } - } else { - parseFunction(jsFunction, node, enclosingTypeName: typeName, isStaticMember: false).map { - type.methods.append($0) + if let method = parseFunction(jsFunction, node) { + if isStaticMember { + type.staticMethods.append(method) + } else { + type.methods.append(method) } } return true @@ -2332,30 +2324,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { for member in members { if let function = member.decl.as(FunctionDeclSyntax.self) { if let jsFunction = AttributeChecker.firstJSFunctionAttribute(function.attributes), - let parsed = parseFunction( - jsFunction, - function, - enclosingTypeName: typeName, - isStaticMember: true, - includeTypeNameForStatic: !jsClassNames.contains(typeName) - ) - { + let parsed = parseFunction(jsFunction, function) { if jsClassNames.contains(typeName) { if let index = importedTypes.firstIndex(where: { $0.name == typeName }) { - let existing = importedTypes[index] - importedTypes[index] = ImportedTypeSkeleton( - name: existing.name, - jsName: existing.jsName, - from: existing.from, - constructor: existing.constructor, - methods: existing.methods, - staticMethods: existing.staticMethods + [parsed], - getters: existing.getters, - setters: existing.setters, - documentation: existing.documentation - ) + importedTypes[index].staticMethods.append(parsed) } else { - staticMethodsByType[typeName, default: []].append(parsed) + importedTypes.append(ImportedTypeSkeleton(name: typeName, staticMethods: [parsed])) } } else { importedFunctions.append(parsed) @@ -2403,9 +2377,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func parseFunction( _ jsFunction: AttributeSyntax, _ node: FunctionDeclSyntax, - enclosingTypeName: String?, - isStaticMember: Bool, - includeTypeNameForStatic: Bool = true ) -> ImportedFunctionSkeleton? { guard validateEffects(node.signature.effectSpecifiers, node: node, attributeName: "JSFunction") != nil else { @@ -2415,12 +2386,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text) let jsName = AttributeChecker.extractJSName(from: jsFunction) let from = AttributeChecker.extractJSImportFrom(from: jsFunction) - let name: String - if isStaticMember, includeTypeNameForStatic, let enclosingTypeName { - name = "\(enclosingTypeName)_\(baseName)" - } else { - name = baseName - } + let name = baseName let parameters = parseParameters(from: node.signature.parameterClause) let returnType: BridgeType diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 66dda6cb0..6fe88a6a0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -758,7 +758,7 @@ public struct ImportedTypeSkeleton: Codable { public let constructor: ImportedConstructorSkeleton? public let methods: [ImportedFunctionSkeleton] /// Static methods available on the JavaScript constructor. - public var staticMethods: [ImportedFunctionSkeleton] = [] + public var staticMethods: [ImportedFunctionSkeleton] public let getters: [ImportedGetterSkeleton] public let setters: [ImportedSetterSkeleton] public let documentation: String? @@ -768,7 +768,7 @@ public struct ImportedTypeSkeleton: Codable { jsName: String? = nil, from: JSImportFrom? = nil, constructor: ImportedConstructorSkeleton? = nil, - methods: [ImportedFunctionSkeleton], + methods: [ImportedFunctionSkeleton] = [], staticMethods: [ImportedFunctionSkeleton] = [], getters: [ImportedGetterSkeleton] = [], setters: [ImportedSetterSkeleton] = [], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json index df3d3829e..7bf5db0fd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json @@ -24,6 +24,43 @@ ], "types" : [ + { + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "StaticBox", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "makeDefault", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "jsName" : "with-dashes", + "name" : "dashed", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + } + ] + }, { "getters" : [ @@ -74,29 +111,6 @@ } } - }, - { - "name" : "makeDefault", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "StaticBox" - } - } - }, - { - "jsName" : "with-dashes", - "name" : "dashed", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "StaticBox" - } - } } ] }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift index 5e297f929..efb83f406 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift @@ -1,35 +1,51 @@ #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 #else -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") -fileprivate func bjs_StaticBox_value_static() -> Float64 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") +fileprivate func bjs_StaticBox_dashed_static() -> Int32 #else -fileprivate func bjs_StaticBox_value_static() -> Float64 { +fileprivate func bjs_StaticBox_dashed_static() -> Int32 { fatalError("Only available on WebAssembly") } #endif +func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_makeDefault_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_dashed() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_dashed_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 #else -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") -fileprivate func bjs_StaticBox_dashed_static() -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") +fileprivate func bjs_StaticBox_value_static() -> Float64 #else -fileprivate func bjs_StaticBox_dashed_static() -> Int32 { +fileprivate func bjs_StaticBox_value_static() -> Float64 { fatalError("Only available on WebAssembly") } #endif @@ -60,22 +76,6 @@ func _$StaticBox_value() throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } -func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { - let ret = bjs_StaticBox_makeDefault_static() - if let error = _swift_js_take_exception() { - throw error - } - return StaticBox.bridgeJSLiftReturn(ret) -} - -func _$StaticBox_dashed() throws(JSException) -> StaticBox { - let ret = bjs_StaticBox_dashed_static() - if let error = _swift_js_take_exception() { - throw error - } - return StaticBox.bridgeJSLiftReturn(ret) -} - func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { let selfValue = self.bridgeJSLowerParameter() let ret = bjs_StaticBox_value(selfValue) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts index 3b2b5de99..e4c59459a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts @@ -4,6 +4,8 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export interface StaticBox { +} export interface StaticBox { value(): number; } @@ -13,11 +15,13 @@ export type Exports = { } export type Imports = { StaticBox: { - create(value: number): StaticBox; - value(): number; makeDefault(): StaticBox; "with-dashes"(): StaticBox; } + StaticBox: { + create(value: number): StaticBox; + value(): number; + } WithCtor: { new(value: number): WithCtor; create(value: number): WithCtor; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index f8f0ba86f..4acf43685 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -203,37 +203,37 @@ export async function createInstantiator(options, swift) { return pointer || 0; } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { + TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() { try { - let ret = imports.StaticBox.create(value); + let ret = imports.StaticBox.makeDefault(); return swift.memory.retain(ret); } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() { + TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() { try { - let ret = imports.StaticBox.value(); - return ret; + let ret = imports.StaticBox["with-dashes"](); + return swift.memory.retain(ret); } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() { + TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { try { - let ret = imports.StaticBox.makeDefault(); + let ret = imports.StaticBox.create(value); return swift.memory.retain(ret); } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() { + TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() { try { - let ret = imports.StaticBox["with-dashes"](); - return swift.memory.retain(ret); + let ret = imports.StaticBox.value(); + return ret; } catch (error) { setException(error); return 0 From 5161a41903aa660c84ad30f332070c07e2f4fcc5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 12:54:10 +0900 Subject: [PATCH 140/252] BridgeJS: Remove support for static members in extensions --- .../BridgeJSCore/SwiftToSkeleton.swift | 51 +--------------- .../MacroSwift/JSClassStaticFunctions.swift | 8 +-- .../JSClassStaticFunctions.json | 60 +++++++------------ .../JSClassStaticFunctions.swift | 56 ++++++++--------- .../JSClassStaticFunctions.d.ts | 8 +-- .../JSClassStaticFunctions.js | 20 +++---- 6 files changed, 65 insertions(+), 138 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index d84d30506..9fb8b8ab0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1856,8 +1856,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private let inputFilePath: String private var jsClassNames: Set private let parent: SwiftToSkeleton - private var staticMethodsByType: [String: [ImportedFunctionSkeleton]] = [:] - // MARK: - State Management enum State { @@ -2118,7 +2116,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { private func exitJSClass() { if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName { - let externalStaticMethods = staticMethodsByType[type.name] ?? [] importedTypes.append( ImportedTypeSkeleton( name: type.name, @@ -2126,13 +2123,12 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { from: type.from, constructor: type.constructor, methods: type.methods, - staticMethods: type.staticMethods + externalStaticMethods, + staticMethods: type.staticMethods, getters: type.getters, setters: type.setters, documentation: nil ) ) - staticMethodsByType[type.name] = nil currentType = nil } stateStack.removeLast() @@ -2172,12 +2168,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { // MARK: - Visitor Methods - override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind { - let typeName = node.extendedType.trimmedDescription - collectStaticMembers(in: node.memberBlock.members, typeName: typeName) - return .skipChildren - } - override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind { switch state { case .topLevel: @@ -2318,45 +2308,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } } - // MARK: - Member Collection - - private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) { - for member in members { - if let function = member.decl.as(FunctionDeclSyntax.self) { - if let jsFunction = AttributeChecker.firstJSFunctionAttribute(function.attributes), - let parsed = parseFunction(jsFunction, function) { - if jsClassNames.contains(typeName) { - if let index = importedTypes.firstIndex(where: { $0.name == typeName }) { - importedTypes[index].staticMethods.append(parsed) - } else { - importedTypes.append(ImportedTypeSkeleton(name: typeName, staticMethods: [parsed])) - } - } else { - importedFunctions.append(parsed) - } - } else if AttributeChecker.hasJSSetterAttribute(function.attributes) { - errors.append( - DiagnosticError( - node: function, - message: - "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } - } else if let variable = member.decl.as(VariableDeclSyntax.self), - AttributeChecker.hasJSGetterAttribute(variable.attributes) - { - errors.append( - DiagnosticError( - node: variable, - message: - "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types." - ) - ) - } - } - } - // MARK: - Parsing Methods private func parseConstructor( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift index 891eab118..c64952565 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSClassStaticFunctions.swift @@ -1,14 +1,8 @@ -extension StaticBox { - @JSFunction static func makeDefault() throws(JSException) -> StaticBox -} - @JSClass struct StaticBox { @JSFunction static func create(_ value: Double) throws(JSException) -> StaticBox @JSFunction func value() throws(JSException) -> Double @JSFunction static func value() throws(JSException) -> Double -} - -extension StaticBox { + @JSFunction static func makeDefault() throws(JSException) -> StaticBox @JSFunction(jsName: "with-dashes") static func dashed() throws(JSException) -> StaticBox } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json index 7bf5db0fd..df3d3829e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json @@ -24,43 +24,6 @@ ], "types" : [ - { - "getters" : [ - - ], - "methods" : [ - - ], - "name" : "StaticBox", - "setters" : [ - - ], - "staticMethods" : [ - { - "name" : "makeDefault", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "StaticBox" - } - } - }, - { - "jsName" : "with-dashes", - "name" : "dashed", - "parameters" : [ - - ], - "returnType" : { - "jsObject" : { - "_0" : "StaticBox" - } - } - } - ] - }, { "getters" : [ @@ -111,6 +74,29 @@ } } + }, + { + "name" : "makeDefault", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } + }, + { + "jsName" : "with-dashes", + "name" : "dashed", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + "_0" : "StaticBox" + } + } } ] }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift index efb83f406..5e297f929 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift @@ -1,51 +1,35 @@ #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 #else -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { +fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") -fileprivate func bjs_StaticBox_dashed_static() -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") +fileprivate func bjs_StaticBox_value_static() -> Float64 #else -fileprivate func bjs_StaticBox_dashed_static() -> Int32 { +fileprivate func bjs_StaticBox_value_static() -> Float64 { fatalError("Only available on WebAssembly") } #endif -func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { - let ret = bjs_StaticBox_makeDefault_static() - if let error = _swift_js_take_exception() { - throw error - } - return StaticBox.bridgeJSLiftReturn(ret) -} - -func _$StaticBox_dashed() throws(JSException) -> StaticBox { - let ret = bjs_StaticBox_dashed_static() - if let error = _swift_js_take_exception() { - throw error - } - return StaticBox.bridgeJSLiftReturn(ret) -} - #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 #else -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { +fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") -fileprivate func bjs_StaticBox_value_static() -> Float64 +@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") +fileprivate func bjs_StaticBox_dashed_static() -> Int32 #else -fileprivate func bjs_StaticBox_value_static() -> Float64 { +fileprivate func bjs_StaticBox_dashed_static() -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -76,6 +60,22 @@ func _$StaticBox_value() throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +func _$StaticBox_makeDefault() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_makeDefault_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + +func _$StaticBox_dashed() throws(JSException) -> StaticBox { + let ret = bjs_StaticBox_dashed_static() + if let error = _swift_js_take_exception() { + throw error + } + return StaticBox.bridgeJSLiftReturn(ret) +} + func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { let selfValue = self.bridgeJSLowerParameter() let ret = bjs_StaticBox_value(selfValue) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts index e4c59459a..3b2b5de99 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts @@ -4,8 +4,6 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -export interface StaticBox { -} export interface StaticBox { value(): number; } @@ -14,13 +12,11 @@ export interface WithCtor { export type Exports = { } export type Imports = { - StaticBox: { - makeDefault(): StaticBox; - "with-dashes"(): StaticBox; - } StaticBox: { create(value: number): StaticBox; value(): number; + makeDefault(): StaticBox; + "with-dashes"(): StaticBox; } WithCtor: { new(value: number): WithCtor; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index 4acf43685..f8f0ba86f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -203,37 +203,37 @@ export async function createInstantiator(options, swift) { return pointer || 0; } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() { + TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { try { - let ret = imports.StaticBox.makeDefault(); + let ret = imports.StaticBox.create(value); return swift.memory.retain(ret); } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() { + TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() { try { - let ret = imports.StaticBox["with-dashes"](); - return swift.memory.retain(ret); + let ret = imports.StaticBox.value(); + return ret; } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { + TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() { try { - let ret = imports.StaticBox.create(value); + let ret = imports.StaticBox.makeDefault(); return swift.memory.retain(ret); } catch (error) { setException(error); return 0 } } - TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() { + TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() { try { - let ret = imports.StaticBox.value(); - return ret; + let ret = imports.StaticBox["with-dashes"](); + return swift.memory.retain(ret); } catch (error) { setException(error); return 0 From fc7e237ae303d0a8b373ae98024083f7efaf91be Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 00:45:00 +0900 Subject: [PATCH 141/252] BridgeJS: Support `T | null` and `T | undefined` --- .../Sources/BridgeJSCore/ExportSwift.swift | 39 +- .../Sources/BridgeJSCore/ImportTS.swift | 30 +- .../BridgeJSCore/SwiftToSkeleton.swift | 24 ++ .../Sources/BridgeJSLink/BridgeJSLink.swift | 2 + .../Sources/BridgeJSLink/JSGlueGen.swift | 228 ++++++++-- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 16 +- .../TS2Swift/JavaScript/src/processor.js | 24 ++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 19 +- Sources/JavaScriptKit/JSUndefinedOr.swift | 408 ++++++++++++++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 23 + .../Generated/BridgeJS.Macros.swift | 4 + .../Generated/BridgeJS.swift | 195 +++++++++ .../Generated/JavaScript/BridgeJS.json | 267 ++++++++++++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 20 + Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 2 + Tests/prelude.mjs | 26 ++ tsconfig.json | 6 + 17 files changed, 1250 insertions(+), 83 deletions(-) create mode 100644 Sources/JavaScriptKit/JSUndefinedOr.swift create mode 100644 tsconfig.json diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index dc8b5e048..39281ddfb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -820,6 +820,8 @@ struct StackCodegen { return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" case .optional(let wrappedType): return liftOptionalExpression(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return liftUndefinedExpression(wrappedType: wrappedType) case .array(let elementType): return liftArrayExpression(elementType: elementType) case .closure: @@ -839,7 +841,7 @@ struct StackCodegen { return liftArrayExpressionInline(elementType: elementType) case .swiftProtocol(let protocolName): return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" - case .optional, .array, .closure: + case .optional, .undefinedOr, .array, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") @@ -883,11 +885,34 @@ struct StackCodegen { } }() """ - case .void, .namespaceEnum, .closure, .optional, .unsafePointer, .swiftProtocol: + case .undefinedOr, .void, .namespaceEnum, .closure, .optional, .unsafePointer, .swiftProtocol: fatalError("Invalid optional wrapped type: \(wrappedType)") } } + private func liftUndefinedExpression(wrappedType: BridgeType) -> ExprSyntax { + switch wrappedType { + case .string, .int, .uint, .bool, .float, .double, .jsObject, + .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: + return "JSUndefinedOr<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" + case .array(let elementType): + let arrayLift = liftArrayExpression(elementType: elementType) + let swiftTypeName = elementType.swiftType + return """ + { + let __isDefined = _swift_js_pop_i32() + if __isDefined == 0 { + return JSUndefinedOr<\(raw: swiftTypeName)>.undefined + } else { + return JSUndefinedOr<\(raw: swiftTypeName)>(optional: \(arrayLift)) + } + }() + """ + case .void, .namespaceEnum, .closure, .optional, .undefinedOr, .unsafePointer, .swiftProtocol: + fatalError("Invalid undefinedOr wrapped type: \(wrappedType)") + } + } + /// Generates statements to lower/push a value onto the stack. /// - Parameters: /// - type: The BridgeType to lower @@ -917,6 +942,8 @@ struct StackCodegen { return ["\(raw: accessor).bridgeJSLowerReturn()"] case .optional(let wrappedType): return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) + case .undefinedOr(let wrappedType): + return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) case .void, .namespaceEnum: return [] case .array(let elementType): @@ -938,7 +965,7 @@ struct StackCodegen { return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] - case .optional, .array, .closure: + case .optional, .undefinedOr, .array, .closure: return lowerArrayStatementsInline( elementType: elementType, accessor: accessor, @@ -1597,6 +1624,7 @@ extension BridgeType { case .swiftProtocol(let name): return "Any\(name)" case .void: return "Void" case .optional(let wrappedType): return "Optional<\(wrappedType.swiftType)>" + case .undefinedOr(let wrappedType): return "JSUndefinedOr<\(wrappedType.swiftType)>" case .array(let elementType): return "[\(elementType.swiftType)]" case .caseEnum(let name): return name case .rawValueEnum(let name, _): return name @@ -1644,6 +1672,10 @@ extension BridgeType { var optionalParams: [(name: String, type: WasmCoreType)] = [("isSome", .i32)] optionalParams.append(contentsOf: try wrappedType.liftParameterInfo().parameters) return LiftingIntrinsicInfo(parameters: optionalParams) + case .undefinedOr(let wrappedType): + var params: [(name: String, type: WasmCoreType)] = [("isDefined", .i32)] + params.append(contentsOf: try wrappedType.liftParameterInfo().parameters) + return LiftingIntrinsicInfo(parameters: params) case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): return rawType.liftingIntrinsicInfo @@ -1693,6 +1725,7 @@ extension BridgeType { case .swiftProtocol: return .jsObject case .void: return .void case .optional: return .optional + case .undefinedOr: return .optional case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): return rawType.loweringIntrinsicInfo diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 7c391eea0..7ac72cffc 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -925,15 +925,15 @@ extension BridgeType { case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as parameters") case .optional(let wrappedType): - switch context { - case .importTS: - throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift: - let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) - var params = [("isSome", WasmCoreType.i32)] - params.append(contentsOf: wrappedInfo.loweredParameters) - return LoweringParameterInfo(loweredParameters: params) - } + let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) + var params = [("isSome", WasmCoreType.i32)] + params.append(contentsOf: wrappedInfo.loweredParameters) + return LoweringParameterInfo(loweredParameters: params) + case .undefinedOr(let wrappedType): + let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) + var params = [("isDefined", WasmCoreType.i32)] + params.append(contentsOf: wrappedInfo.loweredParameters) + return LoweringParameterInfo(loweredParameters: params) case .array: switch context { case .importTS: @@ -1019,13 +1019,11 @@ extension BridgeType { case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as return values") case .optional(let wrappedType): - switch context { - case .importTS: - throw BridgeJSCoreError("Optional types are not yet supported in TypeScript imports") - case .exportSwift: - let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) - return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) - } + let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) + return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) + case .undefinedOr(let wrappedType): + let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) + return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) case .array: switch context { case .importTS: diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index b780012f0..67f1421a2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -133,6 +133,30 @@ public final class SwiftToSkeleton { return .optional(baseType) } } + // JSUndefinedOr + if let identifierType = type.as(IdentifierTypeSyntax.self), + identifierType.name.text == "JSUndefinedOr", + let genericArgs = identifierType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let baseType = lookupType(for: argType, errors: &errors) { + return .undefinedOr(baseType) + } + } + // JavaScriptKit.JSUndefinedOr + if let memberType = type.as(MemberTypeSyntax.self), + let baseType = memberType.baseType.as(IdentifierTypeSyntax.self), + baseType.name.text == "JavaScriptKit", + memberType.name.text == "JSUndefinedOr", + let genericArgs = memberType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argType = TypeSyntax(genericArgs.first?.argument) + { + if let wrappedType = lookupType(for: argType, errors: &errors) { + return .undefinedOr(wrappedType) + } + } // Optional if let identifierType = type.as(IdentifierTypeSyntax.self), identifierType.name.text == "Optional", diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 60b55cd47..0b1be8a10 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3405,6 +3405,8 @@ extension BridgeType { return "number" case .optional(let wrappedType): return "\(wrappedType.tsType) | null" + case .undefinedOr(let wrappedType): + return "\(wrappedType.tsType) | undefined" case .caseEnum(let name): return "\(name)Tag" case .rawValueEnum(let name, _): diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index c78a92de7..ad27dc6f3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -296,7 +296,10 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLiftParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + static func optionalLiftParameter( + wrappedType: BridgeType, + absenceLiteral: String = "null" + ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["isSome", "wrappedValue"], printCode: { arguments, scope, printer, cleanupCode in @@ -306,9 +309,9 @@ struct IntrinsicJSFragment: Sendable { switch wrappedType { case .int, .float, .double, .caseEnum: - resultExpr = "\(isSome) ? \(wrappedValue) : null" + resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" case .bool: - resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : null" + resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : \(absenceLiteral)" case .string: let objectLabel = scope.variable("obj") printer.write("let \(objectLabel);") @@ -320,12 +323,12 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") } printer.write("}") - resultExpr = "\(isSome) ? \(objectLabel) : null" + resultExpr = "\(isSome) ? \(objectLabel) : \(absenceLiteral)" case .swiftHeapObject(let name): - resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : null" + resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : \(absenceLiteral)" case .jsObject: resultExpr = - "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : null" + "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -339,11 +342,11 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") } printer.write("}") - resultExpr = "\(isSome) ? \(objectLabel) : null" + resultExpr = "\(isSome) ? \(objectLabel) : \(absenceLiteral)" case .bool: - resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : null" + resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : \(absenceLiteral)" default: - resultExpr = "\(isSome) ? \(wrappedValue) : null" + resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" } case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName @@ -356,7 +359,7 @@ struct IntrinsicJSFragment: Sendable { ) } printer.write("}") - resultExpr = "\(isSome) ? \(enumVar) : null" + resultExpr = "\(isSome) ? \(enumVar) : \(absenceLiteral)" case .swiftStruct(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let structVar = scope.variable("structValue") @@ -369,7 +372,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(structVar) = null;") + printer.write("\(structVar) = \(absenceLiteral);") } printer.write("}") resultExpr = structVar @@ -387,12 +390,12 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(arrayVar) = null;") + printer.write("\(arrayVar) = \(absenceLiteral);") } printer.write("}") resultExpr = arrayVar default: - resultExpr = "\(isSome) ? \(wrappedValue) : null" + resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" } return [resultExpr] @@ -514,7 +517,8 @@ struct IntrinsicJSFragment: Sendable { static func optionalLiftReturn( wrappedType: BridgeType, - context: BridgeContext = .exportSwift + context: BridgeContext = .exportSwift, + absenceLiteral: String = "null" ) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], @@ -550,7 +554,7 @@ struct IntrinsicJSFragment: Sendable { ? "\(className).__construct(\(pointerVar))" : "_exports['\(className)'].__construct(\(pointerVar))" printer.write( - "const \(resultVar) = \(pointerVar) === null ? null : \(constructExpr);" + "const \(resultVar) = \(pointerVar) === null ? \(absenceLiteral) : \(constructExpr);" ) case .caseEnum: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") @@ -586,7 +590,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(resultVar);") printer.write("if (\(isNullVar)) {") printer.indent { - printer.write("\(resultVar) = null;") + printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("} else {") printer.indent { @@ -608,7 +612,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(resultVar) = null;") + printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("}") case .array(let elementType): @@ -625,7 +629,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(resultVar) = null;") + printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("}") default: @@ -637,7 +641,10 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + static func optionalLowerReturn( + wrappedType: BridgeType, + presenceCheck: (@Sendable (String) -> String)? = nil + ) throws -> IntrinsicJSFragment { switch wrappedType { case .void, .optional, .namespaceEnum, .closure: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") @@ -649,7 +656,8 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let value = arguments[0] let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null;") + let presenceExpr = presenceCheck?(value) ?? "\(value) != null" + printer.write("const \(isSomeVar) = \(presenceExpr);") switch wrappedType { case .bool: @@ -905,7 +913,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType): + case .optional(let wrappedType), .undefinedOr(let wrappedType): return try closureOptionalLiftParameter(wrappedType: wrappedType) default: throw BridgeJSLinkError(message: "Unsupported closure parameter type for lifting: \(type)") @@ -1106,7 +1114,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType): + case .optional(let wrappedType), .undefinedOr(let wrappedType): return try closureOptionalLowerReturn(wrappedType: wrappedType) default: throw BridgeJSLinkError(message: "Unsupported closure return type for lowering: \(type)") @@ -1303,19 +1311,28 @@ struct IntrinsicJSFragment: Sendable { ) case .optional(let wrappedType): return try closureOptionalLiftReturn(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return try closureOptionalLiftReturn(wrappedType: wrappedType, absenceLiteral: "undefined") default: throw BridgeJSLinkError(message: "Unsupported closure return type for lifting: \(type)") } } /// Handles optional return lifting for Swift closure returns - private static func closureOptionalLiftReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + private static func closureOptionalLiftReturn( + wrappedType: BridgeType, + absenceLiteral: String = "null" + ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["invokeCall"], printCode: { arguments, scope, printer, cleanupCode in let invokeCall = arguments[0] printer.write("\(invokeCall);") - let baseFragment = optionalLiftReturn(wrappedType: wrappedType, context: .importTS) + let baseFragment = optionalLiftReturn( + wrappedType: wrappedType, + context: .importTS, + absenceLiteral: absenceLiteral + ) let lifted = baseFragment.printCode([], scope, printer, cleanupCode) if !lifted.isEmpty { printer.write("return \(lifted[0]);") @@ -1361,6 +1378,8 @@ struct IntrinsicJSFragment: Sendable { default: printer.write("return;") } + case .undefinedOr: + printer.write("return;") default: printer.write("return 0;") } @@ -1384,6 +1403,8 @@ struct IntrinsicJSFragment: Sendable { case .void: return .void case .optional(let wrappedType): return try .optionalLowerParameter(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return try .optionalLowerParameter(wrappedType: wrappedType) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1428,6 +1449,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftProtocol: return .jsObjectLiftReturn case .void: return .void case .optional(let wrappedType): return .optionalLiftReturn(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return .optionalLiftReturn(wrappedType: wrappedType, absenceLiteral: "undefined") case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1486,14 +1509,9 @@ struct IntrinsicJSFragment: Sendable { message: "Void can't appear in parameters of imported JS functions" ) case .optional(let wrappedType): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "Optional types are not supported for imported JS functions: \(wrappedType)" - ) - case .exportSwift: - return try .optionalLiftParameter(wrappedType: wrappedType) - } + return try .optionalLiftParameter(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return try .optionalLiftParameter(wrappedType: wrappedType, absenceLiteral: "undefined") case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1584,14 +1602,12 @@ struct IntrinsicJSFragment: Sendable { case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .optional(let wrappedType): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "Optional types are not supported for imported JS functions: \(wrappedType)" - ) - case .exportSwift: - return try .optionalLowerReturn(wrappedType: wrappedType) - } + return try .optionalLowerReturn(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return try .optionalLowerReturn( + wrappedType: wrappedType, + presenceCheck: { value in "\(value) !== undefined" } + ) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1998,6 +2014,67 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") } + return [] + } + ) + case .undefinedOr(let wrappedType): + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(value) !== undefined;") + + switch wrappedType { + case .string: + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let bytesVar = scope.variable("bytes") + printer.write( + "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if(\(idVar)) {") + cleanup.indent { + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + } + cleanup.write("}") + case .int, .uint: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .bool: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .float: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .double: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + default: + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + } + return [] } ) @@ -2083,6 +2160,34 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") + return [optVar] + } + ) + case .undefinedOr(let wrappedType): + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let optVar = scope.variable("optional") + let isSomeVar = scope.variable("isSome") + + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(optVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let wrappedFragment = associatedValuePopPayload(type: wrappedType) + let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) + if let wrappedResult = wrappedResults.first { + printer.write("\(optVar) = \(wrappedResult);") + } else { + printer.write("\(optVar) = undefined;") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(optVar) = undefined;") + } + printer.write("}") + return [optVar] } ) @@ -2331,6 +2436,8 @@ struct IntrinsicJSFragment: Sendable { return try! arrayLift(elementType: innerElementType) case .optional(let wrappedType): return try optionalElementRaiseFragment(wrappedType: wrappedType) + case .undefinedOr(let wrappedType): + return try optionalElementRaiseFragment(wrappedType: wrappedType, absenceLiteral: "undefined") case .unsafePointer: return IntrinsicJSFragment( parameters: [], @@ -2458,6 +2565,14 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .undefinedOr: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("throw new Error(\"Unsupported array element type for lowering: \(elementType)\");") + return [] + } + ) case .swiftHeapObject: return IntrinsicJSFragment( parameters: ["value"], @@ -2479,6 +2594,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let innerElementType): return try! arrayLower(elementType: innerElementType) + case .undefinedOr: + throw BridgeJSLinkError(message: "Unsupported array element type: \(elementType)") case .optional(let wrappedType): return try optionalElementLowerFragment(wrappedType: wrappedType) case .swiftProtocol: @@ -2506,7 +2623,10 @@ struct IntrinsicJSFragment: Sendable { } } - private static func optionalElementRaiseFragment(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + private static func optionalElementRaiseFragment( + wrappedType: BridgeType, + absenceLiteral: String = "null" + ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -2517,7 +2637,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(resultVar);") printer.write("if (\(isSomeVar) === 0) {") printer.indent { - printer.write("\(resultVar) = null;") + printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("} else {") printer.indent { @@ -2536,14 +2656,18 @@ struct IntrinsicJSFragment: Sendable { ) } - private static func optionalElementLowerFragment(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + private static func optionalElementLowerFragment( + wrappedType: BridgeType, + presenceCheck: (@Sendable (String) -> String)? = nil + ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in let value = arguments[0] let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null ? 1 : 0;") + let presenceExpr = presenceCheck?(value) ?? "\(value) != null" + printer.write("const \(isSomeVar) = \(presenceExpr) ? 1 : 0;") // Cleanup is written inside the if block so retained id is in scope let localCleanupWriter = CodeFragmentPrinter() printer.write("if (\(isSomeVar)) {") @@ -3095,6 +3219,14 @@ struct IntrinsicJSFragment: Sendable { } } ) + case .undefinedOr: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");") + return [] + } + ) case .swiftStruct(let nestedName): return IntrinsicJSFragment( parameters: ["value"], @@ -3451,6 +3583,14 @@ struct IntrinsicJSFragment: Sendable { return [varName] } ) + case .undefinedOr: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + printer.write("throw new Error(\"Unsupported struct field type: \(field.type)\");") + return [] + } + ) case .void, .swiftProtocol, .namespaceEnum, .closure: // These types should not appear as struct fields return IntrinsicJSFragment( diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 5013dda66..fabff5d3e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -130,6 +130,7 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable { case int, uint, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void case unsafePointer(UnsafePointerType) indirect case optional(BridgeType) + indirect case undefinedOr(BridgeType) indirect case array(BridgeType) case caseEnum(String) case rawValueEnum(String, SwiftEnumRawType) @@ -895,7 +896,7 @@ extension BridgeType { return .pointer case .unsafePointer: return .pointer - case .optional(_): + case .optional(_), .undefinedOr(_): return nil case .caseEnum: return .i32 @@ -923,6 +924,7 @@ extension BridgeType { /// Returns true if this type is optional public var isOptional: Bool { if case .optional = self { return true } + if case .undefinedOr = self { return true } return false } @@ -961,6 +963,8 @@ extension BridgeType { return kindCode case .optional(let wrapped): return "Sq\(wrapped.mangleTypeName)" + case .undefinedOr(let wrapped): + return "Su\(wrapped.mangleTypeName)" case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name), @@ -987,7 +991,15 @@ extension BridgeType { /// Side channels are needed when the wrapped type cannot be directly returned via WASM, /// or when we need to distinguish null from absent value for certain primitives. public func usesSideChannelForOptionalReturn() -> Bool { - guard case .optional(let wrappedType) = self else { return false } + let wrappedType: BridgeType + switch self { + case .optional(let wrapped): + wrappedType = wrapped + case .undefinedOr(let wrapped): + wrappedType = wrapped + default: + return false + } switch wrappedType { case .string, .int, .float, .double, .jsObject, .swiftProtocol: diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 258334ee8..fd31967b0 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -676,6 +676,30 @@ export class TypeProcessor { * @returns {string} */ const convert = (type) => { + // Handle nullable/undefined unions (e.g. T | null, T | undefined) + const isUnionType = (type.flags & ts.TypeFlags.Union) !== 0; + if (isUnionType) { + /** @type {ts.UnionType} */ + // @ts-ignore + const unionType = type; + const unionTypes = unionType.types; + const hasNull = unionTypes.some(t => (t.flags & ts.TypeFlags.Null) !== 0); + const hasUndefined = unionTypes.some(t => (t.flags & ts.TypeFlags.Undefined) !== 0); + const nonNullableTypes = unionTypes.filter( + t => (t.flags & ts.TypeFlags.Null) === 0 && (t.flags & ts.TypeFlags.Undefined) === 0 + ); + if (nonNullableTypes.length === 1 && (hasNull || hasUndefined)) { + const wrapped = this.visitType(nonNullableTypes[0], node); + if (hasNull && hasUndefined) { + return `JSUndefinedOr>`; + } + if (hasNull) { + return `Optional<${wrapped}>`; + } + return `JSUndefinedOr<${wrapped}>`; + } + } + /** @type {Record} */ const typeMap = { "number": "Double", diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 7b2d97f06..ac60ca860 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -1015,11 +1015,6 @@ extension UnsafeMutablePointer: _BridgedSwiftStackType { } extension Optional where Wrapped == Bool { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional Bool type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Void {} - // MARK: ExportSwift @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( @@ -1071,11 +1066,6 @@ extension Optional where Wrapped == Bool { } extension Optional where Wrapped == Int { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional Int type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} - // MARK: ExportSwift @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( @@ -1123,14 +1113,7 @@ extension Optional where Wrapped == Int { } extension Optional where Wrapped == UInt { - // MARK: ImportTS - - @available(*, unavailable, message: "Optional UInt type is not supported to be passed to imported JS functions") - @_spi(BridgeJS) public func bridgeJSLowerParameter() -> Void {} - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameterWithPresence() -> ( + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { switch consume self { diff --git a/Sources/JavaScriptKit/JSUndefinedOr.swift b/Sources/JavaScriptKit/JSUndefinedOr.swift new file mode 100644 index 000000000..f70cfc0df --- /dev/null +++ b/Sources/JavaScriptKit/JSUndefinedOr.swift @@ -0,0 +1,408 @@ +@frozen public enum JSUndefinedOr { + case undefined + case value(Wrapped) + + /// Convenience accessor for the undefined case. + public static var undefinedValue: Self { .undefined } + + @inlinable + init(optional: Wrapped?) { + self = optional.map(Self.value) ?? .undefined + } + + @inlinable + var optionalRepresentation: Wrapped? { + switch self { + case .undefined: + return nil + case .value(let wrapped): + return wrapped + } + } +} + +extension JSUndefinedOr: ConstructibleFromJSValue where Wrapped: ConstructibleFromJSValue { + public static func construct(from value: JSValue) -> Self? { + if value.isUndefined { return .undefined } + guard let wrapped = Wrapped.construct(from: value) else { return nil } + return .value(wrapped) + } +} + +extension JSUndefinedOr: ConvertibleToJSValue where Wrapped: ConvertibleToJSValue { + public var jsValue: JSValue { + switch self { + case .undefined: + return .undefined + case .value(let wrapped): + return wrapped.jsValue + } + } +} + +// MARK: - BridgeJS Optional-style conformances + +extension JSUndefinedOr where Wrapped == Bool { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(value)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped == Int { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped == UInt { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped == String { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ bytes: Int32, + _ count: Int32 + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped == JSObject { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftProtocolWrapper { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftHeapObject { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, pointer: UnsafeMutableRawPointer) + { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithRetain() -> ( + isSome: Int32, pointer: UnsafeMutableRawPointer + ) { + optionalRepresentation.bridgeJSLowerParameterWithRetain() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ pointer: UnsafeMutableRawPointer + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, pointer)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } +} + +extension JSUndefinedOr where Wrapped == Float { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped == Double { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(caseId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ bytes: Int32, + _ count: Int32 + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftAssociatedValueEnum { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(caseId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension JSUndefinedOr where Wrapped: _BridgedSwiftStruct { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index a20ea2dd5..007f0b265 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -611,6 +611,29 @@ typealias OptionalAge = Int? @JS func roundTripOptionalClass(value: Greeter?) -> Greeter? { return value } + +@JS func roundTripOptionalGreeter(_ value: Greeter?) -> Greeter? { + value +} + +@JS func applyOptionalGreeter(_ value: Greeter?, _ transform: (Greeter?) -> Greeter?) -> Greeter? { + transform(value) +} + +@JS class OptionalHolder { + @JS var nullableGreeter: Greeter? + @JS var undefinedNumber: JSUndefinedOr + + @JS init(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) { + self.nullableGreeter = nullableGreeter + self.undefinedNumber = undefinedNumber + } +} + +@JS func makeOptionalHolder(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) -> OptionalHolder { + OptionalHolder(nullableGreeter: nullableGreeter, undefinedNumber: undefinedNumber) +} + @JS class OptionalPropertyHolder { @JS var optionalName: String? @JS var optionalAge: Int? = nil diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index e066ad272..ee0455c35 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -14,6 +14,10 @@ @JSFunction func jsRoundTripString(_ v: String) throws(JSException) -> String +@JSFunction func jsRoundTripOptionalNumberNull(_ v: Optional) throws(JSException) -> Optional + +@JSFunction func jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + @JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void @JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 94359a709..a572f4c6f 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -679,6 +679,54 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7 #endif } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif + +private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC: _BridgedSwiftClosureBox { + let closure: (Optional) -> Optional + init(_ closure: @escaping (Optional) -> Optional) { + self.closure = closure + } +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC { + static func bridgeJSLower(_ closure: @escaping (Optional) -> Optional) -> UnsafeMutableRawPointer { + let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(closure) + return Unmanaged.passRetained(box).toOpaque() + } + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(callbackValue, param0IsSome, param0Pointer) + return Optional.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() + let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 @@ -4416,6 +4464,39 @@ public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: Unsa #endif } +@_expose(wasm, "bjs_roundTripOptionalGreeter") +@_cdecl("bjs_roundTripOptionalGreeter") +public func _bjs_roundTripOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_applyOptionalGreeter") +@_cdecl("bjs_applyOptionalGreeter") +public func _bjs_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void { + #if arch(wasm32) + let ret = applyOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeOptionalHolder") +@_cdecl("bjs_makeOptionalHolder") +public func _bjs_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsDefined: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsDefined, undefinedNumberValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripOptionalAPIOptionalResult") @_cdecl("bjs_roundTripOptionalAPIOptionalResult") public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { @@ -5826,6 +5907,84 @@ fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int } #endif +@_expose(wasm, "bjs_OptionalHolder_init") +@_cdecl("bjs_OptionalHolder_init") +public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsDefined: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsDefined, undefinedNumberValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_get") +@_cdecl("bjs_OptionalHolder_nullableGreeter_get") +public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_set") +@_cdecl("bjs_OptionalHolder_nullableGreeter_set") +public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_get") +@_cdecl("bjs_OptionalHolder_undefinedNumber_get") +public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set") +@_cdecl("bjs_OptionalHolder_undefinedNumber_set") +public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsDefined: Int32, _ valueValue: Float64) -> Void { + #if arch(wasm32) + OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsDefined, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalHolder_deinit") +@_cdecl("bjs_OptionalHolder_deinit") +public func _bjs_OptionalHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap") +fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer { @@ -7855,6 +8014,42 @@ func _$jsRoundTripString(_ v: String) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberNull") +fileprivate func bjs_jsRoundTripOptionalNumberNull(_ vIsSome: Int32, _ vValue: Float64) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalNumberNull(_ vIsSome: Int32, _ vValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalNumberNull(_ v: Optional) throws(JSException) -> Optional { + let (vIsSome, vValue) = v.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalNumberNull(vIsSome, vValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberUndefined") +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsDefined: Int32, _ vValue: Float64) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsDefined: Int32, _ vValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let (vIsDefined, vValue) = v.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalNumberUndefined(vIsDefined, vValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 4b8ac7c7b..3c71881a5 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -525,6 +525,79 @@ ], "swiftCallName" : "Internal.TestServer" }, + { + "constructor" : { + "abiName" : "bjs_OptionalHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "nullableGreeter", + "name" : "nullableGreeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "label" : "undefinedNumber", + "name" : "undefinedNumber", + "type" : { + "undefinedOr" : { + "_0" : { + "double" : { + + } + } + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "OptionalHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "nullableGreeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "undefinedNumber", + "type" : { + "undefinedOr" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "swiftCallName" : "OptionalHolder" + }, { "constructor" : { "abiName" : "bjs_OptionalPropertyHolder_init", @@ -7444,6 +7517,148 @@ } } }, + { + "abiName" : "bjs_roundTripOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_applyOptionalGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "applyOptionalGreeter", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "label" : "_", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "abiName" : "bjs_makeOptionalHolder", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeOptionalHolder", + "parameters" : [ + { + "label" : "nullableGreeter", + "name" : "nullableGreeter", + "type" : { + "optional" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } + }, + { + "label" : "undefinedNumber", + "name" : "undefinedNumber", + "type" : { + "undefinedOr" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "OptionalHolder" + } + } + }, { "abiName" : "bjs_roundTripOptionalAPIOptionalResult", "effects" : { @@ -11739,6 +11954,58 @@ } } }, + { + "name" : "jsRoundTripOptionalNumberNull", + "parameters" : [ + { + "name" : "v", + "type" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "optional" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripOptionalNumberUndefined", + "parameters" : [ + { + "name" : "v", + "type" : { + "undefinedOr" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "undefinedOr" : { + "_0" : { + "double" : { + + } + } + } + } + }, { "name" : "jsThrowOrVoid", "parameters" : [ diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index ea9f8c68f..136bd36f8 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -35,6 +35,26 @@ class ImportAPITests: XCTestCase { } } + func testRoundTripOptionalNumberNull() throws { + try XCTAssertEqual(jsRoundTripOptionalNumberNull(42), 42) + try XCTAssertNil(jsRoundTripOptionalNumberNull(nil)) + } + + func testRoundTripOptionalNumberUndefined() throws { + let some = try jsRoundTripOptionalNumberUndefined(.value(42)) + switch some { + case .value(let value): + XCTAssertEqual(value, 42) + case .undefined: + XCTFail("Expected defined value") + } + + let undefined = try jsRoundTripOptionalNumberUndefined(.undefinedValue) + if case .value = undefined { + XCTFail("Expected undefined") + } + } + func testRoundTripFeatureFlag() throws { for v in [FeatureFlag.foo, .bar] { try XCTAssertEqual(jsRoundTripFeatureFlag(v), v) diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 983d6052d..d1140e20f 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -2,6 +2,8 @@ export function jsRoundTripVoid(): void export function jsRoundTripNumber(v: number): number export function jsRoundTripBool(v: boolean): boolean export function jsRoundTripString(v: string): string +export function jsRoundTripOptionalNumberNull(v: number | null): number | null +export function jsRoundTripOptionalNumberUndefined(v: number | undefined): number | undefined export function jsThrowOrVoid(shouldThrow: boolean): void export function jsThrowOrNumber(shouldThrow: boolean): number export function jsThrowOrBool(shouldThrow: boolean): boolean diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 850b31b6e..29931ba3a 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -25,6 +25,12 @@ export async function setupOptions(options, context) { "jsRoundTripString": (v) => { return v; }, + "jsRoundTripOptionalNumberNull": (v) => { + return v ?? null; + }, + "jsRoundTripOptionalNumberUndefined": (v) => { + return v === undefined ? undefined : v; + }, "jsThrowOrVoid": (shouldThrow) => { if (shouldThrow) { throw new Error("TestError"); @@ -690,6 +696,26 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { testPropertyGreeter.release(); optionalsHolder.release(); + const optGreeter = new exports.Greeter("Optionaly"); + assert.equal(exports.roundTripOptionalGreeter(null), null); + const optGreeterReturned = exports.roundTripOptionalGreeter(optGreeter); + assert.equal(optGreeterReturned.name, "Optionaly"); + assert.equal(optGreeterReturned.greet(), "Hello, Optionaly!"); + + const appliedOptional = exports.applyOptionalGreeter(null, (g) => g ?? optGreeter); + assert.equal(appliedOptional.name, "Optionaly"); + + const holderOpt = exports.makeOptionalHolder(null, undefined); + assert.equal(holderOpt.nullableGreeter, null); + assert.equal(holderOpt.undefinedNumber, undefined); + holderOpt.nullableGreeter = optGreeter; + holderOpt.undefinedNumber = 123.5; + assert.equal(holderOpt.nullableGreeter.name, "Optionaly"); + assert.equal(holderOpt.undefinedNumber, 123.5); + holderOpt.release(); + optGreeterReturned.release(); + optGreeter.release(); + const aor1 = { tag: APIOptionalResultValues.Tag.Success, param0: "hello world" }; const aor2 = { tag: APIOptionalResultValues.Tag.Success, param0: null }; const aor3 = { tag: APIOptionalResultValues.Tag.Failure, param0: 404, param1: true }; diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..c13ef64e3 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "strict": true, + "skipLibCheck": true + } +} From 6a230daddf1cb158878b35b63bf6c7cf4568f9ee Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 13:33:30 +0900 Subject: [PATCH 142/252] BridgeJS: Simplify Optional and JSUndefinedOr code paths --- .../Generated/JavaScript/BridgeJS.json | 110 ++- .../Sources/BridgeJSCore/ClosureCodegen.swift | 2 +- .../Sources/BridgeJSCore/ExportSwift.swift | 98 +-- .../Sources/BridgeJSCore/ImportTS.swift | 12 +- .../BridgeJSCore/SwiftToSkeleton.swift | 32 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 21 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 206 +---- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 47 +- .../BridgeJSCodegenTests/ArrayTypes.json | 70 +- .../CrossFileTypeResolution.ReverseOrder.json | 5 +- .../CrossFileTypeResolution.json | 5 +- .../DefaultParameters.json | 50 +- .../EnumAssociatedValue.json | 95 +- .../BridgeJSCodegenTests/EnumCase.json | 20 +- .../BridgeJSCodegenTests/EnumRawType.json | 120 ++- .../ImportedTypeInExportedInterface.json | 15 +- .../BridgeJSCodegenTests/Optionals.json | 190 ++-- .../BridgeJSCodegenTests/Protocol.json | 40 +- .../StaticProperties.Global.json | 5 +- .../StaticProperties.json | 5 +- .../BridgeJSCodegenTests/SwiftClosure.json | 45 +- .../BridgeJSCodegenTests/SwiftStruct.json | 40 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 381 ++++++++ Sources/JavaScriptKit/JSUndefinedOr.swift | 371 +------- .../Generated/BridgeJS.swift | 20 +- .../Generated/JavaScript/BridgeJS.json | 825 +++++++++++------- 26 files changed, 1522 insertions(+), 1308 deletions(-) diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json index cb081ab39..4dff97132 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json @@ -449,12 +449,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -470,12 +471,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -491,12 +493,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, @@ -512,12 +515,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, @@ -533,12 +537,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -554,12 +559,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -575,12 +581,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -596,12 +603,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -1844,12 +1852,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -1876,12 +1885,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -1902,12 +1912,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -1917,12 +1928,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -1943,12 +1955,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -1975,12 +1988,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -2001,12 +2015,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -2016,12 +2031,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -2040,7 +2056,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -2049,7 +2065,8 @@ } } } - } + }, + "_1" : "null" } } } @@ -2072,7 +2089,7 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -2081,7 +2098,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -2097,7 +2115,7 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -2106,7 +2124,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -2123,7 +2142,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -2132,13 +2151,14 @@ } } } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -2147,7 +2167,8 @@ } } } - } + }, + "_1" : "null" } } } @@ -2601,12 +2622,13 @@ "isStatic" : false, "name" : "email", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 5d6545668..30cf8b2c2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -22,7 +22,7 @@ public struct ClosureCodegen { collectClosureSignatures(from: paramType, into: &signatures) } collectClosureSignatures(from: signature.returnType, into: &signatures) - case .optional(let wrapped): + case .nullable(let wrapped, _): collectClosureSignatures(from: wrapped, into: &signatures) default: break diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 39281ddfb..cb267c210 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -133,17 +133,27 @@ public class ExportSwift { case .array: typeNameForIntrinsic = param.type.swiftType liftingExpr = StackCodegen().liftExpression(for: param.type) - case .optional(let wrappedType): + case .nullable(let wrappedType, let kind): + let optionalSwiftType: String + if case .null = kind { + optionalSwiftType = "Optional" + } else { + optionalSwiftType = "JSUndefinedOr" + } if case .array(let elementType) = wrappedType { let arrayLift = StackCodegen().liftArrayExpression(elementType: elementType) let isSomeParam = argumentsToLift[0] let swiftTypeName = elementType.swiftType - typeNameForIntrinsic = "Optional<[\(swiftTypeName)]>" + typeNameForIntrinsic = "\(optionalSwiftType)<[\(swiftTypeName)]>" + let absentExpr = + kind == .null + ? "\(optionalSwiftType)<[\(swiftTypeName)]>.none" + : "\(optionalSwiftType)<[\(swiftTypeName)]>.undefinedValue" liftingExpr = ExprSyntax( """ { if \(raw: isSomeParam) == 0 { - return Optional<[\(raw: swiftTypeName)]>.none + return \(raw: absentExpr) } else { return \(arrayLift) } @@ -152,12 +162,12 @@ public class ExportSwift { ) } else if case .swiftProtocol(let protocolName) = wrappedType { let wrapperName = "Any\(protocolName)" - typeNameForIntrinsic = "Optional<\(wrapperName)>" + typeNameForIntrinsic = "\(optionalSwiftType)<\(wrapperName)>" liftingExpr = ExprSyntax( "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" ) } else { - typeNameForIntrinsic = "Optional<\(wrappedType.swiftType)>" + typeNameForIntrinsic = "\(optionalSwiftType)<\(wrappedType.swiftType)>" liftingExpr = ExprSyntax( "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" ) @@ -220,7 +230,7 @@ public class ExportSwift { return CodeBlockItemSyntax( item: .init(DeclSyntax("let ret = \(raw: callExpr) as! \(raw: wrapperName)")) ) - case .optional(let wrappedType): + case .nullable(let wrappedType, _): if case .swiftProtocol(let protocolName) = wrappedType { let wrapperName = "Any\(protocolName)" return CodeBlockItemSyntax( @@ -251,7 +261,7 @@ public class ExportSwift { case .swiftProtocol(let protocolName): let wrapperName = "Any\(protocolName)" append("let ret = \(raw: name) as! \(raw: wrapperName)") - case .optional(let wrappedType): + case .nullable(let wrappedType, _): if case .swiftProtocol(let protocolName) = wrappedType { let wrapperName = "Any\(protocolName)" append("let ret = \(raw: name).flatMap { $0 as? \(raw: wrapperName) }") @@ -278,8 +288,8 @@ public class ExportSwift { private func generateParameterLifting() { let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in switch param.type { - case .swiftStruct, .optional(.swiftStruct), - .associatedValueEnum, .optional(.associatedValueEnum), + case .swiftStruct, .nullable(.swiftStruct, _), + .associatedValueEnum, .nullable(.associatedValueEnum, _), .array: return index default: @@ -308,7 +318,7 @@ public class ExportSwift { case .swiftProtocol(let protocolName): let wrapperName = "Any\(protocolName)" append("let ret = \(raw: selfExpr).\(raw: propertyName) as! \(raw: wrapperName)") - case .optional(let wrappedType): + case .nullable(let wrappedType, _): if case .swiftProtocol(let protocolName) = wrappedType { let wrapperName = "Any\(protocolName)" append("let ret = \(raw: selfExpr).\(raw: propertyName).flatMap { $0 as? \(raw: wrapperName) }") @@ -356,7 +366,7 @@ public class ExportSwift { switch returnType { case .closure(let signature): append("return _BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(ret)") - case .array, .optional(.array): + case .array, .nullable(.array, _): let stackCodegen = StackCodegen() for stmt in stackCodegen.lowerStatements(for: returnType, accessor: "ret", varPrefix: "ret") { append(stmt) @@ -818,10 +828,8 @@ struct StackCodegen { } case .associatedValueEnum: return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .optional(let wrappedType): - return liftOptionalExpression(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): - return liftUndefinedExpression(wrappedType: wrappedType) + case .nullable(let wrappedType, let kind): + return liftNullableExpression(wrappedType: wrappedType, kind: kind) case .array(let elementType): return liftArrayExpression(elementType: elementType) case .closure: @@ -841,7 +849,7 @@ struct StackCodegen { return liftArrayExpressionInline(elementType: elementType) case .swiftProtocol(let protocolName): return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" - case .optional, .undefinedOr, .array, .closure: + case .nullable, .array, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") @@ -865,51 +873,32 @@ struct StackCodegen { """ } - private func liftOptionalExpression(wrappedType: BridgeType) -> ExprSyntax { + private func liftNullableExpression(wrappedType: BridgeType, kind: JSOptionalKind) -> ExprSyntax { + let typeName = kind == .null ? "Optional" : "JSUndefinedOr" switch wrappedType { case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: - return "Optional<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" + return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" case .jsObject(let className?): - return "Optional.bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" + return "\(raw: typeName).bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" case .array(let elementType): let arrayLift = liftArrayExpression(elementType: elementType) let swiftTypeName = elementType.swiftType + let absentExpr = + kind == .null + ? "\(typeName)<[\(swiftTypeName)]>.none" : "\(typeName)<[\(swiftTypeName)]>.undefinedValue" return """ { let __isSome = _swift_js_pop_i32() if __isSome == 0 { - return Optional<[\(raw: swiftTypeName)]>.none + return \(raw: absentExpr) } else { return \(arrayLift) } }() """ - case .undefinedOr, .void, .namespaceEnum, .closure, .optional, .unsafePointer, .swiftProtocol: - fatalError("Invalid optional wrapped type: \(wrappedType)") - } - } - - private func liftUndefinedExpression(wrappedType: BridgeType) -> ExprSyntax { - switch wrappedType { - case .string, .int, .uint, .bool, .float, .double, .jsObject, - .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: - return "JSUndefinedOr<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" - case .array(let elementType): - let arrayLift = liftArrayExpression(elementType: elementType) - let swiftTypeName = elementType.swiftType - return """ - { - let __isDefined = _swift_js_pop_i32() - if __isDefined == 0 { - return JSUndefinedOr<\(raw: swiftTypeName)>.undefined - } else { - return JSUndefinedOr<\(raw: swiftTypeName)>(optional: \(arrayLift)) - } - }() - """ - case .void, .namespaceEnum, .closure, .optional, .undefinedOr, .unsafePointer, .swiftProtocol: - fatalError("Invalid undefinedOr wrapped type: \(wrappedType)") + case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol: + fatalError("Invalid nullable wrapped type: \(wrappedType)") } } @@ -940,9 +929,7 @@ struct StackCodegen { return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .associatedValueEnum, .swiftStruct: return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .optional(let wrappedType): - return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, _): return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) case .void, .namespaceEnum: return [] @@ -965,7 +952,7 @@ struct StackCodegen { return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] - case .optional, .undefinedOr, .array, .closure: + case .nullable, .array, .closure: return lowerArrayStatementsInline( elementType: elementType, accessor: accessor, @@ -1623,8 +1610,8 @@ extension BridgeType { case .unsafePointer(let ptr): return ptr.swiftType case .swiftProtocol(let name): return "Any\(name)" case .void: return "Void" - case .optional(let wrappedType): return "Optional<\(wrappedType.swiftType)>" - case .undefinedOr(let wrappedType): return "JSUndefinedOr<\(wrappedType.swiftType)>" + case .nullable(let wrappedType, let kind): + return kind == .null ? "Optional<\(wrappedType.swiftType)>" : "JSUndefinedOr<\(wrappedType.swiftType)>" case .array(let elementType): return "[\(elementType.swiftType)]" case .caseEnum(let name): return name case .rawValueEnum(let name, _): return name @@ -1668,14 +1655,10 @@ extension BridgeType { case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject case .void: return .void - case .optional(let wrappedType): + case .nullable(let wrappedType, _): var optionalParams: [(name: String, type: WasmCoreType)] = [("isSome", .i32)] optionalParams.append(contentsOf: try wrappedType.liftParameterInfo().parameters) return LiftingIntrinsicInfo(parameters: optionalParams) - case .undefinedOr(let wrappedType): - var params: [(name: String, type: WasmCoreType)] = [("isDefined", .i32)] - params.append(contentsOf: try wrappedType.liftParameterInfo().parameters) - return LiftingIntrinsicInfo(parameters: params) case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): return rawType.liftingIntrinsicInfo @@ -1724,8 +1707,7 @@ extension BridgeType { case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject case .void: return .void - case .optional: return .optional - case .undefinedOr: return .optional + case .nullable: return .optional case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): return rawType.loweringIntrinsicInfo diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 7ac72cffc..cd3f84443 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -924,16 +924,11 @@ extension BridgeType { } case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as parameters") - case .optional(let wrappedType): + case .nullable(let wrappedType, _): let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) var params = [("isSome", WasmCoreType.i32)] params.append(contentsOf: wrappedInfo.loweredParameters) return LoweringParameterInfo(loweredParameters: params) - case .undefinedOr(let wrappedType): - let wrappedInfo = try wrappedType.loweringParameterInfo(context: context) - var params = [("isDefined", WasmCoreType.i32)] - params.append(contentsOf: wrappedInfo.loweredParameters) - return LoweringParameterInfo(loweredParameters: params) case .array: switch context { case .importTS: @@ -1018,10 +1013,7 @@ extension BridgeType { } case .namespaceEnum: throw BridgeJSCoreError("Namespace enums cannot be used as return values") - case .optional(let wrappedType): - let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) - return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, _): let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) case .array: diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 67f1421a2..adc49c89b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -130,7 +130,7 @@ public final class SwiftToSkeleton { if let optionalType = type.as(OptionalTypeSyntax.self) { let wrappedType = optionalType.wrappedType if let baseType = lookupType(for: wrappedType, errors: &errors) { - return .optional(baseType) + return .nullable(baseType, .null) } } // JSUndefinedOr @@ -141,7 +141,7 @@ public final class SwiftToSkeleton { let argType = TypeSyntax(genericArgs.first?.argument) { if let baseType = lookupType(for: argType, errors: &errors) { - return .undefinedOr(baseType) + return .nullable(baseType, .undefined) } } // JavaScriptKit.JSUndefinedOr @@ -154,7 +154,7 @@ public final class SwiftToSkeleton { let argType = TypeSyntax(genericArgs.first?.argument) { if let wrappedType = lookupType(for: argType, errors: &errors) { - return .undefinedOr(wrappedType) + return .nullable(wrappedType, .undefined) } } // Optional @@ -165,7 +165,7 @@ public final class SwiftToSkeleton { let argType = TypeSyntax(genericArgs.first?.argument) { if let baseType = lookupType(for: argType, errors: &errors) { - return .optional(baseType) + return .nullable(baseType, .null) } } // Swift.Optional @@ -178,7 +178,7 @@ public final class SwiftToSkeleton { let argType = TypeSyntax(genericArgs.first?.argument) { if let wrappedType = lookupType(for: argType, errors: &errors) { - return .optional(wrappedType) + return .nullable(wrappedType, .null) } } // [T] @@ -559,7 +559,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { switch type { case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): enumName = name - case .optional(let wrappedType): + case .nullable(let wrappedType, _): switch wrappedType { case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name): enumName = name @@ -608,7 +608,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let expr = defaultClause.value if expr.is(NilLiteralExprSyntax.self) { - guard case .optional(_) = type else { + guard case .nullable = type else { diagnose( node: expr, message: "nil is only valid for optional parameters", @@ -664,10 +664,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let isStructType: Bool let expectedTypeName: String? switch type { - case .swiftStruct(let name), .optional(.swiftStruct(let name)): + case .swiftStruct(let name), .nullable(.swiftStruct(let name), _): isStructType = true expectedTypeName = name.split(separator: ".").last.map(String.init) - case .swiftHeapObject(let name), .optional(.swiftHeapObject(let name)): + case .swiftHeapObject(let name), .nullable(.swiftHeapObject(let name), _): isStructType = false expectedTypeName = name.split(separator: ".").last.map(String.init) default: @@ -803,7 +803,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { switch type { case .array(let element): elementType = element - case .optional(.array(let element)): + case .nullable(.array(let element), _): elementType = element default: diagnose( @@ -858,11 +858,11 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } } - if case .optional(let wrappedType) = type, wrappedType.isOptional { + if case .nullable(let wrappedType, _) = type, wrappedType.isOptional { diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) continue } - if case .optional(let wrappedType) = type, wrappedType.isOptional { + if case .nullable(let wrappedType, _) = type, wrappedType.isOptional { diagnoseNestedOptional(node: param.type, type: param.type.trimmedDescription) continue } @@ -984,7 +984,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { if let returnClause = node.signature.returnClause { let resolvedType = withLookupErrors { self.parent.lookupType(for: returnClause.type, errors: &$0) } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + if let type = resolvedType, case .nullable(let wrappedType, _) = type, wrappedType.isOptional { diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) return nil } @@ -1422,7 +1422,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { switch associatedValue.type { case .string, .int, .float, .double, .bool: break - case .optional(let wrappedType): + case .nullable(let wrappedType, _): switch wrappedType { case .string, .int, .float, .double, .bool: break @@ -1611,7 +1611,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { if let returnClause = node.signature.returnClause { let resolvedType = withLookupErrors { self.parent.lookupType(for: returnClause.type, errors: &$0) } - if let type = resolvedType, case .optional(let wrappedType) = type, wrappedType.isOptional { + if let type = resolvedType, case .nullable(let wrappedType, _) = type, wrappedType.isOptional { diagnoseNestedOptional(node: returnClause.type, type: returnClause.type.trimmedDescription) return nil } @@ -1836,7 +1836,7 @@ fileprivate extension BridgeType { switch (self, expectedType) { case let (lhs, rhs) where lhs == rhs: return true - case (.optional(let wrapped), expectedType): + case (.nullable(let wrapped, _), expectedType): return wrapped == expectedType default: return false diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 0b1be8a10..97678dc64 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -297,7 +297,7 @@ public struct BridgeJSLink { switch type { case .closure: return true - case .optional(let wrapped): + case .nullable(let wrapped, _): return containsClosureType(in: wrapped) default: return false @@ -746,7 +746,7 @@ public struct BridgeJSLink { collectClosureSignatures(from: paramType, into: &signatures) } collectClosureSignatures(from: signature.returnType, into: &signatures) - case .optional(let wrapped): + case .nullable(let wrapped, _): collectClosureSignatures(from: wrapped, into: &signatures) default: break @@ -764,7 +764,7 @@ public struct BridgeJSLink { // Build parameter list for invoke function var invokeParams: [String] = ["callbackId"] for (index, paramType) in signature.parameters.enumerated() { - if case .optional = paramType { + if case .nullable = paramType { invokeParams.append("param\(index)IsSome") invokeParams.append("param\(index)Value") } else { @@ -782,7 +782,7 @@ public struct BridgeJSLink { for (index, paramType) in signature.parameters.enumerated() { let fragment = try! IntrinsicJSFragment.closureLiftParameter(type: paramType) let args: [String] - if case .optional = paramType { + if case .nullable = paramType { args = ["param\(index)IsSome", "param\(index)Value", "param\(index)"] } else { args = ["param\(index)Id", "param\(index)"] @@ -1428,8 +1428,9 @@ public struct BridgeJSLink { return type.tsType case .swiftStruct(let name): return name.components(separatedBy: ".").last ?? name - case .optional(let wrapped): - return "\(resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons)) | null" + case .nullable(let wrapped, let kind): + let base = resolveTypeScriptType(wrapped, exportedSkeletons: exportedSkeletons) + return "\(base) | \(kind.absenceLiteral)" case .array(let elementType): let elementTypeStr = resolveTypeScriptType(elementType, exportedSkeletons: exportedSkeletons) // Parenthesize compound types so `[]` binds correctly in TypeScript @@ -2250,7 +2251,7 @@ extension BridgeJSLink { let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" let accessExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) if context == .exportSwift, returnType.usesSideChannelForOptionalReturn() { - guard case .optional(let wrappedType) = returnType else { + guard case .nullable(let wrappedType, _) = returnType else { fatalError("usesSideChannelForOptionalReturn returned true for non-optional type") } @@ -3403,10 +3404,8 @@ extension BridgeType { return name case .unsafePointer: return "number" - case .optional(let wrappedType): - return "\(wrappedType.tsType) | null" - case .undefinedOr(let wrappedType): - return "\(wrappedType.tsType) | undefined" + case .nullable(let wrappedType, let kind): + return "\(wrappedType.tsType) | \(kind.absenceLiteral)" case .caseEnum(let name): return "\(name)Tag" case .rawValueEnum(let name, _): diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ad27dc6f3..44e751d3a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -298,7 +298,7 @@ struct IntrinsicJSFragment: Sendable { static func optionalLiftParameter( wrappedType: BridgeType, - absenceLiteral: String = "null" + kind: JSOptionalKind ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["isSome", "wrappedValue"], @@ -306,6 +306,7 @@ struct IntrinsicJSFragment: Sendable { let isSome = arguments[0] let wrappedValue = arguments[1] let resultExpr: String + let absenceLiteral = kind.absenceLiteral switch wrappedType { case .int, .float, .double, .caseEnum: @@ -518,8 +519,9 @@ struct IntrinsicJSFragment: Sendable { static func optionalLiftReturn( wrappedType: BridgeType, context: BridgeContext = .exportSwift, - absenceLiteral: String = "null" + kind: JSOptionalKind ) -> IntrinsicJSFragment { + let absenceLiteral = kind.absenceLiteral return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanupCode in @@ -646,7 +648,7 @@ struct IntrinsicJSFragment: Sendable { presenceCheck: (@Sendable (String) -> String)? = nil ) throws -> IntrinsicJSFragment { switch wrappedType { - case .void, .optional, .namespaceEnum, .closure: + case .void, .nullable, .namespaceEnum, .closure: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") default: break } @@ -913,15 +915,19 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType), .undefinedOr(let wrappedType): - return try closureOptionalLiftParameter(wrappedType: wrappedType) + case .nullable(let wrappedType, let kind): + return try closureOptionalLiftParameter(wrappedType: wrappedType, kind: kind) default: throw BridgeJSLinkError(message: "Unsupported closure parameter type for lifting: \(type)") } } - /// Handles optional parameter lifting for closure invocation - private static func closureOptionalLiftParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + /// Handles optional parameter lifting for closure invocation. + private static func closureOptionalLiftParameter( + wrappedType: BridgeType, + kind: JSOptionalKind + ) throws -> IntrinsicJSFragment { + let absenceLiteral = kind.absenceLiteral switch wrappedType { case .string, .rawValueEnum, .int, .bool, .double, .float, .jsObject, .swiftHeapObject, .caseEnum, .associatedValueEnum: @@ -983,7 +989,7 @@ struct IntrinsicJSFragment: Sendable { printer.unindent() printer.write("} else {") printer.indent() - printer.write("\(targetVar) = null;") + printer.write("\(targetVar) = \(absenceLiteral);") printer.unindent() printer.write("}") @@ -1114,7 +1120,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType), .undefinedOr(let wrappedType): + case .nullable(let wrappedType, _): return try closureOptionalLowerReturn(wrappedType: wrappedType) default: throw BridgeJSLinkError(message: "Unsupported closure return type for lowering: \(type)") @@ -1309,10 +1315,8 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType): - return try closureOptionalLiftReturn(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): - return try closureOptionalLiftReturn(wrappedType: wrappedType, absenceLiteral: "undefined") + case .nullable(let wrappedType, let kind): + return try closureOptionalLiftReturn(wrappedType: wrappedType, kind: kind) default: throw BridgeJSLinkError(message: "Unsupported closure return type for lifting: \(type)") } @@ -1321,7 +1325,7 @@ struct IntrinsicJSFragment: Sendable { /// Handles optional return lifting for Swift closure returns private static func closureOptionalLiftReturn( wrappedType: BridgeType, - absenceLiteral: String = "null" + kind: JSOptionalKind ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["invokeCall"], @@ -1331,7 +1335,7 @@ struct IntrinsicJSFragment: Sendable { let baseFragment = optionalLiftReturn( wrappedType: wrappedType, context: .importTS, - absenceLiteral: absenceLiteral + kind: kind ) let lifted = baseFragment.printCode([], scope, printer, cleanupCode) if !lifted.isEmpty { @@ -1371,15 +1375,13 @@ struct IntrinsicJSFragment: Sendable { } case .associatedValueEnum: printer.write("return;") - case .optional(let wrappedType): + case .nullable(let wrappedType, _): switch wrappedType { case .swiftHeapObject: printer.write("return 0;") default: printer.write("return;") } - case .undefinedOr: - printer.write("return;") default: printer.write("return 0;") } @@ -1401,9 +1403,7 @@ struct IntrinsicJSFragment: Sendable { return .swiftHeapObjectLowerParameter case .swiftProtocol: return .jsObjectLowerParameter case .void: return .void - case .optional(let wrappedType): - return try .optionalLowerParameter(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, _): return try .optionalLowerParameter(wrappedType: wrappedType) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): @@ -1448,9 +1448,8 @@ struct IntrinsicJSFragment: Sendable { case .unsafePointer: return .identity case .swiftProtocol: return .jsObjectLiftReturn case .void: return .void - case .optional(let wrappedType): return .optionalLiftReturn(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): - return .optionalLiftReturn(wrappedType: wrappedType, absenceLiteral: "undefined") + case .nullable(let wrappedType, let kind): + return .optionalLiftReturn(wrappedType: wrappedType, kind: kind) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1508,10 +1507,8 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError( message: "Void can't appear in parameters of imported JS functions" ) - case .optional(let wrappedType): - return try .optionalLiftParameter(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): - return try .optionalLiftParameter(wrappedType: wrappedType, absenceLiteral: "undefined") + case .nullable(let wrappedType, let kind): + return try .optionalLiftParameter(wrappedType: wrappedType, kind: kind) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -1601,12 +1598,10 @@ struct IntrinsicJSFragment: Sendable { } case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void - case .optional(let wrappedType): - return try .optionalLowerReturn(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, let kind): return try .optionalLowerReturn( wrappedType: wrappedType, - presenceCheck: { value in "\(value) !== undefined" } + presenceCheck: { value in kind.presenceCheck(value: value) } ) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): @@ -1956,74 +1951,13 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .optional(let wrappedType): - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null;") - - switch wrappedType { - case .string: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let bytesVar = scope.variable("bytes") - printer.write( - "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") - } - printer.write("} else {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - } - printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - cleanup.write("if(\(idVar)) {") - cleanup.indent { - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanup.write("}") - case .int, .uint: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - case .bool: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - case .float: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - case .double: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - default: - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - } - - return [] - } - ) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in let value = arguments[0] let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) !== undefined;") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") switch wrappedType { case .string: @@ -2135,35 +2069,7 @@ struct IntrinsicJSFragment: Sendable { return [dVar] } ) - case .optional(let wrappedType): - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let optVar = scope.variable("optional") - let isSomeVar = scope.variable("isSome") - - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - printer.write("let \(optVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let wrappedFragment = associatedValuePopPayload(type: wrappedType) - let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) - if let wrappedResult = wrappedResults.first { - printer.write("\(optVar) = \(wrappedResult);") - } else { - printer.write("\(optVar) = undefined;") - } - } - printer.write("} else {") - printer.indent { - printer.write("\(optVar) = null;") - } - printer.write("}") - - return [optVar] - } - ) - case .undefinedOr(let wrappedType): + case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -2184,7 +2090,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(optVar) = undefined;") + printer.write("\(optVar) = \(kind.absenceLiteral);") } printer.write("}") @@ -2434,10 +2340,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let innerElementType): return try! arrayLift(elementType: innerElementType) - case .optional(let wrappedType): - return try optionalElementRaiseFragment(wrappedType: wrappedType) - case .undefinedOr(let wrappedType): - return try optionalElementRaiseFragment(wrappedType: wrappedType, absenceLiteral: "undefined") + case .nullable(let wrappedType, let kind): + return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind) case .unsafePointer: return IntrinsicJSFragment( parameters: [], @@ -2565,14 +2469,6 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .undefinedOr: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("throw new Error(\"Unsupported array element type for lowering: \(elementType)\");") - return [] - } - ) case .swiftHeapObject: return IntrinsicJSFragment( parameters: ["value"], @@ -2594,10 +2490,11 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let innerElementType): return try! arrayLower(elementType: innerElementType) - case .undefinedOr: - throw BridgeJSLinkError(message: "Unsupported array element type: \(elementType)") - case .optional(let wrappedType): - return try optionalElementLowerFragment(wrappedType: wrappedType) + case .nullable(let wrappedType, let kind): + return try optionalElementLowerFragment( + wrappedType: wrappedType, + presenceCheck: { kind.presenceCheck(value: $0) } + ) case .swiftProtocol: // Same as jsObject but no cleanup — Swift's AnyProtocol wrapper releases via deinit return IntrinsicJSFragment( @@ -2625,8 +2522,9 @@ struct IntrinsicJSFragment: Sendable { private static func optionalElementRaiseFragment( wrappedType: BridgeType, - absenceLiteral: String = "null" + kind: JSOptionalKind ) throws -> IntrinsicJSFragment { + let absenceLiteral = kind.absenceLiteral return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -2973,13 +2871,13 @@ struct IntrinsicJSFragment: Sendable { return [idVar] } ) - case .optional(let wrappedType): + case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in let value = arguments[0] let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null;") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") if case .caseEnum = wrappedType { printer.write("if (\(isSomeVar)) {") @@ -3219,14 +3117,6 @@ struct IntrinsicJSFragment: Sendable { } } ) - case .undefinedOr: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");") - return [] - } - ) case .swiftStruct(let nestedName): return IntrinsicJSFragment( parameters: ["value"], @@ -3434,7 +3324,7 @@ struct IntrinsicJSFragment: Sendable { return [pVar] } ) - case .optional(let wrappedType): + case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in @@ -3472,7 +3362,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - printer.write("\(optVar) = null;") + printer.write("\(optVar) = \(kind.absenceLiteral);") } printer.write("}") return [optVar] @@ -3583,14 +3473,6 @@ struct IntrinsicJSFragment: Sendable { return [varName] } ) - case .undefinedOr: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - printer.write("throw new Error(\"Unsupported struct field type: \(field.type)\");") - return [] - } - ) case .void, .swiftProtocol, .namespaceEnum, .closure: // These types should not appear as struct fields return IntrinsicJSFragment( diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index fabff5d3e..caf725ee5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -126,11 +126,32 @@ public struct UnsafePointerType: Codable, Equatable, Hashable, Sendable { } } +/// JS semantics for optional/nullable types: which value represents "absent". +public enum JSOptionalKind: String, Codable, Equatable, Hashable, Sendable { + case null + case undefined + + /// The JS literal for absence (e.g. in generated glue). + public var absenceLiteral: String { + switch self { + case .null: return "null" + case .undefined: return "undefined" + } + } + + /// JS expression that is true when the value is present. `value` is the variable name. + public func presenceCheck(value: String) -> String { + switch self { + case .null: return "\(value) != null" + case .undefined: return "\(value) !== undefined" + } + } +} + public enum BridgeType: Codable, Equatable, Hashable, Sendable { case int, uint, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void case unsafePointer(UnsafePointerType) - indirect case optional(BridgeType) - indirect case undefinedOr(BridgeType) + indirect case nullable(BridgeType, JSOptionalKind) indirect case array(BridgeType) case caseEnum(String) case rawValueEnum(String, SwiftEnumRawType) @@ -896,7 +917,7 @@ extension BridgeType { return .pointer case .unsafePointer: return .pointer - case .optional(_), .undefinedOr(_): + case .nullable: return nil case .caseEnum: return .i32 @@ -921,10 +942,9 @@ extension BridgeType { } } - /// Returns true if this type is optional + /// Returns true if this type is optional (nullable with null or undefined). public var isOptional: Bool { - if case .optional = self { return true } - if case .undefinedOr = self { return true } + if case .nullable = self { return true } return false } @@ -961,10 +981,9 @@ extension BridgeType { return "\(kindCode)\(p.count)\(p)" } return kindCode - case .optional(let wrapped): - return "Sq\(wrapped.mangleTypeName)" - case .undefinedOr(let wrapped): - return "Su\(wrapped.mangleTypeName)" + case .nullable(let wrapped, let kind): + let prefix = kind == .null ? "Sq" : "Su" + return "\(prefix)\(wrapped.mangleTypeName)" case .caseEnum(let name), .rawValueEnum(let name, _), .associatedValueEnum(let name), @@ -991,13 +1010,7 @@ extension BridgeType { /// Side channels are needed when the wrapped type cannot be directly returned via WASM, /// or when we need to distinguish null from absent value for certain primitives. public func usesSideChannelForOptionalReturn() -> Bool { - let wrappedType: BridgeType - switch self { - case .optional(let wrapped): - wrappedType = wrapped - case .undefinedOr(let wrapped): - wrappedType = wrapped - default: + guard case .nullable(let wrappedType, _) = self else { return false } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json index 7950cb66a..8dde2cfb7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json @@ -516,12 +516,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -531,12 +532,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -557,12 +559,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -572,12 +575,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -596,7 +600,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -605,13 +609,14 @@ } } } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -620,7 +625,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -639,12 +645,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -654,12 +661,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Point" } - } + }, + "_1" : "null" } } } @@ -680,12 +688,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } @@ -695,12 +704,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } @@ -721,13 +731,14 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Status", "_1" : "Int" } - } + }, + "_1" : "null" } } } @@ -737,13 +748,14 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Status", "_1" : "Int" } - } + }, + "_1" : "null" } } } @@ -994,12 +1006,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } @@ -1009,12 +1022,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json index 7f21c86cf..59fb8484a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.json @@ -12,12 +12,13 @@ "isStatic" : false, "name" : "linkedB", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "ClassB" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json index 3f8129109..cc10331a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.json @@ -33,12 +33,13 @@ "isStatic" : false, "name" : "linkedB", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "ClassB" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json index 64cc1a845..8c088a35e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.json @@ -135,12 +135,13 @@ "label" : "tag", "name" : "tag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -196,12 +197,13 @@ "isStatic" : false, "name" : "tag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -414,23 +416,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -452,23 +456,25 @@ "label" : "greeting", "name" : "greeting", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -646,23 +652,25 @@ "label" : "point", "name" : "point", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } }, @@ -710,23 +718,25 @@ "label" : "point", "name" : "point", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json index ecf045c3c..ba9ee9324 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json @@ -398,12 +398,13 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -414,23 +415,25 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -441,34 +444,37 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -570,23 +576,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -670,23 +678,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } }, @@ -703,23 +713,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "Utilities.Result" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "Utilities.Result" } - } + }, + "_1" : "null" } } }, @@ -736,23 +748,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "NetworkingResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "NetworkingResult" } - } + }, + "_1" : "null" } } }, @@ -769,23 +783,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } }, @@ -802,12 +818,13 @@ "label" : "result1", "name" : "result1", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } }, @@ -815,23 +832,25 @@ "label" : "result2", "name" : "result2", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json index 2d5d5f2fa..ea32ad739 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.json @@ -216,23 +216,25 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -291,23 +293,25 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "TSDirection" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "TSDirection" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json index 20ef1f42f..ba36405ba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.json @@ -517,25 +517,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -596,25 +598,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSTheme", "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSTheme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -675,25 +679,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "FeatureFlag", "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "FeatureFlag", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -754,25 +760,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -833,25 +841,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSHttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSHttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -912,25 +922,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Priority", "_1" : "Int32" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Priority", "_1" : "Int32" } - } + }, + "_1" : "null" } } }, @@ -991,25 +1003,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "FileSize", "_1" : "Int64" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "FileSize", "_1" : "Int64" } - } + }, + "_1" : "null" } } }, @@ -1070,25 +1084,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "UserId", "_1" : "UInt" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "UserId", "_1" : "UInt" } - } + }, + "_1" : "null" } } }, @@ -1149,25 +1165,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TokenId", "_1" : "UInt32" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TokenId", "_1" : "UInt32" } - } + }, + "_1" : "null" } } }, @@ -1228,25 +1246,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "SessionId", "_1" : "UInt64" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "SessionId", "_1" : "UInt64" } - } + }, + "_1" : "null" } } }, @@ -1307,25 +1327,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Precision", "_1" : "Float" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Precision", "_1" : "Float" } - } + }, + "_1" : "null" } } }, @@ -1386,25 +1408,27 @@ "label" : "_", "name" : "input", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Ratio", "_1" : "Double" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Ratio", "_1" : "Double" } - } + }, + "_1" : "null" } } }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json index c40f0dc82..cecf16c9c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.json @@ -73,12 +73,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } @@ -88,12 +89,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } @@ -150,12 +152,13 @@ "isStatic" : false, "name" : "optionalFoo", "type" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json index 2af32886b..ea5c675f0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json @@ -14,12 +14,13 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -56,12 +57,13 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -80,12 +82,13 @@ "isStatic" : false, "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -114,12 +117,13 @@ "isStatic" : false, "name" : "optionalName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -128,12 +132,13 @@ "isStatic" : false, "name" : "optionalAge", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -142,12 +147,13 @@ "isStatic" : false, "name" : "optionalGreeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -173,23 +179,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -206,23 +214,25 @@ "label" : "_", "name" : "holder", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "OptionalPropertyHolder" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "OptionalPropertyHolder" } - } + }, + "_1" : "null" } } }, @@ -239,23 +249,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -272,23 +284,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -305,23 +319,25 @@ "label" : "flag", "name" : "flag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, @@ -338,23 +354,25 @@ "label" : "number", "name" : "number", "type" : { - "optional" : { + "nullable" : { "_0" : { "float" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "float" : { } - } + }, + "_1" : "null" } } }, @@ -371,23 +389,25 @@ "label" : "precision", "name" : "precision", "type" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -404,23 +424,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -437,23 +459,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -470,23 +494,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -503,23 +529,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -536,23 +564,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -569,23 +599,25 @@ "label" : "age", "name" : "age", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -602,23 +634,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -635,12 +669,13 @@ "label" : "firstName", "name" : "firstName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -648,12 +683,13 @@ "label" : "lastName", "name" : "lastName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -661,12 +697,13 @@ "label" : "age", "name" : "age", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -681,12 +718,13 @@ } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json index 5713a2898..e9f5264cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -237,12 +237,13 @@ "isStatic" : false, "name" : "secondDelegate", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftProtocol" : { "_0" : "MyViewControllerDelegate" } - } + }, + "_1" : "null" } } } @@ -667,12 +668,13 @@ "label" : "_", "name" : "helper", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Helper" } - } + }, + "_1" : "null" } } } @@ -695,12 +697,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Helper" } - } + }, + "_1" : "null" } } }, @@ -789,12 +792,13 @@ "isReadonly" : false, "name" : "optionalName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -802,13 +806,14 @@ "isReadonly" : false, "name" : "optionalRawEnum", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "ExampleEnum", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -835,12 +840,13 @@ "isReadonly" : false, "name" : "optionalResult", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "Result" } - } + }, + "_1" : "null" } } }, @@ -857,12 +863,13 @@ "isReadonly" : false, "name" : "directionOptional", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -880,13 +887,14 @@ "isReadonly" : false, "name" : "priorityOptional", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Priority", "_1" : "Int" } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json index 9b1d0d6b8..bb9e48091 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.json @@ -118,12 +118,13 @@ } }, "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json index b3ccf7e93..d385e3887 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.json @@ -118,12 +118,13 @@ } }, "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json index 345582e86..d71726828 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json @@ -202,30 +202,33 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Person" } - } + }, + "_1" : "null" } }, { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } }, { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } ], @@ -325,12 +328,13 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Person" } - } + }, + "_1" : "null" } } ], @@ -353,12 +357,13 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Person" } - } + }, + "_1" : "null" } } ], @@ -700,12 +705,13 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } ], @@ -746,13 +752,14 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } ], @@ -793,12 +800,13 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } ], @@ -838,12 +846,13 @@ "moduleName" : "TestModule", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } ], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json index 1b2dc531f..00c6af5cb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json @@ -184,12 +184,13 @@ "label" : "optCount", "name" : "optCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -197,12 +198,13 @@ "label" : "optFlag", "name" : "optFlag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -248,12 +250,13 @@ "isStatic" : false, "name" : "optCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -262,12 +265,13 @@ "isStatic" : false, "name" : "optFlag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -305,12 +309,13 @@ "isStatic" : false, "name" : "zipCode", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -358,12 +363,13 @@ "isStatic" : false, "name" : "email", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -431,13 +437,14 @@ "isStatic" : false, "name" : "optionalPrecision", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Precision", "_1" : "Float" } - } + }, + "_1" : "null" } } } @@ -563,12 +570,13 @@ "isStatic" : false, "name" : "optionalObject", "type" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index ac60ca860..e337124ee 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -105,6 +105,14 @@ public protocol _BridgedSwiftStackType { consuming func bridgeJSLowerStackReturn() } +/// Types that bridge with the same (isSome, value) ABI as Optional. +/// Used by JSUndefinedOr so all bridge methods delegate to Optional. +public protocol _BridgedAsOptional { + associatedtype Wrapped + var optionalRepresentation: Wrapped? { get } + init(optional: Wrapped?) +} + extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStackType { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -1773,6 +1781,379 @@ extension Optional where Wrapped: _BridgedSwiftStruct { } } +// MARK: - _BridgedAsOptional (JSUndefinedOr) delegating to Optional + +extension _BridgedAsOptional where Wrapped == Bool { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(value)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == Int { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == UInt { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == String { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ bytes: Int32, + _ count: Int32 + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == JSObject { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftProtocolWrapper { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftHeapObject { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, pointer: UnsafeMutableRawPointer) + { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithRetain() -> ( + isSome: Int32, pointer: UnsafeMutableRawPointer + ) { + optionalRepresentation.bridgeJSLowerParameterWithRetain() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ pointer: UnsafeMutableRawPointer + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, pointer)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == Float { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped == Double { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(caseId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ bytes: Int32, + _ count: Int32 + ) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional +where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { + Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftAssociatedValueEnum { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { + optionalRepresentation.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(caseId)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct { + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftParameter(isSome)) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + Self(optional: Optional.bridgeJSLiftParameter()) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + optionalRepresentation.bridgeJSLowerReturn() + } +} + // MARK: - Array Support extension Array where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { diff --git a/Sources/JavaScriptKit/JSUndefinedOr.swift b/Sources/JavaScriptKit/JSUndefinedOr.swift index f70cfc0df..82e218105 100644 --- a/Sources/JavaScriptKit/JSUndefinedOr.swift +++ b/Sources/JavaScriptKit/JSUndefinedOr.swift @@ -6,12 +6,12 @@ public static var undefinedValue: Self { .undefined } @inlinable - init(optional: Wrapped?) { + public init(optional: Wrapped?) { self = optional.map(Self.value) ?? .undefined } @inlinable - var optionalRepresentation: Wrapped? { + public var optionalRepresentation: Wrapped? { switch self { case .undefined: return nil @@ -40,369 +40,6 @@ extension JSUndefinedOr: ConvertibleToJSValue where Wrapped: ConvertibleToJSValu } } -// MARK: - BridgeJS Optional-style conformances +// MARK: - BridgeJS (via _BridgedAsOptional in BridgeJSIntrinsics) -extension JSUndefinedOr where Wrapped == Bool { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftReturn(value)) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped == Int { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped == UInt { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped == String { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter( - _ isSome: Int32, - _ bytes: Int32, - _ count: Int32 - ) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped == JSObject { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftProtocolWrapper { - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftHeapObject { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, pointer: UnsafeMutableRawPointer) - { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithRetain() -> ( - isSome: Int32, pointer: UnsafeMutableRawPointer - ) { - optionalRepresentation.bridgeJSLowerParameterWithRetain() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter( - _ isSome: Int32, - _ pointer: UnsafeMutableRawPointer - ) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, pointer)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } -} - -extension JSUndefinedOr where Wrapped == Float { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped == Double { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftCaseEnum { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftReturn(caseId)) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr -where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter( - _ isSome: Int32, - _ bytes: Int32, - _ count: Int32 - ) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Bool { - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr -where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr -where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { - optionalRepresentation.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftReturn(caseId)) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} - -extension JSUndefinedOr where Wrapped: _BridgedSwiftStruct { - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() - } -} +extension JSUndefinedOr: _BridgedAsOptional {} diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index a572f4c6f..72b104683 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -4488,9 +4488,9 @@ public func _bjs_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: Unsafe @_expose(wasm, "bjs_makeOptionalHolder") @_cdecl("bjs_makeOptionalHolder") -public func _bjs_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsDefined: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { +public func _bjs_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsDefined, undefinedNumberValue)) + let ret = makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5909,9 +5909,9 @@ fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int @_expose(wasm, "bjs_OptionalHolder_init") @_cdecl("bjs_OptionalHolder_init") -public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsDefined: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { +public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsDefined, undefinedNumberValue)) + let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5952,9 +5952,9 @@ public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPoi @_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set") @_cdecl("bjs_OptionalHolder_undefinedNumber_set") -public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsDefined: Int32, _ valueValue: Float64) -> Void { +public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) - OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsDefined, valueValue) + OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif @@ -8034,16 +8034,16 @@ func _$jsRoundTripOptionalNumberNull(_ v: Optional) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberUndefined") -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsDefined: Int32, _ vValue: Float64) -> Void +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsSome: Int32, _ vValue: Float64) -> Void #else -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsDefined: Int32, _ vValue: Float64) -> Void { +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsSome: Int32, _ vValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif func _$jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { - let (vIsDefined, vValue) = v.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalNumberUndefined(vIsDefined, vValue) + let (vIsSome, vValue) = v.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalNumberUndefined(vIsSome, vValue) if let error = _swift_js_take_exception() { throw error } diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 3c71881a5..f73b25c32 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -538,12 +538,13 @@ "label" : "nullableGreeter", "name" : "nullableGreeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -551,12 +552,13 @@ "label" : "undefinedNumber", "name" : "undefinedNumber", "type" : { - "undefinedOr" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "undefined" } } } @@ -572,12 +574,13 @@ "isStatic" : false, "name" : "nullableGreeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -586,12 +589,13 @@ "isStatic" : false, "name" : "undefinedNumber", "type" : { - "undefinedOr" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "undefined" } } } @@ -611,12 +615,13 @@ "label" : "optionalName", "name" : "optionalName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -632,12 +637,13 @@ "isStatic" : false, "name" : "optionalName", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -646,12 +652,13 @@ "isStatic" : false, "name" : "optionalAge", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -660,12 +667,13 @@ "isStatic" : false, "name" : "optionalGreeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -1130,12 +1138,13 @@ "label" : "tag", "name" : "tag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -1207,12 +1216,13 @@ "isStatic" : false, "name" : "tag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -1366,12 +1376,13 @@ } }, "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -1385,12 +1396,13 @@ } }, "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -1572,12 +1584,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -1610,12 +1623,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -1632,12 +1646,13 @@ "label" : "_", "name" : "tag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -1660,12 +1675,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -1682,12 +1698,13 @@ "label" : "_", "name" : "count", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -1710,12 +1727,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -1732,12 +1750,13 @@ "label" : "_", "name" : "direction", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } @@ -1760,13 +1779,14 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -1783,13 +1803,14 @@ "label" : "_", "name" : "theme", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } } @@ -1812,13 +1833,14 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -1835,13 +1857,14 @@ "label" : "_", "name" : "status", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } } @@ -1864,12 +1887,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -1886,12 +1910,13 @@ "label" : "_", "name" : "apiResult", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -1920,12 +1945,13 @@ "isStatic" : false, "name" : "backupProcessor", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftProtocol" : { "_0" : "DataProcessor" } - } + }, + "_1" : "null" } } } @@ -2110,12 +2136,13 @@ "label" : "_", "name" : "greeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -2138,12 +2165,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -2160,12 +2188,13 @@ "label" : "_", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -2188,12 +2217,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -2225,12 +2255,13 @@ "isStatic" : false, "name" : "optionalTag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -2239,12 +2270,13 @@ "isStatic" : false, "name" : "optionalCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -2253,12 +2285,13 @@ "isStatic" : false, "name" : "direction", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -2267,13 +2300,14 @@ "isStatic" : false, "name" : "optionalTheme", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -2282,13 +2316,14 @@ "isStatic" : false, "name" : "httpStatus", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -2297,12 +2332,13 @@ "isStatic" : false, "name" : "apiResult", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -2321,12 +2357,13 @@ "isStatic" : false, "name" : "optionalHelper", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -2512,12 +2549,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } ], @@ -2558,12 +2596,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } ], @@ -2604,12 +2643,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } ], @@ -2649,12 +2689,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } ], @@ -2689,12 +2730,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -3030,12 +3072,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } ], @@ -3076,13 +3119,14 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } ], @@ -3123,12 +3167,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } ], @@ -3168,12 +3213,13 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } ], @@ -3215,12 +3261,13 @@ "label" : "config", "name" : "config", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } } @@ -3246,12 +3293,13 @@ "isStatic" : false, "name" : "config", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Config" } - } + }, + "_1" : "null" } } } @@ -4315,12 +4363,13 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -4331,23 +4380,25 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -4358,34 +4409,37 @@ "associatedValues" : [ { "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, { "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -6855,23 +6909,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -6888,23 +6944,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -6921,23 +6979,25 @@ "label" : "flag", "name" : "flag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } }, @@ -6954,23 +7014,25 @@ "label" : "number", "name" : "number", "type" : { - "optional" : { + "nullable" : { "_0" : { "float" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "float" : { } - } + }, + "_1" : "null" } } }, @@ -6987,23 +7049,25 @@ "label" : "precision", "name" : "precision", "type" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -7020,23 +7084,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -7053,23 +7119,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -7086,23 +7154,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -7119,23 +7189,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -7152,23 +7224,25 @@ "label" : "age", "name" : "age", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -7185,23 +7259,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Status" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Status" } - } + }, + "_1" : "null" } } }, @@ -7218,25 +7294,27 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -7253,25 +7331,27 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -7288,23 +7368,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "TSDirection" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "TSDirection" } - } + }, + "_1" : "null" } } }, @@ -7321,25 +7403,27 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSTheme", "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "TSTheme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -7356,23 +7440,25 @@ "label" : "_", "name" : "method", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Networking.API.Method" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Networking.API.Method" } - } + }, + "_1" : "null" } } }, @@ -7389,23 +7475,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -7422,12 +7510,13 @@ "label" : "_", "name" : "r1", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -7435,12 +7524,13 @@ "label" : "_", "name" : "r2", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -7464,23 +7554,25 @@ "label" : "_", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } }, @@ -7497,23 +7589,25 @@ "label" : "value", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -7530,23 +7624,25 @@ "label" : "_", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -7563,12 +7659,13 @@ "label" : "_", "name" : "value", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -7584,22 +7681,24 @@ "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -7608,12 +7707,13 @@ } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -7630,12 +7730,13 @@ "label" : "nullableGreeter", "name" : "nullableGreeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -7643,12 +7744,13 @@ "label" : "undefinedNumber", "name" : "undefinedNumber", "type" : { - "undefinedOr" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "undefined" } } } @@ -7672,23 +7774,25 @@ "label" : "result", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } }, @@ -7929,23 +8033,25 @@ "label" : "name", "name" : "name", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -8237,7 +8343,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -8246,7 +8352,8 @@ } } } - } + }, + "_1" : "null" } } } @@ -8814,12 +8921,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -8829,12 +8937,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -8855,12 +8964,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -8870,12 +8980,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -8896,12 +9007,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "DataPoint" } - } + }, + "_1" : "null" } } } @@ -8911,12 +9023,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "DataPoint" } - } + }, + "_1" : "null" } } } @@ -8937,12 +9050,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } @@ -8952,12 +9066,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } } @@ -8978,12 +9093,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Status" } - } + }, + "_1" : "null" } } } @@ -8993,12 +9109,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Status" } - } + }, + "_1" : "null" } } } @@ -9017,7 +9134,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9026,13 +9143,14 @@ } } } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9041,7 +9159,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -9058,7 +9177,7 @@ "label" : "_", "name" : "values", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9067,13 +9186,14 @@ } } } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9082,7 +9202,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -9099,7 +9220,7 @@ "label" : "_", "name" : "greeters", "type" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9108,13 +9229,14 @@ } } } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "array" : { "_0" : { @@ -9123,7 +9245,8 @@ } } } - } + }, + "_1" : "null" } } }, @@ -9713,12 +9836,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } @@ -9728,12 +9852,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } @@ -9787,12 +9912,13 @@ "type" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } @@ -9802,12 +9928,13 @@ "returnType" : { "array" : { "_0" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } @@ -10148,12 +10275,13 @@ "label" : "_", "name" : "newResult", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -10417,12 +10545,13 @@ "label" : "_", "name" : "greeter", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -10445,12 +10574,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, @@ -10467,12 +10597,13 @@ "label" : "_", "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -10495,12 +10626,13 @@ ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -10529,12 +10661,13 @@ "isReadonly" : false, "name" : "optionalTag", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -10542,12 +10675,13 @@ "isReadonly" : false, "name" : "optionalCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -10555,12 +10689,13 @@ "isReadonly" : false, "name" : "direction", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -10568,13 +10703,14 @@ "isReadonly" : false, "name" : "optionalTheme", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -10582,13 +10718,14 @@ "isReadonly" : false, "name" : "httpStatus", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "HttpStatus", "_1" : "Int" } - } + }, + "_1" : "null" } } }, @@ -10596,12 +10733,13 @@ "isReadonly" : false, "name" : "apiResult", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -10618,12 +10756,13 @@ "isReadonly" : false, "name" : "optionalHelper", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -10838,12 +10977,13 @@ "label" : "optCount", "name" : "optCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -10851,12 +10991,13 @@ "label" : "optFlag", "name" : "optFlag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -10902,12 +11043,13 @@ "isStatic" : false, "name" : "optCount", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } }, @@ -10916,12 +11058,13 @@ "isStatic" : false, "name" : "optFlag", "type" : { - "optional" : { + "nullable" : { "_0" : { "bool" : { } - } + }, + "_1" : "null" } } } @@ -10959,12 +11102,13 @@ "isStatic" : false, "name" : "zipCode", "type" : { - "optional" : { + "nullable" : { "_0" : { "int" : { } - } + }, + "_1" : "null" } } } @@ -11012,12 +11156,13 @@ "isStatic" : false, "name" : "email", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } }, @@ -11026,12 +11171,13 @@ "isStatic" : false, "name" : "secondaryAddress", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Address" } - } + }, + "_1" : "null" } } } @@ -11059,13 +11205,14 @@ "isStatic" : false, "name" : "theme", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Theme", "_1" : "String" } - } + }, + "_1" : "null" } } }, @@ -11074,12 +11221,13 @@ "isStatic" : false, "name" : "direction", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Direction" } - } + }, + "_1" : "null" } } }, @@ -11117,12 +11265,13 @@ "isStatic" : false, "name" : "owner", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftHeapObject" : { "_0" : "Greeter" } - } + }, + "_1" : "null" } } } @@ -11160,12 +11309,13 @@ "isStatic" : false, "name" : "status", "type" : { - "optional" : { + "nullable" : { "_0" : { "caseEnum" : { "_0" : "Status" } - } + }, + "_1" : "null" } } }, @@ -11174,12 +11324,13 @@ "isStatic" : false, "name" : "outcome", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } } @@ -11248,12 +11399,13 @@ "isStatic" : false, "name" : "result", "type" : { - "optional" : { + "nullable" : { "_0" : { "associatedValueEnum" : { "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, @@ -11262,12 +11414,13 @@ "isStatic" : false, "name" : "metadata", "type" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } }, @@ -11276,12 +11429,13 @@ "isStatic" : false, "name" : "location", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "DataPoint" } - } + }, + "_1" : "null" } } }, @@ -11300,12 +11454,13 @@ "isStatic" : false, "name" : "overrideDefaults", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "ConfigStruct" } - } + }, + "_1" : "null" } } } @@ -11345,13 +11500,14 @@ "isStatic" : false, "name" : "optionalPrecision", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Precision", "_1" : "Float" } - } + }, + "_1" : "null" } } }, @@ -11360,13 +11516,14 @@ "isStatic" : false, "name" : "optionalRatio", "type" : { - "optional" : { + "nullable" : { "_0" : { "rawValueEnum" : { "_0" : "Ratio", "_1" : "Double" } - } + }, + "_1" : "null" } } } @@ -11577,12 +11734,13 @@ "isStatic" : false, "name" : "note", "type" : { - "optional" : { + "nullable" : { "_0" : { "string" : { } - } + }, + "_1" : "null" } } } @@ -11678,12 +11836,13 @@ "isStatic" : false, "name" : "shippingAddress", "type" : { - "optional" : { + "nullable" : { "_0" : { "swiftStruct" : { "_0" : "Address" } - } + }, + "_1" : "null" } } } @@ -11800,12 +11959,13 @@ "isStatic" : false, "name" : "optionalObject", "type" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { } - } + }, + "_1" : "null" } } } @@ -11833,12 +11993,13 @@ "isStatic" : false, "name" : "optionalFoo", "type" : { - "optional" : { + "nullable" : { "_0" : { "jsObject" : { "_0" : "Foo" } - } + }, + "_1" : "null" } } } @@ -11960,23 +12121,25 @@ { "name" : "v", "type" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } } ], "returnType" : { - "optional" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "null" } } }, @@ -11986,23 +12149,25 @@ { "name" : "v", "type" : { - "undefinedOr" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "undefined" } } } ], "returnType" : { - "undefinedOr" : { + "nullable" : { "_0" : { "double" : { } - } + }, + "_1" : "undefined" } } }, From d6551ac8aff85147de52d559c6ee0dff2ce048f0 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 14:02:40 +0900 Subject: [PATCH 143/252] BridgeJS: Add te2swift unit tests --- .../TS2Swift/JavaScript/src/processor.js | 2 +- .../test/__snapshots__/ts2swift.test.js.snap | 41 +++++++++++++++++++ .../test/fixtures/OptionalNullUndefined.d.ts | 20 +++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/OptionalNullUndefined.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index fd31967b0..0e458ed43 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -691,7 +691,7 @@ export class TypeProcessor { if (nonNullableTypes.length === 1 && (hasNull || hasUndefined)) { const wrapped = this.visitType(nonNullableTypes[0], node); if (hasNull && hasUndefined) { - return `JSUndefinedOr>`; + return "JSObject"; } if (hasNull) { return `Optional<${wrapped}>`; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 6add64de4..c1db3e32e 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -145,6 +145,47 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult " `; +exports[`ts2swift > snapshots Swift output for OptionalNullUndefined.d.ts > OptionalNullUndefined 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func roundTripNumberNull(_ value: Optional) throws(JSException) -> Optional + +@JSFunction func roundTripNumberUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + +@JSFunction func roundTripStringNull(_ value: Optional) throws(JSException) -> Optional + +@JSFunction func roundTripStringUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + +@JSFunction func roundTripBooleanNull(_ value: JSObject) throws(JSException) -> JSObject + +@JSFunction func roundTripBooleanUndefined(_ value: JSObject) throws(JSException) -> JSObject + +@JSFunction func optionalNumberParamNull(_ x: Double, _ maybe: Optional) throws(JSException) -> Double + +@JSFunction func optionalNumberParamUndefined(_ x: Double, _ maybe: JSUndefinedOr) throws(JSException) -> Double + +@JSFunction func roundTripMyInterfaceNull(_ value: Optional) throws(JSException) -> Optional + +@JSClass struct MyInterface { +} + +@JSFunction func roundTripMyInterfaceUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + +@JSClass struct WithOptionalFields { + @JSGetter var valueOrNull: Optional + @JSSetter func setValueOrNull(_ value: Optional) throws(JSException) + @JSGetter var valueOrUndefined: JSUndefinedOr + @JSSetter func setValueOrUndefined(_ value: JSUndefinedOr) throws(JSException) +} +" +`; + exports[`ts2swift > snapshots Swift output for PrimitiveParameters.d.ts > PrimitiveParameters 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/OptionalNullUndefined.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/OptionalNullUndefined.d.ts new file mode 100644 index 000000000..8b64528d9 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/OptionalNullUndefined.d.ts @@ -0,0 +1,20 @@ +export function roundTripNumberNull(value: number | null): number | null; +export function roundTripNumberUndefined(value: number | undefined): number | undefined; + +export function roundTripStringNull(value: string | null): string | null; +export function roundTripStringUndefined(value: string | undefined): string | undefined; + +export function roundTripBooleanNull(value: boolean | null): boolean | null; +export function roundTripBooleanUndefined(value: boolean | undefined): boolean | undefined; + +export function optionalNumberParamNull(x: number, maybe: number | null): number; +export function optionalNumberParamUndefined(x: number, maybe: number | undefined): number; + +export interface MyInterface {} +export function roundTripMyInterfaceNull(value: MyInterface | null): MyInterface | null; +export function roundTripMyInterfaceUndefined(value: MyInterface | undefined): MyInterface | undefined; + +export class WithOptionalFields { + valueOrNull: MyInterface | null; + valueOrUndefined: MyInterface | undefined; +} \ No newline at end of file From ab2c0682d4d188cc89a25f426e150d07411a6137 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 14:10:37 +0900 Subject: [PATCH 144/252] BridgeJS: Simplify optional presence check handling --- .../Sources/BridgeJSLink/JSGlueGen.swift | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 44e751d3a..90ea5ab0c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -643,10 +643,7 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLowerReturn( - wrappedType: BridgeType, - presenceCheck: (@Sendable (String) -> String)? = nil - ) throws -> IntrinsicJSFragment { + static func optionalLowerReturn(wrappedType: BridgeType, kind: JSOptionalKind) throws -> IntrinsicJSFragment { switch wrappedType { case .void, .nullable, .namespaceEnum, .closure: throw BridgeJSLinkError(message: "Unsupported optional wrapped type for protocol export: \(wrappedType)") @@ -658,7 +655,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let value = arguments[0] let isSomeVar = scope.variable("isSome") - let presenceExpr = presenceCheck?(value) ?? "\(value) != null" + let presenceExpr = kind.presenceCheck(value: value) printer.write("const \(isSomeVar) = \(presenceExpr);") switch wrappedType { @@ -1599,10 +1596,7 @@ struct IntrinsicJSFragment: Sendable { case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .nullable(let wrappedType, let kind): - return try .optionalLowerReturn( - wrappedType: wrappedType, - presenceCheck: { value in kind.presenceCheck(value: value) } - ) + return try .optionalLowerReturn(wrappedType: wrappedType, kind: kind) case .caseEnum: return .identity case .rawValueEnum(_, let rawType): switch rawType { @@ -2493,7 +2487,7 @@ struct IntrinsicJSFragment: Sendable { case .nullable(let wrappedType, let kind): return try optionalElementLowerFragment( wrappedType: wrappedType, - presenceCheck: { kind.presenceCheck(value: $0) } + kind: kind ) case .swiftProtocol: // Same as jsObject but no cleanup — Swift's AnyProtocol wrapper releases via deinit @@ -2556,7 +2550,7 @@ struct IntrinsicJSFragment: Sendable { private static func optionalElementLowerFragment( wrappedType: BridgeType, - presenceCheck: (@Sendable (String) -> String)? = nil + kind: JSOptionalKind ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], @@ -2564,7 +2558,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let isSomeVar = scope.variable("isSome") - let presenceExpr = presenceCheck?(value) ?? "\(value) != null" + let presenceExpr = kind.presenceCheck(value: value) printer.write("const \(isSomeVar) = \(presenceExpr) ? 1 : 0;") // Cleanup is written inside the if block so retained id is in scope let localCleanupWriter = CodeFragmentPrinter() From 667d787dd3371fd887a427337a004b629d7bbe62 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 14:19:38 +0900 Subject: [PATCH 145/252] BridgeJS: Cover Optional/Undefined usage on import side --- .../Inputs/MacroSwift/Optionals.swift | 32 ++ .../BridgeJSCodegenTests/Optionals.json | 490 ++++++++++++++++++ .../BridgeJSCodegenTests/Optionals.swift | 461 +++++++++++++++- .../BridgeJSLinkTests/Optionals.d.ts | 21 + .../BridgeJSLinkTests/Optionals.js | 268 ++++++++++ 5 files changed, 1271 insertions(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift index d256a8753..3fabe55c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift @@ -90,3 +90,35 @@ typealias OptionalNameAlias = Optional func testMixedOptionals(firstName: String?, lastName: String?, age: Int?, active: Bool) -> String? { return nil } + +@JSClass struct WithOptionalJSClass { + @JSFunction init(valueOrNull: String?, valueOrUndefined: JSUndefinedOr) throws(JSException) + + @JSGetter var stringOrNull: String? + @JSSetter func setStringOrNull(_ value: String?) throws(JSException) + @JSGetter var stringOrUndefined: JSUndefinedOr + @JSSetter func setStringOrUndefined(_ value: JSUndefinedOr) throws(JSException) + @JSFunction func roundTripStringOrNull(value: String?) throws(JSException) -> String? + @JSFunction func roundTripStringOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + + @JSGetter var doubleOrNull: Double? + @JSSetter func setDoubleOrNull(_ value: Double?) throws(JSException) + @JSGetter var doubleOrUndefined: JSUndefinedOr + @JSSetter func setDoubleOrUndefined(_ value: JSUndefinedOr) throws(JSException) + @JSFunction func roundTripDoubleOrNull(value: Double?) throws(JSException) -> Double? + @JSFunction func roundTripDoubleOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + + @JSGetter var boolOrNull: Bool? + @JSSetter func setBoolOrNull(_ value: Bool?) throws(JSException) + @JSGetter var boolOrUndefined: JSUndefinedOr + @JSSetter func setBoolOrUndefined(_ value: JSUndefinedOr) throws(JSException) + @JSFunction func roundTripBoolOrNull(value: Bool?) throws(JSException) -> Bool? + @JSFunction func roundTripBoolOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + + @JSGetter var intOrNull: Int? + @JSSetter func setIntOrNull(_ value: Int?) throws(JSException) + @JSGetter var intOrUndefined: JSUndefinedOr + @JSSetter func setIntOrUndefined(_ value: JSUndefinedOr) throws(JSException) + @JSFunction func roundTripIntOrNull(value: Int?) throws(JSException) -> Int? + @JSFunction func roundTripIntOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json index ea5c675f0..f74b3cdf7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json @@ -736,5 +736,495 @@ ] }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "valueOrNull", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "valueOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + } + ] + }, + "getters" : [ + { + "name" : "stringOrNull", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "stringOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "doubleOrNull", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "doubleOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "boolOrNull", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "boolOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "intOrNull", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "intOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "methods" : [ + { + "name" : "roundTripStringOrNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "roundTripStringOrUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "roundTripDoubleOrNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "roundTripDoubleOrUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "roundTripBoolOrNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "roundTripBoolOrUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "roundTripIntOrNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "roundTripIntOrUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "name" : "WithOptionalJSClass", + "setters" : [ + { + "functionName" : "stringOrNull_set", + "name" : "stringOrNull", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "functionName" : "stringOrUndefined_set", + "name" : "stringOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "functionName" : "doubleOrNull_set", + "name" : "doubleOrNull", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + }, + { + "functionName" : "doubleOrUndefined_set", + "name" : "doubleOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "functionName" : "boolOrNull_set", + "name" : "boolOrNull", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + }, + { + "functionName" : "boolOrUndefined_set", + "name" : "boolOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "functionName" : "intOrNull_set", + "name" : "intOrNull", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "functionName" : "intOrUndefined_set", + "name" : "intOrUndefined", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + } + ] + } + ] + } + ] + }, "moduleName" : "TestModule" } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift index 88195f37d..471d38a6c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift @@ -338,4 +338,463 @@ fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPoi fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_init") +fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 +#else +fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrNull_get") +fileprivate func bjs_WithOptionalJSClass_stringOrNull_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_stringOrNull_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrUndefined_get") +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrNull_get") +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrUndefined_get") +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrNull_get") +fileprivate func bjs_WithOptionalJSClass_boolOrNull_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_WithOptionalJSClass_boolOrNull_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrUndefined_get") +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get(_ self: Int32) -> Int32 +#else +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrNull_get") +fileprivate func bjs_WithOptionalJSClass_intOrNull_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_intOrNull_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrUndefined_get") +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get(_ self: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrNull_set") +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrUndefined_set") +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrNull_set") +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrUndefined_set") +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrNull_set") +fileprivate func bjs_WithOptionalJSClass_boolOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_boolOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrUndefined_set") +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrNull_set") +fileprivate func bjs_WithOptionalJSClass_intOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_intOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrUndefined_set") +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrNull") +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrUndefined") +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripDoubleOrNull") +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripDoubleOrUndefined") +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripBoolOrNull") +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 +#else +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripBoolOrUndefined") +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 +#else +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripIntOrNull") +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripIntOrUndefined") +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$WithOptionalJSClass_init(_ valueOrNull: Optional, _ valueOrUndefined: JSUndefinedOr) throws(JSException) -> JSObject { + let (valueOrNullIsSome, valueOrNullValue) = valueOrNull.bridgeJSLowerParameter() + let (valueOrUndefinedIsSome, valueOrUndefinedValue) = valueOrUndefined.bridgeJSLowerParameter() + let ret = bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullValue, valueOrUndefinedIsSome, valueOrUndefinedValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$WithOptionalJSClass_stringOrNull_get(_ self: JSObject) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_stringOrNull_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_stringOrUndefined_get(_ self: JSObject) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_stringOrUndefined_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_doubleOrNull_get(_ self: JSObject) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_doubleOrNull_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_doubleOrUndefined_get(_ self: JSObject) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_doubleOrUndefined_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_boolOrNull_get(_ self: JSObject) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WithOptionalJSClass_boolOrNull_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturn(ret) +} + +func _$WithOptionalJSClass_boolOrUndefined_get(_ self: JSObject) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + let ret = bjs_WithOptionalJSClass_boolOrUndefined_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturn(ret) +} + +func _$WithOptionalJSClass_intOrNull_get(_ self: JSObject) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_intOrNull_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_intOrUndefined_get(_ self: JSObject) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_intOrUndefined_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_stringOrNull_set(_ self: JSObject, _ newValue: Optional) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_stringOrNull_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_stringOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_stringOrUndefined_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_doubleOrNull_set(_ self: JSObject, _ newValue: Optional) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_doubleOrNull_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_doubleOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_doubleOrUndefined_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_boolOrNull_set(_ self: JSObject, _ newValue: Optional) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_boolOrNull_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_boolOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_boolOrUndefined_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_intOrNull_set(_ self: JSObject, _ newValue: Optional) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_intOrNull_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_intOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let (newValueIsSome, newValueValue) = newValue.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_intOrUndefined_set(selfValue, newValueIsSome, newValueValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$WithOptionalJSClass_roundTripStringOrNull(_ self: JSObject, _ value: Optional) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripStringOrNull(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_roundTripStringOrUndefined(_ self: JSObject, _ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripStringOrUndefined(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_roundTripDoubleOrNull(_ self: JSObject, _ value: Optional) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripDoubleOrNull(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: JSObject, _ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_roundTripBoolOrNull(_ self: JSObject, _ value: Optional) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + let ret = bjs_WithOptionalJSClass_roundTripBoolOrNull(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturn(ret) +} + +func _$WithOptionalJSClass_roundTripBoolOrUndefined(_ self: JSObject, _ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + let ret = bjs_WithOptionalJSClass_roundTripBoolOrUndefined(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturn(ret) +} + +func _$WithOptionalJSClass_roundTripIntOrNull(_ self: JSObject, _ value: Optional) throws(JSException) -> Optional { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripIntOrNull(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$WithOptionalJSClass_roundTripIntOrUndefined(_ self: JSObject, _ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let selfValue = self.bridgeJSLowerParameter() + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_WithOptionalJSClass_roundTripIntOrUndefined(selfValue, valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts index 5f63e9db5..b1a67ccde 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.d.ts @@ -21,6 +21,24 @@ export interface OptionalPropertyHolder extends SwiftHeapObject { optionalAge: number | null; optionalGreeter: Greeter | null; } +export interface WithOptionalJSClass { + roundTripStringOrNull(value: string | null): string | null; + roundTripStringOrUndefined(value: string | undefined): string | undefined; + roundTripDoubleOrNull(value: number | null): number | null; + roundTripDoubleOrUndefined(value: number | undefined): number | undefined; + roundTripBoolOrNull(value: boolean | null): boolean | null; + roundTripBoolOrUndefined(value: boolean | undefined): boolean | undefined; + roundTripIntOrNull(value: number | null): number | null; + roundTripIntOrUndefined(value: number | undefined): number | undefined; + stringOrNull: string | null; + stringOrUndefined: string | undefined; + doubleOrNull: number | null; + doubleOrUndefined: number | undefined; + boolOrNull: boolean | null; + boolOrUndefined: boolean | undefined; + intOrNull: number | null; + intOrUndefined: number | undefined; +} export type Exports = { Greeter: { new(name: string | null): Greeter; @@ -45,6 +63,9 @@ export type Exports = { testMixedOptionals(firstName: string | null, lastName: string | null, age: number | null, active: boolean): string | null; } export type Imports = { + WithOptionalJSClass: { + new(valueOrNull: string | null, valueOrUndefined: string | undefined): WithOptionalJSClass; + } } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 2c08e3d9f..0ec2f81c9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -42,6 +42,7 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); @@ -213,6 +214,273 @@ export async function createInstantiator(options, swift) { const obj = OptionalPropertyHolder.__construct(pointer); return swift.memory.retain(obj); }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_WithOptionalJSClass_init"] = function bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullWrappedValue, valueOrUndefinedIsSome, valueOrUndefinedWrappedValue) { + try { + let obj; + if (valueOrNullIsSome) { + obj = swift.memory.getObject(valueOrNullWrappedValue); + swift.memory.release(valueOrNullWrappedValue); + } + let obj1; + if (valueOrUndefinedIsSome) { + obj1 = swift.memory.getObject(valueOrUndefinedWrappedValue); + swift.memory.release(valueOrUndefinedWrappedValue); + } + return swift.memory.retain(new imports.WithOptionalJSClass(valueOrNullIsSome ? obj : null, valueOrUndefinedIsSome ? obj1 : undefined)); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_WithOptionalJSClass_stringOrNull_get"] = function bjs_WithOptionalJSClass_stringOrNull_get(self) { + try { + let ret = swift.memory.getObject(self).stringOrNull; + const isSome = ret != null; + if (isSome) { + const bytes = textEncoder.encode(ret); + bjs["swift_js_return_optional_string"](1, bytes, bytes.length); + return bytes.length; + } else { + bjs["swift_js_return_optional_string"](0, 0, 0); + return -1; + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_stringOrUndefined_get"] = function bjs_WithOptionalJSClass_stringOrUndefined_get(self) { + try { + let ret = swift.memory.getObject(self).stringOrUndefined; + const isSome = ret !== undefined; + if (isSome) { + const bytes = textEncoder.encode(ret); + bjs["swift_js_return_optional_string"](1, bytes, bytes.length); + return bytes.length; + } else { + bjs["swift_js_return_optional_string"](0, 0, 0); + return -1; + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_doubleOrNull_get"] = function bjs_WithOptionalJSClass_doubleOrNull_get(self) { + try { + let ret = swift.memory.getObject(self).doubleOrNull; + const isSome = ret != null; + bjs["swift_js_return_optional_double"](isSome ? 1 : 0, isSome ? ret : 0.0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_doubleOrUndefined_get"] = function bjs_WithOptionalJSClass_doubleOrUndefined_get(self) { + try { + let ret = swift.memory.getObject(self).doubleOrUndefined; + const isSome = ret !== undefined; + bjs["swift_js_return_optional_double"](isSome ? 1 : 0, isSome ? ret : 0.0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_boolOrNull_get"] = function bjs_WithOptionalJSClass_boolOrNull_get(self) { + try { + let ret = swift.memory.getObject(self).boolOrNull; + const isSome = ret != null; + bjs["swift_js_return_optional_bool"](isSome ? 1 : 0, isSome ? (ret ? 1 : 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_boolOrUndefined_get"] = function bjs_WithOptionalJSClass_boolOrUndefined_get(self) { + try { + let ret = swift.memory.getObject(self).boolOrUndefined; + const isSome = ret !== undefined; + bjs["swift_js_return_optional_bool"](isSome ? 1 : 0, isSome ? (ret ? 1 : 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_intOrNull_get"] = function bjs_WithOptionalJSClass_intOrNull_get(self) { + try { + let ret = swift.memory.getObject(self).intOrNull; + const isSome = ret != null; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_intOrUndefined_get"] = function bjs_WithOptionalJSClass_intOrUndefined_get(self) { + try { + let ret = swift.memory.getObject(self).intOrUndefined; + const isSome = ret !== undefined; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_stringOrNull_set"] = function bjs_WithOptionalJSClass_stringOrNull_set(self, newValueIsSome, newValueWrappedValue) { + try { + let obj; + if (newValueIsSome) { + obj = swift.memory.getObject(newValueWrappedValue); + swift.memory.release(newValueWrappedValue); + } + swift.memory.getObject(self).stringOrNull = newValueIsSome ? obj : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_stringOrUndefined_set"] = function bjs_WithOptionalJSClass_stringOrUndefined_set(self, newValueIsSome, newValueWrappedValue) { + try { + let obj; + if (newValueIsSome) { + obj = swift.memory.getObject(newValueWrappedValue); + swift.memory.release(newValueWrappedValue); + } + swift.memory.getObject(self).stringOrUndefined = newValueIsSome ? obj : undefined; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_doubleOrNull_set"] = function bjs_WithOptionalJSClass_doubleOrNull_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).doubleOrNull = newValueIsSome ? newValueWrappedValue : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_doubleOrUndefined_set"] = function bjs_WithOptionalJSClass_doubleOrUndefined_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).doubleOrUndefined = newValueIsSome ? newValueWrappedValue : undefined; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_boolOrNull_set"] = function bjs_WithOptionalJSClass_boolOrNull_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).boolOrNull = newValueIsSome ? newValueWrappedValue !== 0 : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_boolOrUndefined_set"] = function bjs_WithOptionalJSClass_boolOrUndefined_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).boolOrUndefined = newValueIsSome ? newValueWrappedValue !== 0 : undefined; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_intOrNull_set"] = function bjs_WithOptionalJSClass_intOrNull_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).intOrNull = newValueIsSome ? newValueWrappedValue : null; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_intOrUndefined_set"] = function bjs_WithOptionalJSClass_intOrUndefined_set(self, newValueIsSome, newValueWrappedValue) { + try { + swift.memory.getObject(self).intOrUndefined = newValueIsSome ? newValueWrappedValue : undefined; + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripStringOrNull"] = function bjs_WithOptionalJSClass_roundTripStringOrNull(self, valueIsSome, valueWrappedValue) { + try { + let obj; + if (valueIsSome) { + obj = swift.memory.getObject(valueWrappedValue); + swift.memory.release(valueWrappedValue); + } + let ret = swift.memory.getObject(self).roundTripStringOrNull(valueIsSome ? obj : null); + const isSome = ret != null; + if (isSome) { + const bytes = textEncoder.encode(ret); + bjs["swift_js_return_optional_string"](1, bytes, bytes.length); + return bytes.length; + } else { + bjs["swift_js_return_optional_string"](0, 0, 0); + return -1; + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripStringOrUndefined"] = function bjs_WithOptionalJSClass_roundTripStringOrUndefined(self, valueIsSome, valueWrappedValue) { + try { + let obj; + if (valueIsSome) { + obj = swift.memory.getObject(valueWrappedValue); + swift.memory.release(valueWrappedValue); + } + let ret = swift.memory.getObject(self).roundTripStringOrUndefined(valueIsSome ? obj : undefined); + const isSome = ret !== undefined; + if (isSome) { + const bytes = textEncoder.encode(ret); + bjs["swift_js_return_optional_string"](1, bytes, bytes.length); + return bytes.length; + } else { + bjs["swift_js_return_optional_string"](0, 0, 0); + return -1; + } + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripDoubleOrNull"] = function bjs_WithOptionalJSClass_roundTripDoubleOrNull(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripDoubleOrNull(valueIsSome ? valueWrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_double"](isSome ? 1 : 0, isSome ? ret : 0.0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripDoubleOrUndefined"] = function bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripDoubleOrUndefined(valueIsSome ? valueWrappedValue : undefined); + const isSome = ret !== undefined; + bjs["swift_js_return_optional_double"](isSome ? 1 : 0, isSome ? ret : 0.0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripBoolOrNull"] = function bjs_WithOptionalJSClass_roundTripBoolOrNull(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripBoolOrNull(valueIsSome ? valueWrappedValue !== 0 : null); + const isSome = ret != null; + bjs["swift_js_return_optional_bool"](isSome ? 1 : 0, isSome ? (ret ? 1 : 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripBoolOrUndefined"] = function bjs_WithOptionalJSClass_roundTripBoolOrUndefined(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripBoolOrUndefined(valueIsSome ? valueWrappedValue !== 0 : undefined); + const isSome = ret !== undefined; + bjs["swift_js_return_optional_bool"](isSome ? 1 : 0, isSome ? (ret ? 1 : 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripIntOrNull"] = function bjs_WithOptionalJSClass_roundTripIntOrNull(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripIntOrNull(valueIsSome ? valueWrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_WithOptionalJSClass_roundTripIntOrUndefined"] = function bjs_WithOptionalJSClass_roundTripIntOrUndefined(self, valueIsSome, valueWrappedValue) { + try { + let ret = swift.memory.getObject(self).roundTripIntOrUndefined(valueIsSome ? valueWrappedValue : undefined); + const isSome = ret !== undefined; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; From 966b2d71b9b9f85d04f66a58cc79ef40a0c55d3f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 14:21:26 +0900 Subject: [PATCH 146/252] ./Utilities/format.swift --- .../Inputs/MacroSwift/Optionals.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift index 3fabe55c6..57d994519 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Optionals.swift @@ -99,14 +99,18 @@ func testMixedOptionals(firstName: String?, lastName: String?, age: Int?, active @JSGetter var stringOrUndefined: JSUndefinedOr @JSSetter func setStringOrUndefined(_ value: JSUndefinedOr) throws(JSException) @JSFunction func roundTripStringOrNull(value: String?) throws(JSException) -> String? - @JSFunction func roundTripStringOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + @JSFunction func roundTripStringOrUndefined( + value: JSUndefinedOr + ) throws(JSException) -> JSUndefinedOr @JSGetter var doubleOrNull: Double? @JSSetter func setDoubleOrNull(_ value: Double?) throws(JSException) @JSGetter var doubleOrUndefined: JSUndefinedOr @JSSetter func setDoubleOrUndefined(_ value: JSUndefinedOr) throws(JSException) @JSFunction func roundTripDoubleOrNull(value: Double?) throws(JSException) -> Double? - @JSFunction func roundTripDoubleOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + @JSFunction func roundTripDoubleOrUndefined( + value: JSUndefinedOr + ) throws(JSException) -> JSUndefinedOr @JSGetter var boolOrNull: Bool? @JSSetter func setBoolOrNull(_ value: Bool?) throws(JSException) @@ -121,4 +125,4 @@ func testMixedOptionals(firstName: String?, lastName: String?, age: Int?, active @JSSetter func setIntOrUndefined(_ value: JSUndefinedOr) throws(JSException) @JSFunction func roundTripIntOrNull(value: Int?) throws(JSException) -> Int? @JSFunction func roundTripIntOrUndefined(value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr -} \ No newline at end of file +} From 0bd50f8fd323a66fdfc4ae7e97c9e7cb50259d6c Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 19:02:59 +0900 Subject: [PATCH 147/252] [NFC] BridgeJS: Avoid emitting empty skeletons (#574) --- .../Generated/JavaScript/BridgeJS.json | 8 ----- .../Generated/JavaScript/BridgeJS.json | 8 ----- .../BridgeJSCore/SwiftToSkeleton.swift | 16 ++++++---- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 8 +++++ .../BridgeJSCodegenTests.swift | 18 +++++++++++ .../MacroSwift/Multifile/ExportedOnly.swift | 3 ++ .../Multifile/ImportedFunctions.swift | 1 + .../CrossFileSkipsEmptySkeletons.json | 25 +++++++++++++++ .../CrossFileSkipsEmptySkeletons.swift | 16 ++++++++++ .../BridgeJSCodegenTests/GlobalGetter.json | 18 ----------- .../GlobalThisImports.json | 18 ----------- .../InvalidPropertyNames.json | 18 ----------- .../BridgeJSCodegenTests/JSClass.json | 18 ----------- .../JSClassStaticFunctions.json | 18 ----------- .../BridgeJSCodegenTests/Optionals.json | 3 ++ .../SwiftClosureImports.json | 18 ----------- .../Generated/JavaScript/BridgeJS.json | 32 ------------------- 17 files changed, 83 insertions(+), 163 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ExportedOnly.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ImportedFunctions.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift diff --git a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json index 4dff97132..eacd18cb3 100644 --- a/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json +++ b/Benchmarks/Sources/Generated/JavaScript/BridgeJS.json @@ -2737,14 +2737,6 @@ }, "imported" : { "children" : [ - { - "functions" : [ - - ], - "types" : [ - - ] - }, { "functions" : [ { diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json index 2952e2157..743925c5f 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json @@ -197,14 +197,6 @@ ] } ] - }, - { - "functions" : [ - - ], - "types" : [ - - ] } ] }, diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index f52aa7008..32b9f6418 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -66,13 +66,14 @@ public final class SwiftToSkeleton { ) } - importedFiles.append( - ImportedFileSkeleton( - functions: importCollector.importedFunctions, - types: importCollector.importedTypes, - globalGetters: importCollector.importedGlobalGetters - ) + let importedFile = ImportedFileSkeleton( + functions: importCollector.importedFunctions, + types: importCollector.importedTypes, + globalGetters: importCollector.importedGlobalGetters ) + if !importedFile.isEmpty { + importedFiles.append(importedFile) + } exportCollector.finalize(&exported) } @@ -90,7 +91,8 @@ public final class SwiftToSkeleton { return module }() - return BridgeJSSkeleton(moduleName: moduleName, exported: exported, imported: importedSkeleton) + let exportedSkeleton: ExportedSkeleton? = exported.isEmpty ? nil : exported + return BridgeJSSkeleton(moduleName: moduleName, exported: exportedSkeleton, imported: importedSkeleton) } func lookupType(for type: TypeSyntax, errors: inout [DiagnosticError]) -> BridgeType? { diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 3e2d51f8f..a9812e2e0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -624,6 +624,10 @@ public struct ExportedSkeleton: Codable { self.protocols.append(contentsOf: other.protocols) assert(self.exposeToGlobal == other.exposeToGlobal) } + + public var isEmpty: Bool { + functions.isEmpty && classes.isEmpty && enums.isEmpty && structs.isEmpty && protocols.isEmpty + } } // MARK: - Imported Skeleton @@ -854,6 +858,10 @@ public struct ImportedFileSkeleton: Codable { try container.encode(globalSetters, forKey: .globalSetters) } } + + public var isEmpty: Bool { + functions.isEmpty && types.isEmpty && globalGetters.isEmpty && globalSetters.isEmpty + } } public struct ImportedModuleSkeleton: Codable { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift index ed83bc074..9754fbced 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift @@ -166,4 +166,22 @@ import Testing let skeleton = try swiftAPI.finalize() try snapshotCodegen(skeleton: skeleton, name: "CrossFileFunctionTypes.ReverseOrder") } + + @Test + func codegenSkipsEmptySkeletons() throws { + let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false) + let importedURL = Self.multifileInputsDirectory.appendingPathComponent("ImportedFunctions.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: importedURL, encoding: .utf8)), + inputFilePath: "ImportedFunctions.swift" + ) + let exportedOnlyURL = Self.multifileInputsDirectory.appendingPathComponent("ExportedOnly.swift") + swiftAPI.addSourceFile( + Parser.parse(source: try String(contentsOf: exportedOnlyURL, encoding: .utf8)), + inputFilePath: "ExportedOnly.swift" + ) + let skeleton = try swiftAPI.finalize() + #expect(skeleton.exported == nil, "Empty exported skeleton should be omitted") + try snapshotCodegen(skeleton: skeleton, name: "CrossFileSkipsEmptySkeletons") + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ExportedOnly.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ExportedOnly.swift new file mode 100644 index 000000000..d7887d2bd --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ExportedOnly.swift @@ -0,0 +1,3 @@ +struct ExportedOnly { + let value: Int = 0 +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ImportedFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ImportedFunctions.swift new file mode 100644 index 000000000..451424777 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/ImportedFunctions.swift @@ -0,0 +1 @@ +@JSFunction func fetchNumber() throws(JSException) -> Int diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.json new file mode 100644 index 000000000..10c079b27 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.json @@ -0,0 +1,25 @@ +{ + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "fetchNumber", + "parameters" : [ + + ], + "returnType" : { + "int" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift new file mode 100644 index 000000000..21e4e939a --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift @@ -0,0 +1,16 @@ +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_fetchNumber") +fileprivate func bjs_fetchNumber() -> Int32 +#else +fileprivate func bjs_fetchNumber() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$fetchNumber() throws(JSException) -> Int { + let ret = bjs_fetchNumber() + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json index 031870e57..55ac7dd70 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json index c75d9e011..5e002e34f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json index b983f27a4..935f7a7f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json index be1d0f4cd..689e86150 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json index df3d3829e..a8b64558f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json index f74b3cdf7..9c99bb8c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.json @@ -1220,6 +1220,9 @@ } } } + ], + "staticMethods" : [ + ] } ] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json index 12f76a912..9e0e0a491 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json @@ -1,22 +1,4 @@ { - "exported" : { - "classes" : [ - - ], - "enums" : [ - - ], - "exposeToGlobal" : false, - "functions" : [ - - ], - "protocols" : [ - - ], - "structs" : [ - - ] - }, "imported" : { "children" : [ { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 476f60e34..0cb32079a 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -12643,22 +12643,6 @@ } ] }, - { - "functions" : [ - - ], - "types" : [ - - ] - }, - { - "functions" : [ - - ], - "types" : [ - - ] - }, { "functions" : [ { @@ -12904,22 +12888,6 @@ ], "types" : [ - ] - }, - { - "functions" : [ - - ], - "types" : [ - - ] - }, - { - "functions" : [ - - ], - "types" : [ - ] } ] From 56aabfae337f0949c992ab500415572030a4875d Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 19:04:00 +0900 Subject: [PATCH 148/252] [NFC] BridgeJS: Omit trailing spaces on empty lines in generated JS code (#575) When generating JavaScript code, avoid adding trailing spaces to empty lines. --- .../BridgeJSLink/CodeFragmentPrinter.swift | 5 ++ .../BridgeJSLinkTests/ArrayTypes.js | 8 +-- .../__Snapshots__/BridgeJSLinkTests/Async.js | 2 +- .../BridgeJSLinkTests/DefaultParameters.js | 14 ++--- .../BridgeJSLinkTests/EnumAssociatedValue.js | 12 ++-- .../BridgeJSLinkTests/EnumCase.js | 2 +- .../BridgeJSLinkTests/EnumNamespace.Global.js | 10 +-- .../BridgeJSLinkTests/EnumNamespace.js | 10 +-- .../BridgeJSLinkTests/EnumRawType.js | 2 +- .../BridgeJSLinkTests/GlobalGetter.js | 2 +- .../BridgeJSLinkTests/GlobalThisImports.js | 2 +- .../ImportedTypeInExportedInterface.js | 4 +- .../BridgeJSLinkTests/InvalidPropertyNames.js | 2 +- .../BridgeJSLinkTests/JSClass.js | 2 +- .../JSClassStaticFunctions.js | 2 +- .../BridgeJSLinkTests/MixedGlobal.js | 6 +- .../BridgeJSLinkTests/MixedModules.js | 8 +-- .../BridgeJSLinkTests/MixedPrivate.js | 6 +- .../BridgeJSLinkTests/Namespaces.Global.js | 10 +-- .../BridgeJSLinkTests/Namespaces.js | 10 +-- .../BridgeJSLinkTests/Optionals.js | 8 +-- .../BridgeJSLinkTests/PrimitiveParameters.js | 2 +- .../BridgeJSLinkTests/PrimitiveReturn.js | 2 +- .../BridgeJSLinkTests/PropertyTypes.js | 6 +- .../BridgeJSLinkTests/Protocol.js | 12 ++-- .../StaticFunctions.Global.js | 8 +-- .../BridgeJSLinkTests/StaticFunctions.js | 8 +-- .../StaticProperties.Global.js | 6 +- .../BridgeJSLinkTests/StaticProperties.js | 6 +- .../BridgeJSLinkTests/StringParameter.js | 2 +- .../BridgeJSLinkTests/StringReturn.js | 2 +- .../BridgeJSLinkTests/SwiftClass.js | 10 +-- .../BridgeJSLinkTests/SwiftClosure.js | 62 +++++++++---------- .../BridgeJSLinkTests/SwiftClosureImports.js | 6 +- .../BridgeJSLinkTests/SwiftStruct.js | 20 +++--- .../BridgeJSLinkTests/SwiftStructImports.js | 4 +- .../__Snapshots__/BridgeJSLinkTests/Throws.js | 2 +- .../BridgeJSLinkTests/UnsafePointer.js | 4 +- .../VoidParameterVoidReturn.js | 2 +- 39 files changed, 148 insertions(+), 143 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift index c4624e694..258a0ad18 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift @@ -12,6 +12,11 @@ final class CodeFragmentPrinter { } func write(_ line: S) { + if line.isEmpty { + // Empty lines should not have trailing spaces + lines.append("") + return + } lines.append(String(repeating: " ", count: indentLevel * 4) + String(line)) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index da5920660..491fc610e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -44,7 +44,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createPointHelpers = () => { @@ -288,7 +288,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -298,11 +298,11 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Item_deinit, Item.prototype); } - + } const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Point = PointHelpers; - + const exports = { Item, processIntArray: function bjs_processIntArray(values) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index 4015b6261..d5a195430 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 978272568..bc669993b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -37,7 +37,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createConfigHelpers = () => { @@ -317,7 +317,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -327,7 +327,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_DefaultGreeter_deinit, DefaultGreeter.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -352,7 +352,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_EmptyGreeter_deinit, EmptyGreeter.prototype); } - + constructor() { const ret = instance.exports.bjs_EmptyGreeter_init(); return EmptyGreeter.__construct(ret); @@ -362,7 +362,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_ConstructorDefaults_deinit, ConstructorDefaults.prototype); } - + constructor(name = "Default", count = 42, enabled = true, status = StatusValues.Active, tag = null) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -433,10 +433,10 @@ export async function createInstantiator(options, swift) { } const ConfigHelpers = __bjs_createConfigHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Config = ConfigHelpers; - + const MathOperationsHelpers = __bjs_createMathOperationsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.MathOperations = MathOperationsHelpers; - + const exports = { DefaultGreeter, EmptyGreeter, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 2d8dbc0ca..6eb4b3985 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -506,7 +506,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -683,19 +683,19 @@ export async function createInstantiator(options, swift) { const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.APIResult = APIResultHelpers; - + const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.ComplexResult = ComplexResultHelpers; - + const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.Result = ResultHelpers; - + const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.NetworkingResult = NetworkingResultHelpers; - + const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.APIOptionalResult = APIOptionalResultHelpers; - + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 89a0f0897..874b4c4c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -55,7 +55,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index f48a0050e..78f08ffb5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -75,7 +75,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -286,7 +286,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -296,7 +296,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); } - + constructor() { const ret = instance.exports.bjs_Converter_init(); return Converter.__construct(ret); @@ -312,7 +312,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_HTTPServer_deinit, HTTPServer.prototype); } - + constructor() { const ret = instance.exports.bjs_HTTPServer_init(); return HTTPServer.__construct(ret); @@ -325,7 +325,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestServer_deinit, TestServer.prototype); } - + constructor() { const ret = instance.exports.bjs_TestServer_init(); return TestServer.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 1eb483365..cddeac767 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -56,7 +56,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -267,7 +267,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -277,7 +277,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); } - + constructor() { const ret = instance.exports.bjs_Converter_init(); return Converter.__construct(ret); @@ -293,7 +293,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_HTTPServer_deinit, HTTPServer.prototype); } - + constructor() { const ret = instance.exports.bjs_HTTPServer_init(); return HTTPServer.__construct(ret); @@ -306,7 +306,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestServer_deinit, TestServer.prototype); } - + constructor() { const ret = instance.exports.bjs_TestServer_init(); return TestServer.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 1e137e6eb..315b74262 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -106,7 +106,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index b3b809476..b5053b266 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index 35a3d76ec..0d9eb79c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index e4ce9e8fe..11aa2b3d8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createFooContainerHelpers = () => { @@ -300,7 +300,7 @@ export async function createInstantiator(options, swift) { const js = swift.memory.heap; const FooContainerHelpers = __bjs_createFooContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.FooContainer = FooContainerHelpers; - + const exports = { makeFoo: function bjs_makeFoo() { const ret = instance.exports.bjs_makeFoo(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index ab030062a..6a11003b3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 5b7541b1c..b60a698b4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index f8f0ba86f..214a32294 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index f079de1da..e1345f94b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -234,7 +234,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -244,7 +244,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype); } - + constructor() { const ret = instance.exports.bjs_GlobalClass_init(); return GlobalClass.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 2c43b91e8..0703be789 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -242,7 +242,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -252,7 +252,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype); } - + constructor() { const ret = instance.exports.bjs_GlobalClass_init(); return GlobalClass.__construct(ret); @@ -268,7 +268,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype); } - + constructor() { const ret = instance.exports.bjs_PrivateClass_init(); return PrivateClass.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 4b8ce8a66..0cc377f4c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -234,7 +234,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -244,7 +244,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype); } - + constructor() { const ret = instance.exports.bjs_PrivateClass_init(); return PrivateClass.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 671868eab..630651aea 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -242,7 +242,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -252,7 +252,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -271,7 +271,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); } - + constructor() { const ret = instance.exports.bjs_Converter_init(); return Converter.__construct(ret); @@ -287,7 +287,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype); } - + uuidString() { instance.exports.bjs_UUID_uuidString(this.pointer); const ret = tmpRetString; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index ae7bf7451..b3073da70 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -242,7 +242,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -252,7 +252,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -271,7 +271,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype); } - + constructor() { const ret = instance.exports.bjs_Converter_init(); return Converter.__construct(ret); @@ -287,7 +287,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype); } - + uuidString() { instance.exports.bjs_UUID_uuidString(this.pointer); const ret = tmpRetString; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 0ec2f81c9..27e9c3c6b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -506,7 +506,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -516,7 +516,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); } - + constructor(name) { const isSome = name != null; let nameId, nameBytes; @@ -571,7 +571,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_OptionalPropertyHolder_deinit, OptionalPropertyHolder.prototype); } - + constructor() { const ret = instance.exports.bjs_OptionalPropertyHolder_init(); return OptionalPropertyHolder.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index 97e03063a..98f50e850 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index 871310bb8..e68e4e6a2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index fc13a471a..7bf565105 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -234,7 +234,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -244,7 +244,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PropertyHolder_deinit, PropertyHolder.prototype); } - + constructor(intValue, floatValue, doubleValue, boolValue, stringValue, jsObject) { const stringValueBytes = textEncoder.encode(stringValue); const stringValueId = swift.memory.retain(stringValueBytes); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 24c02750f..ce9065ac4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -95,7 +95,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -579,7 +579,7 @@ export async function createInstantiator(options, swift) { const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.Result = ResultHelpers; - + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -600,7 +600,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -610,7 +610,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Helper_deinit, Helper.prototype); } - + constructor(value) { const ret = instance.exports.bjs_Helper_init(value); return Helper.__construct(ret); @@ -630,7 +630,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MyViewController_deinit, MyViewController.prototype); } - + constructor(delegate) { const ret = instance.exports.bjs_MyViewController_init(swift.memory.retain(delegate)); return MyViewController.__construct(ret); @@ -688,7 +688,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_DelegateManager_deinit, DelegateManager.prototype); } - + constructor(delegates) { const arrayCleanups = []; for (const elem of delegates) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index e7bebfe6c..b79c6ebf4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -82,7 +82,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -267,7 +267,7 @@ export async function createInstantiator(options, swift) { const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.APIResult = APIResultHelpers; - + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -288,7 +288,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -298,7 +298,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MathUtils_deinit, MathUtils.prototype); } - + constructor() { const ret = instance.exports.bjs_MathUtils_init(); return MathUtils.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 8b5a54315..2f240c428 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -82,7 +82,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -267,7 +267,7 @@ export async function createInstantiator(options, swift) { const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.APIResult = APIResultHelpers; - + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -288,7 +288,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -298,7 +298,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_MathUtils_deinit, MathUtils.prototype); } - + constructor() { const ret = instance.exports.bjs_MathUtils_init(); return MathUtils.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 9806fc631..15edf8c60 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -36,7 +36,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -239,7 +239,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -249,7 +249,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PropertyClass_deinit, PropertyClass.prototype); } - + constructor() { const ret = instance.exports.bjs_PropertyClass_init(); return PropertyClass.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index ee127ed07..d90e96f0e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -36,7 +36,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -239,7 +239,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -249,7 +249,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PropertyClass_deinit, PropertyClass.prototype); } - + constructor() { const ret = instance.exports.bjs_PropertyClass_init(); return PropertyClass.__construct(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index 03a4bc9b1..fc67c0027 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 98ea9fa4a..50edf3b06 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index d04cd6507..f3d5cafcb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -242,7 +242,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -252,7 +252,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -289,13 +289,13 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PublicGreeter_deinit, PublicGreeter.prototype); } - + } class PackageGreeter extends SwiftHeapObject { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PackageGreeter_deinit, PackageGreeter.prototype); } - + } const exports = { Greeter, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 40378d042..59512a7eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -133,7 +133,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -303,7 +303,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } - + bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -315,7 +315,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule10HttpStatusO_Si"] = function(closurePtr) { return function(param0) { try { @@ -326,7 +326,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -345,7 +345,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule5ThemeO_SS"] = function(closurePtr) { return function(param0) { try { @@ -361,7 +361,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_Sb"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -375,7 +375,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule5ThemeO_Sb"] = function(closurePtr) { return function(param0) { try { @@ -388,7 +388,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule6PersonC_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -405,7 +405,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule6PersonC_SS"] = function(closurePtr) { return function(param0) { try { @@ -419,7 +419,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -436,7 +436,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule9APIResultO_SS"] = function(closurePtr) { return function(param0) { try { @@ -451,7 +451,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -468,7 +468,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule9DirectionO_SS"] = function(closurePtr) { return function(param0) { try { @@ -482,7 +482,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_Sb"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -494,7 +494,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModule9DirectionO_Sb"] = function(closurePtr) { return function(param0) { try { @@ -505,7 +505,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -524,7 +524,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSS_SS"] = function(closurePtr) { return function(param0) { try { @@ -540,7 +540,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); @@ -564,7 +564,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSq5ThemeO_SS"] = function(closurePtr) { return function(param0) { try { @@ -584,7 +584,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { try { const callback = swift.memory.getObject(callbackId); @@ -620,7 +620,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(closurePtr) { return function(param0, param1, param2) { try { @@ -642,7 +642,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); @@ -664,7 +664,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSq6PersonC_SS"] = function(closurePtr) { return function(param0) { try { @@ -679,7 +679,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); @@ -701,7 +701,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSq9APIResultO_SS"] = function(closurePtr) { return function(param0) { try { @@ -722,7 +722,7 @@ export async function createInstantiator(options, swift) { } }; }; - + bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); @@ -744,7 +744,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"] = function(closurePtr) { return function(param0) { try { @@ -778,7 +778,7 @@ export async function createInstantiator(options, swift) { const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); enumHelpers.APIResult = APIResultHelpers; - + setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -799,7 +799,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -809,7 +809,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Person_deinit, Person.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -822,7 +822,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestProcessor_deinit, TestProcessor.prototype); } - + constructor(transform) { const callbackId = swift.memory.retain(transform); const ret = instance.exports.bjs_TestProcessor_init(callbackId); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 9ab218df1..145eeb756 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; @@ -202,7 +202,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } - + bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); @@ -214,7 +214,7 @@ export async function createInstantiator(options, swift) { return 0; } }; - + bjs["lower_closure_TestModule_10TestModuleSi_Si"] = function(closurePtr) { return function(param0) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index dbeb70e69..f389900dc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -36,7 +36,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createDataPointHelpers = () => { @@ -569,7 +569,7 @@ export async function createInstantiator(options, swift) { obj.registry.register(this, obj.pointer); return obj; } - + release() { this.registry.unregister(this); this.deinit(this.pointer); @@ -579,7 +579,7 @@ export async function createInstantiator(options, swift) { static __construct(ptr) { return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype); } - + constructor(name) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); @@ -608,25 +608,25 @@ export async function createInstantiator(options, swift) { } const DataPointHelpers = __bjs_createDataPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.DataPoint = DataPointHelpers; - + const AddressHelpers = __bjs_createAddressHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Address = AddressHelpers; - + const PersonHelpers = __bjs_createPersonHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Person = PersonHelpers; - + const SessionHelpers = __bjs_createSessionHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Session = SessionHelpers; - + const MeasurementHelpers = __bjs_createMeasurementHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Measurement = MeasurementHelpers; - + const ConfigStructHelpers = __bjs_createConfigStructHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.ConfigStruct = ConfigStructHelpers; - + const ContainerHelpers = __bjs_createContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Container = ContainerHelpers; - + const exports = { Greeter, roundtrip: function bjs_roundtrip(session) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index f4e7e61e9..afed321ce 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createPointHelpers = () => { @@ -252,7 +252,7 @@ export async function createInstantiator(options, swift) { const js = swift.memory.heap; const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.Point = PointHelpers; - + const exports = { }; _exports = exports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 5a492295a..8a1c49647 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 2ac28b7e9..61f6c6cf3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; const __bjs_createPointerFieldsHelpers = () => { @@ -246,7 +246,7 @@ export async function createInstantiator(options, swift) { const js = swift.memory.heap; const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); structHelpers.PointerFields = PointerFieldsHelpers; - + const exports = { takeUnsafeRawPointer: function bjs_takeUnsafeRawPointer(p) { instance.exports.bjs_takeUnsafeRawPointer(p); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index f37cbd90b..053c55672 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; - + let _exports = null; let bjs = null; From 81885ea1194b3b2f7f2025fe0abba367be3b0b4b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 20:54:05 +0900 Subject: [PATCH 149/252] BridgeJS: Perf-tune `SwiftToSkeleton` by avoiding unnecessary Syntax node allocation (#577) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `trimmedDescription` allocates two new Syntax nodes just to get the trimmed description of a node. ```swift extension SyntaxProtocol { public var trimmedDescription: String { // TODO: We shouldn't need to create to copies just to get the trimmed // description. return self.trimmed.description } public var trimmed: Self { // TODO: Should only need one new node here return self.with(\.leadingTrivia, []).with(\.trailingTrivia, []) } } ``` ``` $ cat check.d.ts export function getCanvas(x: string): HTMLCanvasElement; $ node Plugins/BridgeJS/Sources/TS2Swift/JavaScript/bin/ts2swift.js check.d.ts -p tsconfig.json -o out.swift $ hyperfine "./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.before emit-skeleton out.swift" "./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.after emit-skeleton out.swift" Benchmark 1: ./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.before emit-skeleton out.swift Time (mean ± σ): 16.531 s ± 0.317 s [User: 16.355 s, System: 0.107 s] Range (min … max): 16.026 s … 17.252 s 10 runs Benchmark 2: ./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.after emit-skeleton out.swift Time (mean ± σ): 4.068 s ± 0.134 s [User: 3.976 s, System: 0.039 s] Range (min … max): 4.000 s … 4.445 s 10 runs Summary ./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.after emit-skeleton out.swift ran 4.06 ± 0.15 times faster than ./Plugins/BridgeJS/.build/debug/BridgeJSToolInternal.before emit-skeleton out.swift ``` --- .../BridgeJSCore/SwiftToSkeleton.swift | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 32b9f6418..d32d85f55 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -394,22 +394,28 @@ private enum ExportSwiftConstants { static let supportedRawTypes = SwiftEnumRawType.allCases.map { $0.rawValue } } +extension AttributeSyntax { + /// The attribute name as text when it is a simple identifier (e.g. "JS", "JSFunction"). + /// Prefer this over `attributeName.trimmedDescription` for name checks to avoid unnecessary string work. + fileprivate var attributeNameText: String? { + attributeName.as(IdentifierTypeSyntax.self)?.name.text + } +} + extension AttributeListSyntax { func hasJSAttribute() -> Bool { firstJSAttribute != nil } var firstJSAttribute: AttributeSyntax? { - first(where: { - $0.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JS" - })?.as(AttributeSyntax.self) + first(where: { $0.as(AttributeSyntax.self)?.attributeNameText == "JS" })?.as(AttributeSyntax.self) } /// Returns true if any attribute has the given name (e.g. "JSClass"). func hasAttribute(name: String) -> Bool { contains { attribute in guard let syntax = attribute.as(AttributeSyntax.self) else { return false } - return syntax.attributeName.trimmedDescription == name + return syntax.attributeNameText == name } } } @@ -1916,9 +1922,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } static func firstJSFunctionAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { - attributes?.first { attribute in - attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSFunction" - }?.as(AttributeSyntax.self) + firstAttribute(attributes, named: "JSFunction") } static func hasJSGetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { @@ -1926,9 +1930,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } static func firstJSGetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { - attributes?.first { attribute in - attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSGetter" - }?.as(AttributeSyntax.self) + firstAttribute(attributes, named: "JSGetter") } static func hasJSSetterAttribute(_ attributes: AttributeListSyntax?) -> Bool { @@ -1936,9 +1938,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } static func firstJSSetterAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { - attributes?.first { attribute in - attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSSetter" - }?.as(AttributeSyntax.self) + firstAttribute(attributes, named: "JSSetter") } static func hasJSClassAttribute(_ attributes: AttributeListSyntax?) -> Bool { @@ -1946,16 +1946,18 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } static func firstJSClassAttribute(_ attributes: AttributeListSyntax?) -> AttributeSyntax? { - attributes?.first { attribute in - attribute.as(AttributeSyntax.self)?.attributeName.trimmedDescription == "JSClass" - }?.as(AttributeSyntax.self) + firstAttribute(attributes, named: "JSClass") + } + + static func firstAttribute(_ attributes: AttributeListSyntax?, named name: String) -> AttributeSyntax? { + attributes?.first { $0.as(AttributeSyntax.self)?.attributeNameText == name }?.as(AttributeSyntax.self) } static func hasAttribute(_ attributes: AttributeListSyntax?, name: String) -> Bool { guard let attributes else { return false } return attributes.contains { attribute in guard let syntax = attribute.as(AttributeSyntax.self) else { return false } - return syntax.attributeName.trimmedDescription == name + return syntax.attributeNameText == name } } From 16e3f4467581c7231025c51eb13bfc8a9d87cd46 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 4 Feb 2026 21:29:57 +0900 Subject: [PATCH 150/252] BridgeJS: Add JSValue parameter/return support (#570) * BridgeJS: Add support for `JSValue` * BridgeJS: Fix unused result warnings * BridgeJS: Keep translating object-like types to JSObject * UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS * BridgeJS: Update object-like check not to rely on definition location * BridgeJS: Add __bjs_jsValueLower/Lift helper functions * UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS --- .../Sources/BridgeJSCore/ExportSwift.swift | 17 +- .../Sources/BridgeJSCore/ImportTS.swift | 24 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 171 +++++-- .../BridgeJSLink/CodeFragmentPrinter.swift | 34 ++ .../Sources/BridgeJSLink/JSGlueGen.swift | 360 +++++++++++++- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 7 +- .../TS2Swift/JavaScript/src/processor.js | 9 +- .../test/__snapshots__/ts2swift.test.js.snap | 31 +- .../test/fixtures/ObjectLikeTypes.d.ts | 1 + .../Inputs/MacroSwift/JSValue.swift | 32 ++ .../BridgeJSCodegenTests/JSValue.json | 273 +++++++++++ .../BridgeJSCodegenTests/JSValue.swift | 149 ++++++ .../BridgeJSLinkTests/JSValue.d.ts | 37 ++ .../BridgeJSLinkTests/JSValue.js | 456 ++++++++++++++++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 141 ++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 8 + .../Generated/BridgeJS.Macros.swift | 4 +- .../Generated/BridgeJS.swift | 50 +- .../Generated/JavaScript/BridgeJS.json | 80 ++- .../GlobalThisImportTests.swift | 6 +- .../BridgeJSRuntimeTests/ImportAPITests.swift | 18 + Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 2 + Tests/prelude.mjs | 20 + 23 files changed, 1841 insertions(+), 89 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ObjectLikeTypes.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index cb267c210..1137343b0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -804,7 +804,7 @@ struct StackCodegen { func liftExpression(for type: BridgeType) -> ExprSyntax { switch type { case .string, .int, .uint, .bool, .float, .double, - .jsObject(nil), .swiftStruct, .swiftHeapObject: + .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject: return "\(raw: type.swiftType).bridgeJSLiftParameter()" case .jsObject(let className?): return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSLiftParameter())" @@ -841,7 +841,7 @@ struct StackCodegen { func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { switch elementType { - case .int, .uint, .float, .double, .string, .bool, + case .int, .uint, .float, .double, .string, .bool, .jsValue, .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, .unsafePointer, .rawValueEnum, .associatedValueEnum: return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" @@ -876,7 +876,7 @@ struct StackCodegen { private func liftNullableExpression(wrappedType: BridgeType, kind: JSOptionalKind) -> ExprSyntax { let typeName = kind == .null ? "Optional" : "JSUndefinedOr" switch wrappedType { - case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), + case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" case .jsObject(let className?): @@ -914,7 +914,7 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch type { - case .string, .int, .uint, .bool, .float, .double: + case .string, .int, .uint, .bool, .float, .double, .jsValue: return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .jsObject(nil): return ["\(raw: accessor).bridgeJSLowerStackReturn()"] @@ -944,7 +944,7 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch elementType { - case .int, .uint, .float, .double, .string, .bool, + case .int, .uint, .float, .double, .string, .bool, .jsValue, .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, .unsafePointer, .rawValueEnum, .associatedValueEnum: return ["\(raw: accessor).bridgeJSLowerReturn()"] @@ -1015,7 +1015,7 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch wrappedType { - case .string, .int, .uint, .bool, .float, .double: + case .string, .int, .uint, .bool, .float, .double, .jsValue: return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .caseEnum, .rawValueEnum: // Enums conform to _BridgedSwiftStackType @@ -1604,6 +1604,7 @@ extension BridgeType { case .float: return "Float" case .double: return "Double" case .string: return "String" + case .jsValue: return "JSValue" case .jsObject(nil): return "JSObject" case .jsObject(let name?): return name case .swiftHeapObject(let name): return name @@ -1634,6 +1635,7 @@ extension BridgeType { static let double = LiftingIntrinsicInfo(parameters: [("value", .f64)]) static let string = LiftingIntrinsicInfo(parameters: [("bytes", .i32), ("length", .i32)]) static let jsObject = LiftingIntrinsicInfo(parameters: [("value", .i32)]) + static let jsValue = LiftingIntrinsicInfo(parameters: [("kind", .i32), ("payload1", .i32), ("payload2", .f64)]) static let swiftHeapObject = LiftingIntrinsicInfo(parameters: [("value", .pointer)]) static let unsafePointer = LiftingIntrinsicInfo(parameters: [("pointer", .pointer)]) static let void = LiftingIntrinsicInfo(parameters: []) @@ -1651,6 +1653,7 @@ extension BridgeType { case .double: return .double case .string: return .string case .jsObject: return .jsObject + case .jsValue: return .jsValue case .swiftHeapObject: return .swiftHeapObject case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject @@ -1684,6 +1687,7 @@ extension BridgeType { static let double = LoweringIntrinsicInfo(returnType: .f64) static let string = LoweringIntrinsicInfo(returnType: nil) static let jsObject = LoweringIntrinsicInfo(returnType: .i32) + static let jsValue = LoweringIntrinsicInfo(returnType: nil) static let swiftHeapObject = LoweringIntrinsicInfo(returnType: .pointer) static let unsafePointer = LoweringIntrinsicInfo(returnType: .pointer) static let void = LoweringIntrinsicInfo(returnType: nil) @@ -1703,6 +1707,7 @@ extension BridgeType { case .double: return .double case .string: return .string case .jsObject: return .jsObject + case .jsValue: return .jsValue case .swiftHeapObject: return .swiftHeapObject case .unsafePointer: return .unsafePointer case .swiftProtocol: return .jsObject diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index bcfc344b3..22e0ef162 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -178,13 +178,19 @@ public struct ImportTS { rightParen: .rightParenToken() ) - if returnType == .void { - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) - } else if returnType.usesSideChannelForOptionalReturn() { - // Side channel returns don't need "let ret =" - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) + let needsRetBinding: Bool + let liftingInfo = try returnType.liftingReturnInfo(context: context) + if liftingInfo.valueToLift == nil || returnType.usesSideChannelForOptionalReturn() { + // Void and side-channel returns don't need "let ret =" + needsRetBinding = false } else { + needsRetBinding = true + } + + if needsRetBinding { body.append("let ret = \(raw: callExpr)") + } else { + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) } // Add exception check for ImportTS context @@ -883,6 +889,11 @@ extension BridgeType { static let double = LoweringParameterInfo(loweredParameters: [("value", .f64)]) static let string = LoweringParameterInfo(loweredParameters: [("value", .i32)]) static let jsObject = LoweringParameterInfo(loweredParameters: [("value", .i32)]) + static let jsValue = LoweringParameterInfo(loweredParameters: [ + ("kind", .i32), + ("payload1", .i32), + ("payload2", .f64), + ]) static let void = LoweringParameterInfo(loweredParameters: []) } @@ -894,6 +905,7 @@ extension BridgeType { case .double: return .double case .string: return .string case .jsObject: return .jsObject + case .jsValue: return .jsValue case .void: return .void case .closure: // Swift closure is boxed and passed to JS as a pointer. @@ -970,6 +982,7 @@ extension BridgeType { static let double = LiftingReturnInfo(valueToLift: .f64) static let string = LiftingReturnInfo(valueToLift: .i32) static let jsObject = LiftingReturnInfo(valueToLift: .i32) + static let jsValue = LiftingReturnInfo(valueToLift: nil) static let void = LiftingReturnInfo(valueToLift: nil) } @@ -983,6 +996,7 @@ extension BridgeType { case .double: return .double case .string: return .string case .jsObject: return .jsObject + case .jsValue: return .jsValue case .void: return .void case .closure: // JS returns a callback ID for closures, which Swift lifts to a typed closure. diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 87fbf59aa..4695f3283 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -11,6 +11,7 @@ public struct BridgeJSLink { var skeletons: [BridgeJSSkeleton] = [] let sharedMemory: Bool private let namespaceBuilder = NamespaceBuilder() + private let intrinsicRegistry = JSIntrinsicRegistry() public init( skeletons: [BridgeJSSkeleton] = [], @@ -758,7 +759,7 @@ public struct BridgeJSLink { functionName: String ) -> [String] { let printer = CodeFragmentPrinter() - let scope = JSGlueVariableScope() + let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanupCode = CodeFragmentPrinter() // Build parameter list for invoke function @@ -827,7 +828,7 @@ public struct BridgeJSLink { functionName: String ) -> [String] { let printer = CodeFragmentPrinter() - let scope = JSGlueVariableScope() + let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanupCode = CodeFragmentPrinter() printer.nextLine() @@ -1036,23 +1037,37 @@ public struct BridgeJSLink { ) printer.write(lines: topLevelNamespaceCode) + let propertyAssignments = try generateNamespacePropertyAssignments( + data: data, + exportedSkeletons: exportedSkeletons, + namespaceBuilder: namespaceBuilder + ) + // Main function declaration printer.write("export async function createInstantiator(options, \(JSGlueVariableScope.reservedSwift)) {") printer.indent { printer.write(lines: generateVariableDeclarations()) + let bodyPrinter = CodeFragmentPrinter() let allStructs = exportedSkeletons.flatMap { $0.structs } for structDef in allStructs { let structPrinter = CodeFragmentPrinter() - let structScope = JSGlueVariableScope() + let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let structCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs) _ = fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) - printer.write(lines: structPrinter.lines) + bodyPrinter.write(lines: structPrinter.lines) } - printer.nextLine() - printer.write(contentsOf: generateAddImports(needsImportsObject: data.needsImportsObject)) + bodyPrinter.nextLine() + bodyPrinter.write(contentsOf: generateAddImports(needsImportsObject: data.needsImportsObject)) + + if !intrinsicRegistry.isEmpty { + printer.write(lines: intrinsicRegistry.emitLines()) + printer.nextLine() + } + + printer.write(lines: bodyPrinter.lines) } printer.indent() @@ -1111,11 +1126,6 @@ public struct BridgeJSLink { ) printer.write(lines: namespaceInitCode) - let propertyAssignments = try generateNamespacePropertyAssignments( - data: data, - exportedSkeletons: exportedSkeletons, - namespaceBuilder: namespaceBuilder - ) printer.write(lines: propertyAssignments) } printer.write("},") @@ -1128,6 +1138,7 @@ public struct BridgeJSLink { } public func link() throws -> (outputJs: String, outputDts: String) { + intrinsicRegistry.reset() let data = try collectLinkData() let outputJs = try generateJavaScript(data: data) let outputDts = generateTypeScript(data: data) @@ -1222,6 +1233,7 @@ public struct BridgeJSLink { let hierarchicalLines = try namespaceBuilder.buildHierarchicalExportsObject( exportedSkeletons: exportedSkeletons, + intrinsicRegistry: intrinsicRegistry, renderFunctionImpl: { function in let (js, _) = try self.renderExportedFunction(function: function) return js @@ -1293,9 +1305,9 @@ public struct BridgeJSLink { let effects: Effects let scope: JSGlueVariableScope - init(effects: Effects) { + init(effects: Effects, intrinsicRegistry: JSIntrinsicRegistry) { self.effects = effects - self.scope = JSGlueVariableScope() + self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.body = CodeFragmentPrinter() self.cleanupCode = CodeFragmentPrinter() } @@ -1516,7 +1528,10 @@ public struct BridgeJSLink { try jsPrinter.indent { // Constructor as 'init' function if let constructor = structDefinition.constructor { - let thunkBuilder = ExportedThunkBuilder(effects: constructor.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: constructor.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in constructor.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1752,12 +1767,17 @@ public struct BridgeJSLink { extension BridgeJSLink { - func renderExportedFunction(function: ExportedFunction) throws -> (js: [String], dts: [String]) { + func renderExportedFunction( + function: ExportedFunction + ) throws -> (js: [String], dts: [String]) { if function.effects.isStatic, let staticContext = function.staticContext { return try renderStaticFunction(function: function, staticContext: staticContext) } - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: function.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in function.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1790,7 +1810,10 @@ extension BridgeJSLink { return try renderEnumStaticFunction(function: function, enumName: enumName) case .namespaceEnum: if let namespace = function.namespace, !namespace.isEmpty { - return try renderNamespaceFunction(function: function, namespace: namespace.joined(separator: ".")) + return try renderNamespaceFunction( + function: function, + namespace: namespace.joined(separator: ".") + ) } else { return try renderExportedFunction(function: function) } @@ -1801,7 +1824,10 @@ extension BridgeJSLink { function: ExportedFunction, className: String ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: function.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in function.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1829,7 +1855,10 @@ extension BridgeJSLink { function: ExportedFunction, enumName: String ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: function.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in function.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1857,7 +1886,10 @@ extension BridgeJSLink { function: ExportedFunction, namespace: String ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ExportedThunkBuilder(effects: function.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: function.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in function.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1879,7 +1911,10 @@ extension BridgeJSLink { private func renderStaticMethodForExportObject( method: ExportedFunction ) throws -> [String] { - let thunkBuilder = ExportedThunkBuilder(effects: method.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: method.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in method.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1904,7 +1939,10 @@ extension BridgeJSLink { let propertyPrinter = CodeFragmentPrinter() // Generate getter - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let getterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry + ) let getterReturnExpr = try getterThunkBuilder.call( abiName: className != nil ? property.getterAbiName(className: className!) @@ -1921,7 +1959,8 @@ extension BridgeJSLink { // Generate setter if not readonly if !property.isReadonly { let setterThunkBuilder = ExportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false) + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) @@ -1967,7 +2006,10 @@ extension BridgeJSLink { } if let constructor: ExportedConstructor = klass.constructor { - let thunkBuilder = ExportedThunkBuilder(effects: constructor.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: constructor.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in constructor.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -1999,7 +2041,10 @@ extension BridgeJSLink { for method in klass.methods { if method.effects.isStatic { - let thunkBuilder = ExportedThunkBuilder(effects: method.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: method.effects, + intrinsicRegistry: intrinsicRegistry + ) for param in method.parameters { try thunkBuilder.lowerParameter(param: param) } @@ -2022,7 +2067,10 @@ extension BridgeJSLink { ) } } else { - let thunkBuilder = ExportedThunkBuilder(effects: method.effects) + let thunkBuilder = ExportedThunkBuilder( + effects: method.effects, + intrinsicRegistry: intrinsicRegistry + ) thunkBuilder.lowerSelf() for param in method.parameters { try thunkBuilder.lowerParameter(param: param) @@ -2073,7 +2121,10 @@ extension BridgeJSLink { jsPrinter: CodeFragmentPrinter, dtsPrinter: CodeFragmentPrinter ) throws { - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let getterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry + ) if !isStatic { getterThunkBuilder.lowerSelf() } @@ -2095,7 +2146,10 @@ extension BridgeJSLink { // Generate setter if not readonly if !property.isReadonly { - let setterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let setterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry + ) if !isStatic { setterThunkBuilder.lowerSelf() } @@ -2134,9 +2188,9 @@ extension BridgeJSLink { var parameterNames: [String] = [] var parameterForwardings: [String] = [] - init(context: BridgeContext = .importTS) { + init(context: BridgeContext = .importTS, intrinsicRegistry: JSIntrinsicRegistry) { self.body = CodeFragmentPrinter() - self.scope = JSGlueVariableScope() + self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.cleanupCode = CodeFragmentPrinter() self.context = context } @@ -2622,6 +2676,7 @@ extension BridgeJSLink { fileprivate func buildHierarchicalExportsObject( exportedSkeletons: [ExportedSkeleton], + intrinsicRegistry: JSIntrinsicRegistry, renderFunctionImpl: (ExportedFunction) throws -> [String] ) throws -> [String] { let printer = CodeFragmentPrinter() @@ -2631,7 +2686,10 @@ extension BridgeJSLink { try populateJavaScriptExportLines(node: rootNode, renderFunctionImpl: renderFunctionImpl) - try populatePropertyImplementations(node: rootNode) + try populatePropertyImplementations( + node: rootNode, + intrinsicRegistry: intrinsicRegistry + ) printExportsObjectHierarchy(node: rootNode, printer: printer, currentPath: []) @@ -2652,10 +2710,16 @@ extension BridgeJSLink { } } - private func populatePropertyImplementations(node: NamespaceNode) throws { + private func populatePropertyImplementations( + node: NamespaceNode, + intrinsicRegistry: JSIntrinsicRegistry + ) throws { for property in node.content.staticProperties { // Generate getter - let getterThunkBuilder = ExportedThunkBuilder(effects: Effects(isAsync: false, isThrows: false)) + let getterThunkBuilder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry + ) let getterReturnExpr = try getterThunkBuilder.call( abiName: property.getterAbiName(), returnType: property.type @@ -2678,14 +2742,15 @@ extension BridgeJSLink { // Generate setter if not readonly if !property.isReadonly { let setterThunkBuilder = ExportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false) + effects: Effects(isAsync: false, isThrows: false), + intrinsicRegistry: intrinsicRegistry ) try setterThunkBuilder.lowerParameter( param: Parameter(label: "value", name: "value", type: property.type) ) _ = try setterThunkBuilder.call( abiName: property.setterAbiName(), - returnType: .void + returnType: BridgeType.void ) let setterPrinter = CodeFragmentPrinter() @@ -2705,7 +2770,10 @@ extension BridgeJSLink { // Recursively process child nodes for (_, childNode) in node.children { - try populatePropertyImplementations(node: childNode) + try populatePropertyImplementations( + node: childNode, + intrinsicRegistry: intrinsicRegistry + ) } } @@ -3045,7 +3113,7 @@ extension BridgeJSLink { importObjectBuilder: ImportObjectBuilder, function: ImportedFunctionSkeleton ) throws { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) for param in function.parameters { try thunkBuilder.liftParameter(param: param) } @@ -3076,7 +3144,7 @@ extension BridgeJSLink { importObjectBuilder: ImportObjectBuilder, getter: ImportedGetterSkeleton ) throws { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) let jsName = getter.jsName ?? getter.name let importRootExpr = getter.from == .global ? "globalThis" : "imports" let returnExpr = try thunkBuilder.getImportProperty( @@ -3177,7 +3245,7 @@ extension BridgeJSLink { type: ImportedTypeSkeleton, constructor: ImportedConstructorSkeleton ) throws { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) for param in constructor.parameters { try thunkBuilder.liftParameter(param: param) } @@ -3202,7 +3270,7 @@ extension BridgeJSLink { abiName: String, emitCall: (ImportedThunkBuilder) throws -> String? ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) thunkBuilder.liftSelf() let returnExpr = try emitCall(thunkBuilder) let funcLines = thunkBuilder.renderFunction( @@ -3218,7 +3286,7 @@ extension BridgeJSLink { abiName: String, emitCall: (ImportedThunkBuilder) throws -> String? ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) thunkBuilder.liftSelf() let returnExpr = try emitCall(thunkBuilder) let funcLines = thunkBuilder.renderFunction( @@ -3233,7 +3301,7 @@ extension BridgeJSLink { context: ImportedTypeSkeleton, method: ImportedFunctionSkeleton ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) for param in method.parameters { try thunkBuilder.liftParameter(param: param) } @@ -3259,7 +3327,7 @@ extension BridgeJSLink { context: ImportedTypeSkeleton, method: ImportedFunctionSkeleton ) throws -> (js: [String], dts: [String]) { - let thunkBuilder = ImportedThunkBuilder() + let thunkBuilder = ImportedThunkBuilder(intrinsicRegistry: intrinsicRegistry) thunkBuilder.liftSelf() for param in method.parameters { try thunkBuilder.liftParameter(param: param) @@ -3286,7 +3354,10 @@ extension BridgeJSLink { className: `protocol`.name ) - let getterThunkBuilder = ImportedThunkBuilder(context: .exportSwift) + let getterThunkBuilder = ImportedThunkBuilder( + context: .exportSwift, + intrinsicRegistry: intrinsicRegistry + ) getterThunkBuilder.liftSelf() let returnExpr = try getterThunkBuilder.callPropertyGetter(name: property.name, returnType: property.type) let getterLines = getterThunkBuilder.renderFunction( @@ -3304,7 +3375,10 @@ extension BridgeJSLink { operation: "set", className: `protocol`.name ) - let setterThunkBuilder = ImportedThunkBuilder(context: .exportSwift) + let setterThunkBuilder = ImportedThunkBuilder( + context: .exportSwift, + intrinsicRegistry: intrinsicRegistry + ) setterThunkBuilder.liftSelf() try setterThunkBuilder.liftParameter( param: Parameter(label: nil, name: "value", type: property.type) @@ -3324,7 +3398,10 @@ extension BridgeJSLink { protocol: ExportedProtocol, method: ExportedFunction ) throws { - let thunkBuilder = ImportedThunkBuilder(context: .exportSwift) + let thunkBuilder = ImportedThunkBuilder( + context: .exportSwift, + intrinsicRegistry: intrinsicRegistry + ) thunkBuilder.liftSelf() for param in method.parameters { try thunkBuilder.liftParameter(param: param) @@ -3447,6 +3524,8 @@ extension BridgeType { return "boolean" case .jsObject(let name): return name ?? "any" + case .jsValue: + return "any" case .swiftHeapObject(let name): return name case .unsafePointer: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift index 258a0ad18..8c5a47b23 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift @@ -1,3 +1,37 @@ +/// Registry for JS helper intrinsics used during code generation. +final class JSIntrinsicRegistry { + private var entries: [String: [String]] = [:] + + var isEmpty: Bool { + entries.isEmpty + } + + func register(name: String, build: (CodeFragmentPrinter) -> Void) { + guard entries[name] == nil else { return } + let printer = CodeFragmentPrinter() + build(printer) + entries[name] = printer.lines + } + + func reset() { + entries.removeAll() + } + + func emitLines() -> [String] { + var emitted: [String] = [] + for key in entries.keys.sorted() { + if let lines = entries[key] { + emitted.append(contentsOf: lines) + emitted.append("") + } + } + if emitted.last == "" { + emitted.removeLast() + } + return emitted + } +} + /// A printer for code fragments. final class CodeFragmentPrinter { private(set) var lines: [String] = [] diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 90ea5ab0c..ef72cf6f6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -34,6 +34,8 @@ final class JSGlueVariableScope { static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" + private let intrinsicRegistry: JSIntrinsicRegistry? + private var variables: Set = [ reservedSwift, reservedInstance, @@ -64,6 +66,10 @@ final class JSGlueVariableScope { reservedStructHelpers, ] + init(intrinsicRegistry: JSIntrinsicRegistry? = nil) { + self.intrinsicRegistry = intrinsicRegistry + } + /// Returns a unique variable name in the scope based on the given name hint. /// /// - Parameter hint: A hint for the variable name. @@ -80,6 +86,14 @@ final class JSGlueVariableScope { } while !variables.insert(suffixedName).inserted return suffixedName } + + func registerIntrinsic(_ name: String, build: (CodeFragmentPrinter) -> Void) { + intrinsicRegistry?.register(name: name, build: build) + } + + func makeChildScope() -> JSGlueVariableScope { + JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) + } } /// A fragment of JS code used to convert a value between Swift and JS. @@ -238,6 +252,274 @@ struct IntrinsicJSFragment: Sendable { } ) + private static let jsValueLowerHelperName = "__bjs_jsValueLower" + private static let jsValueLiftHelperName = "__bjs_jsValueLift" + + private static func registerJSValueHelpers(scope: JSGlueVariableScope) { + scope.registerIntrinsic("jsValueHelpers") { helperPrinter in + helperPrinter.write("function \(jsValueLowerHelperName)(value) {") + helperPrinter.indent { + emitJSValueLowerBody( + value: "value", + kindVar: "kind", + payload1Var: "payload1", + payload2Var: "payload2", + printer: helperPrinter + ) + helperPrinter.write("return [kind, payload1, payload2];") + } + helperPrinter.write("}") + helperPrinter.write("function \(jsValueLiftHelperName)(kind, payload1, payload2) {") + helperPrinter.indent { + let helperScope = JSGlueVariableScope() + let resultVar = emitJSValueConstruction( + kind: "kind", + payload1: "payload1", + payload2: "payload2", + scope: helperScope, + printer: helperPrinter + ) + helperPrinter.write("return \(resultVar);") + } + helperPrinter.write("}") + } + } + + private static func emitJSValueLowerBody( + value: String, + kindVar: String, + payload1Var: String, + payload2Var: String, + printer: CodeFragmentPrinter + ) { + printer.write("let \(kindVar);") + printer.write("let \(payload1Var);") + printer.write("let \(payload2Var);") + printer.write("if (\(value) === null) {") + printer.indent { + printer.write("\(kindVar) = 4;") + printer.write("\(payload1Var) = 0;") + printer.write("\(payload2Var) = 0;") + } + printer.write("} else {") + printer.indent { + printer.write("switch (typeof \(value)) {") + printer.indent { + printer.write("case \"boolean\":") + printer.indent { + printer.write("\(kindVar) = 0;") + printer.write("\(payload1Var) = \(value) ? 1 : 0;") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"number\":") + printer.indent { + printer.write("\(kindVar) = 2;") + printer.write("\(payload1Var) = 0;") + printer.write("\(payload2Var) = \(value);") + printer.write("break;") + } + printer.write("case \"string\":") + printer.indent { + printer.write("\(kindVar) = 1;") + printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"undefined\":") + printer.indent { + printer.write("\(kindVar) = 5;") + printer.write("\(payload1Var) = 0;") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"object\":") + printer.indent { + printer.write("\(kindVar) = 3;") + printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"function\":") + printer.indent { + printer.write("\(kindVar) = 3;") + printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"symbol\":") + printer.indent { + printer.write("\(kindVar) = 7;") + printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("case \"bigint\":") + printer.indent { + printer.write("\(kindVar) = 8;") + printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } + printer.write("default:") + printer.indent { + printer.write("throw new TypeError(\"Unsupported JSValue type\");") + } + } + printer.write("}") + } + printer.write("}") + } + + static let jsValueLower = IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let value = arguments[0] + let kindVar = scope.variable("\(value)Kind") + let payload1Var = scope.variable("\(value)Payload1") + let payload2Var = scope.variable("\(value)Payload2") + registerJSValueHelpers(scope: scope) + printer.write( + "const [\(kindVar), \(payload1Var), \(payload2Var)] = \(jsValueLowerHelperName)(\(value));" + ) + return [kindVar, payload1Var, payload2Var] + } + ) + + private static func emitJSValueConstruction( + kind: String, + payload1: String, + payload2: String, + scope: JSGlueVariableScope, + printer: CodeFragmentPrinter + ) -> String { + let resultVar = scope.variable("jsValue") + printer.write("let \(resultVar);") + printer.write("switch (\(kind)) {") + printer.indent { + printer.write("case 0:") + printer.indent { + printer.write("\(resultVar) = \(payload1) !== 0;") + printer.write("break;") + } + printer.write("case 1:") + printer.indent { + printer.write( + "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" + ) + printer.write("break;") + } + printer.write("case 2:") + printer.indent { + printer.write("\(resultVar) = \(payload2);") + printer.write("break;") + } + printer.write("case 3:") + printer.indent { + printer.write( + "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" + ) + printer.write("break;") + } + printer.write("case 4:") + printer.indent { + printer.write("\(resultVar) = null;") + printer.write("break;") + } + printer.write("case 5:") + printer.indent { + printer.write("\(resultVar) = undefined;") + printer.write("break;") + } + printer.write("case 7:") + printer.indent { + printer.write( + "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" + ) + printer.write("break;") + } + printer.write("case 8:") + printer.indent { + printer.write( + "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" + ) + printer.write("break;") + } + printer.write("default:") + printer.indent { + printer.write("throw new TypeError(\"Unsupported JSValue kind \" + \(kind));") + } + } + printer.write("}") + return resultVar + } + + static func jsValueLowerReturn(context: BridgeContext) -> IntrinsicJSFragment { + switch context { + case .importTS: + // Return values from imported JS functions should be delivered to the Swift side + // via the parameter stacks that `_swift_js_pop_*` read from. + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let lowered = jsValueLower.printCode(arguments, scope, printer, cleanupCode) + let kindVar = lowered[0] + let payload1Var = lowered[1] + let payload2Var = lowered[2] + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(kindVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(payload1Var));") + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(payload2Var));") + return [] + } + ) + case .exportSwift: + // Kept for symmetry, though JSValue return for export currently relies on Swift pushing + // to tmpRet stacks directly. + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanupCode in + let lowered = jsValueLower.printCode(arguments, scope, printer, cleanupCode) + let kindVar = lowered[0] + let payload1Var = lowered[1] + let payload2Var = lowered[2] + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(kindVar));") + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(payload1Var));") + printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(payload2Var));") + return [] + } + ) + } + } + + static let jsValueLift = IntrinsicJSFragment( + parameters: [], + printCode: { _, scope, printer, cleanupCode in + let payload2 = scope.variable("jsValuePayload2") + let payload1 = scope.variable("jsValuePayload1") + let kind = scope.variable("jsValueKind") + printer.write("const \(payload2) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + printer.write("const \(payload1) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(kind) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + let resultVar = scope.variable("jsValue") + registerJSValueHelpers(scope: scope) + printer.write( + "const \(resultVar) = \(jsValueLiftHelperName)(\(kind), \(payload1), \(payload2));" + ) + return [resultVar] + } + ) + static let jsValueLiftParameter = IntrinsicJSFragment( + parameters: ["kind", "payload1", "payload2"], + printCode: { arguments, scope, printer, cleanupCode in + let resultVar = scope.variable("jsValue") + registerJSValueHelpers(scope: scope) + printer.write( + "const \(resultVar) = \(jsValueLiftHelperName)(\(arguments[0]), \(arguments[1]), \(arguments[2]));" + ) + return [resultVar] + } + ) + static let swiftHeapObjectLowerParameter = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanupCode in @@ -296,10 +578,24 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLiftParameter( - wrappedType: BridgeType, - kind: JSOptionalKind - ) throws -> IntrinsicJSFragment { + static func optionalLiftParameter(wrappedType: BridgeType, kind: JSOptionalKind) throws -> IntrinsicJSFragment { + if case .jsValue = wrappedType { + return IntrinsicJSFragment( + parameters: ["isSome", "kind", "payload1", "payload2"], + printCode: { arguments, scope, printer, cleanupCode in + let isSome = arguments[0] + let lifted = jsValueLiftParameter.printCode( + [arguments[1], arguments[2], arguments[3]], + scope, + printer, + cleanupCode + ) + let valueExpr = lifted.first ?? "undefined" + return ["\(isSome) ? \(valueExpr) : null"] + } + ) + } + return IntrinsicJSFragment( parameters: ["isSome", "wrappedValue"], printCode: { arguments, scope, printer, cleanupCode in @@ -446,6 +742,9 @@ struct IntrinsicJSFragment: Sendable { cleanupCode.write("}") return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0", "\(isSomeVar) ? \(bytesVar).length : 0"] + case .jsValue: + let lowered = jsValueLower.printCode([value], scope, printer, cleanupCode) + return ["+\(isSomeVar)"] + lowered case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("\(value)CaseId") @@ -634,6 +933,22 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("}") + case .jsValue: + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let lifted = jsValueLift.printCode([], scope, printer, cleanupCode) + if let liftedValue = lifted.first { + printer.write("\(resultVar) = \(liftedValue);") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(resultVar) = null;") + } + printer.write("}") default: printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") @@ -702,6 +1017,17 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") + case .jsValue: + if value != "undefined" { + let lowered = jsValueLower.printCode([value], scope, printer, cleanupCode) + let kindVar = lowered[0] + let payload1Var = lowered[1] + let payload2Var = lowered[2] + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(kindVar));") + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(payload1Var));") + printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(payload2Var));") + } + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(isSomeVar) ? 1 : 0);") case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -1396,6 +1722,7 @@ struct IntrinsicJSFragment: Sendable { case .int, .uint, .float, .double, .bool, .unsafePointer: return .identity case .string: return .stringLowerParameter case .jsObject: return .jsObjectLowerParameter + case .jsValue: return .jsValueLower case .swiftHeapObject: return .swiftHeapObjectLowerParameter case .swiftProtocol: return .jsObjectLowerParameter @@ -1441,6 +1768,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLiftReturn case .string: return .stringLiftReturn case .jsObject: return .jsObjectLiftReturn + case .jsValue: return .jsValueLift case .swiftHeapObject(let name): return .swiftHeapObjectLiftReturn(name) case .unsafePointer: return .identity case .swiftProtocol: return .jsObjectLiftReturn @@ -1489,6 +1817,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLiftParameter case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter + case .jsValue: return .jsValueLiftParameter case .unsafePointer: return .identity case .swiftHeapObject(let name): switch context { @@ -1583,6 +1912,7 @@ struct IntrinsicJSFragment: Sendable { case .bool: return .boolLowerReturn case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn + case .jsValue: return .jsValueLowerReturn(context: context) case .unsafePointer: return .identity case .swiftHeapObject(let name): switch context { @@ -1709,7 +2039,7 @@ struct IntrinsicJSFragment: Sendable { let lowerPrinter = CodeFragmentPrinter() for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter - let caseScope = JSGlueVariableScope() + let caseScope = scope.makeChildScope() let caseCleanup = CodeFragmentPrinter() caseCleanup.indent() let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) @@ -1737,7 +2067,7 @@ struct IntrinsicJSFragment: Sendable { let liftPrinter = CodeFragmentPrinter() for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter - let caseScope = JSGlueVariableScope() + let caseScope = scope.makeChildScope() let caseCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) @@ -2208,6 +2538,8 @@ struct IntrinsicJSFragment: Sendable { private static func arrayElementRaiseFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { + case .jsValue: + throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") case .string: return IntrinsicJSFragment( parameters: [], @@ -2352,6 +2684,8 @@ struct IntrinsicJSFragment: Sendable { private static func arrayElementLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { + case .jsValue: + throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") case .string: return IntrinsicJSFragment( parameters: ["value"], @@ -2622,6 +2956,7 @@ struct IntrinsicJSFragment: Sendable { generateStructLowerCode( structDef: capturedStructDef, allStructs: capturedAllStructs, + scope: scope, printer: printer ) } @@ -2634,6 +2969,7 @@ struct IntrinsicJSFragment: Sendable { generateStructLiftCode( structDef: capturedStructDef, allStructs: capturedAllStructs, + scope: scope, printer: printer, attachMethods: true ) @@ -2656,10 +2992,11 @@ struct IntrinsicJSFragment: Sendable { private static func generateStructLowerCode( structDef: ExportedStruct, allStructs: [ExportedStruct], + scope: JSGlueVariableScope, printer: CodeFragmentPrinter ) { let lowerPrinter = CodeFragmentPrinter() - let lowerScope = JSGlueVariableScope() + let lowerScope = scope.makeChildScope() let lowerCleanup = CodeFragmentPrinter() lowerCleanup.indent() @@ -2687,10 +3024,11 @@ struct IntrinsicJSFragment: Sendable { private static func generateStructLiftCode( structDef: ExportedStruct, allStructs: [ExportedStruct], + scope: JSGlueVariableScope, printer: CodeFragmentPrinter, attachMethods: Bool = false ) { - let liftScope = JSGlueVariableScope() + let liftScope = scope.makeChildScope() let liftCleanup = CodeFragmentPrinter() var fieldExpressions: [(name: String, expression: String)] = [] @@ -2724,7 +3062,7 @@ struct IntrinsicJSFragment: Sendable { "\(instanceVar).\(method.name) = function(\(paramList)) {" ) printer.indent { - let methodScope = JSGlueVariableScope() + let methodScope = scope.makeChildScope() let methodCleanup = CodeFragmentPrinter() // Lower the struct instance (this) using the helper's lower function @@ -2778,6 +3116,8 @@ struct IntrinsicJSFragment: Sendable { allStructs: [ExportedStruct] ) -> IntrinsicJSFragment { switch field.type { + case .jsValue: + preconditionFailure("Struct field of JSValue is not supported yet") case .string: return IntrinsicJSFragment( parameters: ["value"], @@ -3264,6 +3604,8 @@ struct IntrinsicJSFragment: Sendable { allStructs: [ExportedStruct] ) -> IntrinsicJSFragment { switch field.type { + case .jsValue: + preconditionFailure("Struct field of JSValue is not supported yet") case .string: return IntrinsicJSFragment( parameters: [], diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index a9812e2e0..0d4a78d3e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -149,7 +149,7 @@ public enum JSOptionalKind: String, Codable, Equatable, Hashable, Sendable { } public enum BridgeType: Codable, Equatable, Hashable, Sendable { - case int, uint, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void + case int, uint, float, double, string, bool, jsObject(String?), jsValue, swiftHeapObject(String), void case unsafePointer(UnsafePointerType) indirect case nullable(BridgeType, JSOptionalKind) indirect case array(BridgeType) @@ -905,6 +905,8 @@ extension BridgeType { self = .string case "Bool": self = .bool + case "JSValue": + self = .jsValue case "Void": self = .void case "JSObject": @@ -929,6 +931,7 @@ extension BridgeType { case .double: return .f64 case .string: return nil case .jsObject: return .i32 + case .jsValue: return nil case .swiftHeapObject: // UnsafeMutableRawPointer is returned as an i32 pointer return .pointer @@ -979,6 +982,8 @@ extension BridgeType { case .jsObject(let name): let typeName = name ?? "JSObject" return "\(typeName.count)\(typeName)C" + case .jsValue: + return "7JSValueV" case .swiftHeapObject(let name): return "\(name.count)\(name)C" case .unsafePointer(let ptr): diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index e2c7d00f0..c06ba94aa 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -706,8 +706,8 @@ export class TypeProcessor { "string": "String", "boolean": "Bool", "void": "Void", - "any": "JSObject", - "unknown": "JSObject", + "any": "JSValue", + "unknown": "JSValue", "null": "Void", "undefined": "Void", "bigint": "Int", @@ -716,12 +716,11 @@ export class TypeProcessor { "never": "Void", "Promise": "JSPromise", }; - const typeString = type.getSymbol()?.name ?? this.checker.typeToString(type); + const symbol = type.getSymbol() ?? type.aliasSymbol; + const typeString = symbol?.name ?? this.checker.typeToString(type); if (typeMap[typeString]) { return typeMap[typeString]; } - - const symbol = type.getSymbol() ?? type.aliasSymbol; if (symbol && (symbol.flags & ts.SymbolFlags.Enum) !== 0) { const typeName = symbol.name; this.seenTypes.set(type, node); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 2413c56af..f81a2ce07 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -38,7 +38,7 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` @JSFunction func asyncRoundTripDouble(_ v: Double) throws(JSException) -> JSPromise -@JSFunction func asyncRoundTripJSObject(_ v: JSObject) throws(JSException) -> JSPromise +@JSFunction func asyncRoundTripJSObject(_ v: JSValue) throws(JSException) -> JSPromise " `; @@ -54,8 +54,8 @@ exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = @JSFunction func returnAnimatable() throws(JSException) -> Animatable @JSClass struct Animatable { - @JSFunction func animate(_ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject - @JSFunction func getAnimations(_ options: JSObject) throws(JSException) -> JSObject + @JSFunction func animate(_ keyframes: JSValue, _ options: JSValue) throws(JSException) -> JSValue + @JSFunction func getAnimations(_ options: JSValue) throws(JSException) -> JSValue } " `; @@ -117,11 +117,11 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func createDatabaseConnection(_ config: JSObject) throws(JSException) -> DatabaseConnection +@JSFunction func createDatabaseConnection(_ config: JSValue) throws(JSException) -> DatabaseConnection @JSClass struct DatabaseConnection { @JSFunction func connect(_ url: String) throws(JSException) -> Void - @JSFunction func execute(_ query: String) throws(JSException) -> JSObject + @JSFunction func execute(_ query: String) throws(JSException) -> JSValue @JSGetter var isConnected: Bool @JSGetter var connectionTimeout: Double @JSSetter func setConnectionTimeout(_ value: Double) throws(JSException) @@ -131,20 +131,33 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult @JSClass struct Logger { @JSFunction func log(_ message: String) throws(JSException) -> Void - @JSFunction func error(_ message: String, _ error: JSObject) throws(JSException) -> Void + @JSFunction func error(_ message: String, _ error: JSValue) throws(JSException) -> Void @JSGetter var level: String } @JSFunction func getConfigManager() throws(JSException) -> ConfigManager @JSClass struct ConfigManager { - @JSFunction func get(_ key: String) throws(JSException) -> JSObject - @JSFunction func set(_ key: String, _ value: JSObject) throws(JSException) -> Void + @JSFunction func get(_ key: String) throws(JSException) -> JSValue + @JSFunction func set(_ key: String, _ value: JSValue) throws(JSException) -> Void @JSGetter var configPath: String } " `; +exports[`ts2swift > snapshots Swift output for ObjectLikeTypes.d.ts > ObjectLikeTypes 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func acceptObject(_ v: JSObject) throws(JSException) -> Void +" +`; + exports[`ts2swift > snapshots Swift output for OptionalNullUndefined.d.ts > OptionalNullUndefined 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. @@ -301,7 +314,7 @@ exports[`ts2swift > snapshots Swift output for TS2SkeletonLike.d.ts > TS2Skeleto @JSFunction func createCodeGenerator(_ format: String) throws(JSException) -> CodeGenerator @JSClass struct CodeGenerator { - @JSFunction func generate(_ input: JSObject) throws(JSException) -> String + @JSFunction func generate(_ input: JSValue) throws(JSException) -> String @JSGetter var outputFormat: String } " diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ObjectLikeTypes.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ObjectLikeTypes.d.ts new file mode 100644 index 000000000..d605048cd --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ObjectLikeTypes.d.ts @@ -0,0 +1 @@ +export function acceptObject(v: object): void; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift new file mode 100644 index 000000000..84251f6b3 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift @@ -0,0 +1,32 @@ +@JS func roundTripJSValue(_ value: JSValue) -> JSValue { + return value +} + +@JS func roundTripOptionalJSValue(_ value: JSValue?) -> JSValue? { + return value +} + +@JS class JSValueHolder { + @JS var value: JSValue + @JS var optionalValue: JSValue? + + @JS init(value: JSValue, optionalValue: JSValue?) { + self.value = value + self.optionalValue = optionalValue + } + + @JS func update(value: JSValue, optionalValue: JSValue?) { + self.value = value + self.optionalValue = optionalValue + } + + @JS func echo(value: JSValue) -> JSValue { + return value + } + + @JS func echoOptional(_ value: JSValue?) -> JSValue? { + return value + } +} + +@JSFunction func jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json new file mode 100644 index 000000000..d10d673d4 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json @@ -0,0 +1,273 @@ +{ + "exported" : { + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_JSValueHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "jsValue" : { + + } + } + }, + { + "label" : "optionalValue", + "name" : "optionalValue", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_JSValueHolder_update", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "update", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "jsValue" : { + + } + } + }, + { + "label" : "optionalValue", + "name" : "optionalValue", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_JSValueHolder_echo", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "echo", + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "jsValue" : { + + } + } + } + ], + "returnType" : { + "jsValue" : { + + } + } + }, + { + "abiName" : "bjs_JSValueHolder_echoOptional", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "echoOptional", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "JSValueHolder", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "value", + "type" : { + "jsValue" : { + + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalValue", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "swiftCallName" : "JSValueHolder" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundTripJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "jsValue" : { + + } + } + } + ], + "returnType" : { + "jsValue" : { + + } + } + }, + { + "abiName" : "bjs_roundTripOptionalJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalJSValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "jsEchoJSValue", + "parameters" : [ + { + "name" : "value", + "type" : { + "jsValue" : { + + } + } + } + ], + "returnType" : { + "jsValue" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift new file mode 100644 index 000000000..3a3be5079 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -0,0 +1,149 @@ +@_expose(wasm, "bjs_roundTripJSValue") +@_cdecl("bjs_roundTripJSValue") +public func _bjs_roundTripJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + let ret = roundTripJSValue(_: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalJSValue") +@_cdecl("bjs_roundTripOptionalJSValue") +public func _bjs_roundTripOptionalJSValue(_ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalJSValue(_: Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_init") +@_cdecl("bjs_JSValueHolder_init") +public func _bjs_JSValueHolder_init(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64, _ optionalValueIsSome: Int32, _ optionalValueKind: Int32, _ optionalValuePayload1: Int32, _ optionalValuePayload2: Float64) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = JSValueHolder(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2), optionalValue: Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_update") +@_cdecl("bjs_JSValueHolder_update") +public func _bjs_JSValueHolder_update(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64, _ optionalValueIsSome: Int32, _ optionalValueKind: Int32, _ optionalValuePayload1: Int32, _ optionalValuePayload2: Float64) -> Void { + #if arch(wasm32) + JSValueHolder.bridgeJSLiftParameter(_self).update(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2), optionalValue: Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2)) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_echo") +@_cdecl("bjs_JSValueHolder_echo") +public func _bjs_JSValueHolder_echo(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + let ret = JSValueHolder.bridgeJSLiftParameter(_self).echo(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_echoOptional") +@_cdecl("bjs_JSValueHolder_echoOptional") +public func _bjs_JSValueHolder_echoOptional(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + let ret = JSValueHolder.bridgeJSLiftParameter(_self).echoOptional(_: Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_value_get") +@_cdecl("bjs_JSValueHolder_value_get") +public func _bjs_JSValueHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = JSValueHolder.bridgeJSLiftParameter(_self).value + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_value_set") +@_cdecl("bjs_JSValueHolder_value_set") +public func _bjs_JSValueHolder_value_set(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + JSValueHolder.bridgeJSLiftParameter(_self).value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_optionalValue_get") +@_cdecl("bjs_JSValueHolder_optionalValue_get") +public func _bjs_JSValueHolder_optionalValue_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = JSValueHolder.bridgeJSLiftParameter(_self).optionalValue + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_optionalValue_set") +@_cdecl("bjs_JSValueHolder_optionalValue_set") +public func _bjs_JSValueHolder_optionalValue_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + #if arch(wasm32) + JSValueHolder.bridgeJSLiftParameter(_self).optionalValue = Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_JSValueHolder_deinit") +@_cdecl("bjs_JSValueHolder_deinit") +public func _bjs_JSValueHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension JSValueHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_JSValueHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_JSValueHolder_wrap") +fileprivate func _bjs_JSValueHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_JSValueHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_jsEchoJSValue") +fileprivate func bjs_jsEchoJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void +#else +fileprivate func bjs_jsEchoJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue { + let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter() + bjs_jsEchoJSValue(valueKind, valuePayload1, valuePayload2) + if let error = _swift_js_take_exception() { + throw error + } + return JSValue.bridgeJSLiftReturn() +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts new file mode 100644 index 000000000..9e2a85ac7 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts @@ -0,0 +1,37 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface JSValueHolder extends SwiftHeapObject { + update(value: any, optionalValue: any | null): void; + echo(value: any): any; + echoOptional(value: any | null): any | null; + value: any; + optionalValue: any | null; +} +export type Exports = { + JSValueHolder: { + new(value: any, optionalValue: any | null): JSValueHolder; + } + roundTripJSValue(value: any): any; + roundTripOptionalJSValue(value: any | null): any | null; +} +export type Imports = { + jsEchoJSValue(value: any): any; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js new file mode 100644 index 000000000..f272b0ff0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -0,0 +1,456 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + function __bjs_jsValueLower(value) { + let kind; + let payload1; + let payload2; + if (value === null) { + kind = 4; + payload1 = 0; + payload2 = 0; + } else { + switch (typeof value) { + case "boolean": + kind = 0; + payload1 = value ? 1 : 0; + payload2 = 0; + break; + case "number": + kind = 2; + payload1 = 0; + payload2 = value; + break; + case "string": + kind = 1; + payload1 = swift.memory.retain(value); + payload2 = 0; + break; + case "undefined": + kind = 5; + payload1 = 0; + payload2 = 0; + break; + case "object": + kind = 3; + payload1 = swift.memory.retain(value); + payload2 = 0; + break; + case "function": + kind = 3; + payload1 = swift.memory.retain(value); + payload2 = 0; + break; + case "symbol": + kind = 7; + payload1 = swift.memory.retain(value); + payload2 = 0; + break; + case "bigint": + kind = 8; + payload1 = swift.memory.retain(value); + payload2 = 0; + break; + default: + throw new TypeError("Unsupported JSValue type"); + } + } + return [kind, payload1, payload2]; + } + function __bjs_jsValueLift(kind, payload1, payload2) { + let jsValue; + switch (kind) { + case 0: + jsValue = payload1 !== 0; + break; + case 1: + jsValue = swift.memory.getObject(payload1); + break; + case 2: + jsValue = payload2; + break; + case 3: + jsValue = swift.memory.getObject(payload1); + break; + case 4: + jsValue = null; + break; + case 5: + jsValue = undefined; + break; + case 7: + jsValue = swift.memory.getObject(payload1); + break; + case 8: + jsValue = swift.memory.getObject(payload1); + break; + default: + throw new TypeError("Unsupported JSValue kind " + kind); + } + return jsValue; + } + + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag = tag; + } + bjs["swift_js_push_i32"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_JSValueHolder_wrap"] = function(pointer) { + const obj = JSValueHolder.__construct(pointer); + return swift.memory.retain(obj); + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_jsEchoJSValue"] = function bjs_jsEchoJSValue(valueKind, valuePayload1, valuePayload2) { + try { + const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2); + let ret = imports.jsEchoJSValue(jsValue); + const [retKind, retPayload1, retPayload2] = __bjs_jsValueLower(ret); + tmpParamInts.push(retKind); + tmpParamInts.push(retPayload1); + tmpParamF64s.push(retPayload2); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class JSValueHolder extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_JSValueHolder_deinit, JSValueHolder.prototype); + } + + constructor(value, optionalValue) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + const isSome = optionalValue != null; + const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); + const ret = instance.exports.bjs_JSValueHolder_init(valueKind, valuePayload1, valuePayload2, +isSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2); + return JSValueHolder.__construct(ret); + } + update(value, optionalValue) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + const isSome = optionalValue != null; + const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); + instance.exports.bjs_JSValueHolder_update(this.pointer, valueKind, valuePayload1, valuePayload2, +isSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2); + } + echo(value) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_JSValueHolder_echo(this.pointer, valueKind, valuePayload1, valuePayload2); + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + return jsValue; + } + echoOptional(value) { + const isSome = value != null; + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_JSValueHolder_echoOptional(this.pointer, +isSome, valueKind, valuePayload1, valuePayload2); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + optResult = jsValue; + } else { + optResult = null; + } + return optResult; + } + get value() { + instance.exports.bjs_JSValueHolder_value_get(this.pointer); + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + return jsValue; + } + set value(value) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_JSValueHolder_value_set(this.pointer, valueKind, valuePayload1, valuePayload2); + } + get optionalValue() { + instance.exports.bjs_JSValueHolder_optionalValue_get(this.pointer); + const isSome = tmpRetInts.pop(); + let optResult; + if (isSome) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + optResult = jsValue; + } else { + optResult = null; + } + return optResult; + } + set optionalValue(value) { + const isSome = value != null; + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_JSValueHolder_optionalValue_set(this.pointer, +isSome, valueKind, valuePayload1, valuePayload2); + } + } + const exports = { + JSValueHolder, + roundTripJSValue: function bjs_roundTripJSValue(value) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_roundTripJSValue(valueKind, valuePayload1, valuePayload2); + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + return jsValue; + }, + roundTripOptionalJSValue: function bjs_roundTripOptionalJSValue(value) { + const isSome = value != null; + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + instance.exports.bjs_roundTripOptionalJSValue(+isSome, valueKind, valuePayload1, valuePayload2); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + optResult = jsValue; + } else { + optResult = null; + } + return optResult; + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index e337124ee..e385a3c60 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -349,6 +349,92 @@ extension JSObject: _BridgedSwiftStackType { } } +extension JSValue: _BridgedSwiftStackType { + public typealias StackLiftResult = JSValue + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) { + return withRawJSValue { raw in + ( + kind: Int32(raw.kind.rawValue), + payload1: Int32(bitPattern: raw.payload1), + payload2: raw.payload2 + ) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn( + _ kind: Int32, + _ payload1: Int32, + _ payload2: Double + ) -> JSValue { + return bridgeJSLiftParameter(kind, payload1, payload2) + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ kind: Int32, + _ payload1: Int32, + _ payload2: Double + ) -> JSValue { + let retainedPayload1: Int32 + if let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) { + switch kindEnum { + case .string, .object, .symbol, .bigInt: + retainedPayload1 = _swift_js_retain(payload1) + default: + retainedPayload1 = payload1 + } + } else { + retainedPayload1 = payload1 + } + + guard let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) else { + fatalError("Invalid JSValue kind: \(kind)") + } + let rawValue = RawJSValue( + kind: kindEnum, + payload1: JavaScriptPayload1(UInt32(bitPattern: retainedPayload1)), + payload2: payload2 + ) + return rawValue.jsValue + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSValue { + let payload2 = _swift_js_pop_f64() + let payload1 = _swift_js_pop_i32() + let kind = _swift_js_pop_i32() + return bridgeJSLiftParameter(kind, payload1, payload2) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> JSValue { + let payload2 = _swift_js_pop_f64() + let payload1 = _swift_js_pop_i32() + let kind = _swift_js_pop_i32() + return bridgeJSLiftParameter(kind, payload1, payload2) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + let lowered = bridgeJSLowerParameter() + let retainedPayload1: Int32 + if let kind = JavaScriptValueKind(rawValue: UInt32(lowered.kind)) { + switch kind { + case .string, .object, .symbol, .bigInt: + retainedPayload1 = _swift_js_retain(lowered.payload1) + default: + retainedPayload1 = lowered.payload1 + } + } else { + retainedPayload1 = lowered.payload1 + } + _swift_js_push_i32(lowered.kind) + _swift_js_push_i32(retainedPayload1) + _swift_js_push_f64(lowered.payload2) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() + } +} + /// A protocol that Swift heap objects exposed to JavaScript via `@JS class` must conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. @@ -1253,6 +1339,61 @@ extension Optional where Wrapped == JSObject { } } +extension Optional where Wrapped == JSValue { + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( + isSome: Int32, kind: Int32, payload1: Int32, payload2: Double + ) { + switch consume self { + case .none: + return (isSome: 0, kind: 0, payload1: 0, payload2: 0) + case .some(let wrapped): + let lowered = wrapped.bridgeJSLowerParameter() + return ( + isSome: 1, + kind: lowered.kind, + payload1: lowered.payload1, + payload2: lowered.payload2 + ) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ kind: Int32, + _ payload1: Int32, + _ payload2: Double + ) -> JSValue? { + if isSome == 0 { + return nil + } else { + return JSValue.bridgeJSLiftParameter(kind, payload1, payload2) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSValue? { + let isSome = _swift_js_pop_i32() + if isSome == 0 { + return nil + } + let payload2 = _swift_js_pop_f64() + let payload1 = _swift_js_pop_i32() + let kind = _swift_js_pop_i32() + return JSValue.bridgeJSLiftParameter(kind, payload1, payload2) + } + + @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { + switch self { + case .none: + _swift_js_push_i32(0) + case .some(let value): + value.bridgeJSLowerReturn() + _swift_js_push_i32(1) + } + } +} + extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { // MARK: ExportSwift diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 007f0b265..345f5dbcf 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -52,6 +52,14 @@ func runJsWorks() -> Void return v } +@JS func roundTripJSValue(v: JSValue) -> JSValue { + return v +} + +@JS func roundTripOptionalJSValue(v: JSValue?) -> JSValue? { + return v +} + @JSClass struct Foo { @JSGetter var value: String @JSFunction init(_ value: String) throws(JSException) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index eaddcea1c..358f0501d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -18,6 +18,8 @@ @JSFunction func jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr +@JSFunction func jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue + @JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void @JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double @@ -75,4 +77,4 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction func getIsCat() throws(JSException) -> Bool } -@JSGetter(from: .global) var globalObject1: JSObject +@JSGetter(from: .global) var globalObject1: JSValue diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index c8f428934..ee9f97508 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3420,6 +3420,28 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #endif } +@_expose(wasm, "bjs_roundTripJSValue") +@_cdecl("bjs_roundTripJSValue") +public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { + #if arch(wasm32) + let ret = roundTripJSValue(v: JSValue.bridgeJSLiftParameter(vKind, vPayload1, vPayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalJSValue") +@_cdecl("bjs_roundTripOptionalJSValue") +public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalJSValue(v: Optional.bridgeJSLiftParameter(vIsSome, vKind, vPayload1, vPayload2)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_makeImportedFoo") @_cdecl("bjs_makeImportedFoo") public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { @@ -7929,19 +7951,19 @@ func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_globalObject1_get") -fileprivate func bjs_globalObject1_get() -> Int32 +fileprivate func bjs_globalObject1_get() -> Void #else -fileprivate func bjs_globalObject1_get() -> Int32 { +fileprivate func bjs_globalObject1_get() -> Void { fatalError("Only available on WebAssembly") } #endif -func _$globalObject1_get() throws(JSException) -> JSObject { - let ret = bjs_globalObject1_get() +func _$globalObject1_get() throws(JSException) -> JSValue { + bjs_globalObject1_get() if let error = _swift_js_take_exception() { throw error } - return JSObject.bridgeJSLiftReturn(ret) + return JSValue.bridgeJSLiftReturn() } #if arch(wasm32) @@ -8050,6 +8072,24 @@ func _$jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSE return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValue") +fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void +#else +fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue { + let (vKind, vPayload1, vPayload2) = v.bridgeJSLowerParameter() + bjs_jsRoundTripJSValue(vKind, vPayload1, vPayload2) + if let error = _swift_js_take_exception() { + throw error + } + return JSValue.bridgeJSLiftReturn() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 0cb32079a..e2877ee76 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -5275,6 +5275,66 @@ } } }, + { + "abiName" : "bjs_roundTripJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSValue", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "jsValue" : { + + } + } + } + ], + "returnType" : { + "jsValue" : { + + } + } + }, + { + "abiName" : "bjs_roundTripOptionalJSValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalJSValue", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "jsValue" : { + + } + }, + "_1" : "null" + } + } + }, { "abiName" : "bjs_makeImportedFoo", "effects" : { @@ -12174,6 +12234,24 @@ } } }, + { + "name" : "jsRoundTripJSValue", + "parameters" : [ + { + "name" : "v", + "type" : { + "jsValue" : { + + } + } + } + ], + "returnType" : { + "jsValue" : { + + } + } + }, { "name" : "jsThrowOrVoid", "parameters" : [ @@ -12314,7 +12392,7 @@ "from" : "global", "name" : "globalObject1", "type" : { - "jsObject" : { + "jsValue" : { } } diff --git a/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift b/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift index 2f6251341..fdd22401d 100644 --- a/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift +++ b/Tests/BridgeJSRuntimeTests/GlobalThisImportTests.swift @@ -13,7 +13,11 @@ final class GlobalThisImportTests: XCTestCase { } func testGlobalGetterImport() throws { - let value = try globalObject1["prop_2"].number + guard let object = try globalObject1.object else { + XCTFail("globalObject1 was not an object") + return + } + let value = object[dynamicMember: "prop_2"].number XCTAssertEqual(value, 2) } } diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index c4ab0c2e0..460297133 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -55,6 +55,24 @@ class ImportAPITests: XCTestCase { } } + func testRoundTripJSValue() throws { + let symbol = JSSymbol("roundTrip") + let bigInt = JSBigInt(_slowBridge: Int64(123456789)) + let values: [JSValue] = [ + .boolean(true), + .number(42), + .string(JSString("hello")), + .object(JSObject.global), + .null, + .undefined, + .symbol(symbol), + .bigInt(bigInt), + ] + for value in values { + try XCTAssertEqual(jsRoundTripJSValue(value), value) + } + } + func testRoundTripFeatureFlag() throws { for v in [FeatureFlag.foo, .bar] { try XCTAssertEqual(jsRoundTripFeatureFlag(v), v) diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 42bca7401..03ecb5b39 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -4,6 +4,8 @@ export function jsRoundTripBool(v: boolean): boolean export function jsRoundTripString(v: string): string export function jsRoundTripOptionalNumberNull(v: number | null): number | null export function jsRoundTripOptionalNumberUndefined(v: number | undefined): number | undefined +export type JSValue = any +export function jsRoundTripJSValue(v: JSValue): JSValue export function jsThrowOrVoid(shouldThrow: boolean): void export function jsThrowOrNumber(shouldThrow: boolean): number export function jsThrowOrBool(shouldThrow: boolean): boolean diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index dc904579d..6a8dd58a2 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -52,6 +52,9 @@ export async function setupOptions(options, context) { "jsRoundTripOptionalNumberUndefined": (v) => { return v === undefined ? undefined : v; }, + "jsRoundTripJSValue": (v) => { + return v; + }, "jsThrowOrVoid": (shouldThrow) => { if (shouldThrow) { throw new Error("TestError"); @@ -78,6 +81,9 @@ export async function setupOptions(options, context) { "jsRoundTripFeatureFlag": (flag) => { return flag; }, + "jsEchoJSValue": (v) => { + return v; + }, "$jsWeirdFunction": () => { return 42; }, @@ -464,6 +470,20 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const anyObject = {}; assert.equal(exports.roundTripJSObject(anyObject), anyObject); + const symbolValue = Symbol("roundTrip"); + const bigIntValue = 12345678901234567890n; + const objectValue = { nested: true }; + const jsValues = [true, 42, "hello", objectValue, null, undefined, symbolValue, bigIntValue]; + for (const value of jsValues) { + const result = exports.roundTripJSValue(value); + assert.strictEqual(result, value); + } + + assert.strictEqual(exports.roundTripOptionalJSValue(null), null); + assert.strictEqual(exports.roundTripOptionalJSValue(undefined), null); + assert.strictEqual(exports.roundTripOptionalJSValue(objectValue), objectValue); + assert.strictEqual(exports.roundTripOptionalJSValue(symbolValue), symbolValue); + try { exports.throwsSwiftError(true); assert.fail("Expected error"); From dcc148fd307c7619fa9857b50e0bdfba1487a517 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 27 Jan 2026 21:09:33 +0700 Subject: [PATCH 151/252] BridgeJS: Support all missing types as associated values in exported enums --- Benchmarks/Sources/Generated/BridgeJS.swift | 22 +- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../BridgeJSCore/SwiftToSkeleton.swift | 10 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 29 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 770 ++++----- .../MacroSwift/EnumAssociatedValue.swift | 63 + .../EnumAssociatedValue.json | 557 +++++++ .../EnumAssociatedValue.swift | 506 +++++- .../BridgeJSCodegenTests/Protocol.swift | 4 +- .../StaticFunctions.Global.swift | 4 +- .../StaticFunctions.swift | 4 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 10 +- .../BridgeJSLinkTests/ArrayTypes.js | 24 +- .../__Snapshots__/BridgeJSLinkTests/Async.js | 4 +- .../BridgeJSLinkTests/DefaultParameters.js | 4 +- .../EnumAssociatedValue.d.ts | 91 ++ .../BridgeJSLinkTests/EnumAssociatedValue.js | 1446 +++++++++++------ .../BridgeJSLinkTests/EnumCase.js | 4 +- .../BridgeJSLinkTests/EnumNamespace.Global.js | 4 +- .../BridgeJSLinkTests/EnumNamespace.js | 4 +- .../BridgeJSLinkTests/EnumRawType.js | 4 +- .../BridgeJSLinkTests/GlobalGetter.js | 4 +- .../BridgeJSLinkTests/GlobalThisImports.js | 4 +- .../ImportedTypeInExportedInterface.js | 4 +- .../BridgeJSLinkTests/InvalidPropertyNames.js | 4 +- .../BridgeJSLinkTests/JSClass.js | 4 +- .../JSClassStaticFunctions.js | 4 +- .../BridgeJSLinkTests/JSValue.js | 4 +- .../BridgeJSLinkTests/MixedGlobal.js | 4 +- .../BridgeJSLinkTests/MixedModules.js | 4 +- .../BridgeJSLinkTests/MixedPrivate.js | 4 +- .../BridgeJSLinkTests/Namespaces.Global.js | 4 +- .../BridgeJSLinkTests/Namespaces.js | 4 +- .../BridgeJSLinkTests/Optionals.js | 4 +- .../BridgeJSLinkTests/PrimitiveParameters.js | 4 +- .../BridgeJSLinkTests/PrimitiveReturn.js | 4 +- .../BridgeJSLinkTests/PropertyTypes.js | 4 +- .../BridgeJSLinkTests/Protocol.js | 95 +- .../StaticFunctions.Global.js | 91 +- .../BridgeJSLinkTests/StaticFunctions.js | 91 +- .../StaticProperties.Global.js | 4 +- .../BridgeJSLinkTests/StaticProperties.js | 4 +- .../BridgeJSLinkTests/StringParameter.js | 4 +- .../BridgeJSLinkTests/StringReturn.js | 4 +- .../BridgeJSLinkTests/SwiftClass.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.js | 157 +- .../BridgeJSLinkTests/SwiftClosureImports.js | 4 +- .../BridgeJSLinkTests/SwiftStruct.js | 16 +- .../BridgeJSLinkTests/SwiftStructImports.js | 4 +- .../__Snapshots__/BridgeJSLinkTests/Throws.js | 4 +- .../BridgeJSLinkTests/UnsafePointer.js | 4 +- .../VoidParameterVoidReturn.js | 4 +- .../Exporting-Swift/Exporting-Swift-Enum.md | 9 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 54 + .../Generated/BridgeJS.swift | 416 ++++- .../Generated/JavaScript/BridgeJS.json | 482 ++++++ Tests/prelude.mjs | 125 +- 57 files changed, 3911 insertions(+), 1297 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 1a413268d..5a480694c 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -64,20 +64,20 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .flag(let param0): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .rate(let param0): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .precise(let param0): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .info: _swift_js_push_tag(Int32(5)) } @@ -161,29 +161,28 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .error(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .location(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .coordinates(let param0, let param1, let param2): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_tag(Int32(5)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() @@ -193,6 +192,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(5)) case .info: _swift_js_push_tag(Int32(6)) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 1137343b0..51ff91695 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1221,9 +1221,11 @@ struct EnumCodegen { .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } .joined(separator: ", ") cases.append("case .\(enumCase.name)(\(pattern)):") - cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) cases.append(contentsOf: payloadCode) + // Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function. + // This ensures nested enum tags don't overwrite the outer tag. + cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") } } return cases diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index d32d85f55..39e3090cd 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -1428,18 +1428,20 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { for enumCase in exportedEnum.cases { for associatedValue in enumCase.associatedValues { switch associatedValue.type { - case .string, .int, .float, .double, .bool: + case .string, .int, .float, .double, .bool, .caseEnum, .rawValueEnum, + .swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array: break case .nullable(let wrappedType, _): switch wrappedType { - case .string, .int, .float, .double, .bool: + case .string, .int, .float, .double, .bool, .caseEnum, .rawValueEnum, + .swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array: break default: diagnose( node: node, message: "Unsupported associated value type: \(associatedValue.type.swiftType)", hint: - "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" + "Only primitive types, enums, structs, classes, JSObject, arrays, and their optionals are supported in associated-value enums" ) } default: @@ -1447,7 +1449,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { node: node, message: "Unsupported associated value type: \(associatedValue.type.swiftType)", hint: - "Only primitive types and optional primitives (String?, Int?, Float?, Double?, Bool?) are supported in associated-value enums" + "Only primitive types, enums, structs, classes, JSObject, arrays, and their optionals are supported in associated-value enums" ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 4695f3283..27ef60760 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -246,7 +246,7 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);", - "let \(JSGlueVariableScope.reservedTmpRetTag);", + "let \(JSGlueVariableScope.reservedTmpRetTag) = [];", "let \(JSGlueVariableScope.reservedTmpRetStrings) = [];", "let \(JSGlueVariableScope.reservedTmpRetInts) = [];", "let \(JSGlueVariableScope.reservedTmpRetF32s) = [];", @@ -388,7 +388,7 @@ public struct BridgeJSLink { printer.write("}") printer.write("bjs[\"swift_js_push_tag\"] = function(tag) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetTag) = tag;") + printer.write("\(JSGlueVariableScope.reservedTmpRetTag).push(tag);") } printer.write("}") printer.write("bjs[\"swift_js_push_i32\"] = function(v) {") @@ -1059,6 +1059,18 @@ public struct BridgeJSLink { _ = fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) bodyPrinter.write(lines: structPrinter.lines) } + + let allAssocEnums = exportedSkeletons.flatMap { + $0.enums.filter { $0.enumType == .associatedValue } + } + for enumDef in allAssocEnums { + let enumPrinter = CodeFragmentPrinter() + let enumScope = JSGlueVariableScope() + let enumCleanup = CodeFragmentPrinter() + let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef) + _ = fragment.printCode([enumDef.valuesName], enumScope, enumPrinter, enumCleanup) + bodyPrinter.write(lines: enumPrinter.lines) + } bodyPrinter.nextLine() bodyPrinter.write(contentsOf: generateAddImports(needsImportsObject: data.needsImportsObject)) @@ -1094,8 +1106,6 @@ public struct BridgeJSLink { "\(JSGlueVariableScope.reservedMemory) = \(JSGlueVariableScope.reservedInstance).exports.memory;", ]) printer.nextLine() - // Enum helpers section - printer.write(contentsOf: enumHelperAssignments()) // Error handling printer.write("\(JSGlueVariableScope.reservedSetException) = (error) => {") printer.indent { @@ -1109,18 +1119,19 @@ public struct BridgeJSLink { } // createExports method - try printer.indent { + printer.indent { printer.write(lines: [ "/** @param {WebAssembly.Instance} instance */", "createExports: (instance) => {", ]) - try printer.indent { + printer.indent { printer.write("const js = \(JSGlueVariableScope.reservedSwift).memory.heap;") printer.write(lines: data.classLines) - // Struct helpers must be initialized AFTER classes are defined (to allow _exports access) + // Struct and enum helpers must be initialized AFTER classes are defined (to allow _exports access) printer.write(contentsOf: structHelperAssignments()) + printer.write(contentsOf: enumHelperAssignments()) let namespaceInitCode = namespaceBuilder.buildNamespaceInitialization( exportedSkeletons: exportedSkeletons ) @@ -1151,7 +1162,7 @@ public struct BridgeJSLink { for skeleton in skeletons.compactMap(\.exported) { for enumDef in skeleton.enums where enumDef.enumType == .associatedValue { printer.write( - "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift));" + "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedStructHelpers), \(JSGlueVariableScope.reservedEnumHelpers));" ) printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;") printer.nextLine() @@ -1616,7 +1627,7 @@ public struct BridgeJSLink { _ = fragment.printCode([enumValuesName], scope, printer, cleanup) jsTopLevelLines.append(contentsOf: printer.lines) case .associatedValue: - let fragment = IntrinsicJSFragment.associatedValueEnumHelper(enumDefinition: enumDefinition) + let fragment = IntrinsicJSFragment.associatedValueEnumValues(enumDefinition: enumDefinition) _ = fragment.printCode([enumValuesName], scope, printer, cleanup) jsTopLevelLines.append(contentsOf: printer.lines) case .namespace: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ef72cf6f6..1547d63a4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -571,7 +571,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [retName] } @@ -652,7 +652,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("}") @@ -678,7 +678,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(arrayVar);") printer.write("if (\(isSome)) {") printer.indent { - // Lift array from stacks - reuse array lift return logic let arrayLiftFragment = try! arrayLift(elementType: elementType) let liftResults = arrayLiftFragment.printCode([], scope, printer, cleanupCode) if let liftResult = liftResults.first { @@ -886,8 +885,10 @@ struct IntrinsicJSFragment: Sendable { } case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName + let tagVar = scope.variable("tag") + printer.write("const \(tagVar) = \(JSGlueVariableScope.reservedTmpRetTag).pop();") let isNullVar = scope.variable("isNull") - printer.write("const \(isNullVar) = (\(JSGlueVariableScope.reservedTmpRetTag) === -1);") + printer.write("const \(isNullVar) = (\(tagVar) === -1);") printer.write("let \(resultVar);") printer.write("if (\(isNullVar)) {") printer.indent { @@ -896,7 +897,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("} else {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(tagVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } printer.write("}") @@ -1233,7 +1234,7 @@ struct IntrinsicJSFragment: Sendable { let targetVar = arguments[1] let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [] } @@ -1304,7 +1305,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) default: fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") @@ -1632,7 +1633,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) printer.write("return \(resultVar);") return [] @@ -1857,7 +1858,7 @@ struct IntrinsicJSFragment: Sendable { let caseId = arguments[0] let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2001,13 +2002,14 @@ struct IntrinsicJSFragment: Sendable { ) } /// Fragment for generating an entire associated value enum helper - static func associatedValueEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { + /// Generates the enum tag constants (e.g. `const XValues = { Tag: { ... } }`) + /// This is placed at module level for exports/imports. + static func associatedValueEnumValues(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], printCode: { arguments, scope, printer, cleanup in let enumName = arguments[0] - // Generate the enum tag object printer.write("const \(enumName) = {") printer.indent { printer.write("Tag: {") @@ -2020,13 +2022,25 @@ struct IntrinsicJSFragment: Sendable { printer.write("},") } printer.write("};") - printer.nextLine() - // Generate the helper function + return [] + } + ) + } + + /// Generates the enum helper factory function (lower/lift closures). + /// This is placed inside `createInstantiator` alongside struct helpers, + /// so it has access to `_exports` for class references. + static func associatedValueEnumHelperFactory(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["enumName"], + printCode: { arguments, scope, printer, cleanup in + let enumName = arguments[0] + printer.write("const __bjs_create\(enumName)Helpers = () => {") printer.indent() printer.write( - "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), textEncoder, \(JSGlueVariableScope.reservedSwift)) => ({" + "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedStructHelpers), \(JSGlueVariableScope.reservedEnumHelpers)) => ({" ) printer.indent() @@ -2058,10 +2072,10 @@ struct IntrinsicJSFragment: Sendable { // Generate lift function printer.write( - "lift: (\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s)) => {" + "lift: (tag, \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" ) printer.indent { - printer.write("const tag = tmpRetTag | 0;") + printer.write("tag = tag | 0;") printer.write("switch (tag) {") printer.indent { let liftPrinter = CodeFragmentPrinter() @@ -2228,62 +2242,77 @@ struct IntrinsicJSFragment: Sendable { private static func associatedValuePushPayload(type: BridgeType) -> IntrinsicJSFragment { switch type { - case .string: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let bytesVar = scope.variable("bytes") - let idVar = scope.variable("id") - printer.write("const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arguments[0]) ? 1 : 0);") - return [] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") - return [] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") - return [] - } - ) case .nullable(let wrappedType, let kind): - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") + return associatedValueOptionalPushPayload(wrappedType: wrappedType, kind: kind) + default: + return try! stackLowerFragment(elementType: type) + } + } - switch wrappedType { + private static func associatedValueOptionalPushPayload( + wrappedType: BridgeType, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") + + switch wrappedType { + case .string: + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let bytesVar = scope.variable("bytes") + printer.write( + "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if(\(idVar)) {") + cleanup.indent { + cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + } + cleanup.write("}") + case .int, .uint: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .bool: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .float: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .double: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .caseEnum: + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" + ) + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .rawValueEnum(_, let rawType): + switch rawType { case .string: let idVar = scope.variable("id") printer.write("let \(idVar);") @@ -2293,8 +2322,12 @@ struct IntrinsicJSFragment: Sendable { printer.write( "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" ) - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") + printer.write( + "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" + ) + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);" + ) printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") } printer.write("} else {") @@ -2303,107 +2336,169 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" + ) cleanup.write("if(\(idVar)) {") cleanup.indent { - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") + cleanup.write( + "\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));" + ) } cleanup.write("}") - case .int, .uint: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") - case .bool: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") case .float: printer.write( "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" + ) case .double: printer.write( "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" + ) default: - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" + ) + printer.write( + "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" + ) } - - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - return [] + case .swiftStruct(let structName): + let structBase = structName.components(separatedBy: ".").last ?? structName + let nestedCleanupVar = scope.variable("nestedCleanup") + printer.write("let \(nestedCleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let structResultVar = scope.variable("structResult") + printer.write( + "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" + ) + printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") + case .swiftHeapObject: + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value).pointer);") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .jsObject: + let idVar = scope.variable("id") + printer.write("let \(idVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(idVar) = undefined;") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + case .associatedValueEnum(let enumName): + let base = enumName.components(separatedBy: ".").last ?? enumName + let caseIdVar = scope.variable("enumCaseId") + let enumCleanupVar = scope.variable("enumCleanup") + printer.write("let \(caseIdVar), \(enumCleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let enumResultVar = scope.variable("enumResult") + printer.write( + "const \(enumResultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + ) + printer.write("\(caseIdVar) = \(enumResultVar).caseId;") + printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + } + printer.write("} else {") + printer.indent { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") + case .array(let elementType): + // Array cleanup references variables declared inside the if block, + // so capture cleanup into a variable declared at the outer scope. + let arrCleanupVar = scope.variable("arrCleanup") + printer.write("let \(arrCleanupVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let localCleanup = CodeFragmentPrinter() + let arrFragment = try! arrayLower(elementType: elementType) + _ = arrFragment.printCode([value], scope, printer, localCleanup) + let cleanupLines = localCleanup.lines.filter { + !$0.trimmingCharacters(in: .whitespaces).isEmpty + } + if !cleanupLines.isEmpty { + printer.write("\(arrCleanupVar) = () => {") + printer.indent { + for line in cleanupLines { + printer.write(line) + } + } + printer.write("};") + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + cleanup.write("if (\(arrCleanupVar)) { \(arrCleanupVar)(); }") + default: + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") } - ) - } + + return [] + } + ) } private static func associatedValuePopPayload(type: BridgeType) -> IntrinsicJSFragment { switch type { - case .string: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let strVar = scope.variable("string") - printer.write("const \(strVar) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") - return [strVar] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let bVar = scope.variable("bool") - printer.write("const \(bVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - return [bVar] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let iVar = scope.variable("int") - printer.write("const \(iVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - return [iVar] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let fVar = scope.variable("f32") - printer.write("const \(fVar) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") - return [fVar] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let dVar = scope.variable("f64") - printer.write("const \(dVar) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") - return [dVar] - } - ) case .nullable(let wrappedType, let kind): - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let optVar = scope.variable("optional") - let isSomeVar = scope.variable("isSome") + return associatedValueOptionalPopPayload(wrappedType: wrappedType, kind: kind) + default: + return try! stackLiftFragment(elementType: type) + } + } - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - printer.write("let \(optVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { + private static func associatedValueOptionalPopPayload( + wrappedType: BridgeType, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let optVar = scope.variable("optional") + let isSomeVar = scope.variable("isSome") + + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(optVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + // For optional associated value enums, Swift uses bridgeJSLowerParameter() + // which pushes caseId to tmpRetInts (not tmpRetTag like bridgeJSLowerReturn()). + if case .associatedValueEnum(let fullName) = wrappedType { + let base = fullName.components(separatedBy: ".").last ?? fullName + let caseIdVar = scope.variable("caseId") + printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write( + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + ) + } else { let wrappedFragment = associatedValuePopPayload(type: wrappedType) let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) if let wrappedResult = wrappedResults.first { @@ -2412,23 +2507,16 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(optVar) = undefined;") } } - printer.write("} else {") - printer.indent { - printer.write("\(optVar) = \(kind.absenceLiteral);") - } - printer.write("}") - - return [optVar] } - ) - default: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - return ["undefined"] + printer.write("} else {") + printer.indent { + printer.write("\(optVar) = \(kind.absenceLiteral);") } - ) - } + printer.write("}") + + return [optVar] + } + ) } static func swiftStructLowerReturn(fullName: String) -> IntrinsicJSFragment { @@ -2489,7 +2577,7 @@ struct IntrinsicJSFragment: Sendable { let elemVar = scope.variable("elem") printer.write("for (const \(elemVar) of \(arr)) {") printer.indent { - let elementFragment = try! arrayElementLowerFragment(elementType: elementType) + let elementFragment = try! stackLowerFragment(elementType: elementType) let elementCleanup = CodeFragmentPrinter() let _ = elementFragment.printCode([elemVar], scope, printer, elementCleanup) if !elementCleanup.lines.isEmpty { @@ -2523,7 +2611,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(resultVar) = [];") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") printer.indent { - let elementFragment = try! arrayElementRaiseFragment(elementType: elementType) + let elementFragment = try! stackLiftFragment(elementType: elementType) let elementResults = elementFragment.printCode([], scope, printer, cleanupCode) if let elementExpr = elementResults.first { printer.write("\(resultVar).push(\(elementExpr));") @@ -2536,7 +2624,7 @@ struct IntrinsicJSFragment: Sendable { ) } - private static func arrayElementRaiseFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") @@ -2592,7 +2680,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let resultVar = scope.variable("struct") printer.write( - "const \(resultVar) = structHelpers.\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2617,6 +2705,24 @@ struct IntrinsicJSFragment: Sendable { return [varName] } ) + case .float: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("rawValue") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + return [varName] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanup in + let varName = scope.variable("rawValue") + printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + return [varName] + } + ) default: return IntrinsicJSFragment( parameters: [], @@ -2632,11 +2738,9 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: [], printCode: { arguments, scope, printer, cleanup in - let caseIdVar = scope.variable("caseId") let resultVar = scope.variable("enumValue") - printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") printer.write( - "const \(resultVar) = enumHelpers.\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2648,7 +2752,7 @@ struct IntrinsicJSFragment: Sendable { let ptrVar = scope.variable("ptr") let objVar = scope.variable("obj") printer.write("const \(ptrVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") - printer.write("const \(objVar) = \(className).__construct(\(ptrVar));") + printer.write("const \(objVar) = _exports['\(className)'].__construct(\(ptrVar));") return [objVar] } ) @@ -2682,7 +2786,7 @@ struct IntrinsicJSFragment: Sendable { } } - private static func arrayElementLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") @@ -2693,7 +2797,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write("const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") @@ -2739,8 +2843,10 @@ struct IntrinsicJSFragment: Sendable { parameters: ["value"], printCode: { arguments, scope, printer, cleanup in let value = arguments[0] - let cleanupVar = scope.variable("cleanup") - printer.write("const { cleanup: \(cleanupVar) } = structHelpers.\(structBase).lower(\(value));") + let cleanupVar = scope.variable("structCleanup") + printer.write( + "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" + ) cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } @@ -2762,7 +2868,9 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) printer.write( "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" ) @@ -2772,6 +2880,22 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .float: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + return [] + } + ) + case .double: + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + return [] + } + ) default: return IntrinsicJSFragment( parameters: ["value"], @@ -2790,7 +2914,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("enumCleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = enumHelpers.\(base).lower(\(value));" + "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") @@ -2867,7 +2991,7 @@ struct IntrinsicJSFragment: Sendable { } printer.write("} else {") printer.indent { - let innerFragment = try! arrayElementRaiseFragment(elementType: wrappedType) + let innerFragment = try! stackLiftFragment(elementType: wrappedType) let innerResults = innerFragment.printCode([], scope, printer, cleanup) if let innerResult = innerResults.first { printer.write("\(resultVar) = \(innerResult);") @@ -2898,7 +3022,7 @@ struct IntrinsicJSFragment: Sendable { let localCleanupWriter = CodeFragmentPrinter() printer.write("if (\(isSomeVar)) {") printer.indent { - let innerFragment = try! arrayElementLowerFragment(elementType: wrappedType) + let innerFragment = try! stackLowerFragment(elementType: wrappedType) let _ = innerFragment.printCode([value], scope, printer, localCleanupWriter) let localCleanupLines = localCleanupWriter.lines.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty @@ -3065,13 +3189,11 @@ struct IntrinsicJSFragment: Sendable { let methodScope = scope.makeChildScope() let methodCleanup = CodeFragmentPrinter() - // Lower the struct instance (this) using the helper's lower function let structCleanupVar = methodScope.variable("structCleanup") printer.write( "const { cleanup: \(structCleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(this);" ) - // Lower each parameter and collect forwarding expressions var paramForwardings: [String] = [] for param in method.parameters { let fragment = try! IntrinsicJSFragment.lowerParameter(type: param.type) @@ -3079,7 +3201,6 @@ struct IntrinsicJSFragment: Sendable { paramForwardings.append(contentsOf: loweredValues) } - // Call the Swift function with all lowered parameters let callExpr = "instance.exports.\(method.abiName)(\(paramForwardings.joined(separator: ", ")))" if method.returnType == .void { printer.write("\(callExpr);") @@ -3118,61 +3239,6 @@ struct IntrinsicJSFragment: Sendable { switch field.type { case .jsValue: preconditionFailure("Struct field of JSValue is not supported yet") - case .string: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let bytesVar = scope.variable("bytes") - let idVar = scope.variable("id") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - return [idVar] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arguments[0]) ? 1 : 0);") - return [] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") - return [] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") - return [] - } - ) - case .unsafePointer: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push((\(arguments[0]) | 0));") - return [] - } - ) case .jsObject: return IntrinsicJSFragment( parameters: ["value"], @@ -3233,7 +3299,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let bytesVar = scope.variable("bytes") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) printer.write( "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" ) @@ -3326,7 +3394,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { let bytesVar = scope.variable("bytes") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") @@ -3369,7 +3439,6 @@ struct IntrinsicJSFragment: Sendable { cleanup.write("}") return [idVar] } else { - // Handle optional primitive types using helper switch wrappedType { case .int, .uint: pushOptionalPrimitive( @@ -3430,7 +3499,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") default: - // For other types (nested structs, etc.), original logic applies let wrappedFragment = structFieldLowerFragment( field: ExportedProperty( name: field.name, @@ -3464,83 +3532,6 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .swiftHeapObject: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value).pointer);") - return [] - } - ) - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("enumCleanup") - printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") - cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - return [cleanupVar] - } - ) - case .caseEnum: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") - return [] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - let value = arguments[0] - let bytesVar = scope.variable("bytes") - let idVar = scope.variable("id") - printer.write("const \(bytesVar) = textEncoder.encode(\(value));") - printer.write( - "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - return [idVar] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") - return [] - } - ) - } case .void, .swiftProtocol, .namespaceEnum, .closure: // These types should not appear as struct fields - return error fragment return IntrinsicJSFragment( @@ -3550,8 +3541,8 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .array(let elementType): - return try! arrayLower(elementType: elementType) + default: + return try! stackLowerFragment(elementType: field.type) } } @@ -3606,60 +3597,6 @@ struct IntrinsicJSFragment: Sendable { switch field.type { case .jsValue: preconditionFailure("Struct field of JSValue is not supported yet") - case .string: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let strVar = scope.variable("string") - printer.write("const \(strVar) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") - return [strVar] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let bVar = scope.variable("bool") - printer.write("const \(bVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop() !== 0;") - return [bVar] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let iVar = scope.variable("int") - printer.write("const \(iVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - return [iVar] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let fVar = scope.variable("f32") - printer.write("const \(fVar) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") - return [fVar] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let dVar = scope.variable("f64") - printer.write("const \(dVar) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") - return [dVar] - } - ) - case .unsafePointer: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let pVar = scope.variable("pointer") - printer.write("const \(pVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") - return [pVar] - } - ) case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: [], @@ -3676,7 +3613,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("enumCaseId") printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") printer.write( - "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) } else { let wrappedFragment = structFieldLiftFragment( @@ -3715,65 +3652,6 @@ struct IntrinsicJSFragment: Sendable { return [structVar] } ) - case .caseEnum: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - return [varName] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") - return [varName] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") - return [varName] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") - return [varName] - } - ) - default: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - return [varName] - } - ) - } - case .swiftHeapObject(let className): - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let ptrVar = scope.variable("ptr") - let varName = scope.variable("value") - printer.write("const \(ptrVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") - printer.write("const \(varName) = _exports['\(className)'].__construct(\(ptrVar));") - return [varName] - } - ) case .jsObject: return IntrinsicJSFragment( parameters: [], @@ -3797,18 +3675,6 @@ struct IntrinsicJSFragment: Sendable { return [varName] } ) - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, scope, printer, cleanup in - let varName = scope.variable("value") - printer.write( - "const \(varName) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s));" - ) - return [varName] - } - ) case .void, .swiftProtocol, .namespaceEnum, .closure: // These types should not appear as struct fields return IntrinsicJSFragment( @@ -3818,8 +3684,8 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .array(let elementType): - return try! arrayLift(elementType: elementType) + default: + return try! stackLiftFragment(elementType: field.type) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift index efb6cd1b1..a0e6cbfeb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumAssociatedValue.swift @@ -55,3 +55,66 @@ enum APIOptionalResult { } @JS func roundTripOptionalAPIOptionalResult(result: APIOptionalResult?) -> APIOptionalResult? @JS func compareAPIResults(result1: APIOptionalResult?, result2: APIOptionalResult?) -> APIOptionalResult? + +@JS enum Precision: Float { + case rough = 0.1 + case fine = 0.001 +} + +@JS enum CardinalDirection { + case north + case south + case east + case west +} + +@JS +enum TypedPayloadResult { + case precision(Precision) + case direction(CardinalDirection) + case optPrecision(Precision?) + case optDirection(CardinalDirection?) + case empty +} + +@JS func roundTripTypedPayloadResult(_ result: TypedPayloadResult) -> TypedPayloadResult +@JS func roundTripOptionalTypedPayloadResult(_ result: TypedPayloadResult?) -> TypedPayloadResult? + +@JS struct Point { + var x: Double + var y: Double +} + +@JS class User { + var name: String + + init(name: String) { + self.name = name + } +} + +@JS +enum AllTypesResult { + case structPayload(Point) + case classPayload(User) + case jsObjectPayload(JSObject) + case nestedEnum(APIResult) + case arrayPayload([Int]) + case empty +} + +@JS func roundTripAllTypesResult(_ result: AllTypesResult) -> AllTypesResult +@JS func roundTripOptionalAllTypesResult(_ result: AllTypesResult?) -> AllTypesResult? + +@JS +enum OptionalAllTypesResult { + case optStruct(Point?) + case optClass(User?) + case optJSObject(JSObject?) + case optNestedEnum(APIResult?) + case optArray([Int]?) + case empty +} + +@JS func roundTripOptionalPayloadResult(_ result: OptionalAllTypesResult) -> OptionalAllTypesResult +@JS func roundTripOptionalPayloadResultOpt(_ result: OptionalAllTypesResult?) -> OptionalAllTypesResult? diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json index ba9ee9324..3c624fa12 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.json @@ -1,7 +1,16 @@ { "exported" : { "classes" : [ + { + "methods" : [ + + ], + "name" : "User", + "properties" : [ + ], + "swiftCallName" : "User" + } ], "enums" : [ { @@ -492,6 +501,346 @@ ], "swiftCallName" : "APIOptionalResult", "tsFullPath" : "APIOptionalResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "rough", + "rawValue" : "0.1" + }, + { + "associatedValues" : [ + + ], + "name" : "fine", + "rawValue" : "0.001" + } + ], + "emitStyle" : "const", + "name" : "Precision", + "rawType" : "Float", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Precision", + "tsFullPath" : "Precision" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" + }, + { + "associatedValues" : [ + + ], + "name" : "east" + }, + { + "associatedValues" : [ + + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "CardinalDirection", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "CardinalDirection", + "tsFullPath" : "CardinalDirection" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + ], + "name" : "precision" + }, + { + "associatedValues" : [ + { + "type" : { + "caseEnum" : { + "_0" : "CardinalDirection" + } + } + } + ], + "name" : "direction" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optPrecision" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "CardinalDirection" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optDirection" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "TypedPayloadResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TypedPayloadResult", + "tsFullPath" : "TypedPayloadResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "swiftStruct" : { + "_0" : "Point" + } + } + } + ], + "name" : "structPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "swiftHeapObject" : { + "_0" : "User" + } + } + } + ], + "name" : "classPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "jsObject" : { + + } + } + } + ], + "name" : "jsObjectPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "name" : "nestedEnum" + }, + { + "associatedValues" : [ + { + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "name" : "arrayPayload" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "AllTypesResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "AllTypesResult", + "tsFullPath" : "AllTypesResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "Point" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optStruct" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "User" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optClass" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optJSObject" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optNestedEnum" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optArray" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "OptionalAllTypesResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "OptionalAllTypesResult", + "tsFullPath" : "OptionalAllTypesResult" } ], "exposeToGlobal" : false, @@ -853,13 +1202,221 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_roundTripTypedPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripTypedPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTypedPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTypedPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + }, + "_1" : "null" + } + } + }, + { + "abiName" : "bjs_roundTripAllTypesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripAllTypesResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAllTypesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAllTypesResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + }, + "_1" : "null" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPayloadResultOpt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPayloadResultOpt", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + }, + "_1" : "null" + } + } } ], "protocols" : [ ], "structs" : [ + { + "methods" : [ + ], + "name" : "Point", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "double" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "double" : { + + } + } + } + ], + "swiftCallName" : "Point" + } ] }, "moduleName" : "TestModule" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 0854cba74..26454a2a7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -55,20 +55,20 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .flag(let param0): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .rate(let param0): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .precise(let param0): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .info: _swift_js_push_tag(Int32(5)) } @@ -145,24 +145,23 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .error(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .coordinates(let param0, let param1, let param2): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() @@ -172,6 +171,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .info: _swift_js_push_tag(Int32(5)) } @@ -224,17 +224,17 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) } } } @@ -278,12 +278,12 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) } } } @@ -358,14 +358,13 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() @@ -376,8 +375,8 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() @@ -393,10 +392,388 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + } + } +} + +extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { +} + +extension CardinalDirection: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> CardinalDirection { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> CardinalDirection { + return CardinalDirection(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .north + case 1: + self = .south + case 2: + self = .east + case 3: + self = .west + default: + return nil + } + } + + private var bridgeJSRawValue: Int32 { + switch self { + case .north: + return 0 + case .south: + return 1 + case .east: + return 2 + case .west: + return 3 + } + } +} + +extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { + switch caseId { + case 0: + return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) + case 1: + return .direction(CardinalDirection.bridgeJSLiftParameter(_swift_js_pop_i32())) + case 2: + return .optPrecision(Optional.bridgeJSLiftParameter()) + case 3: + return .optDirection(Optional.bridgeJSLiftParameter()) + case 4: + return .empty + default: + fatalError("Unknown TypedPayloadResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .precision(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(0) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(1) + case .optPrecision(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(2) + case .optDirection(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(3) + case .empty: + return Int32(4) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .precision(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) + case .optPrecision(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + case .optDirection(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(3)) + case .empty: + _swift_js_push_tag(Int32(4)) + } + } +} + +extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> AllTypesResult { + switch caseId { + case 0: + return .structPayload(Point.bridgeJSLiftParameter()) + case 1: + return .classPayload(User.bridgeJSLiftParameter()) + case 2: + return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) + case 3: + return .nestedEnum(APIResult.bridgeJSLiftParameter(_swift_js_pop_i32())) + case 4: + return .arrayPayload([Int].bridgeJSLiftParameter()) + case 5: + return .empty + default: + fatalError("Unknown AllTypesResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .structPayload(let param0): + param0.bridgeJSLowerReturn() + return Int32(0) + case .classPayload(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(1) + case .jsObjectPayload(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(2) + case .nestedEnum(let param0): + param0.bridgeJSLowerReturn() + return Int32(3) + case .arrayPayload(let param0): + param0.bridgeJSLowerReturn() + return Int32(4) + case .empty: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> AllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> AllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .structPayload(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(0)) + case .classPayload(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) + case .jsObjectPayload(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) + case .nestedEnum(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(3)) + case .arrayPayload(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(4)) + case .empty: + _swift_js_push_tag(Int32(5)) } } } +extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { + switch caseId { + case 0: + return .optStruct(Optional.bridgeJSLiftParameter()) + case 1: + return .optClass(Optional.bridgeJSLiftParameter()) + case 2: + return .optJSObject(Optional.bridgeJSLiftParameter()) + case 3: + return .optNestedEnum(Optional.bridgeJSLiftParameter()) + case 4: + return .optArray({ + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } + }()) + case 5: + return .empty + default: + fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(1) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(2) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(3) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(4) + case .empty: + return Int32(5) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(1)) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(3)) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(4)) + case .empty: + _swift_js_push_tag(Int32(5)) + } + } +} + +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Double.bridgeJSLiftParameter() + let x = Double.bridgeJSLiftParameter() + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 +#else +fileprivate func _bjs_struct_lift_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_handle") @_cdecl("bjs_handle") public func _bjs_handle(_ result: Int32) -> Void { @@ -527,4 +904,95 @@ public func _bjs_compareAPIResults(_ result1IsSome: Int32, _ result1CaseId: Int3 #else fatalError("Only available on WebAssembly") #endif -} \ No newline at end of file +} + +@_expose(wasm, "bjs_roundTripTypedPayloadResult") +@_cdecl("bjs_roundTripTypedPayloadResult") +public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalTypedPayloadResult") +@_cdecl("bjs_roundTripOptionalTypedPayloadResult") +public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripAllTypesResult") +@_cdecl("bjs_roundTripAllTypesResult") +public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalAllTypesResult") +@_cdecl("bjs_roundTripOptionalAllTypesResult") +public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalPayloadResult") +@_cdecl("bjs_roundTripOptionalPayloadResult") +public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalPayloadResultOpt") +@_cdecl("bjs_roundTripOptionalPayloadResultOpt") +public func _bjs_roundTripOptionalPayloadResultOpt(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_User_deinit") +@_cdecl("bjs_User_deinit") +public func _bjs_User_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension User: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_User_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_User_wrap") +fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 21178521d..3536b53cb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -400,11 +400,11 @@ extension Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index ed6cb98c0..3e5b40def 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -82,11 +82,11 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index ed6cb98c0..3e5b40def 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -82,11 +82,11 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index df6046693..94351dbdf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -730,20 +730,20 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .flag(let param0): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .rate(let param0): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .precise(let param0): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .info: _swift_js_push_tag(Int32(5)) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 491fc610e..4610d03ba 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -31,7 +31,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -98,7 +98,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -382,9 +382,9 @@ export async function createInstantiator(options, swift) { processPointArray: function bjs_processPointArray(points) { const arrayCleanups = []; for (const elem of points) { - const { cleanup: cleanup } = structHelpers.Point.lower(elem); + const { cleanup: structCleanup } = structHelpers.Point.lower(elem); arrayCleanups.push(() => { - if (cleanup) { cleanup(); } + if (structCleanup) { structCleanup(); } }); } tmpParamInts.push(points.length); @@ -446,9 +446,9 @@ export async function createInstantiator(options, swift) { findFirstPoint: function bjs_findFirstPoint(points, matching) { const arrayCleanups = []; for (const elem of points) { - const { cleanup: cleanup } = structHelpers.Point.lower(elem); + const { cleanup: structCleanup } = structHelpers.Point.lower(elem); arrayCleanups.push(() => { - if (cleanup) { cleanup(); } + if (structCleanup) { structCleanup(); } }); } tmpParamInts.push(points.length); @@ -610,8 +610,8 @@ export async function createInstantiator(options, swift) { for (const elem of points) { const isSome = elem != null ? 1 : 0; if (isSome) { - const { cleanup: cleanup } = structHelpers.Point.lower(elem); - arrayCleanups.push(() => { if (cleanup) { cleanup(); } }); + const { cleanup: structCleanup } = structHelpers.Point.lower(elem); + arrayCleanups.push(() => { if (structCleanup) { structCleanup(); } }); } else { } tmpParamInts.push(isSome); @@ -766,9 +766,9 @@ export async function createInstantiator(options, swift) { for (const elem of points) { const arrayCleanups1 = []; for (const elem1 of elem) { - const { cleanup: cleanup } = structHelpers.Point.lower(elem1); + const { cleanup: structCleanup } = structHelpers.Point.lower(elem1); arrayCleanups1.push(() => { - if (cleanup) { cleanup(); } + if (structCleanup) { structCleanup(); } }); } tmpParamInts.push(elem.length); @@ -805,7 +805,7 @@ export async function createInstantiator(options, swift) { const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const ptr = tmpRetPointers.pop(); - const obj = Item.__construct(ptr); + const obj = _exports['Item'].__construct(ptr); arrayResult.push(obj); } arrayResult.reverse(); @@ -833,7 +833,7 @@ export async function createInstantiator(options, swift) { const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const ptr = tmpRetPointers.pop(); - const obj = Item.__construct(ptr); + const obj = _exports['Item'].__construct(ptr); arrayResult1.push(obj); } arrayResult1.reverse(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index d5a195430..0aa9148c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index bc669993b..754c47b0a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -24,7 +24,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -123,7 +123,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts index 20962c388..9ab117011 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts @@ -43,6 +43,65 @@ export const APIOptionalResultValues: { export type APIOptionalResultTag = { tag: typeof APIOptionalResultValues.Tag.Success; param0: string | null } | { tag: typeof APIOptionalResultValues.Tag.Failure; param0: number | null; param1: boolean | null } | { tag: typeof APIOptionalResultValues.Tag.Status; param0: boolean | null; param1: number | null; param2: string | null } +export const PrecisionValues: { + readonly Rough: 0.1; + readonly Fine: 0.001; +}; +export type PrecisionTag = typeof PrecisionValues[keyof typeof PrecisionValues]; + +export const CardinalDirectionValues: { + readonly North: 0; + readonly South: 1; + readonly East: 2; + readonly West: 3; +}; +export type CardinalDirectionTag = typeof CardinalDirectionValues[keyof typeof CardinalDirectionValues]; + +export const TypedPayloadResultValues: { + readonly Tag: { + readonly Precision: 0; + readonly Direction: 1; + readonly OptPrecision: 2; + readonly OptDirection: 3; + readonly Empty: 4; + }; +}; + +export type TypedPayloadResultTag = + { tag: typeof TypedPayloadResultValues.Tag.Precision; param0: PrecisionTag } | { tag: typeof TypedPayloadResultValues.Tag.Direction; param0: CardinalDirectionTag } | { tag: typeof TypedPayloadResultValues.Tag.OptPrecision; param0: PrecisionTag | null } | { tag: typeof TypedPayloadResultValues.Tag.OptDirection; param0: CardinalDirectionTag | null } | { tag: typeof TypedPayloadResultValues.Tag.Empty } + +export const AllTypesResultValues: { + readonly Tag: { + readonly StructPayload: 0; + readonly ClassPayload: 1; + readonly JsObjectPayload: 2; + readonly NestedEnum: 3; + readonly ArrayPayload: 4; + readonly Empty: 5; + }; +}; + +export type AllTypesResultTag = + { tag: typeof AllTypesResultValues.Tag.StructPayload; param0: PointTag } | { tag: typeof AllTypesResultValues.Tag.ClassPayload; param0: User } | { tag: typeof AllTypesResultValues.Tag.JsObjectPayload; param0: any } | { tag: typeof AllTypesResultValues.Tag.NestedEnum; param0: APIResultTag } | { tag: typeof AllTypesResultValues.Tag.ArrayPayload; param0: number[] } | { tag: typeof AllTypesResultValues.Tag.Empty } + +export const OptionalAllTypesResultValues: { + readonly Tag: { + readonly OptStruct: 0; + readonly OptClass: 1; + readonly OptJSObject: 2; + readonly OptNestedEnum: 3; + readonly OptArray: 4; + readonly Empty: 5; + }; +}; + +export type OptionalAllTypesResultTag = + { tag: typeof OptionalAllTypesResultValues.Tag.OptStruct; param0: PointTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptClass; param0: User | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptJSObject; param0: any | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptNestedEnum; param0: APIResultTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptArray; param0: number[] | null } | { tag: typeof OptionalAllTypesResultValues.Tag.Empty } + +export interface Point { + x: number; + y: number; +} export type APIResultObject = typeof APIResultValues; export type ComplexResultObject = typeof ComplexResultValues; @@ -53,6 +112,16 @@ export type NetworkingResultObject = typeof API.NetworkingResultValues; export type APIOptionalResultObject = typeof APIOptionalResultValues; +export type PrecisionObject = typeof PrecisionValues; + +export type CardinalDirectionObject = typeof CardinalDirectionValues; + +export type TypedPayloadResultObject = typeof TypedPayloadResultValues; + +export type AllTypesResultObject = typeof AllTypesResultValues; + +export type OptionalAllTypesResultObject = typeof OptionalAllTypesResultValues; + export namespace API { const NetworkingResultValues: { readonly Tag: { @@ -74,7 +143,18 @@ export namespace Utilities { type ResultTag = { tag: typeof ResultValues.Tag.Success; param0: string } | { tag: typeof ResultValues.Tag.Failure; param0: string; param1: number } | { tag: typeof ResultValues.Tag.Status; param0: boolean; param1: number; param2: string } } +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface User extends SwiftHeapObject { +} export type Exports = { + User: { + } handle(result: APIResultTag): void; getResult(): APIResultTag; roundtripAPIResult(result: APIResultTag): APIResultTag; @@ -87,9 +167,20 @@ export type Exports = { roundTripOptionalNetworkingResult(result: API.NetworkingResultTag | null): API.NetworkingResultTag | null; roundTripOptionalAPIOptionalResult(result: APIOptionalResultTag | null): APIOptionalResultTag | null; compareAPIResults(result1: APIOptionalResultTag | null, result2: APIOptionalResultTag | null): APIOptionalResultTag | null; + roundTripTypedPayloadResult(result: TypedPayloadResultTag): TypedPayloadResultTag; + roundTripOptionalTypedPayloadResult(result: TypedPayloadResultTag | null): TypedPayloadResultTag | null; + roundTripAllTypesResult(result: AllTypesResultTag): AllTypesResultTag; + roundTripOptionalAllTypesResult(result: AllTypesResultTag | null): AllTypesResultTag | null; + roundTripOptionalPayloadResult(result: OptionalAllTypesResultTag): OptionalAllTypesResultTag; + roundTripOptionalPayloadResultOpt(result: OptionalAllTypesResultTag | null): OptionalAllTypesResultTag | null; APIResult: APIResultObject ComplexResult: ComplexResultObject APIOptionalResult: APIOptionalResultObject + Precision: PrecisionObject + CardinalDirection: CardinalDirectionObject + TypedPayloadResult: TypedPayloadResultObject + AllTypesResult: AllTypesResultObject + OptionalAllTypesResult: OptionalAllTypesResultObject API: { NetworkingResult: NetworkingResultObject }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 6eb4b3985..123ba56fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -14,78 +14,6 @@ export const APIResultValues = { Info: 5, }, }; - -const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: APIResultValues.Tag.Success, cleanup }; - } - case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; - } - case APIResultValues.Tag.Flag: { - tmpParamInts.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Flag, cleanup }; - } - case APIResultValues.Tag.Rate: { - tmpParamF32s.push(Math.fround(value.param0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Rate, cleanup }; - } - case APIResultValues.Tag.Precise: { - tmpParamF64s.push(value.param0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Precise, cleanup }; - } - case APIResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Info, cleanup }; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - case APIResultValues.Tag.Flag: { - const bool = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Flag, param0: bool }; - } - case APIResultValues.Tag.Rate: { - const f32 = tmpRetF32s.pop(); - return { tag: APIResultValues.Tag.Rate, param0: f32 }; - } - case APIResultValues.Tag.Precise: { - const f64 = tmpRetF64s.pop(); - return { tag: APIResultValues.Tag.Precise, param0: f64 }; - } - case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export const ComplexResultValues = { Tag: { Success: 0, @@ -96,127 +24,6 @@ export const ComplexResultValues = { Info: 5, }, }; - -const __bjs_createComplexResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ComplexResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ComplexResultValues.Tag.Success, cleanup }; - } - case ComplexResultValues.Tag.Error: { - tmpParamInts.push((value.param1 | 0)); - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ComplexResultValues.Tag.Error, cleanup }; - } - case ComplexResultValues.Tag.Status: { - const bytes = textEncoder.encode(value.param2); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.param1 | 0)); - tmpParamInts.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ComplexResultValues.Tag.Status, cleanup }; - } - case ComplexResultValues.Tag.Coordinates: { - tmpParamF64s.push(value.param2); - tmpParamF64s.push(value.param1); - tmpParamF64s.push(value.param0); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Coordinates, cleanup }; - } - case ComplexResultValues.Tag.Comprehensive: { - const bytes = textEncoder.encode(value.param8); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const bytes1 = textEncoder.encode(value.param7); - const id1 = swift.memory.retain(bytes1); - tmpParamInts.push(bytes1.length); - tmpParamInts.push(id1); - const bytes2 = textEncoder.encode(value.param6); - const id2 = swift.memory.retain(bytes2); - tmpParamInts.push(bytes2.length); - tmpParamInts.push(id2); - tmpParamF64s.push(value.param5); - tmpParamF64s.push(value.param4); - tmpParamInts.push((value.param3 | 0)); - tmpParamInts.push((value.param2 | 0)); - tmpParamInts.push(value.param1 ? 1 : 0); - tmpParamInts.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - swift.memory.release(id1); - swift.memory.release(id2); - }; - return { caseId: ComplexResultValues.Tag.Comprehensive, cleanup }; - } - case ComplexResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Info, cleanup }; - } - default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case ComplexResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: ComplexResultValues.Tag.Success, param0: string }; - } - case ComplexResultValues.Tag.Error: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); - return { tag: ComplexResultValues.Tag.Error, param0: string, param1: int }; - } - case ComplexResultValues.Tag.Status: { - const string = tmpRetStrings.pop(); - const int = tmpRetInts.pop(); - const bool = tmpRetInts.pop(); - return { tag: ComplexResultValues.Tag.Status, param0: bool, param1: int, param2: string }; - } - case ComplexResultValues.Tag.Coordinates: { - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); - const f642 = tmpRetF64s.pop(); - return { tag: ComplexResultValues.Tag.Coordinates, param0: f642, param1: f641, param2: f64 }; - } - case ComplexResultValues.Tag.Comprehensive: { - const string = tmpRetStrings.pop(); - const string1 = tmpRetStrings.pop(); - const string2 = tmpRetStrings.pop(); - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); - const int = tmpRetInts.pop(); - const int1 = tmpRetInts.pop(); - const bool = tmpRetInts.pop(); - const bool1 = tmpRetInts.pop(); - return { tag: ComplexResultValues.Tag.Comprehensive, param0: bool1, param1: bool, param2: int1, param3: int, param4: f641, param5: f64, param6: string2, param7: string1, param8: string }; - } - case ComplexResultValues.Tag.Info: return { tag: ComplexResultValues.Tag.Info }; - default: throw new Error("Unknown ComplexResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export const ResultValues = { Tag: { Success: 0, @@ -224,124 +31,12 @@ export const ResultValues = { Status: 2, }, }; - -const __bjs_createResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ResultValues.Tag.Success, cleanup }; - } - case ResultValues.Tag.Failure: { - tmpParamInts.push((value.param1 | 0)); - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ResultValues.Tag.Failure, cleanup }; - } - case ResultValues.Tag.Status: { - const bytes = textEncoder.encode(value.param2); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.param1 | 0)); - tmpParamInts.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ResultValues.Tag.Status, cleanup }; - } - default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case ResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: ResultValues.Tag.Success, param0: string }; - } - case ResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); - return { tag: ResultValues.Tag.Failure, param0: string, param1: int }; - } - case ResultValues.Tag.Status: { - const string = tmpRetStrings.pop(); - const int = tmpRetInts.pop(); - const bool = tmpRetInts.pop(); - return { tag: ResultValues.Tag.Status, param0: bool, param1: int, param2: string }; - } - default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export const NetworkingResultValues = { Tag: { Success: 0, Failure: 1, }, }; - -const __bjs_createNetworkingResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case NetworkingResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: NetworkingResultValues.Tag.Success, cleanup }; - } - case NetworkingResultValues.Tag.Failure: { - tmpParamInts.push((value.param1 | 0)); - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: NetworkingResultValues.Tag.Failure, cleanup }; - } - default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case NetworkingResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: NetworkingResultValues.Tag.Success, param0: string }; - } - case NetworkingResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); - return { tag: NetworkingResultValues.Tag.Failure, param0: string, param1: int }; - } - default: throw new Error("Unknown NetworkingResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export const APIOptionalResultValues = { Tag: { Success: 0, @@ -349,135 +44,46 @@ export const APIOptionalResultValues = { Status: 2, }, }; +export const PrecisionValues = { + Rough: 0.1, + Fine: 0.001, +}; -const __bjs_createAPIOptionalResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIOptionalResultValues.Tag.Success: { - const isSome = value.param0 != null; - let id; - if (isSome) { - let bytes = textEncoder.encode(value.param0); - id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - } else { - tmpParamInts.push(0); - tmpParamInts.push(0); - } - tmpParamInts.push(isSome ? 1 : 0); - const cleanup = () => { - if(id) { - swift.memory.release(id); - } - }; - return { caseId: APIOptionalResultValues.Tag.Success, cleanup }; - } - case APIOptionalResultValues.Tag.Failure: { - const isSome = value.param1 != null; - tmpParamInts.push(isSome ? (value.param1 ? 1 : 0) : 0); - tmpParamInts.push(isSome ? 1 : 0); - const isSome1 = value.param0 != null; - tmpParamInts.push(isSome1 ? (value.param0 | 0) : 0); - tmpParamInts.push(isSome1 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIOptionalResultValues.Tag.Failure, cleanup }; - } - case APIOptionalResultValues.Tag.Status: { - const isSome = value.param2 != null; - let id; - if (isSome) { - let bytes = textEncoder.encode(value.param2); - id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - } else { - tmpParamInts.push(0); - tmpParamInts.push(0); - } - tmpParamInts.push(isSome ? 1 : 0); - const isSome1 = value.param1 != null; - tmpParamInts.push(isSome1 ? (value.param1 | 0) : 0); - tmpParamInts.push(isSome1 ? 1 : 0); - const isSome2 = value.param0 != null; - tmpParamInts.push(isSome2 ? (value.param0 ? 1 : 0) : 0); - tmpParamInts.push(isSome2 ? 1 : 0); - const cleanup = () => { - if(id) { - swift.memory.release(id); - } - }; - return { caseId: APIOptionalResultValues.Tag.Status, cleanup }; - } - default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case APIOptionalResultValues.Tag.Success: { - const isSome = tmpRetInts.pop(); - let optional; - if (isSome) { - const string = tmpRetStrings.pop(); - optional = string; - } else { - optional = null; - } - return { tag: APIOptionalResultValues.Tag.Success, param0: optional }; - } - case APIOptionalResultValues.Tag.Failure: { - const isSome = tmpRetInts.pop(); - let optional; - if (isSome) { - const bool = tmpRetInts.pop(); - optional = bool; - } else { - optional = null; - } - const isSome1 = tmpRetInts.pop(); - let optional1; - if (isSome1) { - const int = tmpRetInts.pop(); - optional1 = int; - } else { - optional1 = null; - } - return { tag: APIOptionalResultValues.Tag.Failure, param0: optional1, param1: optional }; - } - case APIOptionalResultValues.Tag.Status: { - const isSome = tmpRetInts.pop(); - let optional; - if (isSome) { - const string = tmpRetStrings.pop(); - optional = string; - } else { - optional = null; - } - const isSome1 = tmpRetInts.pop(); - let optional1; - if (isSome1) { - const int = tmpRetInts.pop(); - optional1 = int; - } else { - optional1 = null; - } - const isSome2 = tmpRetInts.pop(); - let optional2; - if (isSome2) { - const bool = tmpRetInts.pop(); - optional2 = bool; - } else { - optional2 = null; - } - return { tag: APIOptionalResultValues.Tag.Status, param0: optional2, param1: optional1, param2: optional }; - } - default: throw new Error("Unknown APIOptionalResultValues tag returned from Swift: " + String(tag)); - } - } - }); +export const CardinalDirectionValues = { + North: 0, + South: 1, + East: 2, + West: 3, +}; + +export const TypedPayloadResultValues = { + Tag: { + Precision: 0, + Direction: 1, + OptPrecision: 2, + OptDirection: 3, + Empty: 4, + }, +}; +export const AllTypesResultValues = { + Tag: { + StructPayload: 0, + ClassPayload: 1, + JsObjectPayload: 2, + NestedEnum: 3, + ArrayPayload: 4, + Empty: 5, + }, +}; +export const OptionalAllTypesResultValues = { + Tag: { + OptStruct: 0, + OptClass: 1, + OptJSObject: 2, + OptNestedEnum: 3, + OptArray: 4, + Empty: 5, + }, }; export async function createInstantiator(options, swift) { let instance; @@ -493,7 +99,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -509,6 +115,771 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createPointHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + lower: (value) => { + tmpParamF64s.push(value.x); + tmpParamF64s.push(value.y); + return { cleanup: undefined }; + }, + lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + const f64 = tmpRetF64s.pop(); + const f641 = tmpRetF64s.pop(); + return { x: f641, y: f64 }; + } + }); + }; + const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + case APIResultValues.Tag.Flag: { + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Flag, cleanup }; + } + case APIResultValues.Tag.Rate: { + tmpParamF32s.push(Math.fround(value.param0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Rate, cleanup }; + } + case APIResultValues.Tag.Precise: { + tmpParamF64s.push(value.param0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Precise, cleanup }; + } + case APIResultValues.Tag.Info: { + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Info, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + case APIResultValues.Tag.Flag: { + const bool = tmpRetInts.pop() !== 0; + return { tag: APIResultValues.Tag.Flag, param0: bool }; + } + case APIResultValues.Tag.Rate: { + const f32 = tmpRetF32s.pop(); + return { tag: APIResultValues.Tag.Rate, param0: f32 }; + } + case APIResultValues.Tag.Precise: { + const f64 = tmpRetF64s.pop(); + return { tag: APIResultValues.Tag.Precise, param0: f64 }; + } + case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createComplexResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ComplexResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ComplexResultValues.Tag.Success, cleanup }; + } + case ComplexResultValues.Tag.Error: { + tmpParamInts.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ComplexResultValues.Tag.Error, cleanup }; + } + case ComplexResultValues.Tag.Status: { + const bytes = textEncoder.encode(value.param2); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + tmpParamInts.push((value.param1 | 0)); + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ComplexResultValues.Tag.Status, cleanup }; + } + case ComplexResultValues.Tag.Coordinates: { + tmpParamF64s.push(value.param2); + tmpParamF64s.push(value.param1); + tmpParamF64s.push(value.param0); + const cleanup = undefined; + return { caseId: ComplexResultValues.Tag.Coordinates, cleanup }; + } + case ComplexResultValues.Tag.Comprehensive: { + const bytes = textEncoder.encode(value.param8); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const bytes1 = textEncoder.encode(value.param7); + const id1 = swift.memory.retain(bytes1); + tmpParamInts.push(bytes1.length); + tmpParamInts.push(id1); + const bytes2 = textEncoder.encode(value.param6); + const id2 = swift.memory.retain(bytes2); + tmpParamInts.push(bytes2.length); + tmpParamInts.push(id2); + tmpParamF64s.push(value.param5); + tmpParamF64s.push(value.param4); + tmpParamInts.push((value.param3 | 0)); + tmpParamInts.push((value.param2 | 0)); + tmpParamInts.push(value.param1 ? 1 : 0); + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + swift.memory.release(id1); + swift.memory.release(id2); + }; + return { caseId: ComplexResultValues.Tag.Comprehensive, cleanup }; + } + case ComplexResultValues.Tag.Info: { + const cleanup = undefined; + return { caseId: ComplexResultValues.Tag.Info, cleanup }; + } + default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case ComplexResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: ComplexResultValues.Tag.Success, param0: string }; + } + case ComplexResultValues.Tag.Error: { + const int = tmpRetInts.pop(); + const string = tmpRetStrings.pop(); + return { tag: ComplexResultValues.Tag.Error, param0: string, param1: int }; + } + case ComplexResultValues.Tag.Status: { + const string = tmpRetStrings.pop(); + const int = tmpRetInts.pop(); + const bool = tmpRetInts.pop() !== 0; + return { tag: ComplexResultValues.Tag.Status, param0: bool, param1: int, param2: string }; + } + case ComplexResultValues.Tag.Coordinates: { + const f64 = tmpRetF64s.pop(); + const f641 = tmpRetF64s.pop(); + const f642 = tmpRetF64s.pop(); + return { tag: ComplexResultValues.Tag.Coordinates, param0: f642, param1: f641, param2: f64 }; + } + case ComplexResultValues.Tag.Comprehensive: { + const string = tmpRetStrings.pop(); + const string1 = tmpRetStrings.pop(); + const string2 = tmpRetStrings.pop(); + const f64 = tmpRetF64s.pop(); + const f641 = tmpRetF64s.pop(); + const int = tmpRetInts.pop(); + const int1 = tmpRetInts.pop(); + const bool = tmpRetInts.pop() !== 0; + const bool1 = tmpRetInts.pop() !== 0; + return { tag: ComplexResultValues.Tag.Comprehensive, param0: bool1, param1: bool, param2: int1, param3: int, param4: f641, param5: f64, param6: string2, param7: string1, param8: string }; + } + case ComplexResultValues.Tag.Info: return { tag: ComplexResultValues.Tag.Info }; + default: throw new Error("Unknown ComplexResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ResultValues.Tag.Success, cleanup }; + } + case ResultValues.Tag.Failure: { + tmpParamInts.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ResultValues.Tag.Failure, cleanup }; + } + case ResultValues.Tag.Status: { + const bytes = textEncoder.encode(value.param2); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + tmpParamInts.push((value.param1 | 0)); + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ResultValues.Tag.Status, cleanup }; + } + default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case ResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: ResultValues.Tag.Success, param0: string }; + } + case ResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + const string = tmpRetStrings.pop(); + return { tag: ResultValues.Tag.Failure, param0: string, param1: int }; + } + case ResultValues.Tag.Status: { + const string = tmpRetStrings.pop(); + const int = tmpRetInts.pop(); + const bool = tmpRetInts.pop() !== 0; + return { tag: ResultValues.Tag.Status, param0: bool, param1: int, param2: string }; + } + default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createNetworkingResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case NetworkingResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: NetworkingResultValues.Tag.Success, cleanup }; + } + case NetworkingResultValues.Tag.Failure: { + tmpParamInts.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: NetworkingResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case NetworkingResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: NetworkingResultValues.Tag.Success, param0: string }; + } + case NetworkingResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + const string = tmpRetStrings.pop(); + return { tag: NetworkingResultValues.Tag.Failure, param0: string, param1: int }; + } + default: throw new Error("Unknown NetworkingResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createAPIOptionalResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIOptionalResultValues.Tag.Success: { + const isSome = value.param0 != null; + let id; + if (isSome) { + let bytes = textEncoder.encode(value.param0); + id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + } else { + tmpParamInts.push(0); + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if(id) { + swift.memory.release(id); + } + }; + return { caseId: APIOptionalResultValues.Tag.Success, cleanup }; + } + case APIOptionalResultValues.Tag.Failure: { + const isSome = value.param1 != null; + tmpParamInts.push(isSome ? (value.param1 ? 1 : 0) : 0); + tmpParamInts.push(isSome ? 1 : 0); + const isSome1 = value.param0 != null; + tmpParamInts.push(isSome1 ? (value.param0 | 0) : 0); + tmpParamInts.push(isSome1 ? 1 : 0); + const cleanup = undefined; + return { caseId: APIOptionalResultValues.Tag.Failure, cleanup }; + } + case APIOptionalResultValues.Tag.Status: { + const isSome = value.param2 != null; + let id; + if (isSome) { + let bytes = textEncoder.encode(value.param2); + id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + } else { + tmpParamInts.push(0); + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const isSome1 = value.param1 != null; + tmpParamInts.push(isSome1 ? (value.param1 | 0) : 0); + tmpParamInts.push(isSome1 ? 1 : 0); + const isSome2 = value.param0 != null; + tmpParamInts.push(isSome2 ? (value.param0 ? 1 : 0) : 0); + tmpParamInts.push(isSome2 ? 1 : 0); + const cleanup = () => { + if(id) { + swift.memory.release(id); + } + }; + return { caseId: APIOptionalResultValues.Tag.Status, cleanup }; + } + default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case APIOptionalResultValues.Tag.Success: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const string = tmpRetStrings.pop(); + optional = string; + } else { + optional = null; + } + return { tag: APIOptionalResultValues.Tag.Success, param0: optional }; + } + case APIOptionalResultValues.Tag.Failure: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const bool = tmpRetInts.pop() !== 0; + optional = bool; + } else { + optional = null; + } + const isSome1 = tmpRetInts.pop(); + let optional1; + if (isSome1) { + const int = tmpRetInts.pop(); + optional1 = int; + } else { + optional1 = null; + } + return { tag: APIOptionalResultValues.Tag.Failure, param0: optional1, param1: optional }; + } + case APIOptionalResultValues.Tag.Status: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const string = tmpRetStrings.pop(); + optional = string; + } else { + optional = null; + } + const isSome1 = tmpRetInts.pop(); + let optional1; + if (isSome1) { + const int = tmpRetInts.pop(); + optional1 = int; + } else { + optional1 = null; + } + const isSome2 = tmpRetInts.pop(); + let optional2; + if (isSome2) { + const bool = tmpRetInts.pop() !== 0; + optional2 = bool; + } else { + optional2 = null; + } + return { tag: APIOptionalResultValues.Tag.Status, param0: optional2, param1: optional1, param2: optional }; + } + default: throw new Error("Unknown APIOptionalResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createTypedPayloadResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case TypedPayloadResultValues.Tag.Precision: { + tmpParamF32s.push(Math.fround(value.param0)); + const cleanup = undefined; + return { caseId: TypedPayloadResultValues.Tag.Precision, cleanup }; + } + case TypedPayloadResultValues.Tag.Direction: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: TypedPayloadResultValues.Tag.Direction, cleanup }; + } + case TypedPayloadResultValues.Tag.OptPrecision: { + const isSome = value.param0 != null; + tmpParamF32s.push(isSome ? Math.fround(value.param0) : 0.0); + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = undefined; + return { caseId: TypedPayloadResultValues.Tag.OptPrecision, cleanup }; + } + case TypedPayloadResultValues.Tag.OptDirection: { + const isSome = value.param0 != null; + tmpParamInts.push(isSome ? (value.param0 | 0) : 0); + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = undefined; + return { caseId: TypedPayloadResultValues.Tag.OptDirection, cleanup }; + } + case TypedPayloadResultValues.Tag.Empty: { + const cleanup = undefined; + return { caseId: TypedPayloadResultValues.Tag.Empty, cleanup }; + } + default: throw new Error("Unknown TypedPayloadResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case TypedPayloadResultValues.Tag.Precision: { + const rawValue = tmpRetF32s.pop(); + return { tag: TypedPayloadResultValues.Tag.Precision, param0: rawValue }; + } + case TypedPayloadResultValues.Tag.Direction: { + const caseId = tmpRetInts.pop(); + return { tag: TypedPayloadResultValues.Tag.Direction, param0: caseId }; + } + case TypedPayloadResultValues.Tag.OptPrecision: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const rawValue = tmpRetF32s.pop(); + optional = rawValue; + } else { + optional = null; + } + return { tag: TypedPayloadResultValues.Tag.OptPrecision, param0: optional }; + } + case TypedPayloadResultValues.Tag.OptDirection: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const caseId = tmpRetInts.pop(); + optional = caseId; + } else { + optional = null; + } + return { tag: TypedPayloadResultValues.Tag.OptDirection, param0: optional }; + } + case TypedPayloadResultValues.Tag.Empty: return { tag: TypedPayloadResultValues.Tag.Empty }; + default: throw new Error("Unknown TypedPayloadResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createAllTypesResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case AllTypesResultValues.Tag.StructPayload: { + const { cleanup: structCleanup } = structHelpers.Point.lower(value.param0); + const cleanup = () => { + if (structCleanup) { structCleanup(); } + }; + return { caseId: AllTypesResultValues.Tag.StructPayload, cleanup }; + } + case AllTypesResultValues.Tag.ClassPayload: { + tmpParamPointers.push(value.param0.pointer); + const cleanup = undefined; + return { caseId: AllTypesResultValues.Tag.ClassPayload, cleanup }; + } + case AllTypesResultValues.Tag.JsObjectPayload: { + const objId = swift.memory.retain(value.param0); + tmpParamInts.push(objId); + const cleanup = undefined; + return { caseId: AllTypesResultValues.Tag.JsObjectPayload, cleanup }; + } + case AllTypesResultValues.Tag.NestedEnum: { + const { caseId: caseId, cleanup: enumCleanup } = enumHelpers.APIResult.lower(value.param0); + tmpParamInts.push(caseId); + const cleanup = () => { + if (enumCleanup) { enumCleanup(); } + }; + return { caseId: AllTypesResultValues.Tag.NestedEnum, cleanup }; + } + case AllTypesResultValues.Tag.ArrayPayload: { + const arrayCleanups = []; + for (const elem of value.param0) { + tmpParamInts.push((elem | 0)); + } + tmpParamInts.push(value.param0.length); + const cleanup = () => { + for (const cleanup of arrayCleanups) { cleanup(); } + }; + return { caseId: AllTypesResultValues.Tag.ArrayPayload, cleanup }; + } + case AllTypesResultValues.Tag.Empty: { + const cleanup = undefined; + return { caseId: AllTypesResultValues.Tag.Empty, cleanup }; + } + default: throw new Error("Unknown AllTypesResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case AllTypesResultValues.Tag.StructPayload: { + const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct }; + } + case AllTypesResultValues.Tag.ClassPayload: { + const ptr = tmpRetPointers.pop(); + const obj = _exports['User'].__construct(ptr); + return { tag: AllTypesResultValues.Tag.ClassPayload, param0: obj }; + } + case AllTypesResultValues.Tag.JsObjectPayload: { + const objId = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; + } + case AllTypesResultValues.Tag.NestedEnum: { + const enumValue = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; + } + case AllTypesResultValues.Tag.ArrayPayload: { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + return { tag: AllTypesResultValues.Tag.ArrayPayload, param0: arrayResult }; + } + case AllTypesResultValues.Tag.Empty: return { tag: AllTypesResultValues.Tag.Empty }; + default: throw new Error("Unknown AllTypesResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; + const __bjs_createOptionalAllTypesResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case OptionalAllTypesResultValues.Tag.OptStruct: { + const isSome = value.param0 != null; + let nestedCleanup; + if (isSome) { + const structResult = structHelpers.Point.lower(value.param0); + nestedCleanup = structResult.cleanup; + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if (nestedCleanup) { nestedCleanup(); } + }; + return { caseId: OptionalAllTypesResultValues.Tag.OptStruct, cleanup }; + } + case OptionalAllTypesResultValues.Tag.OptClass: { + const isSome = value.param0 != null; + if (isSome) { + tmpParamPointers.push(value.param0.pointer); + } else { + tmpParamPointers.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = undefined; + return { caseId: OptionalAllTypesResultValues.Tag.OptClass, cleanup }; + } + case OptionalAllTypesResultValues.Tag.OptJSObject: { + const isSome = value.param0 != null; + let id; + if (isSome) { + id = swift.memory.retain(value.param0); + tmpParamInts.push(id); + } else { + id = undefined; + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = undefined; + return { caseId: OptionalAllTypesResultValues.Tag.OptJSObject, cleanup }; + } + case OptionalAllTypesResultValues.Tag.OptNestedEnum: { + const isSome = value.param0 != null; + let enumCaseId, enumCleanup; + if (isSome) { + const enumResult = enumHelpers.APIResult.lower(value.param0); + enumCaseId = enumResult.caseId; + enumCleanup = enumResult.cleanup; + tmpParamInts.push(enumCaseId); + } else { + tmpParamInts.push(0); + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if (enumCleanup) { enumCleanup(); } + }; + return { caseId: OptionalAllTypesResultValues.Tag.OptNestedEnum, cleanup }; + } + case OptionalAllTypesResultValues.Tag.OptArray: { + const isSome = value.param0 != null; + let arrCleanup; + if (isSome) { + const arrayCleanups = []; + for (const elem of value.param0) { + tmpParamInts.push((elem | 0)); + } + tmpParamInts.push(value.param0.length); + arrCleanup = () => { + for (const cleanup of arrayCleanups) { cleanup(); } + }; + } + tmpParamInts.push(isSome ? 1 : 0); + const cleanup = () => { + if (arrCleanup) { arrCleanup(); } + }; + return { caseId: OptionalAllTypesResultValues.Tag.OptArray, cleanup }; + } + case OptionalAllTypesResultValues.Tag.Empty: { + const cleanup = undefined; + return { caseId: OptionalAllTypesResultValues.Tag.Empty, cleanup }; + } + default: throw new Error("Unknown OptionalAllTypesResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case OptionalAllTypesResultValues.Tag.OptStruct: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optional = struct; + } else { + optional = null; + } + return { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptClass: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const ptr = tmpRetPointers.pop(); + const obj = _exports['User'].__construct(ptr); + optional = obj; + } else { + optional = null; + } + return { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptJSObject: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const objId = tmpRetInts.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + optional = obj; + } else { + optional = null; + } + return { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptNestedEnum: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const caseId = tmpRetInts.pop(); + optional = enumHelpers.APIResult.lift(caseId, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } else { + optional = null; + } + return { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptArray: { + const isSome = tmpRetInts.pop(); + let optional; + if (isSome) { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + optional = arrayResult; + } else { + optional = null; + } + return { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.Empty: return { tag: OptionalAllTypesResultValues.Tag.Empty }; + default: throw new Error("Unknown OptionalAllTypesResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; return { /** @@ -545,7 +916,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -586,6 +957,17 @@ export async function createInstantiator(options, swift) { tmpStructCleanups.pop(); } } + bjs["swift_js_struct_lower_Point"] = function(objectId) { + const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); + if (cleanup) { + return tmpStructCleanups.push(cleanup); + } + return 0; + } + bjs["swift_js_struct_lift_Point"] = function() { + const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + return swift.memory.retain(value); + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -676,34 +1058,80 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_User_wrap"] = function(pointer) { + const obj = User.__construct(pointer); + return swift.memory.retain(obj); + }; }, setInstance: (i) => { instance = i; memory = instance.exports.memory; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class User extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_User_deinit, User.prototype); + } + + } + const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + structHelpers.Point = PointHelpers; + + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); enumHelpers.APIResult = APIResultHelpers; - const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); enumHelpers.ComplexResult = ComplexResultHelpers; - const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); enumHelpers.Result = ResultHelpers; - const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); enumHelpers.NetworkingResult = NetworkingResultHelpers; - const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); + const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); enumHelpers.APIOptionalResult = APIOptionalResultHelpers; - setException = (error) => { - instance.exports._swift_js_exception.value = swift.memory.retain(error) - } - }, - /** @param {WebAssembly.Instance} instance */ - createExports: (instance) => { - const js = swift.memory.heap; + const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.TypedPayloadResult = TypedPayloadResultHelpers; + + const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.AllTypesResult = AllTypesResultHelpers; + + const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.OptionalAllTypesResult = OptionalAllTypesResultHelpers; + const exports = { + User, handle: function bjs_handle(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_handle(resultCaseId); @@ -711,13 +1139,13 @@ export async function createInstantiator(options, swift) { }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); - const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -730,12 +1158,13 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIResult(+isSome, isSome ? resultCaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -747,13 +1176,13 @@ export async function createInstantiator(options, swift) { }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -766,12 +1195,13 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalComplexResult(+isSome, isSome ? resultCaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.ComplexResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.ComplexResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -785,12 +1215,13 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, isSome ? resultCaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.Result.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.Result.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -804,12 +1235,13 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, isSome ? resultCaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.NetworkingResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.NetworkingResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -823,12 +1255,13 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, isSome ? resultCaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIOptionalResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -849,20 +1282,107 @@ export async function createInstantiator(options, swift) { result2Cleanup = enumResult1.cleanup; } instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); - const isNull = (tmpRetTag === -1); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); let optResult; if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + optResult = enumHelpers.APIOptionalResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } if (result1Cleanup) { result1Cleanup(); } if (result2Cleanup) { result2Cleanup(); } return optResult; }, + roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { + const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.TypedPayloadResult.lower(result); + instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId); + const ret = enumHelpers.TypedPayloadResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (resultCleanup) { resultCleanup(); } + return ret; + }, + roundTripOptionalTypedPayloadResult: function bjs_roundTripOptionalTypedPayloadResult(result) { + const isSome = result != null; + let resultCaseId, resultCleanup; + if (isSome) { + const enumResult = enumHelpers.TypedPayloadResult.lower(result); + resultCaseId = enumResult.caseId; + resultCleanup = enumResult.cleanup; + } + instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, isSome ? resultCaseId : 0); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); + let optResult; + if (isNull) { + optResult = null; + } else { + optResult = enumHelpers.TypedPayloadResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } + if (resultCleanup) { resultCleanup(); } + return optResult; + }, + roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { + const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.AllTypesResult.lower(result); + instance.exports.bjs_roundTripAllTypesResult(resultCaseId); + const ret = enumHelpers.AllTypesResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (resultCleanup) { resultCleanup(); } + return ret; + }, + roundTripOptionalAllTypesResult: function bjs_roundTripOptionalAllTypesResult(result) { + const isSome = result != null; + let resultCaseId, resultCleanup; + if (isSome) { + const enumResult = enumHelpers.AllTypesResult.lower(result); + resultCaseId = enumResult.caseId; + resultCleanup = enumResult.cleanup; + } + instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, isSome ? resultCaseId : 0); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); + let optResult; + if (isNull) { + optResult = null; + } else { + optResult = enumHelpers.AllTypesResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } + if (resultCleanup) { resultCleanup(); } + return optResult; + }, + roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { + const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.OptionalAllTypesResult.lower(result); + instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId); + const ret = enumHelpers.OptionalAllTypesResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + if (resultCleanup) { resultCleanup(); } + return ret; + }, + roundTripOptionalPayloadResultOpt: function bjs_roundTripOptionalPayloadResultOpt(result) { + const isSome = result != null; + let resultCaseId, resultCleanup; + if (isSome) { + const enumResult = enumHelpers.OptionalAllTypesResult.lower(result); + resultCaseId = enumResult.caseId; + resultCleanup = enumResult.cleanup; + } + instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, isSome ? resultCaseId : 0); + const tag = tmpRetTag.pop(); + const isNull = (tag === -1); + let optResult; + if (isNull) { + optResult = null; + } else { + optResult = enumHelpers.OptionalAllTypesResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + } + if (resultCleanup) { resultCleanup(); } + return optResult; + }, APIResult: APIResultValues, ComplexResult: ComplexResultValues, APIOptionalResult: APIOptionalResultValues, + Precision: PrecisionValues, + CardinalDirection: CardinalDirectionValues, + TypedPayloadResult: TypedPayloadResultValues, + AllTypesResult: AllTypesResultValues, + OptionalAllTypesResult: OptionalAllTypesResultValues, API: { NetworkingResult: NetworkingResultValues, }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 874b4c4c0..9ca596a6e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -42,7 +42,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -94,7 +94,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 78f08ffb5..a7a2c4b98 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -62,7 +62,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -114,7 +114,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index cddeac767..b195b6945 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -43,7 +43,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -95,7 +95,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 315b74262..c906f27ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -93,7 +93,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -146,7 +146,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index b5053b266..ac6170b08 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index 0d9eb79c3..dc2220715 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 11aa2b3d8..efcbbe2d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -135,7 +135,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 6a11003b3..d64ff7e96 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index b60a698b4..096e3a345 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index 214a32294..cacaa87a3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index f272b0ff0..2bd696c3d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -160,7 +160,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index e1345f94b..4ac3b11b7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 0703be789..9eb55f30b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 0cc377f4c..e81a95669 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 630651aea..c8d0b935e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index b3073da70..bb2c93649 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 27e9c3c6b..341fcd966 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index 98f50e850..2d754a5c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index e68e4e6a2..f348869b2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 7bf565105..7be6cd924 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index ce9065ac4..7c20130b3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -22,46 +22,6 @@ export const ResultValues = { Failure: 1, }, }; - -const __bjs_createResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: ResultValues.Tag.Success, cleanup }; - } - case ResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Failure, cleanup }; - } - default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case ResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: ResultValues.Tag.Success, param0: string }; - } - case ResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - return { tag: ResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export const PriorityValues = { Low: -1, Medium: 0, @@ -82,7 +42,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -98,6 +58,45 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: ResultValues.Tag.Success, cleanup }; + } + case ResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: ResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case ResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: ResultValues.Tag.Success, param0: string }; + } + case ResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: ResultValues.Tag.Failure, param0: int }; + } + default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; return { /** @@ -134,7 +133,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -376,7 +375,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { try { - const enumValue = enumHelpers.Result.lift(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const enumValue = enumHelpers.Result.lift(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); swift.memory.getObject(self).result = enumValue; } catch (error) { setException(error); @@ -400,7 +399,7 @@ export async function createInstantiator(options, swift) { try { let enumValue; if (valueIsSome) { - enumValue = enumHelpers.Result.lift(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + enumValue = enumHelpers.Result.lift(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; } catch (error) { @@ -557,7 +556,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_handleResult"] = function bjs_MyViewControllerDelegate_handleResult(self, result) { try { - const enumValue = enumHelpers.Result.lift(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const enumValue = enumHelpers.Result.lift(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); swift.memory.getObject(self).handleResult(enumValue); } catch (error) { setException(error); @@ -577,9 +576,6 @@ export async function createInstantiator(options, swift) { instance = i; memory = instance.exports.memory; - const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); - enumHelpers.Result = ResultHelpers; - setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -727,6 +723,9 @@ export async function createInstantiator(options, swift) { for (const cleanup of arrayCleanups) { cleanup(); } } } + const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.Result = ResultHelpers; + const exports = { Helper, MyViewController, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index b79c6ebf4..391c7167e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -15,46 +15,6 @@ export const APIResultValues = { Failure: 1, }, }; - -const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: APIResultValues.Tag.Success, cleanup }; - } - case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export async function createInstantiator(options, swift) { let instance; let memory; @@ -69,7 +29,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -85,6 +45,45 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; return { /** @@ -121,7 +120,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -265,9 +264,6 @@ export async function createInstantiator(options, swift) { instance = i; memory = instance.exports.memory; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); - enumHelpers.APIResult = APIResultHelpers; - setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -316,6 +312,9 @@ export async function createInstantiator(options, swift) { return ret; } } + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.APIResult = APIResultHelpers; + if (typeof globalThis.Utils === 'undefined') { globalThis.Utils = {}; } @@ -336,7 +335,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 2f240c428..b38668c57 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -15,46 +15,6 @@ export const APIResultValues = { Failure: 1, }, }; - -const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: APIResultValues.Tag.Success, cleanup }; - } - case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export async function createInstantiator(options, swift) { let instance; let memory; @@ -69,7 +29,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -85,6 +45,45 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; return { /** @@ -121,7 +120,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -265,9 +264,6 @@ export async function createInstantiator(options, swift) { instance = i; memory = instance.exports.memory; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); - enumHelpers.APIResult = APIResultHelpers; - setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -316,6 +312,9 @@ export async function createInstantiator(options, swift) { return ret; } } + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.APIResult = APIResultHelpers; + const exports = { MathUtils, Calculator: { @@ -330,7 +329,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 15edf8c60..293ae4f7d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -23,7 +23,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -75,7 +75,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index d90e96f0e..27e3df464 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -23,7 +23,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -75,7 +75,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index fc67c0027..e57c5153d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 50edf3b06..74d140236 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index f3d5cafcb..27398d2a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 59512a7eb..ff5af72f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -34,78 +34,6 @@ export const APIResultValues = { Info: 5, }, }; - -const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift) => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - const cleanup = () => { - swift.memory.release(id); - }; - return { caseId: APIResultValues.Tag.Success, cleanup }; - } - case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; - } - case APIResultValues.Tag.Flag: { - tmpParamInts.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Flag, cleanup }; - } - case APIResultValues.Tag.Rate: { - tmpParamF32s.push(Math.fround(value.param0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Rate, cleanup }; - } - case APIResultValues.Tag.Precise: { - tmpParamF64s.push(value.param0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Precise, cleanup }; - } - case APIResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Info, cleanup }; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); - } - }, - lift: (tmpRetTag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s) => { - const tag = tmpRetTag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - case APIResultValues.Tag.Flag: { - const bool = tmpRetInts.pop(); - return { tag: APIResultValues.Tag.Flag, param0: bool }; - } - case APIResultValues.Tag.Rate: { - const f32 = tmpRetF32s.pop(); - return { tag: APIResultValues.Tag.Rate, param0: f32 }; - } - case APIResultValues.Tag.Precise: { - const f64 = tmpRetF64s.pop(); - return { tag: APIResultValues.Tag.Precise, param0: f64 }; - } - case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); - } - } - }); -}; export async function createInstantiator(options, swift) { let instance; let memory; @@ -120,7 +48,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -136,6 +64,77 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const __bjs_createAPIResultValuesHelpers = () => { + return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + const cleanup = () => { + swift.memory.release(id); + }; + return { caseId: APIResultValues.Tag.Success, cleanup }; + } + case APIResultValues.Tag.Failure: { + tmpParamInts.push((value.param0 | 0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Failure, cleanup }; + } + case APIResultValues.Tag.Flag: { + tmpParamInts.push(value.param0 ? 1 : 0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Flag, cleanup }; + } + case APIResultValues.Tag.Rate: { + tmpParamF32s.push(Math.fround(value.param0)); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Rate, cleanup }; + } + case APIResultValues.Tag.Precise: { + tmpParamF64s.push(value.param0); + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Precise, cleanup }; + } + case APIResultValues.Tag.Info: { + const cleanup = undefined; + return { caseId: APIResultValues.Tag.Info, cleanup }; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = tmpRetStrings.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = tmpRetInts.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + case APIResultValues.Tag.Flag: { + const bool = tmpRetInts.pop() !== 0; + return { tag: APIResultValues.Tag.Flag, param0: bool }; + } + case APIResultValues.Tag.Rate: { + const f32 = tmpRetF32s.pop(); + return { tag: APIResultValues.Tag.Rate, param0: f32 }; + } + case APIResultValues.Tag.Precise: { + const f64 = tmpRetF64s.pop(); + return { tag: APIResultValues.Tag.Precise, param0: f64 }; + } + case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); + }; return { /** @@ -172,7 +171,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); @@ -423,7 +422,7 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.lift(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + let param0 = enumHelpers.APIResult.lift(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -685,7 +684,7 @@ export async function createInstantiator(options, swift) { const callback = swift.memory.getObject(callbackId); let param0; if (param0IsSome) { - param0 = enumHelpers.APIResult.lift(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s); + param0 = enumHelpers.APIResult.lift(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); } else { param0 = null; } @@ -776,9 +775,6 @@ export async function createInstantiator(options, swift) { instance = i; memory = instance.exports.memory; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, textEncoder, swift); - enumHelpers.APIResult = APIResultHelpers; - setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) } @@ -930,6 +926,9 @@ export async function createInstantiator(options, swift) { return bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"](ret); } } + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + enumHelpers.APIResult = APIResultHelpers; + const exports = { Person, TestProcessor, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 145eeb756..52e12ef7c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index f389900dc..adbe18856 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -23,7 +23,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -183,9 +183,9 @@ export async function createInstantiator(options, swift) { }, lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { const ptr = tmpRetPointers.pop(); - const value = _exports['Greeter'].__construct(ptr); + const obj = _exports['Greeter'].__construct(ptr); const int = tmpRetInts.pop(); - return { id: int, owner: value }; + return { id: int, owner: obj }; } }); }; @@ -207,14 +207,14 @@ export async function createInstantiator(options, swift) { const isSome = tmpRetInts.pop(); let optional; if (isSome) { - const value = tmpRetF32s.pop(); - optional = value; + const rawValue = tmpRetF32s.pop(); + optional = rawValue; } else { optional = null; } - const value1 = tmpRetF32s.pop(); + const rawValue1 = tmpRetF32s.pop(); const f64 = tmpRetF64s.pop(); - return { value: f64, precision: value1, optionalPrecision: optional }; + return { value: f64, precision: rawValue1, optionalPrecision: optional }; } }); }; @@ -328,7 +328,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index afed321ce..8f90491df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -85,7 +85,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 8a1c49647..2e2f8bf6a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 61f6c6cf3..bbeeffa0d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -90,7 +90,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 053c55672..45374093b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -18,7 +18,7 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag; + let tmpRetTag = []; let tmpRetStrings = []; let tmpRetInts = []; let tmpRetF32s = []; @@ -71,7 +71,7 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag = tag; + tmpRetTag.push(tag); } bjs["swift_js_push_i32"] = function(v) { tmpRetInts.push(v | 0); diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md index 3dda2b9c5..6fb3afeda 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md @@ -509,8 +509,9 @@ This differs from classes, which use reference semantics and share state across | Static functions | ✅ | | Static properties | ✅ | | Associated values: `String`, `Int`, `Bool`, `Float`, `Double` | ✅ | -| Associated values: Custom classes/structs | ❌ | -| Associated values: Other enums | ❌ | -| Associated values: Arrays/Collections | ❌ | -| Associated values: Optionals | ❌ | +| Associated values: Custom classes/structs | ✅ | +| Associated values: Other enums (case, raw value, and associated value) | ✅ | +| Associated values: `JSObject` | ✅ | +| Associated values: Arrays | ✅ | +| Associated values: Optionals of all supported types | ✅ | | Generics | ❌ | diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 345f5dbcf..fe73ea6fb 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -586,6 +586,22 @@ typealias OptionalAge = Int? return value } +@JS enum TypedPayloadResult { + case precision(Precision) + case direction(Direction) + case optPrecision(Precision?) + case optDirection(Direction?) + case empty +} + +@JS func roundTripTypedPayloadResult(_ result: TypedPayloadResult) -> TypedPayloadResult { + return result +} + +@JS func roundTripOptionalTypedPayloadResult(_ result: TypedPayloadResult?) -> TypedPayloadResult? { + return result +} + @JS func compareAPIResults(_ r1: APIResult?, _ r2: APIResult?) -> String { let r1Str: String switch r1 { @@ -616,6 +632,44 @@ typealias OptionalAge = Int? return result } +@JS +enum AllTypesResult { + case structPayload(Address) + case classPayload(Greeter) + case jsObjectPayload(JSObject) + case nestedEnum(APIResult) + case arrayPayload([Int]) + case jsClassPayload(Foo) + case empty +} + +@JS func roundTripAllTypesResult(_ result: AllTypesResult) -> AllTypesResult { + return result +} + +@JS func roundTripOptionalAllTypesResult(_ result: AllTypesResult?) -> AllTypesResult? { + return result +} + +@JS +enum OptionalAllTypesResult { + case optStruct(Address?) + case optClass(Greeter?) + case optJSObject(JSObject?) + case optNestedEnum(APIResult?) + case optArray([Int]?) + case optJsClass(Foo?) + case empty +} + +@JS func roundTripOptionalPayloadResult(_ result: OptionalAllTypesResult) -> OptionalAllTypesResult { + return result +} + +@JS func roundTripOptionalPayloadResultOpt(_ result: OptionalAllTypesResult?) -> OptionalAllTypesResult? { + return result +} + @JS func roundTripOptionalClass(value: Greeter?) -> Greeter? { return value } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index ee9f97508..0e06c7edc 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1561,20 +1561,20 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .flag(let param0): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .rate(let param0): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .precise(let param0): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .info: _swift_js_push_tag(Int32(5)) } @@ -1658,29 +1658,28 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .error(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .location(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(3)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(3)) case .coordinates(let param0, let param1, let param2): - _swift_js_push_tag(Int32(4)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(4)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - _swift_js_push_tag(Int32(5)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() @@ -1690,6 +1689,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(5)) case .info: _swift_js_push_tag(Int32(6)) } @@ -1742,17 +1742,17 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) } } } @@ -1796,12 +1796,324 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) + } + } +} + +extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { + switch caseId { + case 0: + return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) + case 1: + return .direction(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) + case 2: + return .optPrecision(Optional.bridgeJSLiftParameter()) + case 3: + return .optDirection(Optional.bridgeJSLiftParameter()) + case 4: + return .empty + default: + fatalError("Unknown TypedPayloadResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .precision(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(0) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(1) + case .optPrecision(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(2) + case .optDirection(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(3) + case .empty: + return Int32(4) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .precision(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(0)) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) + case .optPrecision(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + case .optDirection(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(3)) + case .empty: + _swift_js_push_tag(Int32(4)) + } + } +} + +extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> AllTypesResult { + switch caseId { + case 0: + return .structPayload(Address.bridgeJSLiftParameter()) + case 1: + return .classPayload(Greeter.bridgeJSLiftParameter()) + case 2: + return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) + case 3: + return .nestedEnum(APIResult.bridgeJSLiftParameter(_swift_js_pop_i32())) + case 4: + return .arrayPayload([Int].bridgeJSLiftParameter()) + case 5: + return .jsClassPayload(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) + case 6: + return .empty + default: + fatalError("Unknown AllTypesResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .structPayload(let param0): + param0.bridgeJSLowerReturn() + return Int32(0) + case .classPayload(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(1) + case .jsObjectPayload(let param0): + param0.bridgeJSLowerStackReturn() + return Int32(2) + case .nestedEnum(let param0): + param0.bridgeJSLowerReturn() + return Int32(3) + case .arrayPayload(let param0): + param0.bridgeJSLowerReturn() + return Int32(4) + case .jsClassPayload(let param0): + param0.jsObject.bridgeJSLowerStackReturn() + return Int32(5) + case .empty: + return Int32(6) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> AllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> AllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .structPayload(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(0)) + case .classPayload(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(1)) + case .jsObjectPayload(let param0): + param0.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(2)) + case .nestedEnum(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(3)) + case .arrayPayload(let param0): + param0.bridgeJSLowerReturn() + _swift_js_push_tag(Int32(4)) + case .jsClassPayload(let param0): + param0.jsObject.bridgeJSLowerStackReturn() + _swift_js_push_tag(Int32(5)) + case .empty: + _swift_js_push_tag(Int32(6)) + } + } +} + +extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { + switch caseId { + case 0: + return .optStruct(Optional
        .bridgeJSLiftParameter()) + case 1: + return .optClass(Optional.bridgeJSLiftParameter()) + case 2: + return .optJSObject(Optional.bridgeJSLiftParameter()) + case 3: + return .optNestedEnum(Optional.bridgeJSLiftParameter()) + case 4: + return .optArray({ + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } + }()) + case 5: + return .optJsClass(Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + }) + case 6: + return .empty + default: + fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(1) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(2) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(3) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(4) + case .optJsClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(5) + case .empty: + return Int32(6) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(1)) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(3)) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(4)) + case .optJsClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(5)) + case .empty: + _swift_js_push_tag(Int32(6)) } } } @@ -1876,14 +2188,13 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .success(let param0): - _swift_js_push_tag(Int32(0)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): - _swift_js_push_tag(Int32(1)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() @@ -1894,8 +2205,8 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): - _swift_js_push_tag(Int32(2)) let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() @@ -1911,6 +2222,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_tag(Int32(2)) } } } @@ -4451,6 +4763,28 @@ public func _bjs_roundTripOptionalAPIResult(_ valueIsSome: Int32, _ valueCaseId: #endif } +@_expose(wasm, "bjs_roundTripTypedPayloadResult") +@_cdecl("bjs_roundTripTypedPayloadResult") +public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalTypedPayloadResult") +@_cdecl("bjs_roundTripOptionalTypedPayloadResult") +public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_compareAPIResults") @_cdecl("bjs_compareAPIResults") public func _bjs_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { @@ -4475,6 +4809,50 @@ public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultC #endif } +@_expose(wasm, "bjs_roundTripAllTypesResult") +@_cdecl("bjs_roundTripAllTypesResult") +public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalAllTypesResult") +@_cdecl("bjs_roundTripOptionalAllTypesResult") +public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalPayloadResult") +@_cdecl("bjs_roundTripOptionalPayloadResult") +public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalPayloadResultOpt") +@_cdecl("bjs_roundTripOptionalPayloadResultOpt") +public func _bjs_roundTripOptionalPayloadResultOpt(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripOptionalClass") @_cdecl("bjs_roundTripOptionalClass") public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index e2877ee76..41d2ccf89 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -4357,6 +4357,308 @@ "swiftCallName" : "API.NetworkingResult", "tsFullPath" : "API.NetworkingResult" }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + } + } + ], + "name" : "precision" + }, + { + "associatedValues" : [ + { + "type" : { + "caseEnum" : { + "_0" : "Direction" + } + } + } + ], + "name" : "direction" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optPrecision" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optDirection" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "TypedPayloadResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "TypedPayloadResult", + "tsFullPath" : "TypedPayloadResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "swiftStruct" : { + "_0" : "Address" + } + } + } + ], + "name" : "structPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "name" : "classPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "jsObject" : { + + } + } + } + ], + "name" : "jsObjectPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + } + ], + "name" : "nestedEnum" + }, + { + "associatedValues" : [ + { + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "name" : "arrayPayload" + }, + { + "associatedValues" : [ + { + "type" : { + "jsObject" : { + "_0" : "Foo" + } + } + } + ], + "name" : "jsClassPayload" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "AllTypesResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "AllTypesResult", + "tsFullPath" : "AllTypesResult" + }, + { + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "Address" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optStruct" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optClass" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optJSObject" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optNestedEnum" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optArray" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optJsClass" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" + } + ], + "emitStyle" : "const", + "name" : "OptionalAllTypesResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "OptionalAllTypesResult", + "tsFullPath" : "OptionalAllTypesResult" + }, { "cases" : [ { @@ -7557,6 +7859,66 @@ } } }, + { + "abiName" : "bjs_roundTripTypedPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripTypedPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalTypedPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalTypedPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" + } + }, + "_1" : "null" + } + } + }, { "abiName" : "bjs_compareAPIResults", "effects" : { @@ -7636,6 +7998,126 @@ } } }, + { + "abiName" : "bjs_roundTripAllTypesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripAllTypesResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalAllTypesResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalAllTypesResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AllTypesResult" + } + }, + "_1" : "null" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPayloadResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPayloadResult", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + } + }, + { + "abiName" : "bjs_roundTripOptionalPayloadResultOpt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalPayloadResultOpt", + "parameters" : [ + { + "label" : "_", + "name" : "result", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + }, + "_1" : "null" + } + } + }, { "abiName" : "bjs_roundTripOptionalClass", "effects" : { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 6a8dd58a2..cc21a864a 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -1,7 +1,7 @@ // @ts-check import { - DirectionValues, StatusValues, ThemeValues, HttpStatusValues, TSDirection, TSTheme, APIResultValues, ComplexResultValues, APIOptionalResultValues, StaticCalculatorValues, StaticPropertyEnumValues + DirectionValues, StatusValues, ThemeValues, HttpStatusValues, TSDirection, TSTheme, APIResultValues, ComplexResultValues, APIOptionalResultValues, StaticCalculatorValues, StaticPropertyEnumValues, PrecisionValues, TypedPayloadResultValues, AllTypesResultValues, OptionalAllTypesResultValues } from '../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ @@ -781,6 +781,129 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor10), aor10); assert.equal(exports.roundTripOptionalAPIOptionalResult(null), null); + // TypedPayloadResult — rawValueEnum and caseEnum as associated value payloads + assert.equal(exports.Precision.Rough, 0.1); + assert.equal(exports.Precision.Fine, 0.001); + + const tpr_precision = { tag: exports.TypedPayloadResult.Tag.Precision, param0: Math.fround(0.1) }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_precision), tpr_precision); + + const tpr_direction = { tag: exports.TypedPayloadResult.Tag.Direction, param0: exports.Direction.North }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_direction), tpr_direction); + + const tpr_dirSouth = { tag: exports.TypedPayloadResult.Tag.Direction, param0: exports.Direction.South }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_dirSouth), tpr_dirSouth); + + const tpr_optPrecisionSome = { tag: exports.TypedPayloadResult.Tag.OptPrecision, param0: Math.fround(0.001) }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_optPrecisionSome), tpr_optPrecisionSome); + + const tpr_optPrecisionNull = { tag: exports.TypedPayloadResult.Tag.OptPrecision, param0: null }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_optPrecisionNull), tpr_optPrecisionNull); + + const tpr_optDirectionSome = { tag: exports.TypedPayloadResult.Tag.OptDirection, param0: exports.Direction.East }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_optDirectionSome), tpr_optDirectionSome); + + const tpr_optDirectionNull = { tag: exports.TypedPayloadResult.Tag.OptDirection, param0: null }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_optDirectionNull), tpr_optDirectionNull); + + const tpr_empty = { tag: exports.TypedPayloadResult.Tag.Empty }; + assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_empty), tpr_empty); + + // Optional TypedPayloadResult roundtrip + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_precision), tpr_precision); + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_direction), tpr_direction); + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionSome), tpr_optPrecisionSome); + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionNull), tpr_optPrecisionNull); + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_empty), tpr_empty); + assert.equal(exports.roundTripOptionalTypedPayloadResult(null), null); + + // AllTypesResult — struct, class, JSObject, nested enum, array as associated value payloads + const atr_struct = { tag: AllTypesResultValues.Tag.StructPayload, param0: { street: "100 Main St", city: "Boston", zipCode: 2101 } }; + assert.deepEqual(exports.roundTripAllTypesResult(atr_struct), atr_struct); + + const atr_class = { tag: AllTypesResultValues.Tag.ClassPayload, param0: new exports.Greeter("EnumUser") }; + const atr_class_result = exports.roundTripAllTypesResult(atr_class); + assert.equal(atr_class_result.tag, AllTypesResultValues.Tag.ClassPayload); + assert.equal(atr_class_result.param0.name, "EnumUser"); + + const atr_jsObject = { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: { custom: "data", value: 42 } }; + const atr_jsObject_result = exports.roundTripAllTypesResult(atr_jsObject); + assert.equal(atr_jsObject_result.tag, AllTypesResultValues.Tag.JsObjectPayload); + assert.equal(atr_jsObject_result.param0.custom, "data"); + assert.equal(atr_jsObject_result.param0.value, 42); + + const atr_nestedEnum = { tag: AllTypesResultValues.Tag.NestedEnum, param0: { tag: APIResultValues.Tag.Success, param0: "nested!" } }; + assert.deepEqual(exports.roundTripAllTypesResult(atr_nestedEnum), atr_nestedEnum); + + const atr_array = { tag: AllTypesResultValues.Tag.ArrayPayload, param0: [10, 20, 30] }; + assert.deepEqual(exports.roundTripAllTypesResult(atr_array), atr_array); + + const atr_jsClass = { tag: AllTypesResultValues.Tag.JsClassPayload, param0: new ImportedFoo("enumFoo") }; + const atr_jsClass_result = exports.roundTripAllTypesResult(atr_jsClass); + assert.equal(atr_jsClass_result.tag, AllTypesResultValues.Tag.JsClassPayload); + assert.equal(atr_jsClass_result.param0.value, "enumFoo"); + + const atr_empty = { tag: AllTypesResultValues.Tag.Empty }; + assert.deepEqual(exports.roundTripAllTypesResult(atr_empty), atr_empty); + + // Optional AllTypesResult roundtrip + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_struct), atr_struct); + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_array), atr_array); + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_empty), atr_empty); + assert.equal(exports.roundTripOptionalAllTypesResult(null), null); + + // OptionalAllTypesResult — optional struct, class, JSObject, nested enum, array as associated value payloads + const oatr_structSome = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: { street: "200 Oak St", city: "Denver", zipCode: null } }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structSome), oatr_structSome); + + const oatr_structNone = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structNone), oatr_structNone); + + const oatr_classSome = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: new exports.Greeter("OptEnumUser") }; + const oatr_classSome_result = exports.roundTripOptionalPayloadResult(oatr_classSome); + assert.equal(oatr_classSome_result.tag, OptionalAllTypesResultValues.Tag.OptClass); + assert.equal(oatr_classSome_result.param0.name, "OptEnumUser"); + + const oatr_classNone = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_classNone), oatr_classNone); + + const oatr_jsObjectSome = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: { key: "value" } }; + const oatr_jsObjectSome_result = exports.roundTripOptionalPayloadResult(oatr_jsObjectSome); + assert.equal(oatr_jsObjectSome_result.tag, OptionalAllTypesResultValues.Tag.OptJSObject); + assert.equal(oatr_jsObjectSome_result.param0.key, "value"); + + const oatr_jsObjectNone = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsObjectNone), oatr_jsObjectNone); + + const oatr_nestedEnumSome = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: { tag: APIResultValues.Tag.Failure, param0: 404 } }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumSome), oatr_nestedEnumSome); + + const oatr_nestedEnumNone = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumNone), oatr_nestedEnumNone); + + const oatr_arraySome = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: [1, 2, 3] }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arraySome), oatr_arraySome); + + const oatr_arrayNone = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arrayNone), oatr_arrayNone); + + const oatr_jsClassSome = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: new ImportedFoo("optEnumFoo") }; + const oatr_jsClassSome_result = exports.roundTripOptionalPayloadResult(oatr_jsClassSome); + assert.equal(oatr_jsClassSome_result.tag, OptionalAllTypesResultValues.Tag.OptJsClass); + assert.equal(oatr_jsClassSome_result.param0.value, "optEnumFoo"); + + const oatr_jsClassNone = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsClassNone), oatr_jsClassNone); + + const oatr_empty = { tag: OptionalAllTypesResultValues.Tag.Empty }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_empty), oatr_empty); + + // Optional OptionalAllTypesResult roundtrip + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structSome), oatr_structSome); + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structNone), oatr_structNone); + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_empty), oatr_empty); + assert.equal(exports.roundTripOptionalPayloadResultOpt(null), null); + assert.equal(exports.MathUtils.add(2147483647, 0), 2147483647); assert.equal(exports.StaticCalculator.roundtrip(42), 42); assert.equal(StaticCalculatorValues.Scientific, 0); From 43a05d9ad7e77801f6dc1f4a163bb126edcc8460 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 4 Feb 2026 09:50:08 +0100 Subject: [PATCH 152/252] BridgeJS: Few more array import tests BridgeJS: Array import --- .../Sources/BridgeJSCore/ImportTS.swift | 88 +-- .../Sources/BridgeJSLink/BridgeJSLink.swift | 8 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 56 +- .../TS2Swift/JavaScript/src/processor.js | 11 +- .../test/__snapshots__/ts2swift.test.js.snap | 12 +- .../test/fixtures/ArrayParameter.d.ts | 20 +- .../Inputs/MacroSwift/ArrayTypes.swift | 6 + .../Inputs/MacroSwift/ImportArray.swift | 2 + .../BridgeJSCodegenTests/ArrayTypes.json | 115 +++ .../BridgeJSCodegenTests/ArrayTypes.swift | 88 +++ .../BridgeJSCodegenTests/ImportArray.json | 62 ++ .../BridgeJSCodegenTests/ImportArray.swift | 34 + .../BridgeJSLinkTests/ArrayTypes.d.ts | 5 + .../BridgeJSLinkTests/ArrayTypes.js | 89 +++ .../BridgeJSLinkTests/ImportArray.d.ts | 19 + .../BridgeJSLinkTests/ImportArray.js | 257 +++++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 23 +- .../Articles/BridgeJS/Supported-Types.md | 2 +- .../Generated/BridgeJS.Macros.swift | 10 + .../Generated/BridgeJS.swift | 407 +++++++++++ .../Generated/JavaScript/BridgeJS.json | 663 ++++++++++++++++-- .../BridgeJSRuntimeTests/ImportAPITests.swift | 61 ++ .../ImportArrayAPIs.swift | 17 + Tests/BridgeJSRuntimeTests/StructAPIs.swift | 25 + Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 6 + Tests/prelude.mjs | 50 ++ 26 files changed, 2011 insertions(+), 125 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js create mode 100644 Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 22e0ef162..8db872c6e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -83,6 +83,8 @@ public struct ImportTS { var abiReturnType: WasmCoreType? // Track destructured variable names for multiple lowered parameters var destructuredVarNames: [String] = [] + // Stack-lowered parameters should be evaluated in reverse order to match LIFO stacks + var stackLoweringStmts: [CodeBlockItemSyntax] = [] init(moduleName: String, abiName: String, context: BridgeContext = .importTS) { self.moduleName = moduleName @@ -93,11 +95,6 @@ public struct ImportTS { func lowerParameter(param: Parameter) throws { let loweringInfo = try param.type.loweringParameterInfo(context: context) - // Generate destructured variable names for all lowered parameters - let destructuredNames = loweringInfo.loweredParameters.map { - "\(param.name)\($0.name.capitalizedFirstLetter)" - } - let initializerExpr: ExprSyntax switch param.type { case .closure(let signature): @@ -108,6 +105,33 @@ public struct ImportTS { initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") } + if loweringInfo.loweredParameters.isEmpty { + let stmt = CodeBlockItemSyntax( + item: .decl( + DeclSyntax( + VariableDeclSyntax( + bindingSpecifier: .keyword(.let), + bindings: PatternBindingListSyntax { + PatternBindingSyntax( + pattern: PatternSyntax( + IdentifierPatternSyntax(identifier: .wildcardToken()) + ), + initializer: InitializerClauseSyntax(value: initializerExpr) + ) + } + ) + ) + ) + ) + stackLoweringStmts.insert(stmt, at: 0) + return + } + + // Generate destructured variable names for all lowered parameters + let destructuredNames = loweringInfo.loweredParameters.map { + "\(param.name)\($0.name.capitalizedFirstLetter)" + } + // Always add destructuring statement to body (unified for single and multiple) let pattern: PatternSyntax if destructuredNames.count == 1 { @@ -166,7 +190,9 @@ public struct ImportTS { } func call(returnType: BridgeType) throws { - // Build function call expression + let liftingInfo = try returnType.liftingReturnInfo(context: context) + body.append(contentsOf: stackLoweringStmts) + let callExpr = FunctionCallExprSyntax( calledExpression: ExprSyntax("\(raw: abiName)"), leftParen: .leftParenToken(), @@ -178,19 +204,15 @@ public struct ImportTS { rightParen: .rightParenToken() ) - let needsRetBinding: Bool - let liftingInfo = try returnType.liftingReturnInfo(context: context) - if liftingInfo.valueToLift == nil || returnType.usesSideChannelForOptionalReturn() { - // Void and side-channel returns don't need "let ret =" - needsRetBinding = false + if returnType == .void { + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) + } else if returnType.usesSideChannelForOptionalReturn() { + // Side channel returns don't need "let ret =" + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) + } else if liftingInfo.valueToLift == nil { + body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) } else { - needsRetBinding = true - } - - if needsRetBinding { body.append("let ret = \(raw: callExpr)") - } else { - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) } // Add exception check for ImportTS context @@ -934,13 +956,8 @@ extension BridgeType { return LoweringParameterInfo(loweredParameters: [("value", .i32)]) } case .rawValueEnum(_, let rawType): - switch context { - case .importTS: - return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) - case .exportSwift: - // For protocol export we return .i32 for String raw value type instead of nil - return LoweringParameterInfo(loweredParameters: [("value", rawType.wasmCoreType ?? .i32)]) - } + let wasmType = rawType.wasmCoreType ?? .i32 + return LoweringParameterInfo(loweredParameters: [("value", wasmType)]) case .associatedValueEnum: switch context { case .importTS: @@ -964,12 +981,7 @@ extension BridgeType { params.append(contentsOf: wrappedInfo.loweredParameters) return LoweringParameterInfo(loweredParameters: params) case .array: - switch context { - case .importTS: - throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift: - return LoweringParameterInfo(loweredParameters: []) - } + return LoweringParameterInfo(loweredParameters: []) } } @@ -1025,13 +1037,8 @@ extension BridgeType { return LiftingReturnInfo(valueToLift: .i32) } case .rawValueEnum(_, let rawType): - switch context { - case .importTS: - return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) - case .exportSwift: - // For protocol export we return .i32 for String raw value type instead of nil - return LiftingReturnInfo(valueToLift: rawType.wasmCoreType ?? .i32) - } + let wasmType = rawType.wasmCoreType ?? .i32 + return LiftingReturnInfo(valueToLift: wasmType) case .associatedValueEnum: switch context { case .importTS: @@ -1053,12 +1060,7 @@ extension BridgeType { let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) case .array: - switch context { - case .importTS: - throw BridgeJSCoreError("Array types are not yet supported in TypeScript imports") - case .exportSwift: - return LiftingReturnInfo(valueToLift: nil) - } + return LiftingReturnInfo(valueToLift: nil) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 27ef60760..7a5e02f2d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -2212,12 +2212,10 @@ extension BridgeJSLink { func liftParameter(param: Parameter) throws { let liftingFragment = try IntrinsicJSFragment.liftParameter(type: param.type, context: context) - assert( - liftingFragment.parameters.count >= 1, - "Lifting fragment should have at least one parameter to lift" - ) let valuesToLift: [String] - if liftingFragment.parameters.count == 1 { + if liftingFragment.parameters.count == 0 { + valuesToLift = [] + } else if liftingFragment.parameters.count == 1 { parameterNames.append(param.name) valuesToLift = [scope.variable(param.name)] } else { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 1547d63a4..410bce672 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1895,14 +1895,7 @@ struct IntrinsicJSFragment: Sendable { "Namespace enums are not supported to be passed as parameters to imported JS functions: \(string)" ) case .array(let elementType): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "Arrays are not yet supported to be passed as parameters to imported JS functions" - ) - case .exportSwift: - return try arrayLift(elementType: elementType) - } + return try arrayLift(elementType: elementType) } } @@ -1971,14 +1964,7 @@ struct IntrinsicJSFragment: Sendable { message: "Namespace enums are not supported to be returned from imported JS functions: \(string)" ) case .array(let elementType): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "Arrays are not yet supported to be returned from imported JS functions" - ) - case .exportSwift: - return try arrayLower(elementType: elementType) - } + return try arrayLower(elementType: elementType) } } @@ -3215,11 +3201,10 @@ struct IntrinsicJSFragment: Sendable { // Lift return value if needed if method.returnType != .void { let liftFragment = try! IntrinsicJSFragment.liftReturn(type: method.returnType) - if !liftFragment.parameters.isEmpty { - let lifted = liftFragment.printCode(["ret"], methodScope, printer, methodCleanup) - if let liftedValue = lifted.first { - printer.write("return \(liftedValue);") - } + let liftArgs = liftFragment.parameters.isEmpty ? [] : ["ret"] + let lifted = liftFragment.printCode(liftArgs, methodScope, printer, methodCleanup) + if let liftedValue = lifted.first { + printer.write("return \(liftedValue);") } } } @@ -3508,9 +3493,36 @@ struct IntrinsicJSFragment: Sendable { ), allStructs: allStructs ) + let guardedPrinter = CodeFragmentPrinter() + let guardedCleanup = CodeFragmentPrinter() + _ = wrappedFragment.printCode([value], scope, guardedPrinter, guardedCleanup) + var loweredLines = guardedPrinter.lines + var hoistedCleanupVar: String? + if let first = loweredLines.first { + let trimmed = first.trimmingCharacters(in: .whitespaces) + if trimmed.hasPrefix("const "), + let namePart = trimmed.split(separator: " ").dropFirst().first, + trimmed.contains("= []") + { + hoistedCleanupVar = String(namePart) + loweredLines[0] = "\(hoistedCleanupVar!) = [];" + } + } + if let hoistedName = hoistedCleanupVar { + printer.write("let \(hoistedName);") + } printer.write("if (\(isSomeVar)) {") printer.indent { - _ = wrappedFragment.printCode([value], scope, printer, cleanup) + for line in loweredLines { + printer.write(line) + } + if !guardedCleanup.lines.isEmpty { + cleanup.write("if (\(isSomeVar)) {") + cleanup.indent { + cleanup.write(contentsOf: guardedCleanup) + } + cleanup.write("}") + } } printer.write("}") printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index c06ba94aa..ef446af0f 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -663,6 +663,15 @@ export class TypeProcessor { * @private */ visitType(type, node) { + if (this.checker.isArrayType(type)) { + const typeArgs = this.checker.getTypeArguments(type); + if (typeArgs && typeArgs.length > 0) { + const elementType = this.visitType(typeArgs[0], node); + return `[${elementType}]`; + } + return "[JSObject]"; + } + // Treat A and A as the same type if (isTypeReference(type)) { type = type.target; @@ -727,7 +736,7 @@ export class TypeProcessor { return this.renderTypeIdentifier(typeName); } - if (this.checker.isArrayType(type) || this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { + if (this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { return "JSObject"; } // "a" | "b" -> string diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index f81a2ce07..6fdb79f78 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -9,11 +9,17 @@ exports[`ts2swift > snapshots Swift output for ArrayParameter.d.ts > ArrayParame @_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit -@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void +@JSFunction func processNumbers(_ values: [Double]) throws(JSException) -> Void -@JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void +@JSFunction func getNumbers() throws(JSException) -> [Double] -@JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void +@JSFunction func transformNumbers(_ values: [Double]) throws(JSException) -> [Double] + +@JSFunction func processStrings(_ values: [String]) throws(JSException) -> [String] + +@JSFunction func processBooleans(_ values: [Bool]) throws(JSException) -> [Bool] + +@JSFunction func processArraySyntax(_ values: [Double]) throws(JSException) -> [Double] " `; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts index 59674e071..b5a099388 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ArrayParameter.d.ts @@ -1,3 +1,17 @@ -export function checkArray(a: number[]): void; -export function checkArrayWithLength(a: number[], b: number): void; -export function checkArray(a: Array): void; +// Array as parameter +export function processNumbers(values: number[]): void; + +// Array as return value +export function getNumbers(): number[]; + +// Array as both parameter and return value +export function transformNumbers(values: number[]): number[]; + +// String arrays +export function processStrings(values: string[]): string[]; + +// Boolean arrays +export function processBooleans(values: boolean[]): boolean[]; + +// Using Array syntax +export function processArraySyntax(values: Array): Array; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift index c1980cbc2..0cea90512 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ArrayTypes.swift @@ -61,3 +61,9 @@ @JSFunction func checkArray(_ a: JSObject) throws(JSException) -> Void @JSFunction func checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void + +@JSFunction func importProcessNumbers(_ values: [Double]) throws(JSException) -> Void +@JSFunction func importGetNumbers() throws(JSException) -> [Double] +@JSFunction func importTransformNumbers(_ values: [Double]) throws(JSException) -> [Double] +@JSFunction func importProcessStrings(_ values: [String]) throws(JSException) -> [String] +@JSFunction func importProcessBooleans(_ values: [Bool]) throws(JSException) -> [Bool] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift new file mode 100644 index 000000000..cd9142a26 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ImportArray.swift @@ -0,0 +1,2 @@ +@JSFunction func roundtrip(_ items: [Int]) throws(JSException) -> [Int] +@JSFunction func logStrings(_ items: [String]) throws(JSException) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json index 8dde2cfb7..8eab0c059 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.json @@ -1158,6 +1158,121 @@ } } + }, + { + "name" : "importProcessNumbers", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "importGetNumbers", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "name" : "importTransformNumbers", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "name" : "importProcessStrings", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "name" : "importProcessBooleans", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } } ], "types" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index c7c80c3b2..023caf21f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -581,4 +581,92 @@ func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> V if let error = _swift_js_take_exception() { throw error } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importProcessNumbers") +fileprivate func bjs_importProcessNumbers() -> Void +#else +fileprivate func bjs_importProcessNumbers() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importProcessNumbers(_ values: [Double]) throws(JSException) -> Void { + let _ = values.bridgeJSLowerParameter() + bjs_importProcessNumbers() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importGetNumbers") +fileprivate func bjs_importGetNumbers() -> Void +#else +fileprivate func bjs_importGetNumbers() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importGetNumbers() throws(JSException) -> [Double] { + bjs_importGetNumbers() + if let error = _swift_js_take_exception() { + throw error + } + return [Double].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importTransformNumbers") +fileprivate func bjs_importTransformNumbers() -> Void +#else +fileprivate func bjs_importTransformNumbers() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importTransformNumbers(_ values: [Double]) throws(JSException) -> [Double] { + let _ = values.bridgeJSLowerParameter() + bjs_importTransformNumbers() + if let error = _swift_js_take_exception() { + throw error + } + return [Double].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importProcessStrings") +fileprivate func bjs_importProcessStrings() -> Void +#else +fileprivate func bjs_importProcessStrings() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importProcessStrings(_ values: [String]) throws(JSException) -> [String] { + let _ = values.bridgeJSLowerParameter() + bjs_importProcessStrings() + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importProcessBooleans") +fileprivate func bjs_importProcessBooleans() -> Void +#else +fileprivate func bjs_importProcessBooleans() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importProcessBooleans(_ values: [Bool]) throws(JSException) -> [Bool] { + let _ = values.bridgeJSLowerParameter() + bjs_importProcessBooleans() + if let error = _swift_js_take_exception() { + throw error + } + return [Bool].bridgeJSLiftReturn() } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json new file mode 100644 index 000000000..b884e0cb9 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.json @@ -0,0 +1,62 @@ +{ + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "roundtrip", + "parameters" : [ + { + "name" : "items", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "logStrings", + "parameters" : [ + { + "name" : "items", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift new file mode 100644 index 000000000..33b987c76 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift @@ -0,0 +1,34 @@ +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_roundtrip") +fileprivate func bjs_roundtrip() -> Void +#else +fileprivate func bjs_roundtrip() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$roundtrip(_ items: [Int]) throws(JSException) -> [Int] { + let _ = items.bridgeJSLowerParameter() + bjs_roundtrip() + if let error = _swift_js_take_exception() { + throw error + } + return [Int].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_logStrings") +fileprivate func bjs_logStrings() -> Void +#else +fileprivate func bjs_logStrings() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$logStrings(_ items: [String]) throws(JSException) -> Void { + let _ = items.bridgeJSLowerParameter() + bjs_logStrings() + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts index 3316cd7c3..8dc76156b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.d.ts @@ -71,6 +71,11 @@ export type Exports = { export type Imports = { checkArray(a: any): void; checkArrayWithLength(a: any, b: number): void; + importProcessNumbers(values: number[]): void; + importGetNumbers(): number[]; + importTransformNumbers(values: number[]): number[]; + importProcessStrings(values: string[]): string[]; + importProcessBooleans(values: boolean[]): boolean[]; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 4610d03ba..6cca17cf6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -263,6 +263,95 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_importProcessNumbers"] = function bjs_importProcessNumbers() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const f64 = tmpRetF64s.pop(); + arrayResult.push(f64); + } + arrayResult.reverse(); + imports.importProcessNumbers(arrayResult); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importGetNumbers"] = function bjs_importGetNumbers() { + try { + let ret = imports.importGetNumbers(); + const arrayCleanups = []; + for (const elem of ret) { + tmpParamF64s.push(elem); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importTransformNumbers"] = function bjs_importTransformNumbers() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const f64 = tmpRetF64s.pop(); + arrayResult.push(f64); + } + arrayResult.reverse(); + let ret = imports.importTransformNumbers(arrayResult); + const arrayCleanups = []; + for (const elem of ret) { + tmpParamF64s.push(elem); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importProcessStrings"] = function bjs_importProcessStrings() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const string = tmpRetStrings.pop(); + arrayResult.push(string); + } + arrayResult.reverse(); + let ret = imports.importProcessStrings(arrayResult); + const arrayCleanups = []; + for (const elem of ret) { + const bytes = textEncoder.encode(elem); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importProcessBooleans"] = function bjs_importProcessBooleans() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const bool = tmpRetInts.pop() !== 0; + arrayResult.push(bool); + } + arrayResult.reverse(); + let ret = imports.importProcessBooleans(arrayResult); + const arrayCleanups = []; + for (const elem of ret) { + tmpParamInts.push(elem ? 1 : 0); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts new file mode 100644 index 000000000..5d1e2c4dc --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.d.ts @@ -0,0 +1,19 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export type Exports = { +} +export type Imports = { + roundtrip(items: number[]): number[]; + logStrings(items: string[]): void; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js new file mode 100644 index 000000000..daa601aed --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -0,0 +1,257 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag = []; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag.push(tag); + } + bjs["swift_js_push_i32"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_roundtrip"] = function bjs_roundtrip() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + let ret = imports.roundtrip(arrayResult); + const arrayCleanups = []; + for (const elem of ret) { + tmpParamInts.push((elem | 0)); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } + TestModule["bjs_logStrings"] = function bjs_logStrings() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const string = tmpRetStrings.pop(); + arrayResult.push(string); + } + arrayResult.reverse(); + imports.logStrings(arrayResult); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const exports = { + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index e385a3c60..349cecb91 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -2297,7 +2297,9 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct { // MARK: - Array Support -extension Array where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { +extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { + public typealias StackLiftResult = [Element] + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [Element] { let count = Int(_swift_js_pop_i32()) var result: [Element] = [] @@ -2309,10 +2311,23 @@ extension Array where Element: _BridgedSwiftStackType, Element.StackLiftResult = return result } - @_spi(BridgeJS) public func bridgeJSLowerReturn() { - for elem in self { + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [Element] { + bridgeJSLiftParameter() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + let array = self + for elem in array { elem.bridgeJSLowerStackReturn() } - _swift_js_push_i32(Int32(self.count)) + _swift_js_push_i32(Int32(array.count)) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() { + bridgeJSLowerReturn() } } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md index 668fe21b5..c872c0dda 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md @@ -9,7 +9,7 @@ Use this page as a quick reference for how common TypeScript types appear in Swi | `number` | `Double` | | `string` | `String` | | `boolean` | `Bool` | -| TODO | `Array` | +| `T[]` | `[T]` | | TODO | `Dictionary` | | `T \| undefined` | TODO | | `T \| null` | `Optional` | diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 358f0501d..9e05b3ae8 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -63,6 +63,16 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction(jsName: "with-dashes") static func with_dashes() throws(JSException) -> StaticBox } +@JSFunction func jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double] + +@JSFunction func jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String] + +@JSFunction func jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] + +@JSFunction func jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double + +@JSFunction func jsCreateNumberArray() throws(JSException) -> [Double] + @JSFunction(from: .global) func parseInt(_ string: String) throws(JSException) -> Double @JSClass(from: .global) struct Animal { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 0e06c7edc..5638d0442 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3579,6 +3579,84 @@ fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { } #endif +extension ArrayMembers: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ArrayMembers { + let optStrings = { + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[String]>.none + } else { + return [String].bridgeJSLiftParameter() + } + }() + let ints = [Int].bridgeJSLiftParameter() + return ArrayMembers(ints: ints, optStrings: optStrings) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.ints.bridgeJSLowerReturn() + let __bjs_isSome_optStrings = self.optStrings != nil + if let __bjs_unwrapped_optStrings = self.optStrings { + __bjs_unwrapped_optStrings.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_optStrings ? 1 : 0) + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_ArrayMembers(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ArrayMembers())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ArrayMembers") +fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ArrayMembers") +fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 +#else +fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_ArrayMembers_sumValues") +@_cdecl("bjs_ArrayMembers_sumValues") +public func _bjs_ArrayMembers_sumValues() -> Int32 { + #if arch(wasm32) + let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayMembers_firstString") +@_cdecl("bjs_ArrayMembers_firstString") +public func _bjs_ArrayMembers_firstString() -> Void { + #if arch(wasm32) + let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripVoid") @_cdecl("bjs_roundTripVoid") public func _bjs_roundTripVoid() -> Void { @@ -5913,6 +5991,43 @@ public func _bjs_roundTripFooContainer() -> Void { #endif } +@_expose(wasm, "bjs_roundTripArrayMembers") +@_cdecl("bjs_roundTripArrayMembers") +public func _bjs_roundTripArrayMembers() -> Void { + #if arch(wasm32) + let ret = roundTripArrayMembers(_: ArrayMembers.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_arrayMembersSum") +@_cdecl("bjs_arrayMembersSum") +public func _bjs_arrayMembersSum() -> Int32 { + #if arch(wasm32) + let _tmp_values = [Int].bridgeJSLiftParameter() + let _tmp_value = ArrayMembers.bridgeJSLiftParameter() + let ret = arrayMembersSum(_: _tmp_value, _: _tmp_values) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_arrayMembersFirst") +@_cdecl("bjs_arrayMembersFirst") +public func _bjs_arrayMembersFirst() -> Void { + #if arch(wasm32) + let _tmp_values = [String].bridgeJSLiftParameter() + let _tmp_value = ArrayMembers.bridgeJSLiftParameter() + let ret = arrayMembersFirst(_: _tmp_value, _: _tmp_values) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { @@ -8591,6 +8706,95 @@ func _$_jsWeirdFunction() throws(JSException) -> Double { return Double.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumberArray") +fileprivate func bjs_jsRoundTripNumberArray() -> Void +#else +fileprivate func bjs_jsRoundTripNumberArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripNumberArray() + if let error = _swift_js_take_exception() { + throw error + } + return [Double].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripStringArray") +fileprivate func bjs_jsRoundTripStringArray() -> Void +#else +fileprivate func bjs_jsRoundTripStringArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripStringArray() + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBoolArray") +fileprivate func bjs_jsRoundTripBoolArray() -> Void +#else +fileprivate func bjs_jsRoundTripBoolArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripBoolArray() + if let error = _swift_js_take_exception() { + throw error + } + return [Bool].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsSumNumberArray") +fileprivate func bjs_jsSumNumberArray() -> Float64 +#else +fileprivate func bjs_jsSumNumberArray() -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double { + let _ = values.bridgeJSLowerParameter() + let ret = bjs_jsSumNumberArray() + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsCreateNumberArray") +fileprivate func bjs_jsCreateNumberArray() -> Void +#else +fileprivate func bjs_jsCreateNumberArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsCreateNumberArray() throws(JSException) -> [Double] { + bjs_jsCreateNumberArray() + if let error = _swift_js_take_exception() { + throw error + } + return [Double].bridgeJSLiftReturn() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt") fileprivate func bjs_parseInt(_ string: Int32) -> Float64 @@ -9022,6 +9226,209 @@ func _$Animal_getIsCat(_ self: JSObject) throws(JSException) -> Bool { return Bool.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripIntArray") +fileprivate func bjs_jsRoundTripIntArray() -> Void +#else +fileprivate func bjs_jsRoundTripIntArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] { + let _ = items.bridgeJSLowerParameter() + bjs_jsRoundTripIntArray() + if let error = _swift_js_take_exception() { + throw error + } + return [Int].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsArrayLength") +fileprivate func bjs_jsArrayLength() -> Int32 +#else +fileprivate func bjs_jsArrayLength() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsArrayLength(_ items: [Int]) throws(JSException) -> Int { + let _ = items.bridgeJSLowerParameter() + let ret = bjs_jsArrayLength() + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_makeArrayHost") +fileprivate func bjs_makeArrayHost() -> Int32 +#else +fileprivate func bjs_makeArrayHost() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$makeArrayHost(_ numbers: [Int], _ labels: [String]) throws(JSException) -> ArrayHost { + let _ = labels.bridgeJSLowerParameter() + let _ = numbers.bridgeJSLowerParameter() + let ret = bjs_makeArrayHost() + if let error = _swift_js_take_exception() { + throw error + } + return ArrayHost.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_init") +fileprivate func bjs_ArrayHost_init() -> Int32 +#else +fileprivate func bjs_ArrayHost_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_numbers_get") +fileprivate func bjs_ArrayHost_numbers_get(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_numbers_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_labels_get") +fileprivate func bjs_ArrayHost_labels_get(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_labels_get(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_numbers_set") +fileprivate func bjs_ArrayHost_numbers_set(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_numbers_set(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_labels_set") +fileprivate func bjs_ArrayHost_labels_set(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_labels_set(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_concatNumbers") +fileprivate func bjs_ArrayHost_concatNumbers(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_concatNumbers(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_concatLabels") +fileprivate func bjs_ArrayHost_concatLabels(_ self: Int32) -> Void +#else +fileprivate func bjs_ArrayHost_concatLabels(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_firstLabel") +fileprivate func bjs_ArrayHost_firstLabel(_ self: Int32) -> Int32 +#else +fileprivate func bjs_ArrayHost_firstLabel(_ self: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$ArrayHost_init(_ numbers: [Int], _ labels: [String]) throws(JSException) -> JSObject { + let _ = labels.bridgeJSLowerParameter() + let _ = numbers.bridgeJSLowerParameter() + let ret = bjs_ArrayHost_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$ArrayHost_numbers_get(_ self: JSObject) throws(JSException) -> [Int] { + let selfValue = self.bridgeJSLowerParameter() + bjs_ArrayHost_numbers_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return [Int].bridgeJSLiftReturn() +} + +func _$ArrayHost_labels_get(_ self: JSObject) throws(JSException) -> [String] { + let selfValue = self.bridgeJSLowerParameter() + bjs_ArrayHost_labels_get(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +func _$ArrayHost_numbers_set(_ self: JSObject, _ newValue: [Int]) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let _ = newValue.bridgeJSLowerParameter() + bjs_ArrayHost_numbers_set(selfValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$ArrayHost_labels_set(_ self: JSObject, _ newValue: [String]) throws(JSException) -> Void { + let selfValue = self.bridgeJSLowerParameter() + let _ = newValue.bridgeJSLowerParameter() + bjs_ArrayHost_labels_set(selfValue) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$ArrayHost_concatNumbers(_ self: JSObject, _ values: [Int]) throws(JSException) -> [Int] { + let selfValue = self.bridgeJSLowerParameter() + let _ = values.bridgeJSLowerParameter() + bjs_ArrayHost_concatNumbers(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return [Int].bridgeJSLiftReturn() +} + +func _$ArrayHost_concatLabels(_ self: JSObject, _ values: [String]) throws(JSException) -> [String] { + let selfValue = self.bridgeJSLowerParameter() + let _ = values.bridgeJSLowerParameter() + bjs_ArrayHost_concatLabels(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +func _$ArrayHost_firstLabel(_ self: JSObject, _ values: [String]) throws(JSException) -> String { + let selfValue = self.bridgeJSLowerParameter() + let _ = values.bridgeJSLowerParameter() + let ret = bjs_ArrayHost_firstLabel(selfValue) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsApplyInt") fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 41d2ccf89..366115792 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -10917,6 +10917,112 @@ "_0" : "FooContainer" } } + }, + { + "abiName" : "bjs_roundTripArrayMembers", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripArrayMembers", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ArrayMembers" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "ArrayMembers" + } + } + }, + { + "abiName" : "bjs_arrayMembersSum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayMembersSum", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ArrayMembers" + } + } + }, + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_arrayMembersFirst", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayMembersFirst", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "swiftStruct" : { + "_0" : "ArrayMembers" + } + } + }, + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } } ], "protocols" : [ @@ -12547,6 +12653,110 @@ } ], "swiftCallName" : "FooContainer" + }, + { + "methods" : [ + { + "abiName" : "bjs_ArrayMembers_sumValues", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sumValues", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "abiName" : "bjs_ArrayMembers_firstString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "firstString", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "ArrayMembers", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ints", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optStrings", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "swiftCallName" : "ArrayMembers" } ] }, @@ -12850,70 +13060,185 @@ } }, { - "from" : "global", - "name" : "parseInt", + "name" : "jsRoundTripNumberArray", "parameters" : [ { - "name" : "string", + "name" : "values", "type" : { - "string" : { + "array" : { + "_0" : { + "double" : { + } + } } } } ], "returnType" : { - "double" : { - - } - } - } - ], - "globalGetters" : [ - { - "from" : "global", - "name" : "globalObject1", - "type" : { - "jsValue" : { + "array" : { + "_0" : { + "double" : { + } + } } } - } - ], - "types" : [ + }, { - "constructor" : { - "parameters" : [ - { - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "name" : "prefix", - "type" : { - "string" : { + "name" : "jsRoundTripStringArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + } } } } - ] - }, - "getters" : [ - { - "name" : "name", - "type" : { + } + ], + "returnType" : { + "array" : { + "_0" : { "string" : { } } - }, - { - "name" : "prefix", - "type" : { + } + } + }, + { + "name" : "jsRoundTripBoolArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "name" : "jsSumNumberArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "jsCreateNumberArray", + "parameters" : [ + + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "from" : "global", + "name" : "parseInt", + "parameters" : [ + { + "name" : "string", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + } + ], + "globalGetters" : [ + { + "from" : "global", + "name" : "globalObject1", + "type" : { + "jsValue" : { + + } + } + } + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ] + }, + "getters" : [ + { + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "name" : "prefix", + "type" : { "string" : { } @@ -13203,6 +13528,258 @@ } ] }, + { + "functions" : [ + { + "name" : "jsRoundTripIntArray", + "parameters" : [ + { + "name" : "items", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "jsArrayLength", + "parameters" : [ + { + "name" : "items", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "makeArrayHost", + "parameters" : [ + { + "name" : "numbers", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "labels", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "ArrayHost" + } + } + } + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + { + "name" : "numbers", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "labels", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ] + }, + "getters" : [ + { + "name" : "numbers", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "labels", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "methods" : [ + { + "name" : "concatNumbers", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "concatLabels", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "name" : "firstLabel", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "ArrayHost", + "setters" : [ + { + "functionName" : "numbers_set", + "name" : "numbers", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "functionName" : "labels_set", + "name" : "labels", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "staticMethods" : [ + + ] + } + ] + }, { "functions" : [ { diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index 460297133..a465c57b4 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -152,6 +152,33 @@ class ImportAPITests: XCTestCase { XCTAssertEqual(prefixer("world!"), "Hello, world!") } + func testRoundTripIntArray() throws { + let values = [1, 2, 3, 4, 5] + let result = try jsRoundTripIntArray(values) + XCTAssertEqual(result, values) + XCTAssertEqual(try jsArrayLength(values), values.count) + XCTAssertEqual(try jsRoundTripIntArray([]), []) + } + + func testJSClassArrayMembers() throws { + let numbers = [1, 2, 3] + let labels = ["alpha", "beta"] + let host = try makeArrayHost(numbers, labels) + + XCTAssertEqual(try host.numbers, numbers) + XCTAssertEqual(try host.labels, labels) + + try host.setNumbers([10, 20]) + try host.setLabels(["gamma"]) + XCTAssertEqual(try host.numbers, [10, 20]) + XCTAssertEqual(try host.labels, ["gamma"]) + + XCTAssertEqual(try host.concatNumbers([30, 40]), [10, 20, 30, 40]) + XCTAssertEqual(try host.concatLabels(["delta", "epsilon"]), ["gamma", "delta", "epsilon"]) + XCTAssertEqual(try host.firstLabel([]), "gamma") + XCTAssertEqual(try host.firstLabel(["zeta"]), "zeta") + } + func testClosureParameterIntToVoid() throws { var total = 0 let ret = try jsCallTwice(5) { total += $0 } @@ -178,4 +205,38 @@ class ImportAPITests: XCTestCase { let dashed = try StaticBox.with_dashes() XCTAssertEqual(try dashed.value(), 7) } + + func testRoundTripNumberArray() throws { + let input: [Double] = [1.0, 2.5, 3.0, -4.5] + let result = try jsRoundTripNumberArray(input) + XCTAssertEqual(result, input) + XCTAssertEqual(try jsRoundTripNumberArray([]), []) + XCTAssertEqual(try jsRoundTripNumberArray([42.0]), [42.0]) + } + + func testRoundTripStringArray() throws { + let input = ["Hello", "World", "🎉"] + let result = try jsRoundTripStringArray(input) + XCTAssertEqual(result, input) + XCTAssertEqual(try jsRoundTripStringArray([]), []) + XCTAssertEqual(try jsRoundTripStringArray(["", "a", ""]), ["", "a", ""]) + } + + func testRoundTripBoolArray() throws { + let input = [true, false, true, false] + let result = try jsRoundTripBoolArray(input) + XCTAssertEqual(result, input) + XCTAssertEqual(try jsRoundTripBoolArray([]), []) + } + + func testSumNumberArray() throws { + XCTAssertEqual(try jsSumNumberArray([1.0, 2.0, 3.0, 4.0]), 10.0) + XCTAssertEqual(try jsSumNumberArray([]), 0.0) + XCTAssertEqual(try jsSumNumberArray([42.0]), 42.0) + } + + func testCreateNumberArray() throws { + let result = try jsCreateNumberArray() + XCTAssertEqual(result, [1.0, 2.0, 3.0, 4.0, 5.0]) + } } diff --git a/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift new file mode 100644 index 000000000..3f33de86a --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift @@ -0,0 +1,17 @@ +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] +@JSFunction func jsArrayLength(_ items: [Int]) throws(JSException) -> Int + +@JSClass struct ArrayHost { + @JSGetter var numbers: [Int] + @JSGetter var labels: [String] + @JSSetter func setNumbers(_ value: [Int]) throws(JSException) + @JSSetter func setLabels(_ value: [String]) throws(JSException) + @JSFunction init(_ numbers: [Int], _ labels: [String]) throws(JSException) + @JSFunction func concatNumbers(_ values: [Int]) throws(JSException) -> [Int] + @JSFunction func concatLabels(_ values: [String]) throws(JSException) -> [String] + @JSFunction func firstLabel(_ values: [String]) throws(JSException) -> String +} + +@JSFunction func makeArrayHost(_ numbers: [Int], _ labels: [String]) throws(JSException) -> ArrayHost diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift index c7de5d137..49869e0f5 100644 --- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -234,3 +234,28 @@ @JS func roundTripFooContainer(_ container: FooContainer) -> FooContainer { return container } + +@JS struct ArrayMembers { + var ints: [Int] + var optStrings: [String]? + + @JS func sumValues(_ values: [Int]) -> Int { + values.reduce(0, +) + } + + @JS func firstString(_ values: [String]) -> String? { + values.first + } +} + +@JS func roundTripArrayMembers(_ value: ArrayMembers) -> ArrayMembers { + value +} + +@JS func arrayMembersSum(_ value: ArrayMembers, _ values: [Int]) -> Int { + value.sumValues(values) +} + +@JS func arrayMembersFirst(_ value: ArrayMembers, _ values: [String]) -> String? { + value.firstString(values) +} diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index 03ecb5b39..b7dc6c48d 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -44,3 +44,9 @@ export class StaticBox { static makeDefault(): StaticBox; static "with-dashes"(): StaticBox; } + +export function jsRoundTripNumberArray(values: number[]): number[]; +export function jsRoundTripStringArray(values: string[]): string[]; +export function jsRoundTripBoolArray(values: boolean[]): boolean[]; +export function jsSumNumberArray(values: number[]): number; +export function jsCreateNumberArray(): number[]; diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index cc21a864a..e8f0b081c 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -33,6 +33,22 @@ export async function setupOptions(options, context) { return { ...options, getImports: (importsContext) => { + const ArrayHost = class { + constructor(numbers, labels) { + this.numbers = numbers; + this.labels = labels; + } + concatNumbers(values) { + return [...this.numbers, ...values]; + } + concatLabels(values) { + return [...this.labels, ...values]; + } + firstLabel(values) { + const merged = [...values, ...this.labels]; + return merged.length > 0 ? merged[0] : ""; + } + }; return { "jsRoundTripVoid": () => { return; @@ -55,6 +71,12 @@ export async function setupOptions(options, context) { "jsRoundTripJSValue": (v) => { return v; }, + "jsRoundTripIntArray": (items) => { + return items; + }, + "jsArrayLength": (items) => { + return items.length; + }, "jsThrowOrVoid": (shouldThrow) => { if (shouldThrow) { throw new Error("TestError"); @@ -87,6 +109,10 @@ export async function setupOptions(options, context) { "$jsWeirdFunction": () => { return 42; }, + ArrayHost, + makeArrayHost: (numbers, labels) => { + return new ArrayHost(numbers, labels); + }, JsGreeter: class { /** * @param {string} name @@ -140,6 +166,24 @@ export async function setupOptions(options, context) { }, jsTranslatePoint: (point, dx, dy) => { return { x: (point.x | 0) + (dx | 0), y: (point.y | 0) + (dy | 0) }; + }, + jsRoundTripNumberArray: (values) => { + return values; + }, + jsRoundTripStringArray: (values) => { + return values; + }, + jsRoundTripBoolArray: (values) => { + return values; + }, + jsSumNumberArray: (values) => { + return values.reduce((a, b) => a + b, 0); + }, + jsCreateNumberArray: () => { + return [1, 2, 3, 4, 5]; + }, + roundTripArrayMembers: (value) => { + return value; } }; }, @@ -223,6 +267,12 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { ]) { assert.equal(exports.roundTripString(v), v); } + const arrayStruct = { ints: [1, 2, 3], optStrings: ["a", "b"] }; + const arrayStructRoundTrip = exports.roundTripArrayMembers(arrayStruct); + assert.deepEqual(arrayStructRoundTrip.ints, [1, 2, 3]); + assert.deepEqual(arrayStructRoundTrip.optStrings, ["a", "b"]); + assert.equal(exports.arrayMembersSum(arrayStruct, [10, 20]), 30); + assert.equal(exports.arrayMembersFirst(arrayStruct, ["x", "y"]), "x"); for (const p of [1, 4, 1024, 65536, 2147483647]) { assert.equal(exports.roundTripUnsafeRawPointer(p), p); From 66f0d1270f202839bc8d961b171bf14474755e5d Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 4 Feb 2026 17:47:17 +0000 Subject: [PATCH 153/252] build-examples.sh: re-enable Embedded example package (#490) The compiler crash should be fixed in `swift-DEVELOPMENT-SNAPSHOT-2026-01-07-a`. Resolves https://github.com/swiftwasm/JavaScriptKit/issues/449. --- .github/workflows/test.yml | 2 +- Examples/Embedded/build.sh | 2 +- Utilities/build-examples.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 06faa39f0..7b5a808bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -153,7 +153,7 @@ jobs: - uses: actions/checkout@v6 - uses: ./.github/actions/install-swift with: - download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a/swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a-ubuntu22.04.tar.gz + download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-02-02-a/swift-DEVELOPMENT-SNAPSHOT-2026-02-02-a-ubuntu22.04.tar.gz - uses: swiftwasm/setup-swiftwasm@v2 id: setup-wasm32-unknown-wasip1 with: { target: wasm32-unknown-wasip1 } diff --git a/Examples/Embedded/build.sh b/Examples/Embedded/build.sh index 7b33e4b74..2d035493a 100755 --- a/Examples/Embedded/build.sh +++ b/Examples/Embedded/build.sh @@ -2,4 +2,4 @@ set -euxo pipefail package_dir="$(cd "$(dirname "$0")" && pwd)" swift package --package-path "$package_dir" \ - -c release --swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm-embedded" js + -c release --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}-embedded" js diff --git a/Utilities/build-examples.sh b/Utilities/build-examples.sh index 4d99c8627..bc84e6943 100755 --- a/Utilities/build-examples.sh +++ b/Utilities/build-examples.sh @@ -2,7 +2,7 @@ set -euo pipefail -EXCLUDED_EXAMPLES=("Embedded") +EXCLUDED_EXAMPLES=() for example in Examples/*; do skip_example=false From ffa6c066fb561011b2d0f362f75170b2caf00f20 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 10:12:33 +0900 Subject: [PATCH 154/252] - Added JSValue-aware stack lift/lower fragments so arrays push/pop JSValue payloads using the shared helpers, enabling `[JSValue]` round-trips in both directions (`Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift`). - Extended JSValue test inputs with array and optional-array cases plus a JS-imported array echo to exercise the new path (`Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift`). - Updated codegen/link snapshots to reflect the new JSValue array glue (`Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js`, `Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts`). Tests: `UPDATE_SNAPSHOTS=1 swift test --package-path ./Plugins/BridgeJS`. Next step: run `make unittest SWIFT_SDK_ID=DEVELOPMENT-SNAPSHOT-2025-11-03-a-wasm32-unknown-wasip1` for the full runtime suite if you want end-to-end validation. --- .../Sources/BridgeJSLink/JSGlueGen.swift | 33 +++++- .../Inputs/MacroSwift/JSValue.swift | 9 ++ .../BridgeJSCodegenTests/JSValue.json | 102 ++++++++++++++++++ .../BridgeJSCodegenTests/JSValue.swift | 49 +++++++++ .../BridgeJSLinkTests/JSValue.d.ts | 3 + .../BridgeJSLinkTests/JSValue.js | 83 ++++++++++++++ 6 files changed, 277 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 410bce672..cdb23f606 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2613,7 +2613,23 @@ struct IntrinsicJSFragment: Sendable { private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: - throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") + return IntrinsicJSFragment( + parameters: [], + printCode: { _, scope, printer, cleanup in + registerJSValueHelpers(scope: scope) + let payload2Var = scope.variable("jsValuePayload2") + let payload1Var = scope.variable("jsValuePayload1") + let kindVar = scope.variable("jsValueKind") + printer.write("const \(payload2Var) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + printer.write("const \(payload1Var) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(kindVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + let resultVar = scope.variable("jsValue") + printer.write( + "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" + ) + return [resultVar] + } + ) case .string: return IntrinsicJSFragment( parameters: [], @@ -2775,7 +2791,20 @@ struct IntrinsicJSFragment: Sendable { private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: - throw BridgeJSLinkError(message: "Array of JSValue is not supported yet") + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, scope, printer, cleanup in + registerJSValueHelpers(scope: scope) + let lowered = jsValueLower.printCode([arguments[0]], scope, printer, cleanup) + let kindVar = lowered[0] + let payload1Var = lowered[1] + let payload2Var = lowered[2] + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(kindVar));") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(payload1Var));") + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(payload2Var));") + return [] + } + ) case .string: return IntrinsicJSFragment( parameters: ["value"], diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift index 84251f6b3..2a34f5f2b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSValue.swift @@ -6,6 +6,14 @@ return value } +@JS func roundTripJSValueArray(_ values: [JSValue]) -> [JSValue] { + return values +} + +@JS func roundTripOptionalJSValueArray(_ values: [JSValue]?) -> [JSValue]? { + return values +} + @JS class JSValueHolder { @JS var value: JSValue @JS var optionalValue: JSValue? @@ -30,3 +38,4 @@ } @JSFunction func jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue +@JSFunction func jsEchoJSValueArray(_ values: [JSValue]) throws(JSException) -> [JSValue] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json index d10d673d4..5bd83be27 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.json @@ -231,6 +231,82 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_roundTripJSValueArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSValueArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalJSValueArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalJSValueArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } } ], "protocols" : [ @@ -261,6 +337,32 @@ } } + }, + { + "name" : "jsEchoJSValueArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } } ], "types" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index 3a3be5079..f3550129c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -20,6 +20,37 @@ public func _bjs_roundTripOptionalJSValue(_ valueIsSome: Int32, _ valueKind: Int #endif } +@_expose(wasm, "bjs_roundTripJSValueArray") +@_cdecl("bjs_roundTripJSValueArray") +public func _bjs_roundTripJSValueArray() -> Void { + #if arch(wasm32) + let ret = roundTripJSValueArray(_: [JSValue].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalJSValueArray") +@_cdecl("bjs_roundTripOptionalJSValueArray") +public func _bjs_roundTripOptionalJSValueArray(_ values: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalJSValueArray(_: { + if values == 0 { + return Optional<[JSValue]>.none + } else { + return [JSValue].bridgeJSLiftParameter() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + __bjs_unwrapped_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_JSValueHolder_init") @_cdecl("bjs_JSValueHolder_init") public func _bjs_JSValueHolder_init(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64, _ optionalValueIsSome: Int32, _ optionalValueKind: Int32, _ optionalValuePayload1: Int32, _ optionalValuePayload2: Float64) -> UnsafeMutableRawPointer { @@ -146,4 +177,22 @@ func _$jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue { throw error } return JSValue.bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_jsEchoJSValueArray") +fileprivate func bjs_jsEchoJSValueArray() -> Void +#else +fileprivate func bjs_jsEchoJSValueArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsEchoJSValueArray(_ values: [JSValue]) throws(JSException) -> [JSValue] { + let _ = values.bridgeJSLowerParameter() + bjs_jsEchoJSValueArray() + if let error = _swift_js_take_exception() { + throw error + } + return [JSValue].bridgeJSLiftReturn() } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts index 9e2a85ac7..f4c13c610 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.d.ts @@ -24,9 +24,12 @@ export type Exports = { } roundTripJSValue(value: any): any; roundTripOptionalJSValue(value: any | null): any | null; + roundTripJSValueArray(values: any[]): any[]; + roundTripOptionalJSValueArray(values: any[] | null): any[] | null; } export type Imports = { jsEchoJSValue(value: any): any; + jsEchoJSValueArray(values: any[]): any[]; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 2bd696c3d..f5c360bb0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -312,6 +312,31 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_jsEchoJSValueArray"] = function bjs_jsEchoJSValueArray() { + try { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + arrayResult.push(jsValue); + } + arrayResult.reverse(); + let ret = imports.jsEchoJSValueArray(arrayResult); + const arrayCleanups = []; + for (const elem of ret) { + const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); + tmpParamInts.push(elemKind); + tmpParamInts.push(elemPayload1); + tmpParamF64s.push(elemPayload2); + } + tmpParamInts.push(ret.length); + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; @@ -448,6 +473,64 @@ export async function createInstantiator(options, swift) { } return optResult; }, + roundTripJSValueArray: function bjs_roundTripJSValueArray(values) { + const arrayCleanups = []; + for (const elem of values) { + const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); + tmpParamInts.push(elemKind); + tmpParamInts.push(elemPayload1); + tmpParamF64s.push(elemPayload2); + } + tmpParamInts.push(values.length); + instance.exports.bjs_roundTripJSValueArray(); + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + arrayResult.push(jsValue); + } + arrayResult.reverse(); + for (const cleanup of arrayCleanups) { cleanup(); } + return arrayResult; + }, + roundTripOptionalJSValueArray: function bjs_roundTripOptionalJSValueArray(values) { + const isSome = values != null; + const valuesCleanups = []; + if (isSome) { + const arrayCleanups = []; + for (const elem of values) { + const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); + tmpParamInts.push(elemKind); + tmpParamInts.push(elemPayload1); + tmpParamF64s.push(elemPayload2); + } + tmpParamInts.push(values.length); + valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); + } + instance.exports.bjs_roundTripOptionalJSValueArray(+isSome); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const jsValuePayload2 = tmpRetF64s.pop(); + const jsValuePayload1 = tmpRetInts.pop(); + const jsValueKind = tmpRetInts.pop(); + const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + arrayResult.push(jsValue); + } + arrayResult.reverse(); + optResult = arrayResult; + } else { + optResult = null; + } + for (const cleanup of valuesCleanups) { cleanup(); } + return optResult; + }, }; _exports = exports; return exports; From 3dba5dfe81e9d17f64b62c4f6f1cebfd9dea5254 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 10:27:11 +0900 Subject: [PATCH 155/252] - Added JSValue array support end-to-end: JS glue now lowers/lifts optional JSValue arrays, using tmp stacks and JSValue helpers, and Swift intrinsics gained Optional<[JSValue]> bridging (`Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift`, `Sources/JavaScriptKit/BridgeJSIntrinsics.swift`). - Expanded runtime coverage with JSValue array round-trips (including optionals) on both import and export paths plus JS prelude wiring and d.ts definitions (`Tests/BridgeJSRuntimeTests/ExportAPITests.swift`, `Tests/BridgeJSRuntimeTests/ImportAPITests.swift`, `Tests/BridgeJSRuntimeTests/bridge-js.d.ts`, `Tests/prelude.mjs`), and regenerated BridgeJS outputs (`Tests/BridgeJSRuntimeTests/Generated/*`, `Tests/BridgeJSGlobalTests/Generated/*`, plugin outputs). - Runtime tests now include JSValue array cases and all suites pass with the prescribed SDK. Tests: `make unittest SWIFT_SDK_ID=DEVELOPMENT-SNAPSHOT-2025-11-03-a-wasm32-unknown-wasip1`. --- .../Sources/BridgeJSLink/JSGlueGen.swift | 14 ++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 44 ++++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 8 + .../Generated/BridgeJS.Macros.swift | 4 + .../Generated/BridgeJS.swift | 67 +++++++++ .../Generated/JavaScript/BridgeJS.json | 138 ++++++++++++++++++ .../BridgeJSRuntimeTests/ImportAPITests.swift | 26 ++++ Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 2 + Tests/prelude.mjs | 10 ++ 9 files changed, 313 insertions(+) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index cdb23f606..60a6bd338 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1029,6 +1029,20 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(payload2Var));") } printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(isSomeVar) ? 1 : 0);") + case .array(let elementType): + printer.write("if (\(isSomeVar)) {") + printer.indent { + let arrayLowerFragment = try! arrayLower(elementType: elementType) + let arrayCleanup = CodeFragmentPrinter() + let _ = arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + if !arrayCleanup.lines.isEmpty { + for line in arrayCleanup.lines { + printer.write(line) + } + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") case .rawValueEnum(_, let rawType): switch rawType { case .string: diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 349cecb91..1c8592724 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -1394,6 +1394,50 @@ extension Optional where Wrapped == JSValue { } } +extension Optional where Wrapped == [JSValue] { + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return 0 + case .some(let array): + array.bridgeJSLowerReturn() + return 1 + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [JSValue]? { + if isSome == 0 { + return nil + } + return [JSValue].bridgeJSLiftParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [JSValue]? { + let isSome = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [JSValue]? { + let isSome = _swift_js_pop_i32() + if isSome == 0 { + return nil + } + return [JSValue].bridgeJSLiftReturn() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + switch consume self { + case .none: + _swift_js_push_i32(0) + case .some(let array): + array.bridgeJSLowerReturn() + _swift_js_push_i32(1) + } + } +} + extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { // MARK: ExportSwift diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index fe73ea6fb..05fcf146a 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -60,6 +60,14 @@ func runJsWorks() -> Void return v } +@JS func roundTripJSValueArray(v: [JSValue]) -> [JSValue] { + return v +} + +@JS func roundTripOptionalJSValueArray(v: [JSValue]?) -> [JSValue]? { + return v +} + @JSClass struct Foo { @JSGetter var value: String @JSFunction init(_ value: String) throws(JSException) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 9e05b3ae8..675bf9dfb 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -20,6 +20,10 @@ @JSFunction func jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue +@JSFunction func jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] + +@JSFunction func jsRoundTripOptionalJSValueArray(_ v: Optional<[JSValue]>) throws(JSException) -> Optional<[JSValue]> + @JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void @JSFunction func jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 5638d0442..40f1a5690 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3832,6 +3832,37 @@ public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vP #endif } +@_expose(wasm, "bjs_roundTripJSValueArray") +@_cdecl("bjs_roundTripJSValueArray") +public func _bjs_roundTripJSValueArray() -> Void { + #if arch(wasm32) + let ret = roundTripJSValueArray(v: [JSValue].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalJSValueArray") +@_cdecl("bjs_roundTripOptionalJSValueArray") +public func _bjs_roundTripOptionalJSValueArray(_ v: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalJSValueArray(v: { + if v == 0 { + return Optional<[JSValue]>.none + } else { + return [JSValue].bridgeJSLiftParameter() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + __bjs_unwrapped_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_makeImportedFoo") @_cdecl("bjs_makeImportedFoo") public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { @@ -8583,6 +8614,42 @@ func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue { return JSValue.bridgeJSLiftReturn() } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValueArray") +fileprivate func bjs_jsRoundTripJSValueArray() -> Void +#else +fileprivate func bjs_jsRoundTripJSValueArray() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] { + let _ = v.bridgeJSLowerParameter() + bjs_jsRoundTripJSValueArray() + if let error = _swift_js_take_exception() { + throw error + } + return [JSValue].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalJSValueArray") +fileprivate func bjs_jsRoundTripOptionalJSValueArray(_ v: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalJSValueArray(_ v: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalJSValueArray(_ v: Optional<[JSValue]>) throws(JSException) -> Optional<[JSValue]> { + let vIsSome = v.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalJSValueArray(vIsSome) + if let error = _swift_js_take_exception() { + throw error + } + return Optional<[JSValue]>.bridgeJSLiftReturn() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 366115792..e9591185d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -5637,6 +5637,82 @@ } } }, + { + "abiName" : "bjs_roundTripJSValueArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripJSValueArray", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalJSValueArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalJSValueArray", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } + }, { "abiName" : "bjs_makeImportedFoo", "effects" : { @@ -12944,6 +13020,68 @@ } } }, + { + "name" : "jsRoundTripJSValueArray", + "parameters" : [ + { + "name" : "v", + "type" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripOptionalJSValueArray", + "parameters" : [ + { + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "jsValue" : { + + } + } + } + }, + "_1" : "null" + } + } + }, { "name" : "jsThrowOrVoid", "parameters" : [ diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index a465c57b4..43aa6d565 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -73,6 +73,32 @@ class ImportAPITests: XCTestCase { } } + func testRoundTripJSValueArray() throws { + let object = JSObject.global + let symbol = JSSymbol("array") + let bigInt = JSBigInt(_slowBridge: Int64(42)) + let values: [JSValue] = [ + .boolean(false), + .number(123.5), + .string(JSString("hello")), + .object(object), + .null, + .undefined, + .symbol(symbol), + .bigInt(bigInt), + ] + let roundTripped = try jsRoundTripJSValueArray(values) + XCTAssertEqual(roundTripped, values) + XCTAssertEqual(try jsRoundTripJSValueArray([]), []) + } + + func testRoundTripOptionalJSValueArray() throws { + XCTAssertNil(try jsRoundTripOptionalJSValueArray(nil)) + let values: [JSValue] = [.number(1), .undefined, .null] + let result = try jsRoundTripOptionalJSValueArray(values) + XCTAssertEqual(result, values) + } + func testRoundTripFeatureFlag() throws { for v in [FeatureFlag.foo, .bar] { try XCTAssertEqual(jsRoundTripFeatureFlag(v), v) diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index b7dc6c48d..2f01a5a6e 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -6,6 +6,8 @@ export function jsRoundTripOptionalNumberNull(v: number | null): number | null export function jsRoundTripOptionalNumberUndefined(v: number | undefined): number | undefined export type JSValue = any export function jsRoundTripJSValue(v: JSValue): JSValue +export function jsRoundTripJSValueArray(v: JSValue[]): JSValue[] +export function jsRoundTripOptionalJSValueArray(v: JSValue[] | null): JSValue[] | null export function jsThrowOrVoid(shouldThrow: boolean): void export function jsThrowOrNumber(shouldThrow: boolean): number export function jsThrowOrBool(shouldThrow: boolean): boolean diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index e8f0b081c..2809a96e9 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -71,6 +71,12 @@ export async function setupOptions(options, context) { "jsRoundTripJSValue": (v) => { return v; }, + "jsRoundTripJSValueArray": (values) => { + return values; + }, + "jsRoundTripOptionalJSValueArray": (values) => { + return values ?? null; + }, "jsRoundTripIntArray": (items) => { return items; }, @@ -273,6 +279,10 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.deepEqual(arrayStructRoundTrip.optStrings, ["a", "b"]); assert.equal(exports.arrayMembersSum(arrayStruct, [10, 20]), 30); assert.equal(exports.arrayMembersFirst(arrayStruct, ["x", "y"]), "x"); + const jsValueArray = [true, 42, "ok", { nested: 1 }, null, undefined]; + assert.deepEqual(exports.roundTripJSValueArray(jsValueArray), jsValueArray); + assert.deepEqual(exports.roundTripOptionalJSValueArray(jsValueArray), jsValueArray); + assert.equal(exports.roundTripOptionalJSValueArray(null), null); for (const p of [1, 4, 1024, 65536, 2147483647]) { assert.equal(exports.roundTripUnsafeRawPointer(p), p); From f56d72f1709e5d172352a763bb2f2e3838a3de2f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 15:07:13 +0900 Subject: [PATCH 156/252] BridgeJS: Fix throws hint spacing (#584) --- Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 39e3090cd..3de74f74b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -2017,7 +2017,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { DiagnosticError( node: node, message: "@\(attributeName) declarations must be throws.", - hint: "Declare the function as 'throws (JSException)'." + hint: "Declare the function as 'throws(JSException)'." ) ) return nil From 4db13d9af83cc1318c3e122aa32834436b2e1f2a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 15:07:28 +0900 Subject: [PATCH 157/252] [NFC] BridgeJS: Split out OptionalSupportTests.swift (#583) BridgeJS: Split out OptionalSupportTests.swift --- Package.swift | 1 + Package@swift-6.2.swift | 1 + .../BridgeJSRuntimeTests/ExportAPITests.swift | 190 +- .../Generated/BridgeJS.Macros.swift | 4 - .../Generated/BridgeJS.swift | 2748 ++++++----- .../Generated/JavaScript/BridgeJS.json | 4382 +++++++++-------- .../BridgeJSRuntimeTests/ImportAPITests.swift | 20 - .../JavaScript/OptionalSupportTests.mjs | 219 + .../BridgeJSRuntimeTests/JavaScript/Types.mjs | 6 + .../OptionalSupportTests.swift | 232 + Tests/BridgeJSRuntimeTests/bridge-js.d.ts | 2 - Tests/prelude.mjs | 203 +- 12 files changed, 4108 insertions(+), 3900 deletions(-) create mode 100644 Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs create mode 100644 Tests/BridgeJSRuntimeTests/JavaScript/Types.mjs create mode 100644 Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift diff --git a/Package.swift b/Package.swift index 1d4c8fb06..c7f3517e8 100644 --- a/Package.swift +++ b/Package.swift @@ -183,6 +183,7 @@ let package = Package( "bridge-js.d.ts", "bridge-js.global.d.ts", "Generated/JavaScript", + "JavaScript", ], swiftSettings: [ .enableExperimentalFeature("Extern") diff --git a/Package@swift-6.2.swift b/Package@swift-6.2.swift index 456a87ca0..f640feeb7 100644 --- a/Package@swift-6.2.swift +++ b/Package@swift-6.2.swift @@ -194,6 +194,7 @@ let package = Package( "bridge-js.d.ts", "bridge-js.global.d.ts", "Generated/JavaScript", + "JavaScript", ], swiftSettings: [ .enableExperimentalFeature("Extern") diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index fe73ea6fb..a41cc3029 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -515,123 +515,6 @@ enum ComplexResult { return result } -// MARK: - Optionals - -@JS func roundTripOptionalString(name: String?) -> String? { - return name -} - -@JS func roundTripOptionalInt(value: Int?) -> Int? { - return value -} - -@JS func roundTripOptionalBool(flag: Bool?) -> Bool? { - return flag -} - -@JS func roundTripOptionalFloat(number: Float?) -> Float? { - return number -} - -@JS func roundTripOptionalDouble(precision: Double?) -> Double? { - return precision -} - -@JS func roundTripOptionalSyntax(name: Optional) -> Optional { - return name -} - -@JS func roundTripOptionalMixSyntax(name: String?) -> Optional { - return name -} - -@JS func roundTripOptionalSwiftSyntax(name: Swift.Optional) -> Swift.Optional { - return name -} - -@JS func roundTripOptionalWithSpaces(value: Optional) -> Optional { - return value -} - -typealias OptionalAge = Int? -@JS func roundTripOptionalTypeAlias(age: OptionalAge) -> OptionalAge { - return age -} - -@JS func roundTripOptionalStatus(value: Status?) -> Status? { - return value -} - -@JS func roundTripOptionalTheme(value: Theme?) -> Theme? { - return value -} - -@JS func roundTripOptionalHttpStatus(value: HttpStatus?) -> HttpStatus? { - return value -} - -@JS func roundTripOptionalTSDirection(value: TSDirection?) -> TSDirection? { - return value -} - -@JS func roundTripOptionalTSTheme(value: TSTheme?) -> TSTheme? { - return value -} - -@JS func roundTripOptionalNetworkingAPIMethod(_ method: Networking.API.Method?) -> Networking.API.Method? { - return method -} - -@JS func roundTripOptionalAPIResult(value: APIResult?) -> APIResult? { - return value -} - -@JS enum TypedPayloadResult { - case precision(Precision) - case direction(Direction) - case optPrecision(Precision?) - case optDirection(Direction?) - case empty -} - -@JS func roundTripTypedPayloadResult(_ result: TypedPayloadResult) -> TypedPayloadResult { - return result -} - -@JS func roundTripOptionalTypedPayloadResult(_ result: TypedPayloadResult?) -> TypedPayloadResult? { - return result -} - -@JS func compareAPIResults(_ r1: APIResult?, _ r2: APIResult?) -> String { - let r1Str: String - switch r1 { - case .none: r1Str = "nil" - case .some(.success(let msg)): r1Str = "success:\(msg)" - case .some(.failure(let code)): r1Str = "failure:\(code)" - case .some(.info): r1Str = "info" - case .some(.flag(let b)): r1Str = "flag:\(b)" - case .some(.rate(let r)): r1Str = "rate:\(r)" - case .some(.precise(let p)): r1Str = "precise:\(p)" - } - - let r2Str: String - switch r2 { - case .none: r2Str = "nil" - case .some(.success(let msg)): r2Str = "success:\(msg)" - case .some(.failure(let code)): r2Str = "failure:\(code)" - case .some(.info): r2Str = "info" - case .some(.flag(let b)): r2Str = "flag:\(b)" - case .some(.rate(let r)): r2Str = "rate:\(r)" - case .some(.precise(let p)): r2Str = "precise:\(p)" - } - - return "r1:\(r1Str),r2:\(r2Str)" -} - -@JS func roundTripOptionalComplexResult(_ result: ComplexResult?) -> ComplexResult? { - return result -} - @JS enum AllTypesResult { case structPayload(Address) @@ -644,76 +527,19 @@ enum AllTypesResult { } @JS func roundTripAllTypesResult(_ result: AllTypesResult) -> AllTypesResult { - return result -} - -@JS func roundTripOptionalAllTypesResult(_ result: AllTypesResult?) -> AllTypesResult? { - return result + result } -@JS -enum OptionalAllTypesResult { - case optStruct(Address?) - case optClass(Greeter?) - case optJSObject(JSObject?) - case optNestedEnum(APIResult?) - case optArray([Int]?) - case optJsClass(Foo?) +@JS enum TypedPayloadResult { + case precision(Precision) + case direction(Direction) + case optPrecision(Precision?) + case optDirection(Direction?) case empty } -@JS func roundTripOptionalPayloadResult(_ result: OptionalAllTypesResult) -> OptionalAllTypesResult { - return result -} - -@JS func roundTripOptionalPayloadResultOpt(_ result: OptionalAllTypesResult?) -> OptionalAllTypesResult? { - return result -} - -@JS func roundTripOptionalClass(value: Greeter?) -> Greeter? { - return value -} - -@JS func roundTripOptionalGreeter(_ value: Greeter?) -> Greeter? { - value -} - -@JS func applyOptionalGreeter(_ value: Greeter?, _ transform: (Greeter?) -> Greeter?) -> Greeter? { - transform(value) -} - -@JS class OptionalHolder { - @JS var nullableGreeter: Greeter? - @JS var undefinedNumber: JSUndefinedOr - - @JS init(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) { - self.nullableGreeter = nullableGreeter - self.undefinedNumber = undefinedNumber - } -} - -@JS func makeOptionalHolder(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) -> OptionalHolder { - OptionalHolder(nullableGreeter: nullableGreeter, undefinedNumber: undefinedNumber) -} - -@JS class OptionalPropertyHolder { - @JS var optionalName: String? - @JS var optionalAge: Int? = nil - @JS var optionalGreeter: Greeter? = nil - - @JS init(optionalName: String?) { - self.optionalName = optionalName - } -} - -@JS -enum APIOptionalResult { - case success(String?) - case failure(Int?, Bool?) - case status(Bool?, Int?, String?) -} -@JS func roundTripOptionalAPIOptionalResult(result: APIOptionalResult?) -> APIOptionalResult? { - return result +@JS func roundTripTypedPayloadResult(_ result: TypedPayloadResult) -> TypedPayloadResult { + result } // MARK: - Property Tests diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 9e05b3ae8..dcaad63fa 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -14,10 +14,6 @@ @JSFunction func jsRoundTripString(_ v: String) throws(JSException) -> String -@JSFunction func jsRoundTripOptionalNumberNull(_ v: Optional) throws(JSException) -> Optional - -@JSFunction func jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr - @JSFunction func jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue @JSFunction func jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 5638d0442..51751dec1 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1806,91 +1806,6 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } -extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { - switch caseId { - case 0: - return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) - case 1: - return .direction(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) - case 2: - return .optPrecision(Optional.bridgeJSLiftParameter()) - case 3: - return .optDirection(Optional.bridgeJSLiftParameter()) - case 4: - return .empty - default: - fatalError("Unknown TypedPayloadResult case ID: \(caseId)") - } - } - - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - switch self { - case .precision(let param0): - param0.bridgeJSLowerStackReturn() - return Int32(0) - case .direction(let param0): - param0.bridgeJSLowerStackReturn() - return Int32(1) - case .optPrecision(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - return Int32(2) - case .optDirection(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - return Int32(3) - case .empty: - return Int32(4) - } - } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .precision(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) - case .direction(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) - case .optPrecision(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(2)) - case .optDirection(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(3)) - case .empty: - _swift_js_push_tag(Int32(4)) - } - } -} - extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> AllTypesResult { switch caseId { @@ -1976,34 +1891,21 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { } } -extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { +extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: - return .optStruct(Optional
        .bridgeJSLiftParameter()) + return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) case 1: - return .optClass(Optional.bridgeJSLiftParameter()) + return .direction(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) case 2: - return .optJSObject(Optional.bridgeJSLiftParameter()) + return .optPrecision(Optional.bridgeJSLiftParameter()) case 3: - return .optNestedEnum(Optional.bridgeJSLiftParameter()) + return .optDirection(Optional.bridgeJSLiftParameter()) case 4: - return .optArray({ - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) - case 5: - return .optJsClass(Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - }) - case 6: return .empty default: - fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)") + fatalError("Unknown TypedPayloadResult case ID: \(caseId)") } } @@ -2011,248 +1913,95 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { - case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + case .precision(let param0): + param0.bridgeJSLowerStackReturn() return Int32(0) - case .optClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() return Int32(1) - case .optJSObject(let param0): + case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) - case .optNestedEnum(let param0): + case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) - case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - return Int32(4) - case .optJsClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - return Int32(5) case .empty: - return Int32(6) + return Int32(4) } } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { return _bridgeJSLiftFromCaseId(caseId) } // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { return _bridgeJSLiftFromCaseId(caseId) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { - case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + case .precision(let param0): + param0.bridgeJSLowerStackReturn() _swift_js_push_tag(Int32(0)) - case .optClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + case .direction(let param0): + param0.bridgeJSLowerStackReturn() _swift_js_push_tag(Int32(1)) - case .optJSObject(let param0): + case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(2)) - case .optNestedEnum(let param0): + case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) - case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(4)) - case .optJsClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(5)) case .empty: - _swift_js_push_tag(Int32(6)) + _swift_js_push_tag(Int32(4)) } } } -extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { - switch caseId { +extension StaticCalculator: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticCalculator { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticCalculator { + return StaticCalculator(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + private init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { case 0: - return .success(Optional.bridgeJSLiftParameter()) + self = .scientific case 1: - return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) - case 2: - return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + self = .basic default: - fatalError("Unknown APIOptionalResult case ID: \(caseId)") + return nil } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - switch self { - case .success(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - return Int32(0) - case .failure(let param0, let param1): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - return Int32(1) - case .status(let param0, let param1, let param2): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - let __bjs_isSome_param2 = param2 != nil - if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - return Int32(2) - } - } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(0)) - case .failure(let param0, let param1): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - _swift_js_push_tag(Int32(1)) - case .status(let param0, let param1, let param2): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - let __bjs_isSome_param2 = param2 != nil - if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - _swift_js_push_tag(Int32(2)) - } - } -} - -extension StaticCalculator: _BridgedSwiftCaseEnum { - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - return bridgeJSRawValue - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> StaticCalculator { - return bridgeJSLiftParameter(value) - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> StaticCalculator { - return StaticCalculator(bridgeJSRawValue: value)! - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSLowerParameter() - } - - private init?(bridgeJSRawValue: Int32) { - switch bridgeJSRawValue { - case 0: - self = .scientific - case 1: - self = .basic - default: - return nil - } - } - - private var bridgeJSRawValue: Int32 { + private var bridgeJSRawValue: Int32 { switch self { case .scientific: return 0 @@ -2532,108 +2281,359 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se #endif } -extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Int.bridgeJSLiftParameter() - let x = Int.bridgeJSLiftParameter() - return Point(x: x, y: y) +extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { + switch caseId { + case 0: + return .optStruct(Optional
        .bridgeJSLiftParameter()) + case 1: + return .optClass(Optional.bridgeJSLiftParameter()) + case 2: + return .optJSObject(Optional.bridgeJSLiftParameter()) + case 3: + return .optNestedEnum(Optional.bridgeJSLiftParameter()) + case 4: + return .optArray({ + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } + }()) + case 5: + return .optJsClass(Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + }) + case 6: + return .empty + default: + fatalError("Unknown OptionalAllTypesResult case ID: \(caseId)") + } } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() - } + // MARK: Protocol Export - init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(1) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(2) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(3) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(4) + case .optJsClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(5) + case .empty: + return Int32(6) } - self = Self.bridgeJSLiftParameter() } - func toJSObject() -> JSObject { - let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) } -} - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 -#else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 -#else -fileprivate func _bjs_struct_lift_Point() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif + // MARK: ExportSwift -extension PointerFields: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() - let ptr = UnsafePointer.bridgeJSLiftParameter() - let opaque = OpaquePointer.bridgeJSLiftParameter() - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() - let raw = UnsafeRawPointer.bridgeJSLiftParameter() - return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { + return _bridgeJSLiftFromCaseId(caseId) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.raw.bridgeJSLowerStackReturn() - self.mutRaw.bridgeJSLowerStackReturn() - self.opaque.bridgeJSLowerStackReturn() - self.ptr.bridgeJSLowerStackReturn() - self.mutPtr.bridgeJSLowerStackReturn() - } - - init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } - self = Self.bridgeJSLiftParameter() - } - - func toJSObject() -> JSObject { - let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 -#else -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 -#else -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -@_expose(wasm, "bjs_PointerFields_init") -@_cdecl("bjs_PointerFields_init") -public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) - return ret.bridgeJSLowerReturn() + switch self { + case .optStruct(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) + case .optClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(1)) + case .optJSObject(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + case .optNestedEnum(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(3)) + case .optArray(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(4)) + case .optJsClass(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(5)) + case .empty: + _swift_js_push_tag(Int32(6)) + } + } +} + +extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { + private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { + switch caseId { + case 0: + return .success(Optional.bridgeJSLiftParameter()) + case 1: + return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + case 2: + return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + default: + fatalError("Unknown APIOptionalResult case ID: \(caseId)") + } + } + + // MARK: Protocol Export + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + switch self { + case .success(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + return Int32(0) + case .failure(let param0, let param1): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + return Int32(1) + case .status(let param0, let param1, let param2): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + let __bjs_isSome_param2 = param2 != nil + if let __bjs_unwrapped_param2 = param2 { + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) + return Int32(2) + } + } + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + // MARK: ExportSwift + + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { + return _bridgeJSLiftFromCaseId(caseId) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + switch self { + case .success(let param0): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + _swift_js_push_tag(Int32(0)) + case .failure(let param0, let param1): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + _swift_js_push_tag(Int32(1)) + case .status(let param0, let param1, let param2): + let __bjs_isSome_param0 = param0 != nil + if let __bjs_unwrapped_param0 = param0 { + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + let __bjs_isSome_param1 = param1 != nil + if let __bjs_unwrapped_param1 = param1 { + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) + let __bjs_isSome_param2 = param2 != nil + if let __bjs_unwrapped_param2 = param2 { + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) + _swift_js_push_tag(Int32(2)) + } + } +} + +extension Point: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { + let y = Int.bridgeJSLiftParameter() + let x = Int.bridgeJSLiftParameter() + return Point(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") +fileprivate func _bjs_struct_lift_Point() -> Int32 +#else +fileprivate func _bjs_struct_lift_Point() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension PointerFields: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() + let ptr = UnsafePointer.bridgeJSLiftParameter() + let opaque = OpaquePointer.bridgeJSLiftParameter() + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() + let raw = UnsafeRawPointer.bridgeJSLiftParameter() + return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.raw.bridgeJSLowerStackReturn() + self.mutRaw.bridgeJSLowerStackReturn() + self.opaque.bridgeJSLowerStackReturn() + self.ptr.bridgeJSLowerStackReturn() + self.mutPtr.bridgeJSLowerStackReturn() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 +#else +fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_PointerFields_init") +@_cdecl("bjs_PointerFields_init") +public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4654,683 +4654,802 @@ public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void { #endif } -@_expose(wasm, "bjs_roundTripOptionalString") -@_cdecl("bjs_roundTripOptionalString") -public func _bjs_roundTripOptionalString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { - #if arch(wasm32) - let ret = roundTripOptionalString(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundTripOptionalInt") -@_cdecl("bjs_roundTripOptionalInt") -public func _bjs_roundTripOptionalInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { - #if arch(wasm32) - let ret = roundTripOptionalInt(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundTripOptionalBool") -@_cdecl("bjs_roundTripOptionalBool") -public func _bjs_roundTripOptionalBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void { - #if arch(wasm32) - let ret = roundTripOptionalBool(flag: Optional.bridgeJSLiftParameter(flagIsSome, flagValue)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundTripOptionalFloat") -@_cdecl("bjs_roundTripOptionalFloat") -public func _bjs_roundTripOptionalFloat(_ numberIsSome: Int32, _ numberValue: Float32) -> Void { - #if arch(wasm32) - let ret = roundTripOptionalFloat(number: Optional.bridgeJSLiftParameter(numberIsSome, numberValue)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundTripOptionalDouble") -@_cdecl("bjs_roundTripOptionalDouble") -public func _bjs_roundTripOptionalDouble(_ precisionIsSome: Int32, _ precisionValue: Float64) -> Void { - #if arch(wasm32) - let ret = roundTripOptionalDouble(precision: Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_roundTripOptionalSyntax") -@_cdecl("bjs_roundTripOptionalSyntax") -public func _bjs_roundTripOptionalSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripAllTypesResult") +@_cdecl("bjs_roundTripAllTypesResult") +public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalMixSyntax") -@_cdecl("bjs_roundTripOptionalMixSyntax") -public func _bjs_roundTripOptionalMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripTypedPayloadResult") +@_cdecl("bjs_roundTripTypedPayloadResult") +public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalMixSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalSwiftSyntax") -@_cdecl("bjs_roundTripOptionalSwiftSyntax") -public func _bjs_roundTripOptionalSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +@_expose(wasm, "bjs_createPropertyHolder") +@_cdecl("bjs_createPropertyHolder") +public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripOptionalSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalWithSpaces") -@_cdecl("bjs_roundTripOptionalWithSpaces") -public func _bjs_roundTripOptionalWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64) -> Void { +@_expose(wasm, "bjs_testPropertyHolder") +@_cdecl("bjs_testPropertyHolder") +public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = roundTripOptionalWithSpaces(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalTypeAlias") -@_cdecl("bjs_roundTripOptionalTypeAlias") -public func _bjs_roundTripOptionalTypeAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { +@_expose(wasm, "bjs_resetObserverCounts") +@_cdecl("bjs_resetObserverCounts") +public func _bjs_resetObserverCounts() -> Void { #if arch(wasm32) - let ret = roundTripOptionalTypeAlias(age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue)) - return ret.bridgeJSLowerReturn() + resetObserverCounts() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalStatus") -@_cdecl("bjs_roundTripOptionalStatus") -public func _bjs_roundTripOptionalStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +@_expose(wasm, "bjs_getObserverStats") +@_cdecl("bjs_getObserverStats") +public func _bjs_getObserverStats() -> Void { #if arch(wasm32) - let ret = roundTripOptionalStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let ret = getObserverStats() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalTheme") -@_cdecl("bjs_roundTripOptionalTheme") -public func _bjs_roundTripOptionalTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +@_expose(wasm, "bjs_testStringDefault") +@_cdecl("bjs_testStringDefault") +public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) + let ret = testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalHttpStatus") -@_cdecl("bjs_roundTripOptionalHttpStatus") -public func _bjs_roundTripOptionalHttpStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +@_expose(wasm, "bjs_testIntDefault") +@_cdecl("bjs_testIntDefault") +public func _bjs_testIntDefault(_ count: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripOptionalHttpStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let ret = testIntDefault(count: Int.bridgeJSLiftParameter(count)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalTSDirection") -@_cdecl("bjs_roundTripOptionalTSDirection") -public func _bjs_roundTripOptionalTSDirection(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +@_expose(wasm, "bjs_testBoolDefault") +@_cdecl("bjs_testBoolDefault") +public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripOptionalTSDirection(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let ret = testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalTSTheme") -@_cdecl("bjs_roundTripOptionalTSTheme") -public func _bjs_roundTripOptionalTSTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +@_expose(wasm, "bjs_testOptionalDefault") +@_cdecl("bjs_testOptionalDefault") +public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTSTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) + let ret = testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalNetworkingAPIMethod") -@_cdecl("bjs_roundTripOptionalNetworkingAPIMethod") -public func _bjs_roundTripOptionalNetworkingAPIMethod(_ methodIsSome: Int32, _ methodValue: Int32) -> Void { +@_expose(wasm, "bjs_testMultipleDefaults") +@_cdecl("bjs_testMultipleDefaults") +public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalNetworkingAPIMethod(_: Optional.bridgeJSLiftParameter(methodIsSome, methodValue)) + let ret = testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalAPIResult") -@_cdecl("bjs_roundTripOptionalAPIResult") -public func _bjs_roundTripOptionalAPIResult(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Void { +@_expose(wasm, "bjs_testSimpleEnumDefault") +@_cdecl("bjs_testSimpleEnumDefault") +public func _bjs_testSimpleEnumDefault(_ status: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripOptionalAPIResult(value: Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId)) + let ret = testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripTypedPayloadResult") -@_cdecl("bjs_roundTripTypedPayloadResult") -public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { +@_expose(wasm, "bjs_testDirectionDefault") +@_cdecl("bjs_testDirectionDefault") +public func _bjs_testDirectionDefault(_ direction: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) + let ret = testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalTypedPayloadResult") -@_cdecl("bjs_roundTripOptionalTypedPayloadResult") -public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_testRawStringEnumDefault") +@_cdecl("bjs_testRawStringEnumDefault") +public func _bjs_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let ret = testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_compareAPIResults") -@_cdecl("bjs_compareAPIResults") -public func _bjs_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { +@_expose(wasm, "bjs_testComplexInit") +@_cdecl("bjs_testComplexInit") +public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let _tmp_r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) - let _tmp_r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) - let ret = compareAPIResults(_: _tmp_r1, _: _tmp_r2) + let ret = testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalComplexResult") -@_cdecl("bjs_roundTripOptionalComplexResult") -public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_testEmptyInit") +@_cdecl("bjs_testEmptyInit") +public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripOptionalComplexResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let ret = testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripAllTypesResult") -@_cdecl("bjs_roundTripAllTypesResult") -public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { +@_expose(wasm, "bjs_arrayWithDefault") +@_cdecl("bjs_arrayWithDefault") +public func _bjs_arrayWithDefault() -> Int32 { #if arch(wasm32) - let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) + let ret = arrayWithDefault(_: [Int].bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalAllTypesResult") -@_cdecl("bjs_roundTripOptionalAllTypesResult") -public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_arrayWithOptionalDefault") +@_cdecl("bjs_arrayWithOptionalDefault") +public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let ret = arrayWithOptionalDefault(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } + }()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalPayloadResult") -@_cdecl("bjs_roundTripOptionalPayloadResult") -public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { +@_expose(wasm, "bjs_arrayMixedDefaults") +@_cdecl("bjs_arrayMixedDefaults") +public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(result)) + let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSLiftParameter(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalPayloadResultOpt") -@_cdecl("bjs_roundTripOptionalPayloadResultOpt") -public func _bjs_roundTripOptionalPayloadResultOpt(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_formatName") +@_cdecl("bjs_formatName") +public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalClass") -@_cdecl("bjs_roundTripOptionalClass") -public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_makeFormatter") +@_cdecl("bjs_makeFormatter") +public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripOptionalClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) - return ret.bridgeJSLowerReturn() + let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalGreeter") -@_cdecl("bjs_roundTripOptionalGreeter") -public func _bjs_roundTripOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_makeAdder") +@_cdecl("bjs_makeAdder") +public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) - return ret.bridgeJSLowerReturn() + let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) + return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(ret) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_applyOptionalGreeter") -@_cdecl("bjs_applyOptionalGreeter") -public func _bjs_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void { +@_expose(wasm, "bjs_roundTripIntArray") +@_cdecl("bjs_roundTripIntArray") +public func _bjs_roundTripIntArray() -> Void { #if arch(wasm32) - let ret = applyOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform)) - return ret.bridgeJSLowerReturn() + let ret = roundTripIntArray(_: [Int].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_makeOptionalHolder") -@_cdecl("bjs_makeOptionalHolder") -public func _bjs_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundTripStringArray") +@_cdecl("bjs_roundTripStringArray") +public func _bjs_roundTripStringArray() -> Void { #if arch(wasm32) - let ret = makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) - return ret.bridgeJSLowerReturn() + let ret = roundTripStringArray(_: [String].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalAPIOptionalResult") -@_cdecl("bjs_roundTripOptionalAPIOptionalResult") -public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_roundTripDoubleArray") +@_cdecl("bjs_roundTripDoubleArray") +public func _bjs_roundTripDoubleArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalAPIOptionalResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) - return ret.bridgeJSLowerReturn() + let ret = roundTripDoubleArray(_: [Double].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_createPropertyHolder") -@_cdecl("bjs_createPropertyHolder") -public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundTripBoolArray") +@_cdecl("bjs_roundTripBoolArray") +public func _bjs_roundTripBoolArray() -> Void { #if arch(wasm32) - let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) - return ret.bridgeJSLowerReturn() + let ret = roundTripBoolArray(_: [Bool].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testPropertyHolder") -@_cdecl("bjs_testPropertyHolder") -public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_roundTripDirectionArray") +@_cdecl("bjs_roundTripDirectionArray") +public func _bjs_roundTripDirectionArray() -> Void { #if arch(wasm32) - let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) - return ret.bridgeJSLowerReturn() + let ret = roundTripDirectionArray(_: [Direction].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_resetObserverCounts") -@_cdecl("bjs_resetObserverCounts") -public func _bjs_resetObserverCounts() -> Void { +@_expose(wasm, "bjs_roundTripStatusArray") +@_cdecl("bjs_roundTripStatusArray") +public func _bjs_roundTripStatusArray() -> Void { #if arch(wasm32) - resetObserverCounts() + let ret = roundTripStatusArray(_: [Status].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_getObserverStats") -@_cdecl("bjs_getObserverStats") -public func _bjs_getObserverStats() -> Void { +@_expose(wasm, "bjs_roundTripThemeArray") +@_cdecl("bjs_roundTripThemeArray") +public func _bjs_roundTripThemeArray() -> Void { #if arch(wasm32) - let ret = getObserverStats() - return ret.bridgeJSLowerReturn() + let ret = roundTripThemeArray(_: [Theme].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testStringDefault") -@_cdecl("bjs_testStringDefault") -public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripHttpStatusArray") +@_cdecl("bjs_roundTripHttpStatusArray") +public func _bjs_roundTripHttpStatusArray() -> Void { #if arch(wasm32) - let ret = testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) - return ret.bridgeJSLowerReturn() + let ret = roundTripHttpStatusArray(_: [HttpStatus].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testIntDefault") -@_cdecl("bjs_testIntDefault") -public func _bjs_testIntDefault(_ count: Int32) -> Int32 { +@_expose(wasm, "bjs_roundTripDataPointArray") +@_cdecl("bjs_roundTripDataPointArray") +public func _bjs_roundTripDataPointArray() -> Void { #if arch(wasm32) - let ret = testIntDefault(count: Int.bridgeJSLiftParameter(count)) - return ret.bridgeJSLowerReturn() + let ret = roundTripDataPointArray(_: [DataPoint].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testBoolDefault") -@_cdecl("bjs_testBoolDefault") -public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { +@_expose(wasm, "bjs_roundTripGreeterArray") +@_cdecl("bjs_roundTripGreeterArray") +public func _bjs_roundTripGreeterArray() -> Void { #if arch(wasm32) - let ret = testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) - return ret.bridgeJSLowerReturn() + let ret = roundTripGreeterArray(_: [Greeter].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testOptionalDefault") -@_cdecl("bjs_testOptionalDefault") -public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalIntArray") +@_cdecl("bjs_roundTripOptionalIntArray") +public func _bjs_roundTripOptionalIntArray() -> Void { #if arch(wasm32) - let ret = testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalIntArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testMultipleDefaults") -@_cdecl("bjs_testMultipleDefaults") -public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalStringArray") +@_cdecl("bjs_roundTripOptionalStringArray") +public func _bjs_roundTripOptionalStringArray() -> Void { #if arch(wasm32) - let ret = testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalStringArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testSimpleEnumDefault") -@_cdecl("bjs_testSimpleEnumDefault") -public func _bjs_testSimpleEnumDefault(_ status: Int32) -> Int32 { +@_expose(wasm, "bjs_roundTripOptionalDataPointArray") +@_cdecl("bjs_roundTripOptionalDataPointArray") +public func _bjs_roundTripOptionalDataPointArray() -> Void { #if arch(wasm32) - let ret = testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalDataPointArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testDirectionDefault") -@_cdecl("bjs_testDirectionDefault") -public func _bjs_testDirectionDefault(_ direction: Int32) -> Int32 { +@_expose(wasm, "bjs_roundTripOptionalDirectionArray") +@_cdecl("bjs_roundTripOptionalDirectionArray") +public func _bjs_roundTripOptionalDirectionArray() -> Void { #if arch(wasm32) - let ret = testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalDirectionArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testRawStringEnumDefault") -@_cdecl("bjs_testRawStringEnumDefault") -public func _bjs_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalStatusArray") +@_cdecl("bjs_roundTripOptionalStatusArray") +public func _bjs_roundTripOptionalStatusArray() -> Void { #if arch(wasm32) - let ret = testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalStatusArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [Optional] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append(Optional.bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + let __bjs_isSome_ret_elem = __bjs_elem_ret != nil + if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testComplexInit") -@_cdecl("bjs_testComplexInit") -public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_roundTripOptionalIntArrayType") +@_cdecl("bjs_roundTripOptionalIntArrayType") +public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { #if arch(wasm32) - let ret = testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalIntArrayType(_: { + if values == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + __bjs_unwrapped_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_testEmptyInit") -@_cdecl("bjs_testEmptyInit") -public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundTripOptionalStringArrayType") +@_cdecl("bjs_roundTripOptionalStringArrayType") +public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { #if arch(wasm32) - let ret = testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object)) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalStringArrayType(_: { + if values == 0 { + return Optional<[String]>.none + } else { + return [String].bridgeJSLiftParameter() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + __bjs_unwrapped_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_arrayWithDefault") -@_cdecl("bjs_arrayWithDefault") -public func _bjs_arrayWithDefault() -> Int32 { +@_expose(wasm, "bjs_roundTripOptionalGreeterArrayType") +@_cdecl("bjs_roundTripOptionalGreeterArrayType") +public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { #if arch(wasm32) - let ret = arrayWithDefault(_: [Int].bridgeJSLiftParameter()) - return ret.bridgeJSLowerReturn() + let ret = roundTripOptionalGreeterArrayType(_: { + if greeters == 0 { + return Optional<[Greeter]>.none + } else { + return [Greeter].bridgeJSLiftParameter() + } + }()) + let __bjs_isSome_ret = ret != nil + if let __bjs_unwrapped_ret = ret { + __bjs_unwrapped_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_arrayWithOptionalDefault") -@_cdecl("bjs_arrayWithOptionalDefault") -public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { +@_expose(wasm, "bjs_roundTripNestedIntArray") +@_cdecl("bjs_roundTripNestedIntArray") +public func _bjs_roundTripNestedIntArray() -> Void { #if arch(wasm32) - let ret = arrayWithOptionalDefault(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() + let ret = roundTripNestedIntArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[Int]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([Int].bridgeJSLiftParameter()) } + __result.reverse() + return __result }()) - return ret.bridgeJSLowerReturn() + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_arrayMixedDefaults") -@_cdecl("bjs_arrayMixedDefaults") -public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { +@_expose(wasm, "bjs_roundTripNestedStringArray") +@_cdecl("bjs_roundTripNestedStringArray") +public func _bjs_roundTripNestedStringArray() -> Void { #if arch(wasm32) - let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSLiftParameter(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) - return ret.bridgeJSLowerReturn() + let ret = roundTripNestedStringArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[String]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([String].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_formatName") -@_cdecl("bjs_formatName") -public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void { +@_expose(wasm, "bjs_roundTripNestedDoubleArray") +@_cdecl("bjs_roundTripNestedDoubleArray") +public func _bjs_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) - let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) - return ret.bridgeJSLowerReturn() + let ret = roundTripNestedDoubleArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[Double]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([Double].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_makeFormatter") -@_cdecl("bjs_makeFormatter") -public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundTripNestedBoolArray") +@_cdecl("bjs_roundTripNestedBoolArray") +public func _bjs_roundTripNestedBoolArray() -> Void { #if arch(wasm32) - let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) - return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) + let ret = roundTripNestedBoolArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[Bool]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([Bool].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_makeAdder") -@_cdecl("bjs_makeAdder") -public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundTripNestedDataPointArray") +@_cdecl("bjs_roundTripNestedDataPointArray") +public func _bjs_roundTripNestedDataPointArray() -> Void { #if arch(wasm32) - let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) - return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(ret) + let ret = roundTripNestedDataPointArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[DataPoint]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([DataPoint].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripIntArray") -@_cdecl("bjs_roundTripIntArray") -public func _bjs_roundTripIntArray() -> Void { +@_expose(wasm, "bjs_roundTripNestedDirectionArray") +@_cdecl("bjs_roundTripNestedDirectionArray") +public func _bjs_roundTripNestedDirectionArray() -> Void { #if arch(wasm32) - let ret = roundTripIntArray(_: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedDirectionArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[Direction]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([Direction].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripStringArray") -@_cdecl("bjs_roundTripStringArray") -public func _bjs_roundTripStringArray() -> Void { +@_expose(wasm, "bjs_roundTripNestedGreeterArray") +@_cdecl("bjs_roundTripNestedGreeterArray") +public func _bjs_roundTripNestedGreeterArray() -> Void { #if arch(wasm32) - let ret = roundTripStringArray(_: [String].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedGreeterArray(_: { + let __count = Int(_swift_js_pop_i32()) + var __result: [[Greeter]] = [] + __result.reserveCapacity(__count) + for _ in 0 ..< __count { + __result.append([Greeter].bridgeJSLiftParameter()) + } + __result.reverse() + return __result + }()) + for __bjs_elem_ret in ret { + __bjs_elem_ret.bridgeJSLowerReturn()} + _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripDoubleArray") -@_cdecl("bjs_roundTripDoubleArray") -public func _bjs_roundTripDoubleArray() -> Void { +@_expose(wasm, "bjs_roundTripUnsafeRawPointerArray") +@_cdecl("bjs_roundTripUnsafeRawPointerArray") +public func _bjs_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripDoubleArray(_: [Double].bridgeJSLiftParameter()) + let ret = roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripBoolArray") -@_cdecl("bjs_roundTripBoolArray") -public func _bjs_roundTripBoolArray() -> Void { +@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointerArray") +@_cdecl("bjs_roundTripUnsafeMutableRawPointerArray") +public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripBoolArray(_: [Bool].bridgeJSLiftParameter()) + let ret = roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripDirectionArray") -@_cdecl("bjs_roundTripDirectionArray") -public func _bjs_roundTripDirectionArray() -> Void { +@_expose(wasm, "bjs_roundTripOpaquePointerArray") +@_cdecl("bjs_roundTripOpaquePointerArray") +public func _bjs_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripDirectionArray(_: [Direction].bridgeJSLiftParameter()) + let ret = roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripStatusArray") -@_cdecl("bjs_roundTripStatusArray") -public func _bjs_roundTripStatusArray() -> Void { +@_expose(wasm, "bjs_roundTripUnsafePointerArray") +@_cdecl("bjs_roundTripUnsafePointerArray") +public func _bjs_roundTripUnsafePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripStatusArray(_: [Status].bridgeJSLiftParameter()) + let ret = roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripThemeArray") -@_cdecl("bjs_roundTripThemeArray") -public func _bjs_roundTripThemeArray() -> Void { +@_expose(wasm, "bjs_roundTripUnsafeMutablePointerArray") +@_cdecl("bjs_roundTripUnsafeMutablePointerArray") +public func _bjs_roundTripUnsafeMutablePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripThemeArray(_: [Theme].bridgeJSLiftParameter()) + let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripHttpStatusArray") -@_cdecl("bjs_roundTripHttpStatusArray") -public func _bjs_roundTripHttpStatusArray() -> Void { +@_expose(wasm, "bjs_consumeDataProcessorArrayType") +@_cdecl("bjs_consumeDataProcessorArrayType") +public func _bjs_consumeDataProcessorArrayType() -> Int32 { #if arch(wasm32) - let ret = roundTripHttpStatusArray(_: [HttpStatus].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = consumeDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripDataPointArray") -@_cdecl("bjs_roundTripDataPointArray") -public func _bjs_roundTripDataPointArray() -> Void { +@_expose(wasm, "bjs_roundTripDataProcessorArrayType") +@_cdecl("bjs_roundTripDataProcessorArrayType") +public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) - let ret = roundTripDataPointArray(_: [DataPoint].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) + ret.map { + $0 as! AnyDataProcessor + } .bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripGreeterArray") -@_cdecl("bjs_roundTripGreeterArray") -public func _bjs_roundTripGreeterArray() -> Void { +@_expose(wasm, "bjs_roundTripJSObjectArray") +@_cdecl("bjs_roundTripJSObjectArray") +public func _bjs_roundTripJSObjectArray() -> Void { #if arch(wasm32) - let ret = roundTripGreeterArray(_: [Greeter].bridgeJSLiftParameter()) + let ret = roundTripJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalIntArray") -@_cdecl("bjs_roundTripOptionalIntArray") -public func _bjs_roundTripOptionalIntArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalJSObjectArray") +@_cdecl("bjs_roundTripOptionalJSObjectArray") +public func _bjs_roundTripOptionalJSObjectArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalIntArray(_: { + let ret = roundTripOptionalJSObjectArray(_: { let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] + var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result @@ -5346,41 +5465,40 @@ public func _bjs_roundTripOptionalIntArray() -> Void { #endif } -@_expose(wasm, "bjs_roundTripOptionalStringArray") -@_cdecl("bjs_roundTripOptionalStringArray") -public func _bjs_roundTripOptionalStringArray() -> Void { +@_expose(wasm, "bjs_roundTripFooArray") +@_cdecl("bjs_roundTripFooArray") +public func _bjs_roundTripFooArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalStringArray(_: { + let ret = roundTripFooArray(_: { let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] + var __result: [Foo] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) } __result.reverse() return __result }()) - for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + ret.map { + $0.jsObject + } .bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalDataPointArray") -@_cdecl("bjs_roundTripOptionalDataPointArray") -public func _bjs_roundTripOptionalDataPointArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalFooArray") +@_cdecl("bjs_roundTripOptionalFooArray") +public func _bjs_roundTripOptionalFooArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalDataPointArray(_: { + let ret = roundTripOptionalFooArray(_: { let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] + var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSLiftParameter().map { + Foo(unsafelyWrapping: $0) + }) } __result.reverse() return __result @@ -5388,7 +5506,7 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} + __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} _swift_js_push_i32(Int32(ret.count)) #else @@ -5396,429 +5514,311 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { #endif } -@_expose(wasm, "bjs_roundTripOptionalDirectionArray") -@_cdecl("bjs_roundTripOptionalDirectionArray") -public func _bjs_roundTripOptionalDirectionArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalString") +@_cdecl("bjs_roundTripOptionalString") +public func _bjs_roundTripOptionalString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalDirectionArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalString(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalStatusArray") -@_cdecl("bjs_roundTripOptionalStatusArray") -public func _bjs_roundTripOptionalStatusArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalInt") +@_cdecl("bjs_roundTripOptionalInt") +public func _bjs_roundTripOptionalInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalStatusArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalInt(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalIntArrayType") -@_cdecl("bjs_roundTripOptionalIntArrayType") -public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalBool") +@_cdecl("bjs_roundTripOptionalBool") +public func _bjs_roundTripOptionalBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalIntArrayType(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalBool(flag: Optional.bridgeJSLiftParameter(flagIsSome, flagValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalFloat") +@_cdecl("bjs_roundTripOptionalFloat") +public func _bjs_roundTripOptionalFloat(_ numberIsSome: Int32, _ numberValue: Float32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalFloat(number: Optional.bridgeJSLiftParameter(numberIsSome, numberValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalDouble") +@_cdecl("bjs_roundTripOptionalDouble") +public func _bjs_roundTripOptionalDouble(_ precisionIsSome: Int32, _ precisionValue: Float64) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalDouble(precision: Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalSyntax") +@_cdecl("bjs_roundTripOptionalSyntax") +public func _bjs_roundTripOptionalSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalMixSyntax") +@_cdecl("bjs_roundTripOptionalMixSyntax") +public func _bjs_roundTripOptionalMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalMixSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalSwiftSyntax") +@_cdecl("bjs_roundTripOptionalSwiftSyntax") +public func _bjs_roundTripOptionalSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalStringArrayType") -@_cdecl("bjs_roundTripOptionalStringArrayType") -public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalWithSpaces") +@_cdecl("bjs_roundTripOptionalWithSpaces") +public func _bjs_roundTripOptionalWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalStringArrayType(_: { - if values == 0 { - return Optional<[String]>.none - } else { - return [String].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalWithSpaces(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalGreeterArrayType") -@_cdecl("bjs_roundTripOptionalGreeterArrayType") -public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { +@_expose(wasm, "bjs_roundTripOptionalTypeAlias") +@_cdecl("bjs_roundTripOptionalTypeAlias") +public func _bjs_roundTripOptionalTypeAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalGreeterArrayType(_: { - if greeters == 0 { - return Optional<[Greeter]>.none - } else { - return [Greeter].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalTypeAlias(age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedIntArray") -@_cdecl("bjs_roundTripNestedIntArray") -public func _bjs_roundTripNestedIntArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalStatus") +@_cdecl("bjs_roundTripOptionalStatus") +public func _bjs_roundTripOptionalStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Int]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([Int].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedStringArray") -@_cdecl("bjs_roundTripNestedStringArray") -public func _bjs_roundTripNestedStringArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalTheme") +@_cdecl("bjs_roundTripOptionalTheme") +public func _bjs_roundTripOptionalTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[String]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([String].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedDoubleArray") -@_cdecl("bjs_roundTripNestedDoubleArray") -public func _bjs_roundTripNestedDoubleArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalHttpStatus") +@_cdecl("bjs_roundTripOptionalHttpStatus") +public func _bjs_roundTripOptionalHttpStatus(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Double]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([Double].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalHttpStatus(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedBoolArray") -@_cdecl("bjs_roundTripNestedBoolArray") -public func _bjs_roundTripNestedBoolArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalTSDirection") +@_cdecl("bjs_roundTripOptionalTSDirection") +public func _bjs_roundTripOptionalTSDirection(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedBoolArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Bool]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([Bool].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalTSDirection(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedDataPointArray") -@_cdecl("bjs_roundTripNestedDataPointArray") -public func _bjs_roundTripNestedDataPointArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalTSTheme") +@_cdecl("bjs_roundTripOptionalTSTheme") +public func _bjs_roundTripOptionalTSTheme(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedDataPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[DataPoint]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([DataPoint].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalTSTheme(value: Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedDirectionArray") -@_cdecl("bjs_roundTripNestedDirectionArray") -public func _bjs_roundTripNestedDirectionArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalNetworkingAPIMethod") +@_cdecl("bjs_roundTripOptionalNetworkingAPIMethod") +public func _bjs_roundTripOptionalNetworkingAPIMethod(_ methodIsSome: Int32, _ methodValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedDirectionArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Direction]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([Direction].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalNetworkingAPIMethod(_: Optional.bridgeJSLiftParameter(methodIsSome, methodValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripNestedGreeterArray") -@_cdecl("bjs_roundTripNestedGreeterArray") -public func _bjs_roundTripNestedGreeterArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalAPIResult") +@_cdecl("bjs_roundTripOptionalAPIResult") +public func _bjs_roundTripOptionalAPIResult(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripNestedGreeterArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Greeter]] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append([Greeter].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalAPIResult(value: Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripUnsafeRawPointerArray") -@_cdecl("bjs_roundTripUnsafeRawPointerArray") -public func _bjs_roundTripUnsafeRawPointerArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalTypedPayloadResult") +@_cdecl("bjs_roundTripOptionalTypedPayloadResult") +public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripUnsafeMutableRawPointerArray") -@_cdecl("bjs_roundTripUnsafeMutableRawPointerArray") -public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { +@_expose(wasm, "bjs_compareAPIResults") +@_cdecl("bjs_compareAPIResults") +public func _bjs_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let _tmp_r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) + let _tmp_r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) + let ret = compareAPIResults(_: _tmp_r1, _: _tmp_r2) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOpaquePointerArray") -@_cdecl("bjs_roundTripOpaquePointerArray") -public func _bjs_roundTripOpaquePointerArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalComplexResult") +@_cdecl("bjs_roundTripOptionalComplexResult") +public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOptionalComplexResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripUnsafePointerArray") -@_cdecl("bjs_roundTripUnsafePointerArray") -public func _bjs_roundTripUnsafePointerArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalAllTypesResult") +@_cdecl("bjs_roundTripOptionalAllTypesResult") +public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripUnsafeMutablePointerArray") -@_cdecl("bjs_roundTripUnsafeMutablePointerArray") -public func _bjs_roundTripUnsafeMutablePointerArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalPayloadResult") +@_cdecl("bjs_roundTripOptionalPayloadResult") +public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(result)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_consumeDataProcessorArrayType") -@_cdecl("bjs_consumeDataProcessorArrayType") -public func _bjs_consumeDataProcessorArrayType() -> Int32 { +@_expose(wasm, "bjs_roundTripOptionalPayloadResultOpt") +@_cdecl("bjs_roundTripOptionalPayloadResultOpt") +public func _bjs_roundTripOptionalPayloadResultOpt(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = consumeDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) + let ret = roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripDataProcessorArrayType") -@_cdecl("bjs_roundTripDataProcessorArrayType") -public func _bjs_roundTripDataProcessorArrayType() -> Void { - #if arch(wasm32) - let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) - ret.map { - $0 as! AnyDataProcessor - } .bridgeJSLowerReturn() +@_expose(wasm, "bjs_roundTripOptionalClass") +@_cdecl("bjs_roundTripOptionalClass") +public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripJSObjectArray") -@_cdecl("bjs_roundTripJSObjectArray") -public func _bjs_roundTripJSObjectArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalGreeter") +@_cdecl("bjs_roundTripOptionalGreeter") +public func _bjs_roundTripOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = roundTripJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalJSObjectArray") -@_cdecl("bjs_roundTripOptionalJSObjectArray") -public func _bjs_roundTripOptionalJSObjectArray() -> Void { +@_expose(wasm, "bjs_applyOptionalGreeter") +@_cdecl("bjs_applyOptionalGreeter") +public func _bjs_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSObjectArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = applyOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripFooArray") -@_cdecl("bjs_roundTripFooArray") -public func _bjs_roundTripFooArray() -> Void { +@_expose(wasm, "bjs_makeOptionalHolder") +@_cdecl("bjs_makeOptionalHolder") +public func _bjs_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripFooArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Foo] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) - } - __result.reverse() - return __result - }()) - ret.map { - $0.jsObject - } .bridgeJSLowerReturn() + let ret = makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_roundTripOptionalFooArray") -@_cdecl("bjs_roundTripOptionalFooArray") -public func _bjs_roundTripOptionalFooArray() -> Void { +@_expose(wasm, "bjs_roundTripOptionalAPIOptionalResult") +@_cdecl("bjs_roundTripOptionalAPIOptionalResult") +public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalFooArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Optional] = [] - __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - }) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripOptionalAPIOptionalResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6299,302 +6299,125 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer { public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_Converter_deinit") -@_cdecl("bjs_Converter_deinit") -public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif -} - -extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -@_expose(wasm, "bjs_HTTPServer_init") -@_cdecl("bjs_HTTPServer_init") -public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { - #if arch(wasm32) - let ret = Networking.API.HTTPServer() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_HTTPServer_call") -@_cdecl("bjs_HTTPServer_call") -public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { - #if arch(wasm32) - Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_HTTPServer_deinit") -@_cdecl("bjs_HTTPServer_deinit") -public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif -} - -extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -@_expose(wasm, "bjs_TestServer_init") -@_cdecl("bjs_TestServer_init") -public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { - #if arch(wasm32) - let ret = Internal.TestServer() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_TestServer_call") -@_cdecl("bjs_TestServer_call") -public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { - #if arch(wasm32) - Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_TestServer_deinit") -@_cdecl("bjs_TestServer_deinit") -public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif -} - -extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -@_expose(wasm, "bjs_OptionalHolder_init") -@_cdecl("bjs_OptionalHolder_init") -public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { - #if arch(wasm32) - let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_get") -@_cdecl("bjs_OptionalHolder_nullableGreeter_get") -public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_set") -@_cdecl("bjs_OptionalHolder_nullableGreeter_set") -public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_get") -@_cdecl("bjs_OptionalHolder_undefinedNumber_get") -public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set") -@_cdecl("bjs_OptionalHolder_undefinedNumber_set") -public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { - #if arch(wasm32) - OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsSome, valueValue) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalHolder_deinit") -@_cdecl("bjs_OptionalHolder_deinit") -public func _bjs_OptionalHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_Converter_deinit") +@_cdecl("bjs_Converter_deinit") +public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { +extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque())))) } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap") -fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@_expose(wasm, "bjs_OptionalPropertyHolder_init") -@_cdecl("bjs_OptionalPropertyHolder_init") -public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_HTTPServer_init") +@_cdecl("bjs_HTTPServer_init") +public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalPropertyHolder(optionalName: Optional.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength)) + let ret = Networking.API.HTTPServer() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get") -@_cdecl("bjs_OptionalPropertyHolder_optionalName_get") -public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_HTTPServer_call") +@_cdecl("bjs_HTTPServer_call") +public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName - return ret.bridgeJSLowerReturn() + Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalName_set") -public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +@_expose(wasm, "bjs_HTTPServer_deinit") +@_cdecl("bjs_HTTPServer_deinit") +public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") -@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") -public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque())))) + } } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") -public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { - #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) - #else +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") - #endif } +#endif -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") -@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") -public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_TestServer_init") +@_cdecl("bjs_TestServer_init") +public func _bjs_TestServer_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter + let ret = Internal.TestServer() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") -public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_TestServer_call") +@_cdecl("bjs_TestServer_call") +public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_deinit") -@_cdecl("bjs_OptionalPropertyHolder_deinit") -public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_TestServer_deinit") +@_cdecl("bjs_TestServer_deinit") +public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { +extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque())))) } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -8147,181 +7970,358 @@ public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawP #endif } -@_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter") -@_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") -public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter") +@_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") +public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() + return _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator") +@_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") +public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() + return _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processDirection") +@_cdecl("bjs_TextProcessor_processDirection") +public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processTheme") +@_cdecl("bjs_TextProcessor_processTheme") +public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processHttpStatus") +@_cdecl("bjs_TextProcessor_processHttpStatus") +public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processAPIResult") +@_cdecl("bjs_TextProcessor_processAPIResult") +public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeDirectionChecker") +@_cdecl("bjs_TextProcessor_makeDirectionChecker") +public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() + return _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeThemeValidator") +@_cdecl("bjs_TextProcessor_makeThemeValidator") +public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() + return _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor") +@_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") +public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() + return _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler") +@_cdecl("bjs_TextProcessor_makeAPIResultHandler") +public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() + return _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalDirection") +@_cdecl("bjs_TextProcessor_processOptionalDirection") +public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalTheme") +@_cdecl("bjs_TextProcessor_processOptionalTheme") +public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult") +@_cdecl("bjs_TextProcessor_processOptionalAPIResult") +public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter") +@_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") +public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() + return _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLower(ret) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_TextProcessor_deinit") +@_cdecl("bjs_TextProcessor_deinit") +public func _bjs_TextProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() - return _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLower(ret) + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator") -@_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") -public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") +fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_OptionalHolder_init") +@_cdecl("bjs_OptionalHolder_init") +public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() - return _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC.bridgeJSLower(ret) + let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processDirection") -@_cdecl("bjs_TextProcessor_processDirection") -public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_get") +@_cdecl("bjs_OptionalHolder_nullableGreeter_get") +public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback)) + let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processTheme") -@_cdecl("bjs_TextProcessor_processTheme") -public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalHolder_nullableGreeter_set") +@_cdecl("bjs_OptionalHolder_nullableGreeter_set") +public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processHttpStatus") -@_cdecl("bjs_TextProcessor_processHttpStatus") -public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { +@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_get") +@_cdecl("bjs_OptionalHolder_undefinedNumber_get") +public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback)) + let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processAPIResult") -@_cdecl("bjs_TextProcessor_processAPIResult") -public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalHolder_undefinedNumber_set") +@_cdecl("bjs_OptionalHolder_undefinedNumber_set") +public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeDirectionChecker") -@_cdecl("bjs_TextProcessor_makeDirectionChecker") -public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_OptionalHolder_deinit") +@_cdecl("bjs_OptionalHolder_deinit") +public func _bjs_OptionalHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() - return _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb.bridgeJSLower(ret) + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeThemeValidator") -@_cdecl("bjs_TextProcessor_makeThemeValidator") -public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap") +fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_OptionalPropertyHolder_init") +@_cdecl("bjs_OptionalPropertyHolder_init") +public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() - return _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb.bridgeJSLower(ret) + let ret = OptionalPropertyHolder(optionalName: Optional.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor") -@_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") -public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_get") +@_cdecl("bjs_OptionalPropertyHolder_optionalName_get") +public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() - return _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLower(ret) + let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler") -@_cdecl("bjs_TextProcessor_makeAPIResultHandler") -public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalName_set") +public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() - return _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLower(ret) + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processOptionalDirection") -@_cdecl("bjs_TextProcessor_processOptionalDirection") -public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") +@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") +public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback)) + let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processOptionalTheme") -@_cdecl("bjs_TextProcessor_processOptionalTheme") -public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") +public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_processOptionalAPIResult") -@_cdecl("bjs_TextProcessor_processOptionalAPIResult") -public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") +@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") +public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback)) + let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter") -@_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") -public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") +public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLower(ret) + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TextProcessor_deinit") -@_cdecl("bjs_TextProcessor_deinit") -public func _bjs_TextProcessor_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_OptionalPropertyHolder_deinit") +@_cdecl("bjs_OptionalPropertyHolder_deinit") +public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() + Unmanaged.fromOpaque(pointer).release() #else fatalError("Only available on WebAssembly") #endif } -extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { +extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_TextProcessor_wrap(Unmanaged.passRetained(self).toOpaque())))) + return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") -fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif @@ -8529,42 +8529,6 @@ func _$jsRoundTripString(_ v: String) throws(JSException) -> String { return String.bridgeJSLiftReturn(ret) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberNull") -fileprivate func bjs_jsRoundTripOptionalNumberNull(_ vIsSome: Int32, _ vValue: Float64) -> Void -#else -fileprivate func bjs_jsRoundTripOptionalNumberNull(_ vIsSome: Int32, _ vValue: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsRoundTripOptionalNumberNull(_ v: Optional) throws(JSException) -> Optional { - let (vIsSome, vValue) = v.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalNumberNull(vIsSome, vValue) - if let error = _swift_js_take_exception() { - throw error - } - return Optional.bridgeJSLiftReturnFromSideChannel() -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberUndefined") -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsSome: Int32, _ vValue: Float64) -> Void -#else -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ vIsSome: Int32, _ vValue: Float64) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsRoundTripOptionalNumberUndefined(_ v: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { - let (vIsSome, vValue) = v.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalNumberUndefined(vIsSome, vValue) - if let error = _swift_js_take_exception() { - throw error - } - return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() -} - #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValue") fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void @@ -9540,4 +9504,92 @@ func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException throw error } return Point.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runJsOptionalSupportTests") +fileprivate func bjs_runJsOptionalSupportTests() -> Void +#else +fileprivate func bjs_runJsOptionalSupportTests() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$runJsOptionalSupportTests() throws(JSException) -> Void { + bjs_runJsOptionalSupportTests() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberNull") +fileprivate func bjs_jsRoundTripOptionalNumberNull(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalNumberNull(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalNumberNull(_ value: Optional) throws(JSException) -> Optional { + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalNumberNull(valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberUndefined") +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalNumberUndefined(valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalStringNull") +fileprivate func bjs_jsRoundTripOptionalStringNull(_ nameIsSome: Int32, _ nameValue: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalStringNull(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalStringNull(_ name: Optional) throws(JSException) -> Optional { + let (nameIsSome, nameValue) = name.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalStringNull(nameIsSome, nameValue) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalStringUndefined") +fileprivate func bjs_jsRoundTripOptionalStringUndefined(_ nameIsSome: Int32, _ nameValue: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalStringUndefined(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let (nameIsSome, nameValue) = name.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalStringUndefined(nameIsSome, nameValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 366115792..01d47b5a0 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -525,161 +525,6 @@ ], "swiftCallName" : "Internal.TestServer" }, - { - "constructor" : { - "abiName" : "bjs_OptionalHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "nullableGreeter", - "name" : "nullableGreeter", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - }, - { - "label" : "undefinedNumber", - "name" : "undefinedNumber", - "type" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "undefined" - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "OptionalHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "nullableGreeter", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "undefinedNumber", - "type" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "undefined" - } - } - } - ], - "swiftCallName" : "OptionalHolder" - }, - { - "constructor" : { - "abiName" : "bjs_OptionalPropertyHolder_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "optionalName", - "name" : "optionalName", - "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" - } - } - } - ] - }, - "methods" : [ - - ], - "name" : "OptionalPropertyHolder", - "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalName", - "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalAge", - "type" : { - "nullable" : { - "_0" : { - "int" : { - - } - }, - "_1" : "null" - } - } - }, - { - "isReadonly" : false, - "isStatic" : false, - "name" : "optionalGreeter", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - } - ], - "swiftCallName" : "OptionalPropertyHolder" - }, { "constructor" : { "abiName" : "bjs_SimplePropertyHolder_init", @@ -3241,7 +3086,7 @@ }, { "constructor" : { - "abiName" : "bjs_Container_init", + "abiName" : "bjs_OptionalHolder_init", "effects" : { "isAsync" : false, "isStatic" : false, @@ -3249,25 +3094,30 @@ }, "parameters" : [ { - "label" : "location", - "name" : "location", + "label" : "nullableGreeter", + "name" : "nullableGreeter", "type" : { - "swiftStruct" : { - "_0" : "DataPoint" + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" } } }, { - "label" : "config", - "name" : "config", + "label" : "undefinedNumber", + "name" : "undefinedNumber", "type" : { "nullable" : { "_0" : { - "swiftStruct" : { - "_0" : "Config" + "double" : { + } }, - "_1" : "null" + "_1" : "undefined" } } } @@ -3276,51 +3126,201 @@ "methods" : [ ], - "name" : "Container", + "name" : "OptionalHolder", "properties" : [ { "isReadonly" : false, "isStatic" : false, - "name" : "location", + "name" : "nullableGreeter", "type" : { - "swiftStruct" : { - "_0" : "DataPoint" + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" } } }, { "isReadonly" : false, "isStatic" : false, - "name" : "config", + "name" : "undefinedNumber", "type" : { "nullable" : { "_0" : { - "swiftStruct" : { - "_0" : "Config" + "double" : { + } }, - "_1" : "null" + "_1" : "undefined" } } } ], - "swiftCallName" : "Container" - } - ], - "enums" : [ + "swiftCallName" : "OptionalHolder" + }, { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" + "constructor" : { + "abiName" : "bjs_OptionalPropertyHolder_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false }, + "parameters" : [ + { + "label" : "optionalName", + "name" : "optionalName", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "OptionalPropertyHolder", + "properties" : [ { - "associatedValues" : [ + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalName", + "type" : { + "nullable" : { + "_0" : { + "string" : { - ], - "name" : "south" + } + }, + "_1" : "null" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalAge", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "optionalGreeter", + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + } + ], + "swiftCallName" : "OptionalPropertyHolder" + }, + { + "constructor" : { + "abiName" : "bjs_Container_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "location", + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "label" : "config", + "name" : "config", + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + }, + "_1" : "null" + } + } + } + ] + }, + "methods" : [ + + ], + "name" : "Container", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "location", + "type" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + }, + { + "isReadonly" : false, + "isStatic" : false, + "name" : "config", + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "Config" + } + }, + "_1" : "null" + } + } + } + ], + "swiftCallName" : "Container" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "north" + }, + { + "associatedValues" : [ + + ], + "name" : "south" }, { "associatedValues" : [ @@ -4357,86 +4357,6 @@ "swiftCallName" : "API.NetworkingResult", "tsFullPath" : "API.NetworkingResult" }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - } - } - ], - "name" : "precision" - }, - { - "associatedValues" : [ - { - "type" : { - "caseEnum" : { - "_0" : "Direction" - } - } - } - ], - "name" : "direction" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Precision", - "_1" : "Float" - } - }, - "_1" : "null" - } - } - } - ], - "name" : "optPrecision" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - }, - "_1" : "null" - } - } - } - ], - "name" : "optDirection" - }, - { - "associatedValues" : [ - - ], - "name" : "empty" - } - ], - "emitStyle" : "const", - "name" : "TypedPayloadResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "TypedPayloadResult", - "tsFullPath" : "TypedPayloadResult" - }, { "cases" : [ { @@ -4539,35 +4459,26 @@ "associatedValues" : [ { "type" : { - "nullable" : { - "_0" : { - "swiftStruct" : { - "_0" : "Address" - } - }, - "_1" : "null" + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" } } } ], - "name" : "optStruct" + "name" : "precision" }, { "associatedValues" : [ { "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" + "caseEnum" : { + "_0" : "Direction" } } } ], - "name" : "optClass" + "name" : "direction" }, { "associatedValues" : [ @@ -4575,8 +4486,9 @@ "type" : { "nullable" : { "_0" : { - "jsObject" : { - + "rawValueEnum" : { + "_0" : "Precision", + "_1" : "Float" } }, "_1" : "null" @@ -4584,7 +4496,7 @@ } } ], - "name" : "optJSObject" + "name" : "optPrecision" }, { "associatedValues" : [ @@ -4592,8 +4504,8 @@ "type" : { "nullable" : { "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" + "caseEnum" : { + "_0" : "Direction" } }, "_1" : "null" @@ -4601,45 +4513,7 @@ } } ], - "name" : "optNestedEnum" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } - } - }, - "_1" : "null" - } - } - } - ], - "name" : "optArray" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "jsObject" : { - "_0" : "Foo" - } - }, - "_1" : "null" - } - } - } - ], - "name" : "optJsClass" + "name" : "optDirection" }, { "associatedValues" : [ @@ -4649,116 +4523,15 @@ } ], "emitStyle" : "const", - "name" : "OptionalAllTypesResult", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "OptionalAllTypesResult", - "tsFullPath" : "OptionalAllTypesResult" - }, - { - "cases" : [ - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" - } - } - } - ], - "name" : "success" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "int" : { - - } - }, - "_1" : "null" - } - } - }, - { - "type" : { - "nullable" : { - "_0" : { - "bool" : { - - } - }, - "_1" : "null" - } - } - } - ], - "name" : "failure" - }, - { - "associatedValues" : [ - { - "type" : { - "nullable" : { - "_0" : { - "bool" : { - - } - }, - "_1" : "null" - } - } - }, - { - "type" : { - "nullable" : { - "_0" : { - "int" : { - - } - }, - "_1" : "null" - } - } - }, - { - "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" - } - } - } - ], - "name" : "status" - } - ], - "emitStyle" : "const", - "name" : "APIOptionalResult", + "name" : "TypedPayloadResult", "staticMethods" : [ ], "staticProperties" : [ ], - "swiftCallName" : "APIOptionalResult", - "tsFullPath" : "APIOptionalResult" + "swiftCallName" : "TypedPayloadResult", + "tsFullPath" : "TypedPayloadResult" }, { "cases" : [ @@ -5207,274 +4980,501 @@ ], "swiftCallName" : "StaticPropertyNamespace.NestedProperties", "tsFullPath" : "StaticPropertyNamespace.NestedProperties" - } - ], - "exposeToGlobal" : false, - "functions" : [ - { - "abiName" : "bjs_roundTripVoid", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripVoid", - "parameters" : [ - - ], - "returnType" : { - "void" : { - - } - } }, { - "abiName" : "bjs_roundTripInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripInt", - "parameters" : [ + "cases" : [ { - "label" : "v", - "name" : "v", - "type" : { - "int" : { - + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "Address" + } + }, + "_1" : "null" + } + } } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "abiName" : "bjs_roundTripUInt", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripUInt", - "parameters" : [ + ], + "name" : "optStruct" + }, { - "label" : "v", - "name" : "v", - "type" : { - "uint" : { - + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } } - } - } - ], - "returnType" : { - "uint" : { - - } - } - }, - { - "abiName" : "bjs_roundTripFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripFloat", - "parameters" : [ + ], + "name" : "optClass" + }, { - "label" : "v", - "name" : "v", - "type" : { - "float" : { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + } + }, + "_1" : "null" + } + } } - } - } - ], - "returnType" : { - "float" : { - - } - } - }, - { - "abiName" : "bjs_roundTripDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripDouble", - "parameters" : [ + ], + "name" : "optJSObject" + }, { - "label" : "v", - "name" : "v", - "type" : { - "double" : { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optNestedEnum" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + } + } + } + }, + "_1" : "null" + } + } } - } + ], + "name" : "optArray" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + }, + "_1" : "null" + } + } + } + ], + "name" : "optJsClass" + }, + { + "associatedValues" : [ + + ], + "name" : "empty" } ], - "returnType" : { - "double" : { + "emitStyle" : "const", + "name" : "OptionalAllTypesResult", + "staticMethods" : [ - } - } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "OptionalAllTypesResult", + "tsFullPath" : "OptionalAllTypesResult" }, { - "abiName" : "bjs_roundTripBool", + "cases" : [ + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "success" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ + { + "type" : { + "nullable" : { + "_0" : { + "bool" : { + + } + }, + "_1" : "null" + } + } + }, + { + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "name" : "status" + } + ], + "emitStyle" : "const", + "name" : "APIOptionalResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIOptionalResult", + "tsFullPath" : "APIOptionalResult" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundTripVoid", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripBool", + "name" : "roundTripVoid", "parameters" : [ - { - "label" : "v", - "name" : "v", - "type" : { - "bool" : { - } - } - } ], "returnType" : { - "bool" : { + "void" : { } } }, { - "abiName" : "bjs_roundTripString", + "abiName" : "bjs_roundTripInt", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripString", + "name" : "roundTripInt", "parameters" : [ { "label" : "v", "name" : "v", "type" : { - "string" : { + "int" : { } } } ], "returnType" : { - "string" : { + "int" : { } } }, { - "abiName" : "bjs_roundTripSwiftHeapObject", + "abiName" : "bjs_roundTripUInt", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripSwiftHeapObject", + "name" : "roundTripUInt", "parameters" : [ { "label" : "v", "name" : "v", "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "uint" : { + } } } ], "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "uint" : { + } } }, { - "abiName" : "bjs_roundTripUnsafeRawPointer", + "abiName" : "bjs_roundTripFloat", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeRawPointer", + "name" : "roundTripFloat", "parameters" : [ { "label" : "v", "name" : "v", "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "float" : { + } } } ], "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "float" : { + } } }, { - "abiName" : "bjs_roundTripUnsafeMutableRawPointer", + "abiName" : "bjs_roundTripDouble", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeMutableRawPointer", + "name" : "roundTripDouble", "parameters" : [ { "label" : "v", "name" : "v", "type" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } + "double" : { + } } } ], "returnType" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } + "double" : { + } } }, { - "abiName" : "bjs_roundTripOpaquePointer", + "abiName" : "bjs_roundTripBool", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOpaquePointer", + "name" : "roundTripBool", "parameters" : [ { "label" : "v", "name" : "v", "type" : { - "unsafePointer" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_roundTripString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripString", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_roundTripSwiftHeapObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripSwiftHeapObject", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeRawPointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutableRawPointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutableRawPointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + ], + "returnType" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + }, + { + "abiName" : "bjs_roundTripOpaquePointer", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOpaquePointer", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "unsafePointer" : { "_0" : { "kind" : "opaquePointer" } @@ -7259,445 +7259,296 @@ } }, { - "abiName" : "bjs_roundTripOptionalString", + "abiName" : "bjs_roundTripAllTypesResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalString", + "name" : "roundTripAllTypesResult", "parameters" : [ { - "label" : "name", - "name" : "name", + "label" : "_", + "name" : "result", "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "AllTypesResult" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "AllTypesResult" } } }, { - "abiName" : "bjs_roundTripOptionalInt", + "abiName" : "bjs_roundTripTypedPayloadResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalInt", + "name" : "roundTripTypedPayloadResult", "parameters" : [ { - "label" : "value", - "name" : "value", + "label" : "_", + "name" : "result", "type" : { - "nullable" : { - "_0" : { - "int" : { - - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "int" : { - - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" } } }, { - "abiName" : "bjs_roundTripOptionalBool", + "abiName" : "bjs_createPropertyHolder", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalBool", + "name" : "createPropertyHolder", "parameters" : [ { - "label" : "flag", - "name" : "flag", + "label" : "intValue", + "name" : "intValue", "type" : { - "nullable" : { - "_0" : { - "bool" : { + "int" : { - } - }, - "_1" : "null" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "bool" : { + }, + { + "label" : "floatValue", + "name" : "floatValue", + "type" : { + "float" : { } - }, - "_1" : "null" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalFloat", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalFloat", - "parameters" : [ + } + }, { - "label" : "number", - "name" : "number", + "label" : "doubleValue", + "name" : "doubleValue", "type" : { - "nullable" : { - "_0" : { - "float" : { + "double" : { - } - }, - "_1" : "null" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "float" : { + }, + { + "label" : "boolValue", + "name" : "boolValue", + "type" : { + "bool" : { } - }, - "_1" : "null" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalDouble", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalDouble", - "parameters" : [ + } + }, { - "label" : "precision", - "name" : "precision", + "label" : "stringValue", + "name" : "stringValue", "type" : { - "nullable" : { - "_0" : { - "double" : { + "string" : { - } - }, - "_1" : "null" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "null" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalSyntax", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalSyntax", - "parameters" : [ + }, { - "label" : "name", - "name" : "name", + "label" : "jsObject", + "name" : "jsObject", "type" : { - "nullable" : { - "_0" : { - "string" : { + "jsObject" : { - } - }, - "_1" : "null" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" + "swiftHeapObject" : { + "_0" : "PropertyHolder" } } }, { - "abiName" : "bjs_roundTripOptionalMixSyntax", + "abiName" : "bjs_testPropertyHolder", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalMixSyntax", + "name" : "testPropertyHolder", "parameters" : [ { - "label" : "name", - "name" : "name", + "label" : "holder", + "name" : "holder", "type" : { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" + "swiftHeapObject" : { + "_0" : "PropertyHolder" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "string" : { + "string" : { - } - }, - "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalSwiftSyntax", + "abiName" : "bjs_resetObserverCounts", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalSwiftSyntax", + "name" : "resetObserverCounts", "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "nullable" : { - "_0" : { - "string" : { - } - }, - "_1" : "null" - } - } - } ], "returnType" : { - "nullable" : { - "_0" : { - "string" : { + "void" : { - } - }, - "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalWithSpaces", + "abiName" : "bjs_getObserverStats", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalWithSpaces", + "name" : "getObserverStats", "parameters" : [ - { - "label" : "value", - "name" : "value", - "type" : { - "nullable" : { - "_0" : { - "double" : { - } - }, - "_1" : "null" - } - } - } ], "returnType" : { - "nullable" : { - "_0" : { - "double" : { + "string" : { - } - }, - "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalTypeAlias", + "abiName" : "bjs_testStringDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalTypeAlias", + "name" : "testStringDefault", "parameters" : [ { - "label" : "age", - "name" : "age", + "defaultValue" : { + "string" : { + "_0" : "Hello World" + } + }, + "label" : "message", + "name" : "message", "type" : { - "nullable" : { - "_0" : { - "int" : { + "string" : { - } - }, - "_1" : "null" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "int" : { + "string" : { - } - }, - "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalStatus", + "abiName" : "bjs_testIntDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalStatus", + "name" : "testIntDefault", "parameters" : [ { - "label" : "value", - "name" : "value", + "defaultValue" : { + "int" : { + "_0" : 42 + } + }, + "label" : "count", + "name" : "count", "type" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - }, - "_1" : "null" + "int" : { + } } } ], "returnType" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - }, - "_1" : "null" + "int" : { + } } }, { - "abiName" : "bjs_roundTripOptionalTheme", + "abiName" : "bjs_testBoolDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalTheme", + "name" : "testBoolDefault", "parameters" : [ { - "label" : "value", - "name" : "value", + "defaultValue" : { + "bool" : { + "_0" : true + } + }, + "label" : "flag", + "name" : "flag", "type" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - }, - "_1" : "null" + "bool" : { + } } } ], "returnType" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - }, - "_1" : "null" + "bool" : { + } } }, { - "abiName" : "bjs_roundTripOptionalHttpStatus", + "abiName" : "bjs_testOptionalDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalHttpStatus", + "name" : "testOptionalDefault", "parameters" : [ { - "label" : "value", - "name" : "value", + "defaultValue" : { + "null" : { + + } + }, + "label" : "name", + "name" : "name", "type" : { "nullable" : { "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "string" : { + } }, "_1" : "null" @@ -7708,9 +7559,8 @@ "returnType" : { "nullable" : { "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "string" : { + } }, "_1" : "null" @@ -7718,530 +7568,671 @@ } }, { - "abiName" : "bjs_roundTripOptionalTSDirection", + "abiName" : "bjs_testMultipleDefaults", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalTSDirection", + "name" : "testMultipleDefaults", "parameters" : [ { - "label" : "value", - "name" : "value", + "defaultValue" : { + "string" : { + "_0" : "Default Title" + } + }, + "label" : "title", + "name" : "title", "type" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" - } - }, - "_1" : "null" + "string" : { + } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "TSDirection" + }, + { + "defaultValue" : { + "int" : { + "_0" : -10 } }, - "_1" : "null" - } - } - }, - { - "abiName" : "bjs_roundTripOptionalTSTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripOptionalTSTheme", - "parameters" : [ + "label" : "count", + "name" : "count", + "type" : { + "int" : { + + } + } + }, { - "label" : "value", - "name" : "value", + "defaultValue" : { + "bool" : { + "_0" : false + } + }, + "label" : "enabled", + "name" : "enabled", "type" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - }, - "_1" : "null" + "bool" : { + } } } ], "returnType" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "TSTheme", - "_1" : "String" - } - }, - "_1" : "null" + "string" : { + } } }, { - "abiName" : "bjs_roundTripOptionalNetworkingAPIMethod", + "abiName" : "bjs_testSimpleEnumDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalNetworkingAPIMethod", + "name" : "testSimpleEnumDefault", "parameters" : [ { - "label" : "_", - "name" : "method", + "defaultValue" : { + "enumCase" : { + "_0" : "Status", + "_1" : "success" + } + }, + "label" : "status", + "name" : "status", "type" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - }, - "_1" : "null" + "caseEnum" : { + "_0" : "Status" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Networking.API.Method" - } - }, - "_1" : "null" + "caseEnum" : { + "_0" : "Status" } } }, { - "abiName" : "bjs_roundTripOptionalAPIResult", + "abiName" : "bjs_testDirectionDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalAPIResult", + "name" : "testDirectionDefault", "parameters" : [ { - "label" : "value", - "name" : "value", + "defaultValue" : { + "enumCase" : { + "_0" : "Direction", + "_1" : "north" + } + }, + "label" : "direction", + "name" : "direction", "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" + "caseEnum" : { + "_0" : "Direction" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" + "caseEnum" : { + "_0" : "Direction" } } }, { - "abiName" : "bjs_roundTripTypedPayloadResult", + "abiName" : "bjs_testRawStringEnumDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripTypedPayloadResult", + "name" : "testRawStringEnumDefault", "parameters" : [ { - "label" : "_", - "name" : "result", + "defaultValue" : { + "enumCase" : { + "_0" : "Theme", + "_1" : "light" + } + }, + "label" : "theme", + "name" : "theme", "type" : { - "associatedValueEnum" : { - "_0" : "TypedPayloadResult" + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } } } ], "returnType" : { - "associatedValueEnum" : { - "_0" : "TypedPayloadResult" + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } } }, { - "abiName" : "bjs_roundTripOptionalTypedPayloadResult", + "abiName" : "bjs_testComplexInit", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalTypedPayloadResult", + "name" : "testComplexInit", "parameters" : [ { - "label" : "_", - "name" : "result", - "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "TypedPayloadResult" + "defaultValue" : { + "objectWithArguments" : { + "_0" : "Greeter", + "_1" : [ + { + "string" : { + "_0" : "DefaultGreeter" + } } - }, - "_1" : "null" + ] + } + }, + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "TypedPayloadResult" - } - }, - "_1" : "null" + "string" : { + } } }, { - "abiName" : "bjs_compareAPIResults", + "abiName" : "bjs_testEmptyInit", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "compareAPIResults", + "name" : "testEmptyInit", "parameters" : [ { - "label" : "_", - "name" : "r1", - "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" + "defaultValue" : { + "object" : { + "_0" : "StaticPropertyHolder" } - } - }, - { + }, "label" : "_", - "name" : "r2", + "name" : "object", "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" + "swiftHeapObject" : { + "_0" : "StaticPropertyHolder" } } } ], "returnType" : { - "string" : { - + "swiftHeapObject" : { + "_0" : "StaticPropertyHolder" } } }, { - "abiName" : "bjs_roundTripOptionalComplexResult", + "abiName" : "bjs_arrayWithDefault", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalComplexResult", + "name" : "arrayWithDefault", "parameters" : [ { - "label" : "_", - "name" : "result", - "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" - } - }, - "_1" : "null" + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 1 + } + }, + { + "int" : { + "_0" : 2 + } + }, + { + "int" : { + "_0" : 3 + } + } + ] + } + }, + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } } } } ], "returnType" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "ComplexResult" + "int" : { + + } + } + }, + { + "abiName" : "bjs_arrayWithOptionalDefault", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "arrayWithOptionalDefault", + "parameters" : [ + { + "defaultValue" : { + "null" : { + } }, - "_1" : "null" + "label" : "_", + "name" : "values", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "int" : { + } } }, { - "abiName" : "bjs_roundTripAllTypesResult", + "abiName" : "bjs_arrayMixedDefaults", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripAllTypesResult", + "name" : "arrayMixedDefaults", "parameters" : [ { - "label" : "_", - "name" : "result", + "defaultValue" : { + "string" : { + "_0" : "Sum" + } + }, + "label" : "prefix", + "name" : "prefix", "type" : { - "associatedValueEnum" : { - "_0" : "AllTypesResult" + "string" : { + + } + } + }, + { + "defaultValue" : { + "array" : { + "_0" : [ + { + "int" : { + "_0" : 10 + } + }, + { + "int" : { + "_0" : 20 + } + } + ] + } + }, + "label" : "values", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "defaultValue" : { + "string" : { + "_0" : "!" + } + }, + "label" : "suffix", + "name" : "suffix", + "type" : { + "string" : { + } } } ], "returnType" : { - "associatedValueEnum" : { - "_0" : "AllTypesResult" + "string" : { + } } }, { - "abiName" : "bjs_roundTripOptionalAllTypesResult", + "abiName" : "bjs_formatName", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalAllTypesResult", + "name" : "formatName", "parameters" : [ { "label" : "_", - "name" : "result", + "name" : "name", "type" : { - "nullable" : { + "string" : { + + } + } + }, + { + "label" : "transform", + "name" : "transform", + "type" : { + "closure" : { "_0" : { - "associatedValueEnum" : { - "_0" : "AllTypesResult" + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } } - }, - "_1" : "null" + } } } } ], "returnType" : { - "nullable" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "prefix", + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { "_0" : { - "associatedValueEnum" : { - "_0" : "AllTypesResult" + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_roundTripOptionalPayloadResult", + "abiName" : "bjs_makeAdder", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalPayloadResult", + "name" : "makeAdder", + "parameters" : [ + { + "label" : "base", + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + } + } + } + }, + { + "abiName" : "bjs_roundTripIntArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripIntArray", "parameters" : [ { "label" : "_", - "name" : "result", + "name" : "values", "type" : { - "associatedValueEnum" : { - "_0" : "OptionalAllTypesResult" + "array" : { + "_0" : { + "int" : { + + } + } } } } ], "returnType" : { - "associatedValueEnum" : { - "_0" : "OptionalAllTypesResult" + "array" : { + "_0" : { + "int" : { + + } + } } } }, { - "abiName" : "bjs_roundTripOptionalPayloadResultOpt", + "abiName" : "bjs_roundTripStringArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalPayloadResultOpt", + "name" : "roundTripStringArray", "parameters" : [ { "label" : "_", - "name" : "result", + "name" : "values", "type" : { - "nullable" : { + "array" : { "_0" : { - "associatedValueEnum" : { - "_0" : "OptionalAllTypesResult" + "string" : { + } - }, - "_1" : "null" + } } } } ], "returnType" : { - "nullable" : { + "array" : { "_0" : { - "associatedValueEnum" : { - "_0" : "OptionalAllTypesResult" + "string" : { + } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_roundTripOptionalClass", + "abiName" : "bjs_roundTripDoubleArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalClass", + "name" : "roundTripDoubleArray", "parameters" : [ { - "label" : "value", - "name" : "value", + "label" : "_", + "name" : "values", "type" : { - "nullable" : { + "array" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "double" : { + } - }, - "_1" : "null" + } } } } ], "returnType" : { - "nullable" : { + "array" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "double" : { + } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_roundTripOptionalGreeter", + "abiName" : "bjs_roundTripBoolArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalGreeter", + "name" : "roundTripBoolArray", "parameters" : [ { "label" : "_", - "name" : "value", + "name" : "values", "type" : { - "nullable" : { + "array" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "bool" : { + } - }, - "_1" : "null" + } } } } ], "returnType" : { - "nullable" : { + "array" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "bool" : { + } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_applyOptionalGreeter", + "abiName" : "bjs_roundTripDirectionArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "applyOptionalGreeter", + "name" : "roundTripDirectionArray", "parameters" : [ { "label" : "_", - "name" : "value", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - }, - { - "label" : "_", - "name" : "transform", + "name" : "values", "type" : { - "closure" : { + "array" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } + "caseEnum" : { + "_0" : "Direction" } } } @@ -8249,336 +8240,420 @@ } ], "returnType" : { - "nullable" : { + "array" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "caseEnum" : { + "_0" : "Direction" } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_makeOptionalHolder", + "abiName" : "bjs_roundTripStatusArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "makeOptionalHolder", + "name" : "roundTripStatusArray", "parameters" : [ { - "label" : "nullableGreeter", - "name" : "nullableGreeter", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - }, - "_1" : "null" - } - } - }, - { - "label" : "undefinedNumber", - "name" : "undefinedNumber", + "label" : "_", + "name" : "values", "type" : { - "nullable" : { + "array" : { "_0" : { - "double" : { - + "caseEnum" : { + "_0" : "Status" } - }, - "_1" : "undefined" + } } } } ], "returnType" : { - "swiftHeapObject" : { - "_0" : "OptionalHolder" + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + } } } }, { - "abiName" : "bjs_roundTripOptionalAPIOptionalResult", + "abiName" : "bjs_roundTripThemeArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalAPIOptionalResult", + "name" : "roundTripThemeArray", "parameters" : [ { - "label" : "result", - "name" : "result", + "label" : "_", + "name" : "values", "type" : { - "nullable" : { + "array" : { "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } - }, - "_1" : "null" + } } } } ], "returnType" : { - "nullable" : { + "array" : { "_0" : { - "associatedValueEnum" : { - "_0" : "APIOptionalResult" + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } - }, - "_1" : "null" + } } } }, { - "abiName" : "bjs_createPropertyHolder", + "abiName" : "bjs_roundTripHttpStatusArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "createPropertyHolder", + "name" : "roundTripHttpStatusArray", "parameters" : [ { - "label" : "intValue", - "name" : "intValue", - "type" : { - "int" : { - - } - } - }, - { - "label" : "floatValue", - "name" : "floatValue", - "type" : { - "float" : { - - } - } - }, - { - "label" : "doubleValue", - "name" : "doubleValue", - "type" : { - "double" : { - - } - } - }, - { - "label" : "boolValue", - "name" : "boolValue", + "label" : "_", + "name" : "values", "type" : { - "bool" : { - + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } } } - }, - { - "label" : "stringValue", - "name" : "stringValue", - "type" : { - "string" : { - + } + ], + "returnType" : { + "array" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" } } - }, + } + } + }, + { + "abiName" : "bjs_roundTripDataPointArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDataPointArray", + "parameters" : [ { - "label" : "jsObject", - "name" : "jsObject", + "label" : "_", + "name" : "points", "type" : { - "jsObject" : { - + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } } } } ], "returnType" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } } } }, { - "abiName" : "bjs_testPropertyHolder", + "abiName" : "bjs_roundTripGreeterArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testPropertyHolder", + "name" : "roundTripGreeterArray", "parameters" : [ { - "label" : "holder", - "name" : "holder", + "label" : "_", + "name" : "greeters", "type" : { - "swiftHeapObject" : { - "_0" : "PropertyHolder" + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } } } } ], "returnType" : { - "string" : { - + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } } } }, { - "abiName" : "bjs_resetObserverCounts", + "abiName" : "bjs_roundTripOptionalIntArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "resetObserverCounts", + "name" : "roundTripOptionalIntArray", "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "int" : { + } + }, + "_1" : "null" + } + } + } + } + } ], "returnType" : { - "void" : { + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "int" : { + } + }, + "_1" : "null" + } + } } } }, { - "abiName" : "bjs_getObserverStats", + "abiName" : "bjs_roundTripOptionalStringArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "getObserverStats", + "name" : "roundTripOptionalStringArray", "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "null" + } + } + } + } + } ], "returnType" : { - "string" : { + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "null" + } + } } } }, { - "abiName" : "bjs_testStringDefault", + "abiName" : "bjs_roundTripOptionalDataPointArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testStringDefault", + "name" : "roundTripOptionalDataPointArray", "parameters" : [ { - "defaultValue" : { - "string" : { - "_0" : "Hello World" - } - }, - "label" : "message", - "name" : "message", + "label" : "_", + "name" : "points", "type" : { - "string" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + }, + "_1" : "null" + } + } } } } ], "returnType" : { - "string" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + }, + "_1" : "null" + } + } } } }, { - "abiName" : "bjs_testIntDefault", + "abiName" : "bjs_roundTripOptionalDirectionArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testIntDefault", + "name" : "roundTripOptionalDirectionArray", "parameters" : [ { - "defaultValue" : { - "int" : { - "_0" : 42 - } - }, - "label" : "count", - "name" : "count", + "label" : "_", + "name" : "directions", "type" : { - "int" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } } } } ], "returnType" : { - "int" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } } } }, { - "abiName" : "bjs_testBoolDefault", + "abiName" : "bjs_roundTripOptionalStatusArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testBoolDefault", + "name" : "roundTripOptionalStatusArray", "parameters" : [ { - "defaultValue" : { - "bool" : { - "_0" : true - } - }, - "label" : "flag", - "name" : "flag", + "label" : "_", + "name" : "statuses", "type" : { - "bool" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + }, + "_1" : "null" + } + } } } } ], "returnType" : { - "bool" : { - + "array" : { + "_0" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" + } + }, + "_1" : "null" + } + } } } }, { - "abiName" : "bjs_testOptionalDefault", + "abiName" : "bjs_roundTripOptionalIntArrayType", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testOptionalDefault", - "parameters" : [ - { - "defaultValue" : { - "null" : { - - } - }, - "label" : "name", - "name" : "name", + "name" : "roundTripOptionalIntArrayType", + "parameters" : [ + { + "label" : "_", + "name" : "values", "type" : { "nullable" : { "_0" : { - "string" : { + "array" : { + "_0" : { + "int" : { + } + } } }, "_1" : "null" @@ -8589,8 +8664,12 @@ "returnType" : { "nullable" : { "_0" : { - "string" : { + "array" : { + "_0" : { + "int" : { + } + } } }, "_1" : "null" @@ -8598,263 +8677,235 @@ } }, { - "abiName" : "bjs_testMultipleDefaults", + "abiName" : "bjs_roundTripOptionalStringArrayType", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testMultipleDefaults", + "name" : "roundTripOptionalStringArrayType", "parameters" : [ { - "defaultValue" : { - "string" : { - "_0" : "Default Title" - } - }, - "label" : "title", - "name" : "title", - "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { - "int" : { - "_0" : -10 - } - }, - "label" : "count", - "name" : "count", - "type" : { - "int" : { - - } - } - }, - { - "defaultValue" : { - "bool" : { - "_0" : false - } - }, - "label" : "enabled", - "name" : "enabled", + "label" : "_", + "name" : "values", "type" : { - "bool" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + } + } + } + }, + "_1" : "null" } } } ], "returnType" : { - "string" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + } + } + } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_testSimpleEnumDefault", + "abiName" : "bjs_roundTripOptionalGreeterArrayType", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testSimpleEnumDefault", + "name" : "roundTripOptionalGreeterArrayType", "parameters" : [ { - "defaultValue" : { - "enumCase" : { - "_0" : "Status", - "_1" : "success" - } - }, - "label" : "status", - "name" : "status", + "label" : "_", + "name" : "greeters", "type" : { - "caseEnum" : { - "_0" : "Status" + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + }, + "_1" : "null" } } } ], "returnType" : { - "caseEnum" : { - "_0" : "Status" + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_testDirectionDefault", + "abiName" : "bjs_roundTripNestedIntArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testDirectionDefault", + "name" : "roundTripNestedIntArray", "parameters" : [ { - "defaultValue" : { - "enumCase" : { - "_0" : "Direction", - "_1" : "north" - } - }, - "label" : "direction", - "name" : "direction", + "label" : "_", + "name" : "values", "type" : { - "caseEnum" : { - "_0" : "Direction" + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } } } } ], "returnType" : { - "caseEnum" : { - "_0" : "Direction" + "array" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } } } }, { - "abiName" : "bjs_testRawStringEnumDefault", + "abiName" : "bjs_roundTripNestedStringArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testRawStringEnumDefault", + "name" : "roundTripNestedStringArray", "parameters" : [ { - "defaultValue" : { - "enumCase" : { - "_0" : "Theme", - "_1" : "light" - } - }, - "label" : "theme", - "name" : "theme", + "label" : "_", + "name" : "values", "type" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } } } } ], "returnType" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "array" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } } } }, { - "abiName" : "bjs_testComplexInit", + "abiName" : "bjs_roundTripNestedDoubleArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "testComplexInit", + "name" : "roundTripNestedDoubleArray", "parameters" : [ { - "defaultValue" : { - "objectWithArguments" : { - "_0" : "Greeter", - "_1" : [ - { - "string" : { - "_0" : "DefaultGreeter" + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "double" : { + + } } } - ] - } - }, - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" + } } } } ], "returnType" : { - "string" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "double" : { - } - } - }, - { - "abiName" : "bjs_testEmptyInit", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "testEmptyInit", - "parameters" : [ - { - "defaultValue" : { - "object" : { - "_0" : "StaticPropertyHolder" - } - }, - "label" : "_", - "name" : "object", - "type" : { - "swiftHeapObject" : { - "_0" : "StaticPropertyHolder" + } + } } } } - ], - "returnType" : { - "swiftHeapObject" : { - "_0" : "StaticPropertyHolder" - } } }, { - "abiName" : "bjs_arrayWithDefault", + "abiName" : "bjs_roundTripNestedBoolArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "arrayWithDefault", + "name" : "roundTripNestedBoolArray", "parameters" : [ { - "defaultValue" : { - "array" : { - "_0" : [ - { - "int" : { - "_0" : 1 - } - }, - { - "int" : { - "_0" : 2 - } - }, - { - "int" : { - "_0" : 3 - } - } - ] - } - }, "label" : "_", "name" : "values", "type" : { "array" : { "_0" : { - "int" : { + "array" : { + "_0" : { + "bool" : { + } + } } } } @@ -8862,162 +8913,122 @@ } ], "returnType" : { - "int" : { + "array" : { + "_0" : { + "array" : { + "_0" : { + "bool" : { + } + } + } + } } } }, { - "abiName" : "bjs_arrayWithOptionalDefault", + "abiName" : "bjs_roundTripNestedDataPointArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "arrayWithOptionalDefault", + "name" : "roundTripNestedDataPointArray", "parameters" : [ { - "defaultValue" : { - "null" : { - - } - }, "label" : "_", - "name" : "values", + "name" : "points", "type" : { - "nullable" : { + "array" : { "_0" : { "array" : { "_0" : { - "int" : { - + "swiftStruct" : { + "_0" : "DataPoint" } } } - }, - "_1" : "null" + } } } } ], "returnType" : { - "int" : { - + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "DataPoint" + } + } + } + } } } }, { - "abiName" : "bjs_arrayMixedDefaults", + "abiName" : "bjs_roundTripNestedDirectionArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "arrayMixedDefaults", + "name" : "roundTripNestedDirectionArray", "parameters" : [ { - "defaultValue" : { - "string" : { - "_0" : "Sum" - } - }, - "label" : "prefix", - "name" : "prefix", + "label" : "_", + "name" : "directions", "type" : { - "string" : { - - } - } - }, - { - "defaultValue" : { "array" : { - "_0" : [ - { - "int" : { - "_0" : 10 - } - }, - { - "int" : { - "_0" : 20 + "_0" : { + "array" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } } } - ] + } } - }, - "label" : "values", - "name" : "values", - "type" : { + } + } + ], + "returnType" : { + "array" : { + "_0" : { "array" : { "_0" : { - "int" : { - + "caseEnum" : { + "_0" : "Direction" } } } } - }, - { - "defaultValue" : { - "string" : { - "_0" : "!" - } - }, - "label" : "suffix", - "name" : "suffix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "string" : { - } } }, { - "abiName" : "bjs_formatName", + "abiName" : "bjs_roundTripNestedGreeterArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "formatName", + "name" : "roundTripNestedGreeterArray", "parameters" : [ { "label" : "_", - "name" : "name", - "type" : { - "string" : { - - } - } - }, - { - "label" : "transform", - "name" : "transform", + "name" : "greeters", "type" : { - "closure" : { + "array" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" } } - ], - "returnType" : { - "string" : { - - } } } } @@ -9025,47 +9036,87 @@ } ], "returnType" : { - "string" : { - + "array" : { + "_0" : { + "array" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + } } } }, { - "abiName" : "bjs_makeFormatter", + "abiName" : "bjs_roundTripUnsafeRawPointerArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "makeFormatter", + "name" : "roundTripUnsafeRawPointerArray", "parameters" : [ { - "label" : "prefix", - "name" : "prefix", + "label" : "_", + "name" : "values", "type" : { - "string" : { - + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" + } + } + } } } } ], "returnType" : { - "closure" : { + "array" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } + "unsafePointer" : { + "_0" : { + "kind" : "unsafeRawPointer" } - ], - "returnType" : { - "string" : { - + } + } + } + } + }, + { + "abiName" : "bjs_roundTripUnsafeMutableRawPointerArray", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripUnsafeMutableRawPointerArray", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutableRawPointer" } } } @@ -9073,41 +9124,36 @@ } }, { - "abiName" : "bjs_makeAdder", + "abiName" : "bjs_roundTripOpaquePointerArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "makeAdder", + "name" : "roundTripOpaquePointerArray", "parameters" : [ { - "label" : "base", - "name" : "base", + "label" : "_", + "name" : "values", "type" : { - "int" : { - + "array" : { + "_0" : { + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" + } + } + } } } } ], "returnType" : { - "closure" : { + "array" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - } - ], - "returnType" : { - "int" : { - + "unsafePointer" : { + "_0" : { + "kind" : "opaquePointer" } } } @@ -9115,13 +9161,13 @@ } }, { - "abiName" : "bjs_roundTripIntArray", + "abiName" : "bjs_roundTripUnsafePointerArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripIntArray", + "name" : "roundTripUnsafePointerArray", "parameters" : [ { "label" : "_", @@ -9129,8 +9175,11 @@ "type" : { "array" : { "_0" : { - "int" : { - + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } } } } @@ -9140,21 +9189,24 @@ "returnType" : { "array" : { "_0" : { - "int" : { - + "unsafePointer" : { + "_0" : { + "kind" : "unsafePointer", + "pointee" : "UInt8" + } } } } } }, { - "abiName" : "bjs_roundTripStringArray", + "abiName" : "bjs_roundTripUnsafeMutablePointerArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripStringArray", + "name" : "roundTripUnsafeMutablePointerArray", "parameters" : [ { "label" : "_", @@ -9162,8 +9214,11 @@ "type" : { "array" : { "_0" : { - "string" : { - + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } } } } @@ -9173,30 +9228,33 @@ "returnType" : { "array" : { "_0" : { - "string" : { - + "unsafePointer" : { + "_0" : { + "kind" : "unsafeMutablePointer", + "pointee" : "UInt8" + } } } } } }, { - "abiName" : "bjs_roundTripDoubleArray", + "abiName" : "bjs_consumeDataProcessorArrayType", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripDoubleArray", + "name" : "consumeDataProcessorArrayType", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "processors", "type" : { "array" : { "_0" : { - "double" : { - + "swiftProtocol" : { + "_0" : "DataProcessor" } } } @@ -9204,32 +9262,28 @@ } ], "returnType" : { - "array" : { - "_0" : { - "double" : { + "int" : { - } - } } } }, { - "abiName" : "bjs_roundTripBoolArray", + "abiName" : "bjs_roundTripDataProcessorArrayType", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripBoolArray", + "name" : "roundTripDataProcessorArrayType", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "processors", "type" : { "array" : { "_0" : { - "bool" : { - + "swiftProtocol" : { + "_0" : "DataProcessor" } } } @@ -9239,30 +9293,30 @@ "returnType" : { "array" : { "_0" : { - "bool" : { - + "swiftProtocol" : { + "_0" : "DataProcessor" } } } } }, { - "abiName" : "bjs_roundTripDirectionArray", + "abiName" : "bjs_roundTripJSObjectArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripDirectionArray", + "name" : "roundTripJSObjectArray", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "objects", "type" : { "array" : { "_0" : { - "caseEnum" : { - "_0" : "Direction" + "jsObject" : { + } } } @@ -9272,30 +9326,35 @@ "returnType" : { "array" : { "_0" : { - "caseEnum" : { - "_0" : "Direction" + "jsObject" : { + } } } } }, { - "abiName" : "bjs_roundTripStatusArray", + "abiName" : "bjs_roundTripOptionalJSObjectArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripStatusArray", + "name" : "roundTripOptionalJSObjectArray", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "objects", "type" : { "array" : { "_0" : { - "caseEnum" : { - "_0" : "Status" + "nullable" : { + "_0" : { + "jsObject" : { + + } + }, + "_1" : "null" } } } @@ -9305,31 +9364,35 @@ "returnType" : { "array" : { "_0" : { - "caseEnum" : { - "_0" : "Status" + "nullable" : { + "_0" : { + "jsObject" : { + + } + }, + "_1" : "null" } } } } }, { - "abiName" : "bjs_roundTripThemeArray", + "abiName" : "bjs_roundTripFooArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripThemeArray", + "name" : "roundTripFooArray", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "foos", "type" : { "array" : { "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "jsObject" : { + "_0" : "Foo" } } } @@ -9339,32 +9402,35 @@ "returnType" : { "array" : { "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "jsObject" : { + "_0" : "Foo" } } } } }, { - "abiName" : "bjs_roundTripHttpStatusArray", + "abiName" : "bjs_roundTripOptionalFooArray", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripHttpStatusArray", + "name" : "roundTripOptionalFooArray", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "foos", "type" : { "array" : { "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "nullable" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + }, + "_1" : "null" } } } @@ -9374,316 +9440,280 @@ "returnType" : { "array" : { "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "nullable" : { + "_0" : { + "jsObject" : { + "_0" : "Foo" + } + }, + "_1" : "null" } } } } }, { - "abiName" : "bjs_roundTripDataPointArray", + "abiName" : "bjs_roundTripOptionalString", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripDataPointArray", + "name" : "roundTripOptionalString", "parameters" : [ { - "label" : "_", - "name" : "points", + "label" : "name", + "name" : "name", "type" : { - "array" : { + "nullable" : { "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" + "string" : { + } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" + "string" : { + } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripGreeterArray", + "abiName" : "bjs_roundTripOptionalInt", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripGreeterArray", + "name" : "roundTripOptionalInt", "parameters" : [ { - "label" : "_", - "name" : "greeters", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "int" : { + } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "int" : { + } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalIntArray", + "abiName" : "bjs_roundTripOptionalBool", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalIntArray", + "name" : "roundTripOptionalBool", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "flag", + "name" : "flag", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "int" : { + "bool" : { - } - }, - "_1" : "null" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "int" : { + "bool" : { - } - }, - "_1" : "null" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalStringArray", + "abiName" : "bjs_roundTripOptionalFloat", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalStringArray", + "name" : "roundTripOptionalFloat", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "number", + "name" : "number", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "string" : { + "float" : { - } - }, - "_1" : "null" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "string" : { + "float" : { - } - }, - "_1" : "null" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalDataPointArray", + "abiName" : "bjs_roundTripOptionalDouble", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalDataPointArray", + "name" : "roundTripOptionalDouble", "parameters" : [ { - "label" : "_", - "name" : "points", + "label" : "precision", + "name" : "precision", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - }, - "_1" : "null" + "double" : { + } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - }, - "_1" : "null" + "double" : { + } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalDirectionArray", + "abiName" : "bjs_roundTripOptionalSyntax", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalDirectionArray", + "name" : "roundTripOptionalSyntax", "parameters" : [ { - "label" : "_", - "name" : "directions", + "label" : "name", + "name" : "name", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - }, - "_1" : "null" + "string" : { + } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - }, - "_1" : "null" + "string" : { + } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalStatusArray", + "abiName" : "bjs_roundTripOptionalMixSyntax", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalStatusArray", + "name" : "roundTripOptionalMixSyntax", "parameters" : [ { - "label" : "_", - "name" : "statuses", + "label" : "name", + "name" : "name", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - }, - "_1" : "null" + "string" : { + } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Status" - } - }, - "_1" : "null" + "string" : { + } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalIntArrayType", + "abiName" : "bjs_roundTripOptionalSwiftSyntax", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalIntArrayType", + "name" : "roundTripOptionalSwiftSyntax", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "name", + "name" : "name", "type" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "int" : { + "string" : { - } - } } }, "_1" : "null" @@ -9694,12 +9724,8 @@ "returnType" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "int" : { + "string" : { - } - } } }, "_1" : "null" @@ -9707,26 +9733,22 @@ } }, { - "abiName" : "bjs_roundTripOptionalStringArrayType", + "abiName" : "bjs_roundTripOptionalWithSpaces", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalStringArrayType", + "name" : "roundTripOptionalWithSpaces", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "value", + "name" : "value", "type" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "string" : { + "double" : { - } - } } }, "_1" : "null" @@ -9737,12 +9759,8 @@ "returnType" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "string" : { + "double" : { - } - } } }, "_1" : "null" @@ -9750,26 +9768,22 @@ } }, { - "abiName" : "bjs_roundTripOptionalGreeterArrayType", + "abiName" : "bjs_roundTripOptionalTypeAlias", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalGreeterArrayType", + "name" : "roundTripOptionalTypeAlias", "parameters" : [ { - "label" : "_", - "name" : "greeters", + "label" : "age", + "name" : "age", "type" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } + "int" : { + } }, "_1" : "null" @@ -9780,12 +9794,8 @@ "returnType" : { "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } + "int" : { + } }, "_1" : "null" @@ -9793,598 +9803,589 @@ } }, { - "abiName" : "bjs_roundTripNestedIntArray", + "abiName" : "bjs_roundTripOptionalStatus", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedIntArray", + "name" : "roundTripOptionalStatus", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } + "caseEnum" : { + "_0" : "Status" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { - "_0" : { - "array" : { - "_0" : { - "int" : { - - } - } + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Status" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedStringArray", + "abiName" : "bjs_roundTripOptionalTheme", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedStringArray", + "name" : "roundTripOptionalTheme", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "string" : { - - } - } + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "string" : { - - } - } + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedDoubleArray", + "abiName" : "bjs_roundTripOptionalHttpStatus", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedDoubleArray", + "name" : "roundTripOptionalHttpStatus", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "double" : { - - } - } + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "double" : { - - } - } + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedBoolArray", + "abiName" : "bjs_roundTripOptionalTSDirection", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedBoolArray", + "name" : "roundTripOptionalTSDirection", "parameters" : [ { - "label" : "_", - "name" : "values", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "bool" : { - - } - } + "caseEnum" : { + "_0" : "TSDirection" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "bool" : { - - } - } + "caseEnum" : { + "_0" : "TSDirection" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedDataPointArray", + "abiName" : "bjs_roundTripOptionalTSTheme", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedDataPointArray", + "name" : "roundTripOptionalTSTheme", "parameters" : [ { - "label" : "_", - "name" : "points", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftStruct" : { - "_0" : "DataPoint" - } - } + "rawValueEnum" : { + "_0" : "TSTheme", + "_1" : "String" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedDirectionArray", + "abiName" : "bjs_roundTripOptionalNetworkingAPIMethod", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedDirectionArray", + "name" : "roundTripOptionalNetworkingAPIMethod", "parameters" : [ { "label" : "_", - "name" : "directions", + "name" : "method", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } + "caseEnum" : { + "_0" : "Networking.API.Method" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - } + "caseEnum" : { + "_0" : "Networking.API.Method" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripNestedGreeterArray", + "abiName" : "bjs_roundTripOptionalAPIResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripNestedGreeterArray", + "name" : "roundTripOptionalAPIResult", "parameters" : [ { - "label" : "_", - "name" : "greeters", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } + "associatedValueEnum" : { + "_0" : "APIResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "array" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } + "associatedValueEnum" : { + "_0" : "APIResult" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripUnsafeRawPointerArray", + "abiName" : "bjs_roundTripOptionalTypedPayloadResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeRawPointerArray", + "name" : "roundTripOptionalTypedPayloadResult", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "result", "type" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeRawPointer" - } + "associatedValueEnum" : { + "_0" : "TypedPayloadResult" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripUnsafeMutableRawPointerArray", + "abiName" : "bjs_compareAPIResults", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeMutableRawPointerArray", + "name" : "compareAPIResults", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "r1", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + }, + { + "label" : "_", + "name" : "r2", "type" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } + "associatedValueEnum" : { + "_0" : "APIResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutableRawPointer" - } - } - } + "string" : { + } } }, { - "abiName" : "bjs_roundTripOpaquePointerArray", + "abiName" : "bjs_roundTripOptionalComplexResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOpaquePointerArray", + "name" : "roundTripOptionalComplexResult", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "result", "type" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } + "associatedValueEnum" : { + "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "opaquePointer" - } + "associatedValueEnum" : { + "_0" : "ComplexResult" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripUnsafePointerArray", + "abiName" : "bjs_roundTripOptionalAllTypesResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafePointerArray", + "name" : "roundTripOptionalAllTypesResult", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "result", "type" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } + "associatedValueEnum" : { + "_0" : "AllTypesResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafePointer", - "pointee" : "UInt8" - } + "associatedValueEnum" : { + "_0" : "AllTypesResult" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripUnsafeMutablePointerArray", + "abiName" : "bjs_roundTripOptionalPayloadResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripUnsafeMutablePointerArray", + "name" : "roundTripOptionalPayloadResult", "parameters" : [ { "label" : "_", - "name" : "values", + "name" : "result", "type" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" } } } ], "returnType" : { - "array" : { - "_0" : { - "unsafePointer" : { - "_0" : { - "kind" : "unsafeMutablePointer", - "pointee" : "UInt8" - } - } - } + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" } } }, { - "abiName" : "bjs_consumeDataProcessorArrayType", + "abiName" : "bjs_roundTripOptionalPayloadResultOpt", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "consumeDataProcessorArrayType", + "name" : "roundTripOptionalPayloadResultOpt", "parameters" : [ { "label" : "_", - "name" : "processors", + "name" : "result", "type" : { - "array" : { + "nullable" : { "_0" : { - "swiftProtocol" : { - "_0" : "DataProcessor" + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "int" : { - + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "OptionalAllTypesResult" + } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripDataProcessorArrayType", + "abiName" : "bjs_roundTripOptionalClass", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripDataProcessorArrayType", + "name" : "roundTripOptionalClass", "parameters" : [ { - "label" : "_", - "name" : "processors", + "label" : "value", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "swiftProtocol" : { - "_0" : "DataProcessor" + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "swiftProtocol" : { - "_0" : "DataProcessor" + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripJSObjectArray", + "abiName" : "bjs_roundTripOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripJSObjectArray", + "name" : "roundTripOptionalGreeter", "parameters" : [ { "label" : "_", - "name" : "objects", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "jsObject" : { - + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "jsObject" : { - + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripOptionalJSObjectArray", + "abiName" : "bjs_applyOptionalGreeter", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalJSObjectArray", + "name" : "applyOptionalGreeter", "parameters" : [ { "label" : "_", - "name" : "objects", + "name" : "value", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "jsObject" : { - + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + }, + { + "label" : "_", + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" } - }, - "_1" : "null" + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } } } } @@ -10392,93 +10393,92 @@ } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "jsObject" : { - - } - }, - "_1" : "null" + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" } } }, { - "abiName" : "bjs_roundTripFooArray", + "abiName" : "bjs_makeOptionalHolder", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripFooArray", + "name" : "makeOptionalHolder", "parameters" : [ { - "label" : "_", - "name" : "foos", + "label" : "nullableGreeter", + "name" : "nullableGreeter", "type" : { - "array" : { + "nullable" : { "_0" : { - "jsObject" : { - "_0" : "Foo" + "swiftHeapObject" : { + "_0" : "Greeter" } - } + }, + "_1" : "null" + } + } + }, + { + "label" : "undefinedNumber", + "name" : "undefinedNumber", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "undefined" } } } ], "returnType" : { - "array" : { - "_0" : { - "jsObject" : { - "_0" : "Foo" - } - } + "swiftHeapObject" : { + "_0" : "OptionalHolder" } } }, { - "abiName" : "bjs_roundTripOptionalFooArray", + "abiName" : "bjs_roundTripOptionalAPIOptionalResult", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripOptionalFooArray", + "name" : "roundTripOptionalAPIOptionalResult", "parameters" : [ { - "label" : "_", - "name" : "foos", + "label" : "result", + "name" : "result", "type" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "jsObject" : { - "_0" : "Foo" - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } } ], "returnType" : { - "array" : { + "nullable" : { "_0" : { - "nullable" : { - "_0" : { - "jsObject" : { - "_0" : "Foo" - } - }, - "_1" : "null" + "associatedValueEnum" : { + "_0" : "APIOptionalResult" } - } + }, + "_1" : "null" } } }, @@ -12870,62 +12870,6 @@ } } }, - { - "name" : "jsRoundTripOptionalNumberNull", - "parameters" : [ - { - "name" : "v", - "type" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "null" - } - } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "null" - } - } - }, - { - "name" : "jsRoundTripOptionalNumberUndefined", - "parameters" : [ - { - "name" : "v", - "type" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "undefined" - } - } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "undefined" - } - } - }, { "name" : "jsRoundTripJSValue", "parameters" : [ @@ -14025,6 +13969,136 @@ ], "types" : [ + ] + }, + { + "functions" : [ + { + "name" : "runJsOptionalSupportTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsRoundTripOptionalNumberNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "jsRoundTripOptionalNumberUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "undefined" + } + } + }, + { + "name" : "jsRoundTripOptionalStringNull", + "parameters" : [ + { + "name" : "name", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "name" : "jsRoundTripOptionalStringUndefined", + "parameters" : [ + { + "name" : "name", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "undefined" + } + } + } + ], + "types" : [ + ] } ] diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index a465c57b4..cef881db0 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -35,26 +35,6 @@ class ImportAPITests: XCTestCase { } } - func testRoundTripOptionalNumberNull() throws { - try XCTAssertEqual(jsRoundTripOptionalNumberNull(42), 42) - try XCTAssertNil(jsRoundTripOptionalNumberNull(nil)) - } - - func testRoundTripOptionalNumberUndefined() throws { - let some = try jsRoundTripOptionalNumberUndefined(.value(42)) - switch some { - case .value(let value): - XCTAssertEqual(value, 42) - case .undefined: - XCTFail("Expected defined value") - } - - let undefined = try jsRoundTripOptionalNumberUndefined(.undefinedValue) - if case .value = undefined { - XCTFail("Expected undefined") - } - } - func testRoundTripJSValue() throws { let symbol = JSSymbol("roundTrip") let bigInt = JSBigInt(_slowBridge: Int64(123456789)) diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs new file mode 100644 index 000000000..8a856582d --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs @@ -0,0 +1,219 @@ +// @ts-check + +import assert from 'node:assert'; +import { + StatusValues, + ThemeValues, + HttpStatusValues, + TSDirection, + TSTheme, + APIResultValues, + APIOptionalResultValues, + AllTypesResultValues, + OptionalAllTypesResultValues, +} from '../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js'; + +import { ImportedFoo } from './Types.mjs'; + +/** + * Optional value bridging coverage for BridgeJS runtime tests. + * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports + */ +export function runJsOptionalSupportTests(exports) { + assert.equal(exports.roundTripOptionalString(null), null); + assert.equal(exports.roundTripOptionalInt(null), null); + assert.equal(exports.roundTripOptionalBool(null), null); + assert.equal(exports.roundTripOptionalFloat(null), null); + assert.equal(exports.roundTripOptionalDouble(null), null); + + assert.equal(exports.roundTripOptionalString('Hello'), 'Hello'); + assert.equal(exports.roundTripOptionalInt(42), 42); + assert.equal(exports.roundTripOptionalBool(true), true); + assert.equal(exports.roundTripOptionalFloat(3.141592502593994), 3.141592502593994); // Float32 precision + assert.equal(exports.roundTripOptionalDouble(2.718), 2.718); + + assert.equal(exports.roundTripOptionalSyntax(null), null); + assert.equal(exports.roundTripOptionalSyntax('Test'), 'Test'); + assert.equal(exports.roundTripOptionalMixSyntax(null), null); + assert.equal(exports.roundTripOptionalMixSyntax('Mix'), 'Mix'); + assert.equal(exports.roundTripOptionalSwiftSyntax(null), null); + assert.equal(exports.roundTripOptionalSwiftSyntax('Swift'), 'Swift'); + assert.equal(exports.roundTripOptionalWithSpaces(null), null); + assert.equal(exports.roundTripOptionalWithSpaces(1.618), 1.618); + assert.equal(exports.roundTripOptionalTypeAlias(null), null); + assert.equal(exports.roundTripOptionalTypeAlias(25), 25); + assert.equal(exports.roundTripOptionalStatus(exports.Status.Success), StatusValues.Success); + assert.equal(exports.roundTripOptionalTheme(exports.Theme.Light), ThemeValues.Light); + assert.equal(exports.roundTripOptionalHttpStatus(exports.HttpStatus.Ok), HttpStatusValues.Ok); + assert.equal(exports.roundTripOptionalTSDirection(TSDirection.North), TSDirection.North); + assert.equal(exports.roundTripOptionalTSTheme(TSTheme.Light), TSTheme.Light); + assert.equal(exports.roundTripOptionalNetworkingAPIMethod(exports.Networking.API.Method.Get), exports.Networking.API.Method.Get); + + const pVal = 3.141592653589793; + const p1 = { tag: APIResultValues.Tag.Precise, param0: pVal }; + const cl1 = { tag: exports.ComplexResult.Tag.Location, param0: 37.7749, param1: -122.4194, param2: 'San Francisco' }; + + assert.deepEqual(exports.roundTripOptionalAPIResult(p1), p1); + assert.deepEqual(exports.roundTripOptionalComplexResult(cl1), cl1); + + const apiSuccess = { tag: exports.APIResult.Tag.Success, param0: 'test success' }; + const apiFailure = { tag: exports.APIResult.Tag.Failure, param0: 404 }; + const apiInfo = { tag: exports.APIResult.Tag.Info }; + + assert.equal(exports.compareAPIResults(apiSuccess, apiFailure), 'r1:success:test success,r2:failure:404'); + assert.equal(exports.compareAPIResults(null, apiInfo), 'r1:nil,r2:info'); + assert.equal(exports.compareAPIResults(apiFailure, null), 'r1:failure:404,r2:nil'); + assert.equal(exports.compareAPIResults(null, null), 'r1:nil,r2:nil'); + + const optionalGreeter = new exports.Greeter('Schrödinger'); + const optionalGreeter2 = exports.roundTripOptionalClass(optionalGreeter); + assert.equal(optionalGreeter2?.greet() ?? '', 'Hello, Schrödinger!'); + assert.equal(optionalGreeter2?.name ?? '', 'Schrödinger'); + assert.equal(optionalGreeter2?.prefix ?? '', 'Hello'); + assert.equal(exports.roundTripOptionalClass(null), null); + optionalGreeter.release(); + optionalGreeter2?.release(); + + const optionalsHolder = new exports.OptionalPropertyHolder(null); + + assert.equal(optionalsHolder.optionalName, null); + assert.equal(optionalsHolder.optionalAge, null); + assert.equal(optionalsHolder.optionalGreeter, null); + + optionalsHolder.optionalName = 'Alice'; + optionalsHolder.optionalAge = 25; + assert.equal(optionalsHolder.optionalName, 'Alice'); + assert.equal(optionalsHolder.optionalAge, 25); + + const testPropertyGreeter = new exports.Greeter('Bob'); + optionalsHolder.optionalGreeter = testPropertyGreeter; + assert.equal(optionalsHolder.optionalGreeter.greet(), 'Hello, Bob!'); + assert.equal(optionalsHolder.optionalGreeter.name, 'Bob'); + + optionalsHolder.optionalName = null; + optionalsHolder.optionalAge = null; + optionalsHolder.optionalGreeter = null; + assert.equal(optionalsHolder.optionalName, null); + assert.equal(optionalsHolder.optionalAge, null); + assert.equal(optionalsHolder.optionalGreeter, null); + testPropertyGreeter.release(); + optionalsHolder.release(); + + const optGreeter = new exports.Greeter('Optionaly'); + assert.equal(exports.roundTripOptionalGreeter(null), null); + const optGreeterReturned = exports.roundTripOptionalGreeter(optGreeter); + assert.equal(optGreeterReturned.name, 'Optionaly'); + assert.equal(optGreeterReturned.greet(), 'Hello, Optionaly!'); + + const appliedOptional = exports.applyOptionalGreeter(null, (g) => g ?? optGreeter); + assert.equal(appliedOptional.name, 'Optionaly'); + + const holderOpt = exports.makeOptionalHolder(null, undefined); + assert.equal(holderOpt.nullableGreeter, null); + assert.equal(holderOpt.undefinedNumber, undefined); + holderOpt.nullableGreeter = optGreeter; + holderOpt.undefinedNumber = 123.5; + assert.equal(holderOpt.nullableGreeter.name, 'Optionaly'); + assert.equal(holderOpt.undefinedNumber, 123.5); + holderOpt.release(); + optGreeterReturned.release(); + optGreeter.release(); + + const aor1 = { tag: APIOptionalResultValues.Tag.Success, param0: 'hello world' }; + const aor2 = { tag: APIOptionalResultValues.Tag.Success, param0: null }; + const aor3 = { tag: APIOptionalResultValues.Tag.Failure, param0: 404, param1: true }; + const aor4 = { tag: APIOptionalResultValues.Tag.Failure, param0: 404, param1: null }; + const aor5 = { tag: APIOptionalResultValues.Tag.Failure, param0: null, param1: null }; + const aor6 = { tag: APIOptionalResultValues.Tag.Status, param0: true, param1: 200, param2: 'OK' }; + const aor7 = { tag: APIOptionalResultValues.Tag.Status, param0: true, param1: null, param2: 'Partial' }; + const aor8 = { tag: APIOptionalResultValues.Tag.Status, param0: null, param1: null, param2: 'Zero' }; + const aor9 = { tag: APIOptionalResultValues.Tag.Status, param0: false, param1: 500, param2: null }; + const aor10 = { tag: APIOptionalResultValues.Tag.Status, param0: null, param1: 0, param2: 'Zero' }; + + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor1), aor1); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor2), aor2); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor3), aor3); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor4), aor4); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor5), aor5); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor6), aor6); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor7), aor7); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor8), aor8); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor9), aor9); + assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor10), aor10); + assert.equal(exports.roundTripOptionalAPIOptionalResult(null), null); + + // Optional TypedPayloadResult roundtrip + const tpr_precision = { tag: exports.TypedPayloadResult.Tag.Precision, param0: Math.fround(0.1) }; + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_precision), tpr_precision); + const tpr_direction = { tag: exports.TypedPayloadResult.Tag.Direction, param0: exports.Direction.North }; + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_direction), tpr_direction); + const tpr_optPrecisionSome = { tag: exports.TypedPayloadResult.Tag.OptPrecision, param0: Math.fround(0.001) }; + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionSome), tpr_optPrecisionSome); + const tpr_optPrecisionNull = { tag: exports.TypedPayloadResult.Tag.OptPrecision, param0: null }; + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionNull), tpr_optPrecisionNull); + const tpr_empty = { tag: exports.TypedPayloadResult.Tag.Empty }; + assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_empty), tpr_empty); + assert.equal(exports.roundTripOptionalTypedPayloadResult(null), null); + + // Optional AllTypesResult roundtrip + const atr_struct = { tag: AllTypesResultValues.Tag.StructPayload, param0: { street: "100 Main St", city: "Boston", zipCode: 2101 } }; + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_struct), atr_struct); + const atr_array = { tag: AllTypesResultValues.Tag.ArrayPayload, param0: [10, 20, 30] }; + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_array), atr_array); + const atr_empty = { tag: AllTypesResultValues.Tag.Empty }; + assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_empty), atr_empty); + assert.equal(exports.roundTripOptionalAllTypesResult(null), null); + + // OptionalAllTypesResult — optional struct, class, JSObject, nested enum, array as associated value payloads + const oatr_structSome = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: { street: "200 Oak St", city: "Denver", zipCode: null } }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structSome), oatr_structSome); + + const oatr_structNone = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structNone), oatr_structNone); + + const oatr_classSome = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: new exports.Greeter("OptEnumUser") }; + const oatr_classSome_result = exports.roundTripOptionalPayloadResult(oatr_classSome); + assert.equal(oatr_classSome_result.tag, OptionalAllTypesResultValues.Tag.OptClass); + assert.equal(oatr_classSome_result.param0.name, "OptEnumUser"); + + const oatr_classNone = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_classNone), oatr_classNone); + + const oatr_jsObjectSome = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: { key: "value" } }; + const oatr_jsObjectSome_result = exports.roundTripOptionalPayloadResult(oatr_jsObjectSome); + assert.equal(oatr_jsObjectSome_result.tag, OptionalAllTypesResultValues.Tag.OptJSObject); + assert.equal(oatr_jsObjectSome_result.param0.key, "value"); + + const oatr_jsObjectNone = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsObjectNone), oatr_jsObjectNone); + + const oatr_nestedEnumSome = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: { tag: APIResultValues.Tag.Failure, param0: 404 } }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumSome), oatr_nestedEnumSome); + + const oatr_nestedEnumNone = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumNone), oatr_nestedEnumNone); + + const oatr_arraySome = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: [1, 2, 3] }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arraySome), oatr_arraySome); + + const oatr_arrayNone = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arrayNone), oatr_arrayNone); + + const oatr_jsClassSome = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: new ImportedFoo("optEnumFoo") }; + const oatr_jsClassSome_result = exports.roundTripOptionalPayloadResult(oatr_jsClassSome); + assert.equal(oatr_jsClassSome_result.tag, OptionalAllTypesResultValues.Tag.OptJsClass); + assert.equal(oatr_jsClassSome_result.param0.value, "optEnumFoo"); + + const oatr_jsClassNone = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: null }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsClassNone), oatr_jsClassNone); + + const oatr_empty = { tag: OptionalAllTypesResultValues.Tag.Empty }; + assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_empty), oatr_empty); + + // Optional OptionalAllTypesResult roundtrip + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structSome), oatr_structSome); + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structNone), oatr_structNone); + assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_empty), oatr_empty); + assert.equal(exports.roundTripOptionalPayloadResultOpt(null), null); + +} diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/Types.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/Types.mjs new file mode 100644 index 000000000..b4c2079d8 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/Types.mjs @@ -0,0 +1,6 @@ +export class ImportedFoo { + /** @param {string} value */ + constructor(value) { + this.value = value; + } +} diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift new file mode 100644 index 000000000..bc0f1fcc8 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -0,0 +1,232 @@ +import XCTest +@_spi(Experimental) import JavaScriptKit +import JavaScriptEventLoop + +@JSFunction func runJsOptionalSupportTests() throws + +final class OptionalSupportTests: XCTestCase { + func testRunJsOptionalSupportTests() throws { + try runJsOptionalSupportTests() + } + + // FIXME: Optional return type on imported function is broken + // func testRoundTripOptionalStringNull() throws { + // try XCTAssertEqual(jsRoundTripOptionalStringNull("hello"), "hello") + // try XCTAssertNil(jsRoundTripOptionalStringNull(nil)) + // } + + // func testRoundTripOptionalStringUndefined() throws { + // let some = try jsRoundTripOptionalStringUndefined(.value("hi")) + // switch some { + // case .value(let value): + // XCTAssertEqual(value, "hi") + // case .undefined: + // XCTFail("Expected defined value") + // } + + // let undefined = try jsRoundTripOptionalStringUndefined(.undefinedValue) + // if case .value = undefined { + // XCTFail("Expected undefined") + // } + // } + + func testRoundTripOptionalNumberNull() throws { + try XCTAssertEqual(jsRoundTripOptionalNumberNull(42), 42) + try XCTAssertNil(jsRoundTripOptionalNumberNull(nil)) + } + + func testRoundTripOptionalNumberUndefined() throws { + let some = try jsRoundTripOptionalNumberUndefined(.value(42)) + switch some { + case .value(let value): + XCTAssertEqual(value, 42) + case .undefined: + XCTFail("Expected defined value") + } + + let undefined = try jsRoundTripOptionalNumberUndefined(.undefined) + if case .value = undefined { + XCTFail("Expected undefined") + } + } +} + +// MARK: - Optional Bridging + +@JSFunction func jsRoundTripOptionalNumberNull(_ value: Int?) throws -> Int? +@JSFunction func jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws -> JSUndefinedOr +@JSFunction func jsRoundTripOptionalStringNull(_ name: String?) throws -> String? +@JSFunction func jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws -> JSUndefinedOr + +@JS func roundTripOptionalString(name: String?) -> String? { + name +} + +@JS func roundTripOptionalInt(value: Int?) -> Int? { + value +} + +@JS func roundTripOptionalBool(flag: Bool?) -> Bool? { + flag +} + +@JS func roundTripOptionalFloat(number: Float?) -> Float? { + number +} + +@JS func roundTripOptionalDouble(precision: Double?) -> Double? { + precision +} + +@JS func roundTripOptionalSyntax(name: Optional) -> Optional { + name +} + +@JS func roundTripOptionalMixSyntax(name: String?) -> Optional { + name +} + +@JS func roundTripOptionalSwiftSyntax(name: Swift.Optional) -> Swift.Optional { + name +} + +@JS func roundTripOptionalWithSpaces(value: Optional) -> Optional { + value +} + +typealias OptionalAge = Int? +@JS func roundTripOptionalTypeAlias(age: OptionalAge) -> OptionalAge { + age +} + +@JS func roundTripOptionalStatus(value: Status?) -> Status? { + value +} + +@JS func roundTripOptionalTheme(value: Theme?) -> Theme? { + value +} + +@JS func roundTripOptionalHttpStatus(value: HttpStatus?) -> HttpStatus? { + value +} + +@JS func roundTripOptionalTSDirection(value: TSDirection?) -> TSDirection? { + value +} + +@JS func roundTripOptionalTSTheme(value: TSTheme?) -> TSTheme? { + value +} + +@JS func roundTripOptionalNetworkingAPIMethod(_ method: Networking.API.Method?) -> Networking.API.Method? { + method +} + +@JS func roundTripOptionalAPIResult(value: APIResult?) -> APIResult? { + value +} + +@JS func roundTripOptionalTypedPayloadResult(_ result: TypedPayloadResult?) -> TypedPayloadResult? { + result +} + +@JS func compareAPIResults(_ r1: APIResult?, _ r2: APIResult?) -> String { + let r1Str: String + switch r1 { + case .none: r1Str = "nil" + case .some(.success(let msg)): r1Str = "success:\(msg)" + case .some(.failure(let code)): r1Str = "failure:\(code)" + case .some(.info): r1Str = "info" + case .some(.flag(let b)): r1Str = "flag:\(b)" + case .some(.rate(let r)): r1Str = "rate:\(r)" + case .some(.precise(let p)): r1Str = "precise:\(p)" + } + + let r2Str: String + switch r2 { + case .none: r2Str = "nil" + case .some(.success(let msg)): r2Str = "success:\(msg)" + case .some(.failure(let code)): r2Str = "failure:\(code)" + case .some(.info): r2Str = "info" + case .some(.flag(let b)): r2Str = "flag:\(b)" + case .some(.rate(let r)): r2Str = "rate:\(r)" + case .some(.precise(let p)): r2Str = "precise:\(p)" + } + + return "r1:\(r1Str),r2:\(r2Str)" +} + +@JS func roundTripOptionalComplexResult(_ result: ComplexResult?) -> ComplexResult? { + result +} + +@JS func roundTripOptionalAllTypesResult(_ result: AllTypesResult?) -> AllTypesResult? { + result +} + +@JS +enum OptionalAllTypesResult { + case optStruct(Address?) + case optClass(Greeter?) + case optJSObject(JSObject?) + case optNestedEnum(APIResult?) + case optArray([Int]?) + case optJsClass(Foo?) + case empty +} + +@JS func roundTripOptionalPayloadResult(_ result: OptionalAllTypesResult) -> OptionalAllTypesResult { + result +} + +@JS func roundTripOptionalPayloadResultOpt(_ result: OptionalAllTypesResult?) -> OptionalAllTypesResult? { + result +} + +@JS func roundTripOptionalClass(value: Greeter?) -> Greeter? { + value +} + +@JS func roundTripOptionalGreeter(_ value: Greeter?) -> Greeter? { + value +} + +@JS func applyOptionalGreeter(_ value: Greeter?, _ transform: (Greeter?) -> Greeter?) -> Greeter? { + transform(value) +} + +@JS class OptionalHolder { + @JS var nullableGreeter: Greeter? + @JS var undefinedNumber: JSUndefinedOr + + @JS init(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) { + self.nullableGreeter = nullableGreeter + self.undefinedNumber = undefinedNumber + } +} + +@JS func makeOptionalHolder(nullableGreeter: Greeter?, undefinedNumber: JSUndefinedOr) -> OptionalHolder { + OptionalHolder(nullableGreeter: nullableGreeter, undefinedNumber: undefinedNumber) +} + +@JS class OptionalPropertyHolder { + @JS var optionalName: String? + @JS var optionalAge: Int? = nil + @JS var optionalGreeter: Greeter? = nil + + @JS init(optionalName: String?) { + self.optionalName = optionalName + } +} + +@JS +enum APIOptionalResult { + case success(String?) + case failure(Int?, Bool?) + case status(Bool?, Int?, String?) +} + +@JS func roundTripOptionalAPIOptionalResult(result: APIOptionalResult?) -> APIOptionalResult? { + result +} diff --git a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts index b7dc6c48d..08d56adf1 100644 --- a/Tests/BridgeJSRuntimeTests/bridge-js.d.ts +++ b/Tests/BridgeJSRuntimeTests/bridge-js.d.ts @@ -2,8 +2,6 @@ export function jsRoundTripVoid(): void export function jsRoundTripNumber(v: number): number export function jsRoundTripBool(v: boolean): boolean export function jsRoundTripString(v: string): string -export function jsRoundTripOptionalNumberNull(v: number | null): number | null -export function jsRoundTripOptionalNumberUndefined(v: number | undefined): number | undefined export type JSValue = any export function jsRoundTripJSValue(v: JSValue): JSValue export function jsThrowOrVoid(shouldThrow: boolean): void diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index e8f0b081c..70e138e63 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -3,6 +3,8 @@ import { DirectionValues, StatusValues, ThemeValues, HttpStatusValues, TSDirection, TSTheme, APIResultValues, ComplexResultValues, APIOptionalResultValues, StaticCalculatorValues, StaticPropertyEnumValues, PrecisionValues, TypedPayloadResultValues, AllTypesResultValues, OptionalAllTypesResultValues } from '../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js'; +import { ImportedFoo } from './BridgeJSRuntimeTests/JavaScript/Types.mjs'; +import { runJsOptionalSupportTests } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ export async function setupOptions(options, context) { @@ -68,6 +70,12 @@ export async function setupOptions(options, context) { "jsRoundTripOptionalNumberUndefined": (v) => { return v === undefined ? undefined : v; }, + "jsRoundTripOptionalStringNull": (v) => { + return v ?? null; + }, + "jsRoundTripOptionalStringUndefined": (v) => { + return v === undefined ? undefined : v; + }, "jsRoundTripJSValue": (v) => { return v; }, @@ -184,6 +192,11 @@ export async function setupOptions(options, context) { }, roundTripArrayMembers: (value) => { return value; + }, + runJsOptionalSupportTests: () => { + const exports = importsContext.getExports(); + if (!exports) { throw new Error("No exports!?"); } + runJsOptionalSupportTests(exports); } }; }, @@ -220,13 +233,6 @@ export async function setupOptions(options, context) { import assert from "node:assert"; -class ImportedFoo { - /** @param {string} value */ - constructor(value) { - this.value = value; - } -} - /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { exports.roundTripVoid(); @@ -714,123 +720,6 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.deepEqual(exports.makeAPINetworkingResultSuccess("Connected"), { tag: exports.API.NetworkingResult.Tag.Success, param0: "Connected" }); assert.deepEqual(exports.makeAPINetworkingResultFailure("Timeout", 408), { tag: exports.API.NetworkingResult.Tag.Failure, param0: "Timeout", param1: 408 }); - assert.equal(exports.roundTripOptionalString(null), null); - assert.equal(exports.roundTripOptionalInt(null), null); - assert.equal(exports.roundTripOptionalBool(null), null); - assert.equal(exports.roundTripOptionalFloat(null), null); - assert.equal(exports.roundTripOptionalDouble(null), null); - - assert.equal(exports.roundTripOptionalString("Hello"), "Hello"); - assert.equal(exports.roundTripOptionalInt(42), 42); - assert.equal(exports.roundTripOptionalBool(true), true); - assert.equal(exports.roundTripOptionalFloat(3.141592502593994), 3.141592502593994); // Float32 precision - assert.equal(exports.roundTripOptionalDouble(2.718), 2.718); - - assert.equal(exports.roundTripOptionalSyntax(null), null); - assert.equal(exports.roundTripOptionalSyntax("Test"), "Test"); - assert.equal(exports.roundTripOptionalMixSyntax(null), null); - assert.equal(exports.roundTripOptionalMixSyntax("Mix"), "Mix"); - assert.equal(exports.roundTripOptionalSwiftSyntax(null), null); - assert.equal(exports.roundTripOptionalSwiftSyntax("Swift"), "Swift"); - assert.equal(exports.roundTripOptionalWithSpaces(null), null); - assert.equal(exports.roundTripOptionalWithSpaces(1.618), 1.618); - assert.equal(exports.roundTripOptionalTypeAlias(null), null); - assert.equal(exports.roundTripOptionalTypeAlias(25), 25); - assert.equal(exports.roundTripOptionalStatus(exports.Status.Success), StatusValues.Success); - assert.equal(exports.roundTripOptionalTheme(exports.Theme.Light), ThemeValues.Light); - assert.equal(exports.roundTripOptionalHttpStatus(exports.HttpStatus.Ok), HttpStatusValues.Ok); - assert.equal(exports.roundTripOptionalTSDirection(TSDirection.North), TSDirection.North); - assert.equal(exports.roundTripOptionalTSTheme(TSTheme.Light), TSTheme.Light); - assert.equal(exports.roundTripOptionalNetworkingAPIMethod(exports.Networking.API.Method.Get), exports.Networking.API.Method.Get); - assert.deepEqual(exports.roundTripOptionalAPIResult(p1), p1); - assert.deepEqual(exports.roundTripOptionalComplexResult(cl1), cl1); - - const apiSuccess = { tag: exports.APIResult.Tag.Success, param0: "test success" }; - const apiFailure = { tag: exports.APIResult.Tag.Failure, param0: 404 }; - const apiInfo = { tag: exports.APIResult.Tag.Info }; - - assert.equal(exports.compareAPIResults(apiSuccess, apiFailure), "r1:success:test success,r2:failure:404"); - assert.equal(exports.compareAPIResults(null, apiInfo), "r1:nil,r2:info"); - assert.equal(exports.compareAPIResults(apiFailure, null), "r1:failure:404,r2:nil"); - assert.equal(exports.compareAPIResults(null, null), "r1:nil,r2:nil"); - - const optionalGreeter = new exports.Greeter("Schrödinger"); - const optionalGreeter2 = exports.roundTripOptionalClass(optionalGreeter); - assert.equal(optionalGreeter2?.greet() ?? "", "Hello, Schrödinger!"); - assert.equal(optionalGreeter2?.name ?? "", "Schrödinger"); - assert.equal(optionalGreeter2?.prefix ?? "", "Hello"); - assert.equal(exports.roundTripOptionalClass(null), null); - optionalGreeter.release(); - optionalGreeter2?.release(); - - const optionalsHolder = new exports.OptionalPropertyHolder(null); - - assert.equal(optionalsHolder.optionalName, null); - assert.equal(optionalsHolder.optionalAge, null); - assert.equal(optionalsHolder.optionalGreeter, null); - - optionalsHolder.optionalName = "Alice"; - optionalsHolder.optionalAge = 25; - assert.equal(optionalsHolder.optionalName, "Alice"); - assert.equal(optionalsHolder.optionalAge, 25); - - const testPropertyGreeter = new exports.Greeter("Bob"); - optionalsHolder.optionalGreeter = testPropertyGreeter; - assert.equal(optionalsHolder.optionalGreeter.greet(), "Hello, Bob!"); - assert.equal(optionalsHolder.optionalGreeter.name, "Bob"); - - optionalsHolder.optionalName = null; - optionalsHolder.optionalAge = null; - optionalsHolder.optionalGreeter = null; - assert.equal(optionalsHolder.optionalName, null); - assert.equal(optionalsHolder.optionalAge, null); - assert.equal(optionalsHolder.optionalGreeter, null); - testPropertyGreeter.release(); - optionalsHolder.release(); - - const optGreeter = new exports.Greeter("Optionaly"); - assert.equal(exports.roundTripOptionalGreeter(null), null); - const optGreeterReturned = exports.roundTripOptionalGreeter(optGreeter); - assert.equal(optGreeterReturned.name, "Optionaly"); - assert.equal(optGreeterReturned.greet(), "Hello, Optionaly!"); - - const appliedOptional = exports.applyOptionalGreeter(null, (g) => g ?? optGreeter); - assert.equal(appliedOptional.name, "Optionaly"); - - const holderOpt = exports.makeOptionalHolder(null, undefined); - assert.equal(holderOpt.nullableGreeter, null); - assert.equal(holderOpt.undefinedNumber, undefined); - holderOpt.nullableGreeter = optGreeter; - holderOpt.undefinedNumber = 123.5; - assert.equal(holderOpt.nullableGreeter.name, "Optionaly"); - assert.equal(holderOpt.undefinedNumber, 123.5); - holderOpt.release(); - optGreeterReturned.release(); - optGreeter.release(); - - const aor1 = { tag: APIOptionalResultValues.Tag.Success, param0: "hello world" }; - const aor2 = { tag: APIOptionalResultValues.Tag.Success, param0: null }; - const aor3 = { tag: APIOptionalResultValues.Tag.Failure, param0: 404, param1: true }; - const aor4 = { tag: APIOptionalResultValues.Tag.Failure, param0: 404, param1: null }; - const aor5 = { tag: APIOptionalResultValues.Tag.Failure, param0: null, param1: null }; - const aor6 = { tag: APIOptionalResultValues.Tag.Status, param0: true, param1: 200, param2: "OK" }; - const aor7 = { tag: APIOptionalResultValues.Tag.Status, param0: true, param1: null, param2: "Partial" }; - const aor8 = { tag: APIOptionalResultValues.Tag.Status, param0: null, param1: null, param2: "Zero" }; - const aor9 = { tag: APIOptionalResultValues.Tag.Status, param0: false, param1: 500, param2: null }; - const aor10 = { tag: APIOptionalResultValues.Tag.Status, param0: null, param1: 0, param2: "Zero" }; - - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor1), aor1); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor2), aor2); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor3), aor3); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor4), aor4); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor5), aor5); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor6), aor6); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor7), aor7); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor8), aor8); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor9), aor9); - assert.deepEqual(exports.roundTripOptionalAPIOptionalResult(aor10), aor10); - assert.equal(exports.roundTripOptionalAPIOptionalResult(null), null); - // TypedPayloadResult — rawValueEnum and caseEnum as associated value payloads assert.equal(exports.Precision.Rough, 0.1); assert.equal(exports.Precision.Fine, 0.001); @@ -859,14 +748,6 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const tpr_empty = { tag: exports.TypedPayloadResult.Tag.Empty }; assert.deepEqual(exports.roundTripTypedPayloadResult(tpr_empty), tpr_empty); - // Optional TypedPayloadResult roundtrip - assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_precision), tpr_precision); - assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_direction), tpr_direction); - assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionSome), tpr_optPrecisionSome); - assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_optPrecisionNull), tpr_optPrecisionNull); - assert.deepEqual(exports.roundTripOptionalTypedPayloadResult(tpr_empty), tpr_empty); - assert.equal(exports.roundTripOptionalTypedPayloadResult(null), null); - // AllTypesResult — struct, class, JSObject, nested enum, array as associated value payloads const atr_struct = { tag: AllTypesResultValues.Tag.StructPayload, param0: { street: "100 Main St", city: "Boston", zipCode: 2101 } }; assert.deepEqual(exports.roundTripAllTypesResult(atr_struct), atr_struct); @@ -896,64 +777,6 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const atr_empty = { tag: AllTypesResultValues.Tag.Empty }; assert.deepEqual(exports.roundTripAllTypesResult(atr_empty), atr_empty); - // Optional AllTypesResult roundtrip - assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_struct), atr_struct); - assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_array), atr_array); - assert.deepEqual(exports.roundTripOptionalAllTypesResult(atr_empty), atr_empty); - assert.equal(exports.roundTripOptionalAllTypesResult(null), null); - - // OptionalAllTypesResult — optional struct, class, JSObject, nested enum, array as associated value payloads - const oatr_structSome = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: { street: "200 Oak St", city: "Denver", zipCode: null } }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structSome), oatr_structSome); - - const oatr_structNone = { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_structNone), oatr_structNone); - - const oatr_classSome = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: new exports.Greeter("OptEnumUser") }; - const oatr_classSome_result = exports.roundTripOptionalPayloadResult(oatr_classSome); - assert.equal(oatr_classSome_result.tag, OptionalAllTypesResultValues.Tag.OptClass); - assert.equal(oatr_classSome_result.param0.name, "OptEnumUser"); - - const oatr_classNone = { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_classNone), oatr_classNone); - - const oatr_jsObjectSome = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: { key: "value" } }; - const oatr_jsObjectSome_result = exports.roundTripOptionalPayloadResult(oatr_jsObjectSome); - assert.equal(oatr_jsObjectSome_result.tag, OptionalAllTypesResultValues.Tag.OptJSObject); - assert.equal(oatr_jsObjectSome_result.param0.key, "value"); - - const oatr_jsObjectNone = { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsObjectNone), oatr_jsObjectNone); - - const oatr_nestedEnumSome = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: { tag: APIResultValues.Tag.Failure, param0: 404 } }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumSome), oatr_nestedEnumSome); - - const oatr_nestedEnumNone = { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_nestedEnumNone), oatr_nestedEnumNone); - - const oatr_arraySome = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: [1, 2, 3] }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arraySome), oatr_arraySome); - - const oatr_arrayNone = { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_arrayNone), oatr_arrayNone); - - const oatr_jsClassSome = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: new ImportedFoo("optEnumFoo") }; - const oatr_jsClassSome_result = exports.roundTripOptionalPayloadResult(oatr_jsClassSome); - assert.equal(oatr_jsClassSome_result.tag, OptionalAllTypesResultValues.Tag.OptJsClass); - assert.equal(oatr_jsClassSome_result.param0.value, "optEnumFoo"); - - const oatr_jsClassNone = { tag: OptionalAllTypesResultValues.Tag.OptJsClass, param0: null }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_jsClassNone), oatr_jsClassNone); - - const oatr_empty = { tag: OptionalAllTypesResultValues.Tag.Empty }; - assert.deepEqual(exports.roundTripOptionalPayloadResult(oatr_empty), oatr_empty); - - // Optional OptionalAllTypesResult roundtrip - assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structSome), oatr_structSome); - assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_structNone), oatr_structNone); - assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_empty), oatr_empty); - assert.equal(exports.roundTripOptionalPayloadResultOpt(null), null); - assert.equal(exports.MathUtils.add(2147483647, 0), 2147483647); assert.equal(exports.StaticCalculator.roundtrip(42), 42); assert.equal(StaticCalculatorValues.Scientific, 0); From b2e93d0322ce11b1e9cbf11b562ace226489c8b4 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 15:01:31 +0900 Subject: [PATCH 158/252] BridgeJS: Fix optional String return handling in generated JS glue code --- .../Sources/BridgeJSLink/JSGlueGen.swift | 20 ++-------- .../BridgeJSLinkTests/Optionals.js | 28 ++++--------- .../OptionalSupportTests.swift | 39 +++++++++---------- 3 files changed, 31 insertions(+), 56 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 410bce672..fc04e4670 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -994,19 +994,13 @@ struct IntrinsicJSFragment: Sendable { "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" ) case .string: - let bytesVar = scope.variable("bytes") printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write( - "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write("bjs[\"swift_js_return_optional_string\"](1, \(bytesVar), \(bytesVar).length);") - printer.write("return \(bytesVar).length;") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") } printer.write("} else {") printer.indent { - printer.write("bjs[\"swift_js_return_optional_string\"](0, 0, 0);") - printer.write("return -1;") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = null;") } printer.write("}") case .jsObject, .swiftProtocol: @@ -1032,19 +1026,13 @@ struct IntrinsicJSFragment: Sendable { case .rawValueEnum(_, let rawType): switch rawType { case .string: - let bytesVar = scope.variable("bytes") printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write( - "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write( - "bjs[\"swift_js_return_optional_string\"](1, \(bytesVar), \(bytesVar).length);" - ) + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") } printer.write("} else {") printer.indent { - printer.write("bjs[\"swift_js_return_optional_string\"](0, 0, 0);") + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = null;") } printer.write("}") default: diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 341fcd966..0d45b2169 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -238,12 +238,9 @@ export async function createInstantiator(options, swift) { let ret = swift.memory.getObject(self).stringOrNull; const isSome = ret != null; if (isSome) { - const bytes = textEncoder.encode(ret); - bjs["swift_js_return_optional_string"](1, bytes, bytes.length); - return bytes.length; + tmpRetString = ret; } else { - bjs["swift_js_return_optional_string"](0, 0, 0); - return -1; + tmpRetString = null; } } catch (error) { setException(error); @@ -254,12 +251,9 @@ export async function createInstantiator(options, swift) { let ret = swift.memory.getObject(self).stringOrUndefined; const isSome = ret !== undefined; if (isSome) { - const bytes = textEncoder.encode(ret); - bjs["swift_js_return_optional_string"](1, bytes, bytes.length); - return bytes.length; + tmpRetString = ret; } else { - bjs["swift_js_return_optional_string"](0, 0, 0); - return -1; + tmpRetString = null; } } catch (error) { setException(error); @@ -395,12 +389,9 @@ export async function createInstantiator(options, swift) { let ret = swift.memory.getObject(self).roundTripStringOrNull(valueIsSome ? obj : null); const isSome = ret != null; if (isSome) { - const bytes = textEncoder.encode(ret); - bjs["swift_js_return_optional_string"](1, bytes, bytes.length); - return bytes.length; + tmpRetString = ret; } else { - bjs["swift_js_return_optional_string"](0, 0, 0); - return -1; + tmpRetString = null; } } catch (error) { setException(error); @@ -416,12 +407,9 @@ export async function createInstantiator(options, swift) { let ret = swift.memory.getObject(self).roundTripStringOrUndefined(valueIsSome ? obj : undefined); const isSome = ret !== undefined; if (isSome) { - const bytes = textEncoder.encode(ret); - bjs["swift_js_return_optional_string"](1, bytes, bytes.length); - return bytes.length; + tmpRetString = ret; } else { - bjs["swift_js_return_optional_string"](0, 0, 0); - return -1; + tmpRetString = null; } } catch (error) { setException(error); diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift index bc0f1fcc8..adfd51dea 100644 --- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -9,26 +9,25 @@ final class OptionalSupportTests: XCTestCase { try runJsOptionalSupportTests() } - // FIXME: Optional return type on imported function is broken - // func testRoundTripOptionalStringNull() throws { - // try XCTAssertEqual(jsRoundTripOptionalStringNull("hello"), "hello") - // try XCTAssertNil(jsRoundTripOptionalStringNull(nil)) - // } - - // func testRoundTripOptionalStringUndefined() throws { - // let some = try jsRoundTripOptionalStringUndefined(.value("hi")) - // switch some { - // case .value(let value): - // XCTAssertEqual(value, "hi") - // case .undefined: - // XCTFail("Expected defined value") - // } - - // let undefined = try jsRoundTripOptionalStringUndefined(.undefinedValue) - // if case .value = undefined { - // XCTFail("Expected undefined") - // } - // } + func testRoundTripOptionalStringNull() throws { + try XCTAssertEqual(jsRoundTripOptionalStringNull("hello"), "hello") + try XCTAssertNil(jsRoundTripOptionalStringNull(nil)) + } + + func testRoundTripOptionalStringUndefined() throws { + let some = try jsRoundTripOptionalStringUndefined(.value("hi")) + switch some { + case .value(let value): + XCTAssertEqual(value, "hi") + case .undefined: + XCTFail("Expected defined value") + } + + let undefined = try jsRoundTripOptionalStringUndefined(.undefinedValue) + if case .value = undefined { + XCTFail("Expected undefined") + } + } func testRoundTripOptionalNumberNull() throws { try XCTAssertEqual(jsRoundTripOptionalNumberNull(42), 42) From b9320732ff0b2a2102507c9002f40663624f145e Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 5 Feb 2026 09:39:03 +0100 Subject: [PATCH 159/252] BridgeJS: Skip directories in generate input file processing --- Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index dd37fb3bc..92e74e621 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -148,7 +148,13 @@ import BridgeJSUtilities exposeToGlobal: config.exposeToGlobal ) for inputFile in inputFiles.sorted() { - let content = try String(contentsOf: URL(fileURLWithPath: inputFile), encoding: .utf8) + let inputURL = URL(fileURLWithPath: inputFile) + // Skip directories (e.g. .docc catalogs included in target.sourceFiles) + var isDirectory: ObjCBool = false + if FileManager.default.fileExists(atPath: inputFile, isDirectory: &isDirectory), isDirectory.boolValue { + continue + } + let content = try String(contentsOf: inputURL, encoding: .utf8) if hasBridgeJSSkipComment(content) { continue } From 89d8165c805218defa8de02eb863ace42b976361 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 16:22:21 +0900 Subject: [PATCH 160/252] [NFC] BridgeJS: Add push/pop JS codegen helpers This is a preparation for unifying stacks for param/ret values to make it direction agnostic. --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 4 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 390 +++++++++--------- 2 files changed, 208 insertions(+), 186 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 7a5e02f2d..c2b0c6ed3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1065,7 +1065,7 @@ public struct BridgeJSLink { } for enumDef in allAssocEnums { let enumPrinter = CodeFragmentPrinter() - let enumScope = JSGlueVariableScope() + let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let enumCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef) _ = fragment.printCode([enumDef.valuesName], enumScope, enumPrinter, enumCleanup) @@ -1608,7 +1608,7 @@ public struct BridgeJSLink { ) throws -> (jsTopLevel: [String], jsExportEntry: [String], dtsType: [String], dtsExportEntry: [String]) { var jsTopLevelLines: [String] = [] var dtsTypeLines: [String] = [] - let scope = JSGlueVariableScope() + let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanup = CodeFragmentPrinter() let printer = CodeFragmentPrinter() let enumValuesName = enumDefinition.valuesName diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 1619c2cd2..772c8c84c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -34,7 +34,7 @@ final class JSGlueVariableScope { static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" - private let intrinsicRegistry: JSIntrinsicRegistry? + private let intrinsicRegistry: JSIntrinsicRegistry private var variables: Set = [ reservedSwift, @@ -66,7 +66,7 @@ final class JSGlueVariableScope { reservedStructHelpers, ] - init(intrinsicRegistry: JSIntrinsicRegistry? = nil) { + init(intrinsicRegistry: JSIntrinsicRegistry) { self.intrinsicRegistry = intrinsicRegistry } @@ -88,7 +88,7 @@ final class JSGlueVariableScope { } func registerIntrinsic(_ name: String, build: (CodeFragmentPrinter) -> Void) { - intrinsicRegistry?.register(name: name, build: build) + intrinsicRegistry.register(name: name, build: build) } func makeChildScope() -> JSGlueVariableScope { @@ -96,6 +96,53 @@ final class JSGlueVariableScope { } } +extension JSGlueVariableScope { + // MARK: Parameter + + func emitPushI32Parameter(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(value));") + } + func emitPushF64Parameter(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(value));") + } + func emitPushF32Parameter(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(\(value));") + } + func emitPushPointerParameter(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value));") + } + + // MARK: Return + + func emitPushI32Return(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(value));") + } + func emitPushF64Return(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(value));") + } + func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) { + printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(\(value));") + } + func popTagReturn() -> String { + return "\(JSGlueVariableScope.reservedTmpRetTag).pop()" + } + func popStringReturn() -> String { + return "\(JSGlueVariableScope.reservedTmpRetStrings).pop()" + } + func popI32Return() -> String { + return "\(JSGlueVariableScope.reservedTmpRetInts).pop()" + } + func popF64Return() -> String { + return "\(JSGlueVariableScope.reservedTmpRetF64s).pop()" + } + func popF32Return() -> String { + return "\(JSGlueVariableScope.reservedTmpRetF32s).pop()" + } + func popPointerReturn() -> String { + return "\(JSGlueVariableScope.reservedTmpRetPointers).pop()" + } +} + /// A fragment of JS code used to convert a value between Swift and JS. /// /// See `BridgeJSIntrinsics.swift` in the main JavaScriptKit module for Swift side lowering/lifting implementation. @@ -271,7 +318,7 @@ struct IntrinsicJSFragment: Sendable { helperPrinter.write("}") helperPrinter.write("function \(jsValueLiftHelperName)(kind, payload1, payload2) {") helperPrinter.indent { - let helperScope = JSGlueVariableScope() + let helperScope = scope.makeChildScope() let resultVar = emitJSValueConstruction( kind: "kind", payload1: "payload1", @@ -466,9 +513,9 @@ struct IntrinsicJSFragment: Sendable { let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(kindVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(payload1Var));") - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(payload2Var));") + scope.emitPushI32Parameter(kindVar, printer: printer) + scope.emitPushI32Parameter(payload1Var, printer: printer) + scope.emitPushF64Parameter(payload2Var, printer: printer) return [] } ) @@ -482,9 +529,9 @@ struct IntrinsicJSFragment: Sendable { let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(kindVar));") - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(payload1Var));") - printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(payload2Var));") + scope.emitPushI32Parameter(kindVar, printer: printer) + scope.emitPushI32Parameter(payload1Var, printer: printer) + scope.emitPushF64Parameter(payload2Var, printer: printer) return [] } ) @@ -497,9 +544,9 @@ struct IntrinsicJSFragment: Sendable { let payload2 = scope.variable("jsValuePayload2") let payload1 = scope.variable("jsValuePayload1") let kind = scope.variable("jsValueKind") - printer.write("const \(payload2) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") - printer.write("const \(payload1) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - printer.write("const \(kind) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(payload2) = \(scope.popF64Return());") + printer.write("const \(payload1) = \(scope.popI32Return());") + printer.write("const \(kind) = \(scope.popI32Return());") let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( @@ -571,7 +618,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [retName] } @@ -886,7 +933,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let tagVar = scope.variable("tag") - printer.write("const \(tagVar) = \(JSGlueVariableScope.reservedTmpRetTag).pop();") + printer.write("const \(tagVar) = \(scope.popTagReturn());") let isNullVar = scope.variable("isNull") printer.write("const \(isNullVar) = (\(tagVar) === -1);") printer.write("let \(resultVar);") @@ -904,7 +951,7 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -919,7 +966,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") case .array(let elementType): let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -936,7 +983,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") case .jsValue: let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -1018,11 +1065,11 @@ struct IntrinsicJSFragment: Sendable { let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(kindVar));") - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(payload1Var));") - printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(payload2Var));") + scope.emitPushI32Parameter(kindVar, printer: printer) + scope.emitPushI32Parameter(payload1Var, printer: printer) + scope.emitPushF64Parameter(payload2Var, printer: printer) } - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .array(let elementType): printer.write("if (\(isSomeVar)) {") printer.indent { @@ -1036,7 +1083,7 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -1635,7 +1682,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) printer.write("return \(resultVar);") return [] @@ -2259,46 +2306,36 @@ struct IntrinsicJSFragment: Sendable { "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" ) printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if(\(idVar)) {") cleanup.indent { cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") } cleanup.write("}") case .int, .uint: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .bool: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) ? 1 : 0) : 0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .float: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushF32Parameter("\(isSomeVar) ? Math.fround(\(value)) : 0.0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .double: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushF64Parameter("\(isSomeVar) ? \(value) : 0.0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .caseEnum: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -2313,20 +2350,16 @@ struct IntrinsicJSFragment: Sendable { printer.write( "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" ) - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);" - ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" - ) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if(\(idVar)) {") cleanup.indent { cleanup.write( @@ -2335,26 +2368,14 @@ struct IntrinsicJSFragment: Sendable { } cleanup.write("}") case .float: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF32s).push(\(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" - ) + scope.emitPushF32Parameter("\(isSomeVar) ? Math.fround(\(value)) : 0.0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .double: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF64s).push(\(isSomeVar) ? \(value) : 0.0);" - ) - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" - ) + scope.emitPushF64Parameter("\(isSomeVar) ? \(value) : 0.0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) default: - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? (\(value) | 0) : 0);" - ) - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);" - ) + scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } case .swiftStruct(let structName): let structBase = structName.components(separatedBy: ".").last ?? structName @@ -2369,34 +2390,34 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") case .swiftHeapObject: printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value).pointer);") + scope.emitPushPointerParameter("\(value).pointer", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + scope.emitPushPointerParameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .jsObject: let idVar = scope.variable("id") printer.write("let \(idVar);") printer.write("if (\(isSomeVar)) {") printer.indent { printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { printer.write("\(idVar) = undefined;") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .associatedValueEnum(let enumName): let base = enumName.components(separatedBy: ".").last ?? enumName let caseIdVar = scope.variable("enumCaseId") @@ -2410,14 +2431,14 @@ struct IntrinsicJSFragment: Sendable { ) printer.write("\(caseIdVar) = \(enumResultVar).caseId;") printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + scope.emitPushI32Parameter(caseIdVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") case .array(let elementType): // Array cleanup references variables declared inside the if block, @@ -2443,10 +2464,10 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(arrCleanupVar)) { \(arrCleanupVar)(); }") default: - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } return [] @@ -2473,7 +2494,7 @@ struct IntrinsicJSFragment: Sendable { let optVar = scope.variable("optional") let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -2482,7 +2503,7 @@ struct IntrinsicJSFragment: Sendable { if case .associatedValueEnum(let fullName) = wrappedType { let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("caseId") - printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(caseIdVar) = \(scope.popI32Return());") printer.write( "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) @@ -2579,7 +2600,7 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arr).length);") + scope.emitPushI32Parameter("\(arr).length", printer: printer) cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return [] } @@ -2595,7 +2616,7 @@ struct IntrinsicJSFragment: Sendable { let lenVar = scope.variable("arrayLen") let iVar = scope.variable("i") - printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(lenVar) = \(scope.popI32Return());") printer.write("const \(resultVar) = [];") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") printer.indent { @@ -2622,9 +2643,9 @@ struct IntrinsicJSFragment: Sendable { let payload2Var = scope.variable("jsValuePayload2") let payload1Var = scope.variable("jsValuePayload1") let kindVar = scope.variable("jsValueKind") - printer.write("const \(payload2Var) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") - printer.write("const \(payload1Var) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") - printer.write("const \(kindVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(payload2Var) = \(scope.popF64Return());") + printer.write("const \(payload1Var) = \(scope.popI32Return());") + printer.write("const \(kindVar) = \(scope.popI32Return());") let resultVar = scope.variable("jsValue") printer.write( "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" @@ -2637,7 +2658,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let strVar = scope.variable("string") - printer.write("const \(strVar) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + printer.write("const \(strVar) = \(scope.popStringReturn());") return [strVar] } ) @@ -2646,7 +2667,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let bVar = scope.variable("bool") - printer.write("const \(bVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop() !== 0;") + printer.write("const \(bVar) = \(scope.popI32Return()) !== 0;") return [bVar] } ) @@ -2655,7 +2676,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let iVar = scope.variable("int") - printer.write("const \(iVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(iVar) = \(scope.popI32Return());") return [iVar] } ) @@ -2664,7 +2685,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let fVar = scope.variable("f32") - printer.write("const \(fVar) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + printer.write("const \(fVar) = \(scope.popF32Return());") return [fVar] } ) @@ -2673,7 +2694,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let dVar = scope.variable("f64") - printer.write("const \(dVar) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + printer.write("const \(dVar) = \(scope.popF64Return());") return [dVar] } ) @@ -2694,7 +2715,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("caseId") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(varName) = \(scope.popI32Return());") return [varName] } ) @@ -2705,7 +2726,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetStrings).pop();") + printer.write("const \(varName) = \(scope.popStringReturn());") return [varName] } ) @@ -2714,7 +2735,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF32s).pop();") + printer.write("const \(varName) = \(scope.popF32Return());") return [varName] } ) @@ -2723,7 +2744,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetF64s).pop();") + printer.write("const \(varName) = \(scope.popF64Return());") return [varName] } ) @@ -2732,7 +2753,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(varName) = \(scope.popI32Return());") return [varName] } ) @@ -2744,7 +2765,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetTag).pop(), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) return [resultVar] } @@ -2755,7 +2776,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let ptrVar = scope.variable("ptr") let objVar = scope.variable("obj") - printer.write("const \(ptrVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + printer.write("const \(ptrVar) = \(scope.popPointerReturn());") printer.write("const \(objVar) = _exports['\(className)'].__construct(\(ptrVar));") return [objVar] } @@ -2766,7 +2787,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let idVar = scope.variable("objId") let objVar = scope.variable("obj") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(idVar) = \(scope.popI32Return());") printer.write("const \(objVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [objVar] @@ -2781,7 +2802,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let pVar = scope.variable("pointer") - printer.write("const \(pVar) = \(JSGlueVariableScope.reservedTmpRetPointers).pop();") + printer.write("const \(pVar) = \(scope.popPointerReturn());") return [pVar] } ) @@ -2801,9 +2822,9 @@ struct IntrinsicJSFragment: Sendable { let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(kindVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(payload1Var));") - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(payload2Var));") + scope.emitPushI32Parameter(kindVar, printer: printer) + scope.emitPushI32Parameter(payload1Var, printer: printer) + scope.emitPushF64Parameter(payload2Var, printer: printer) return [] } ) @@ -2816,8 +2837,8 @@ struct IntrinsicJSFragment: Sendable { let idVar = scope.variable("id") printer.write("const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [] } @@ -2826,7 +2847,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(arguments[0]) ? 1 : 0);") + scope.emitPushI32Parameter("\(arguments[0]) ? 1 : 0", printer: printer) return [] } ) @@ -2834,7 +2855,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } ) @@ -2842,7 +2863,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) return [] } ) @@ -2850,7 +2871,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + scope.emitPushF64Parameter("\(arguments[0])", printer: printer) return [] } ) @@ -2872,7 +2893,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } ) @@ -2891,8 +2912,8 @@ struct IntrinsicJSFragment: Sendable { printer.write( "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [] } @@ -2901,7 +2922,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(arguments[0])));") + scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) return [] } ) @@ -2909,7 +2930,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(arguments[0]));") + scope.emitPushF64Parameter("\(arguments[0])", printer: printer) return [] } ) @@ -2917,7 +2938,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(arguments[0]) | 0));") + scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } ) @@ -2933,7 +2954,7 @@ struct IntrinsicJSFragment: Sendable { printer.write( "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + scope.emitPushI32Parameter(caseIdVar, printer: printer) cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } @@ -2942,7 +2963,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(arguments[0]).pointer);") + scope.emitPushPointerParameter("\(arguments[0]).pointer", printer: printer) return [] } ) @@ -2953,7 +2974,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let idVar = scope.variable("objId") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter(idVar, printer: printer) return [] } ) @@ -2972,7 +2993,7 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let idVar = scope.variable("objId") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter(idVar, printer: printer) return [] } ) @@ -2980,7 +3001,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanup in - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push((\(arguments[0]) | 0));") + scope.emitPushPointerParameter("(\(arguments[0]) | 0)", printer: printer) return [] } ) @@ -3000,7 +3021,7 @@ struct IntrinsicJSFragment: Sendable { let isSomeVar = scope.variable("isSome") let resultVar = scope.variable("optValue") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar) === 0) {") printer.indent { @@ -3054,23 +3075,23 @@ struct IntrinsicJSFragment: Sendable { // Push placeholders so Swift can unconditionally pop value slots switch wrappedType { case .float: - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(0.0);") + scope.emitPushF32Parameter("0.0", printer: printer) case .double: - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(0.0);") + scope.emitPushF64Parameter("0.0", printer: printer) case .swiftStruct: // No placeholder — Swift only pops struct fields when isSome=1 break case .string, .rawValueEnum(_, .string): - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) + scope.emitPushI32Parameter("0", printer: printer) case .swiftHeapObject: - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + scope.emitPushPointerParameter("0", printer: printer) default: - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar));") + scope.emitPushI32Parameter(isSomeVar, printer: printer) return [] } @@ -3271,9 +3292,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(idVar) = undefined;") } printer.write("}") - printer.write( - "\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar) !== undefined ? \(idVar) : 0);" - ) + scope.emitPushI32Parameter("\(idVar) !== undefined ? \(idVar) : 0", printer: printer) cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") cleanup.indent { cleanup.write("try {") @@ -3298,14 +3317,14 @@ struct IntrinsicJSFragment: Sendable { if case .caseEnum = wrappedType { printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(value) | 0));") + scope.emitPushI32Parameter("\(value) | 0", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] } else if case .rawValueEnum(_, let rawType) = wrappedType { switch rawType { @@ -3321,16 +3340,16 @@ struct IntrinsicJSFragment: Sendable { printer.write( "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" ) - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write( "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" ) @@ -3338,40 +3357,38 @@ struct IntrinsicJSFragment: Sendable { case .float: printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write( - "\(JSGlueVariableScope.reservedTmpParamF32s).push(Math.fround(\(value)));" - ) + scope.emitPushF32Parameter("Math.fround(\(value))", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(0.0);") + scope.emitPushF32Parameter("0.0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] case .double: printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(value));") + scope.emitPushF64Parameter("\(value)", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(0.0);") + scope.emitPushF64Parameter("0.0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] default: printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push((\(value) | 0));") + scope.emitPushI32Parameter("\(value) | 0", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] } } else if case .swiftHeapObject = wrappedType { @@ -3380,14 +3397,14 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write("\(ptrVar) = \(value).pointer;") - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(ptrVar));") + scope.emitPushPointerParameter("\(ptrVar)", printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(0);") + scope.emitPushPointerParameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] } else if case .swiftStruct(let structName) = wrappedType { let nestedCleanupVar = scope.variable("nestedCleanup") @@ -3401,7 +3418,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") return [] } else if case .string = wrappedType { @@ -3414,16 +3431,16 @@ struct IntrinsicJSFragment: Sendable { "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" ) printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(bytesVar).length);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write( "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" ) @@ -3434,15 +3451,15 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(idVar));") + scope.emitPushI32Parameter(idVar, printer: printer) } printer.write("} else {") printer.indent { printer.write("\(idVar) = undefined;") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") cleanup.indent { cleanup.write("try {") @@ -3463,7 +3480,8 @@ struct IntrinsicJSFragment: Sendable { stack: .tmpParamInts, convert: "| 0", zeroValue: "0", - printer: printer + printer: printer, + scope: scope ) case .bool: pushOptionalPrimitive( @@ -3472,7 +3490,8 @@ struct IntrinsicJSFragment: Sendable { stack: .tmpParamInts, convert: "? 1 : 0", zeroValue: "0", - printer: printer + printer: printer, + scope: scope ) case .float: pushOptionalPrimitive( @@ -3481,7 +3500,8 @@ struct IntrinsicJSFragment: Sendable { stack: .tmpParamF32s, convert: "Math.fround", zeroValue: "0.0", - printer: printer + printer: printer, + scope: scope ) case .double: pushOptionalPrimitive( @@ -3490,7 +3510,8 @@ struct IntrinsicJSFragment: Sendable { stack: .tmpParamF64s, convert: nil, zeroValue: "0.0", - printer: printer + printer: printer, + scope: scope ) case .associatedValueEnum(let enumName): let base = enumName.components(separatedBy: ".").last ?? enumName @@ -3505,14 +3526,14 @@ struct IntrinsicJSFragment: Sendable { ) printer.write("\(caseIdVar) = \(enumResultVar).caseId;") printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(caseIdVar));") + scope.emitPushI32Parameter(caseIdVar, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);") + scope.emitPushI32Parameter("0", printer: printer) } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") default: let wrappedFragment = structFieldLowerFragment( @@ -3556,7 +3577,7 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } return [] } @@ -3596,7 +3617,8 @@ struct IntrinsicJSFragment: Sendable { stack: StackType, convert: String?, zeroValue: String, - printer: CodeFragmentPrinter + printer: CodeFragmentPrinter, + scope: JSGlueVariableScope ) { let stackName: String switch stack { @@ -3624,7 +3646,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(stackName).push(\(zeroValue));") } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } private enum StackType { @@ -3646,7 +3668,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let isSomeVar = scope.variable("isSome") let optVar = scope.variable("optional") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32Return());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -3654,7 +3676,7 @@ struct IntrinsicJSFragment: Sendable { if case .associatedValueEnum(let enumName) = wrappedType { let base = enumName.components(separatedBy: ".").last ?? enumName let caseIdVar = scope.variable("enumCaseId") - printer.write("const \(caseIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(caseIdVar) = \(scope.popI32Return());") printer.write( "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" ) @@ -3701,7 +3723,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let objectIdVar = scope.variable("objectId") let varName = scope.variable("value") - printer.write("const \(objectIdVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(objectIdVar) = \(scope.popI32Return());") printer.write("let \(varName);") printer.write("if (\(objectIdVar) !== 0) {") printer.indent { From 63b7b7220272279db6682a9d13dd7ea1c8195837 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 18:53:36 +0900 Subject: [PATCH 161/252] [NFC] BridgeJS: Remove explicit stack storage captures from enum/struct helpers (#588) --- .../Sources/BridgeJSLink/JSGlueGen.swift | 36 ++++++------ .../BridgeJSLinkTests/ArrayTypes.js | 10 ++-- .../BridgeJSLinkTests/DefaultParameters.js | 10 ++-- .../BridgeJSLinkTests/EnumAssociatedValue.js | 58 +++++++++---------- .../ImportedTypeInExportedInterface.js | 4 +- .../BridgeJSLinkTests/Protocol.js | 8 +-- .../StaticFunctions.Global.js | 4 +- .../BridgeJSLinkTests/StaticFunctions.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.js | 6 +- .../BridgeJSLinkTests/SwiftStruct.js | 22 +++---- .../BridgeJSLinkTests/SwiftStructImports.js | 2 +- .../BridgeJSLinkTests/UnsafePointer.js | 6 +- 12 files changed, 85 insertions(+), 85 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 772c8c84c..ae83f33e6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -618,7 +618,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTagReturn()));" ) return [retName] } @@ -699,7 +699,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue));" ) } printer.write("}") @@ -711,7 +711,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") printer.indent { printer.write( - "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" ) } printer.write("} else {") @@ -944,7 +944,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("} else {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(tagVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(tagVar));" ) } printer.write("}") @@ -956,7 +956,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" ) } printer.write("} else {") @@ -1283,7 +1283,7 @@ struct IntrinsicJSFragment: Sendable { let targetVar = arguments[1] let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId));" ) return [] } @@ -1354,7 +1354,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName printer.write( - "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value));" ) default: fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") @@ -1682,7 +1682,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()));" ) printer.write("return \(resultVar);") return [] @@ -1907,7 +1907,7 @@ struct IntrinsicJSFragment: Sendable { let caseId = arguments[0] let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId));" ) return [resultVar] } @@ -1924,7 +1924,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" ) return [resultVar] } @@ -2107,7 +2107,7 @@ struct IntrinsicJSFragment: Sendable { // Generate lift function printer.write( - "lift: (tag, \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" + "lift: (tag) => {" ) printer.indent { printer.write("tag = tag | 0;") @@ -2505,7 +2505,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") printer.write("const \(caseIdVar) = \(scope.popI32Return());") printer.write( - "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar));" ) } else { let wrappedFragment = associatedValuePopPayload(type: wrappedType) @@ -2565,7 +2565,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in let resultVar = scope.variable("structValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();" ) return [resultVar] } @@ -2705,7 +2705,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let resultVar = scope.variable("struct") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();" ) return [resultVar] } @@ -2765,7 +2765,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), );" ) return [resultVar] } @@ -3125,7 +3125,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("},") printer.write( - "lift: (\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers)) => {" + "lift: () => {" ) printer.indent { generateStructLiftCode( @@ -3678,7 +3678,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("enumCaseId") printer.write("const \(caseIdVar) = \(scope.popI32Return());") printer.write( - "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), \(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), );" ) } else { let wrappedFragment = structFieldLiftFragment( @@ -3712,7 +3712,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let structVar = scope.variable("struct") printer.write( - "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lift();" ) return [structVar] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 6cca17cf6..42176ae1f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -54,7 +54,7 @@ export async function createInstantiator(options, swift) { tmpParamF64s.push(value.y); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const f64 = tmpRetF64s.pop(); const f641 = tmpRetF64s.pop(); return { x: f641, y: f64 }; @@ -481,7 +481,7 @@ export async function createInstantiator(options, swift) { const arrayLen = tmpRetInts.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Point.lift(); arrayResult.push(struct); } arrayResult.reverse(); @@ -544,7 +544,7 @@ export async function createInstantiator(options, swift) { const matchingBytes = textEncoder.encode(matching); const matchingId = swift.memory.retain(matchingBytes); instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); - const structValue = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.Point.lift(); for (const cleanup of arrayCleanups) { cleanup(); } swift.memory.release(matchingId); return structValue; @@ -715,7 +715,7 @@ export async function createInstantiator(options, swift) { if (isSome1 === 0) { optValue = null; } else { - const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Point.lift(); optValue = struct; } arrayResult.push(optValue); @@ -873,7 +873,7 @@ export async function createInstantiator(options, swift) { const arrayLen1 = tmpRetInts.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { - const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Point.lift(); arrayResult1.push(struct); } arrayResult1.reverse(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 754c47b0a..4317cc124 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -54,7 +54,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const bool = tmpRetInts.pop() !== 0; const int = tmpRetInts.pop(); const string = tmpRetStrings.pop(); @@ -68,7 +68,7 @@ export async function createInstantiator(options, swift) { tmpParamF64s.push(value.baseValue); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const f64 = tmpRetF64s.pop(); const instance1 = { baseValue: f64 }; instance1.add = function(a, b = 10.0) { @@ -528,7 +528,7 @@ export async function createInstantiator(options, swift) { const isSome1 = tmpRetInts.pop(); let optResult; if (isSome1) { - optResult = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = structHelpers.Config.lift(); } else { optResult = null; } @@ -546,7 +546,7 @@ export async function createInstantiator(options, swift) { const isSome1 = tmpRetInts.pop(); let optResult; if (isSome1) { - optResult = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = structHelpers.Config.lift(); } else { optResult = null; } @@ -663,7 +663,7 @@ export async function createInstantiator(options, swift) { MathOperations: { init: function(baseValue = 0.0) { instance.exports.bjs_MathOperations_init(baseValue); - const structValue = structHelpers.MathOperations.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.MathOperations.lift(); return structValue; }, subtract: function(a, b) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 123ba56fa..b25276d9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -122,7 +122,7 @@ export async function createInstantiator(options, swift) { tmpParamF64s.push(value.y); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const f64 = tmpRetF64s.pop(); const f641 = tmpRetF64s.pop(); return { x: f641, y: f64 }; @@ -171,7 +171,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -278,7 +278,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case ComplexResultValues.Tag.Success: { @@ -361,7 +361,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case ResultValues.Tag.Success: { @@ -413,7 +413,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case NetworkingResultValues.Tag.Success: { @@ -494,7 +494,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case APIOptionalResultValues.Tag.Success: { @@ -595,7 +595,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown TypedPayloadResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case TypedPayloadResultValues.Tag.Precision: { @@ -683,11 +683,11 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown AllTypesResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case AllTypesResultValues.Tag.StructPayload: { - const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Point.lift(); return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct }; } case AllTypesResultValues.Tag.ClassPayload: { @@ -702,7 +702,7 @@ export async function createInstantiator(options, swift) { return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; } case AllTypesResultValues.Tag.NestedEnum: { - const enumValue = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const enumValue = enumHelpers.APIResult.lift(tmpRetTag.pop(), ); return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; } case AllTypesResultValues.Tag.ArrayPayload: { @@ -807,14 +807,14 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown OptionalAllTypesResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case OptionalAllTypesResultValues.Tag.OptStruct: { const isSome = tmpRetInts.pop(); let optional; if (isSome) { - const struct = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Point.lift(); optional = struct; } else { optional = null; @@ -851,7 +851,7 @@ export async function createInstantiator(options, swift) { let optional; if (isSome) { const caseId = tmpRetInts.pop(); - optional = enumHelpers.APIResult.lift(caseId, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optional = enumHelpers.APIResult.lift(caseId); } else { optional = null; } @@ -1139,13 +1139,13 @@ export async function createInstantiator(options, swift) { }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1164,7 +1164,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.APIResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1176,13 +1176,13 @@ export async function createInstantiator(options, swift) { }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop()); return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1201,7 +1201,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.ComplexResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.ComplexResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1221,7 +1221,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.Result.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.Result.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1241,7 +1241,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.NetworkingResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.NetworkingResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1261,7 +1261,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.APIOptionalResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1288,7 +1288,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.APIOptionalResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.APIOptionalResult.lift(tag); } if (result1Cleanup) { result1Cleanup(); } if (result2Cleanup) { result2Cleanup(); } @@ -1297,7 +1297,7 @@ export async function createInstantiator(options, swift) { roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.TypedPayloadResult.lower(result); instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId); - const ret = enumHelpers.TypedPayloadResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.TypedPayloadResult.lift(tmpRetTag.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1316,7 +1316,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.TypedPayloadResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.TypedPayloadResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1324,7 +1324,7 @@ export async function createInstantiator(options, swift) { roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.AllTypesResult.lower(result); instance.exports.bjs_roundTripAllTypesResult(resultCaseId); - const ret = enumHelpers.AllTypesResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.AllTypesResult.lift(tmpRetTag.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1343,7 +1343,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.AllTypesResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.AllTypesResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; @@ -1351,7 +1351,7 @@ export async function createInstantiator(options, swift) { roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.OptionalAllTypesResult.lower(result); instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId); - const ret = enumHelpers.OptionalAllTypesResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.OptionalAllTypesResult.lift(tmpRetTag.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1370,7 +1370,7 @@ export async function createInstantiator(options, swift) { if (isNull) { optResult = null; } else { - optResult = enumHelpers.OptionalAllTypesResult.lift(tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + optResult = enumHelpers.OptionalAllTypesResult.lift(tag); } if (resultCleanup) { resultCleanup(); } return optResult; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index efcbbe2d6..23db5be56 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -70,7 +70,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -370,7 +370,7 @@ export async function createInstantiator(options, swift) { roundtripFooContainer: function bjs_roundtripFooContainer(container) { const { cleanup: cleanup } = structHelpers.FooContainer.lower(container); instance.exports.bjs_roundtripFooContainer(); - const structValue = structHelpers.FooContainer.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.FooContainer.lift(); if (cleanup) { cleanup(); } return structValue; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 7c20130b3..965df2b37 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -81,7 +81,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case ResultValues.Tag.Success: { @@ -375,7 +375,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_result_set"] = function bjs_MyViewControllerDelegate_result_set(self, value) { try { - const enumValue = enumHelpers.Result.lift(value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const enumValue = enumHelpers.Result.lift(value); swift.memory.getObject(self).result = enumValue; } catch (error) { setException(error); @@ -399,7 +399,7 @@ export async function createInstantiator(options, swift) { try { let enumValue; if (valueIsSome) { - enumValue = enumHelpers.Result.lift(valueWrappedValue, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + enumValue = enumHelpers.Result.lift(valueWrappedValue); } swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; } catch (error) { @@ -556,7 +556,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_handleResult"] = function bjs_MyViewControllerDelegate_handleResult(self, result) { try { - const enumValue = enumHelpers.Result.lift(result, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const enumValue = enumHelpers.Result.lift(result); swift.memory.getObject(self).handleResult(enumValue); } catch (error) { setException(error); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 391c7167e..451c356a5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -68,7 +68,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -335,7 +335,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index b38668c57..00135e97d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -68,7 +68,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -329,7 +329,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop(), tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index ff5af72f9..9f2c16b2d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -106,7 +106,7 @@ export async function createInstantiator(options, swift) { default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } }, - lift: (tag, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: (tag) => { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { @@ -422,7 +422,7 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.lift(param0Id, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + let param0 = enumHelpers.APIResult.lift(param0Id); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -684,7 +684,7 @@ export async function createInstantiator(options, swift) { const callback = swift.memory.getObject(callbackId); let param0; if (param0IsSome) { - param0 = enumHelpers.APIResult.lift(param0Value, tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + param0 = enumHelpers.APIResult.lift(param0Value); } else { param0 = null; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index adbe18856..1198f1539 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -67,7 +67,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -115,7 +115,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -158,7 +158,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -167,7 +167,7 @@ export async function createInstantiator(options, swift) { } else { optional = null; } - const struct = structHelpers.Address.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const struct = structHelpers.Address.lift(); const int = tmpRetInts.pop(); const string1 = tmpRetStrings.pop(); return { name: string1, age: int, address: struct, email: optional }; @@ -181,7 +181,7 @@ export async function createInstantiator(options, swift) { tmpParamPointers.push(value.owner.pointer); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const ptr = tmpRetPointers.pop(); const obj = _exports['Greeter'].__construct(ptr); const int = tmpRetInts.pop(); @@ -203,7 +203,7 @@ export async function createInstantiator(options, swift) { tmpParamInts.push(isSome ? 1 : 0); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -223,7 +223,7 @@ export async function createInstantiator(options, swift) { lower: (value) => { return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { return { }; } }); @@ -264,7 +264,7 @@ export async function createInstantiator(options, swift) { }; return { cleanup }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const isSome = tmpRetInts.pop(); let optional; if (isSome) { @@ -632,14 +632,14 @@ export async function createInstantiator(options, swift) { roundtrip: function bjs_roundtrip(session) { const { cleanup: cleanup } = structHelpers.Person.lower(session); instance.exports.bjs_roundtrip(); - const structValue = structHelpers.Person.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.Person.lift(); if (cleanup) { cleanup(); } return structValue; }, roundtripContainer: function bjs_roundtripContainer(container) { const { cleanup: cleanup } = structHelpers.Container.lower(container); instance.exports.bjs_roundtripContainer(); - const structValue = structHelpers.Container.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.Container.lift(); if (cleanup) { cleanup(); } return structValue; }, @@ -651,7 +651,7 @@ export async function createInstantiator(options, swift) { const isSome = optCount != null; const isSome1 = optFlag != null; instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag : 0); - const structValue = structHelpers.DataPoint.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.DataPoint.lift(); swift.memory.release(labelId); return structValue; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 8f90491df..393cd6847 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -41,7 +41,7 @@ export async function createInstantiator(options, swift) { tmpParamInts.push((value.y | 0)); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const int = tmpRetInts.pop(); const int1 = tmpRetInts.pop(); return { x: int1, y: int }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index bbeeffa0d..a2240a9e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -44,7 +44,7 @@ export async function createInstantiator(options, swift) { tmpParamPointers.push((value.mutPtr | 0)); return { cleanup: undefined }; }, - lift: (tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers) => { + lift: () => { const pointer = tmpRetPointers.pop(); const pointer1 = tmpRetPointers.pop(); const pointer2 = tmpRetPointers.pop(); @@ -286,14 +286,14 @@ export async function createInstantiator(options, swift) { roundTripPointerFields: function bjs_roundTripPointerFields(value) { const { cleanup: cleanup } = structHelpers.PointerFields.lower(value); instance.exports.bjs_roundTripPointerFields(); - const structValue = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.PointerFields.lift(); if (cleanup) { cleanup(); } return structValue; }, PointerFields: { init: function(raw, mutRaw, opaque, ptr, mutPtr) { instance.exports.bjs_PointerFields_init(raw, mutRaw, opaque, ptr, mutPtr); - const structValue = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const structValue = structHelpers.PointerFields.lift(); return structValue; }, }, From 20457f42ab5845b81877aa3017eea70bf0a271c2 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 19:28:49 +0900 Subject: [PATCH 162/252] [NFC] BridgeJS: Remove remaining explicit captures from enum/struct helpers --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 6 +-- .../Sources/BridgeJSLink/JSGlueGen.swift | 4 +- .../BridgeJSLinkTests/ArrayTypes.js | 6 +-- .../BridgeJSLinkTests/DefaultParameters.js | 12 +++--- .../BridgeJSLinkTests/EnumAssociatedValue.js | 38 ++++++++--------- .../ImportedTypeInExportedInterface.js | 6 +-- .../BridgeJSLinkTests/Protocol.js | 4 +- .../StaticFunctions.Global.js | 4 +- .../BridgeJSLinkTests/StaticFunctions.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.js | 4 +- .../BridgeJSLinkTests/SwiftStruct.js | 42 +++++++++---------- .../BridgeJSLinkTests/SwiftStructImports.js | 6 +-- .../BridgeJSLinkTests/UnsafePointer.js | 6 +-- 13 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index c2b0c6ed3..af6961711 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -478,7 +478,7 @@ public struct BridgeJSLink { printer.write("bjs[\"swift_js_struct_lift_\(structDef.name)\"] = function() {") printer.indent { printer.write( - "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lift(\(JSGlueVariableScope.reservedTmpRetStrings), \(JSGlueVariableScope.reservedTmpRetInts), \(JSGlueVariableScope.reservedTmpRetF32s), \(JSGlueVariableScope.reservedTmpRetF64s), \(JSGlueVariableScope.reservedTmpRetPointers));" + "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lift();" ) printer.write("return \(JSGlueVariableScope.reservedSwift).memory.retain(value);") } @@ -1162,7 +1162,7 @@ public struct BridgeJSLink { for skeleton in skeletons.compactMap(\.exported) { for enumDef in skeleton.enums where enumDef.enumType == .associatedValue { printer.write( - "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedStructHelpers), \(JSGlueVariableScope.reservedEnumHelpers));" + "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()();" ) printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;") printer.nextLine() @@ -1178,7 +1178,7 @@ public struct BridgeJSLink { for skeleton in skeletons.compactMap(\.exported) { for structDef in skeleton.structs { printer.write( - "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()(\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), \(JSGlueVariableScope.reservedTextEncoder), \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedEnumHelpers));" + "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()();" ) printer.write( "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name) = \(structDef.name)Helpers;" diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ae83f33e6..ff0343fd3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2075,7 +2075,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const __bjs_create\(enumName)Helpers = () => {") printer.indent() printer.write( - "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedStructHelpers), \(JSGlueVariableScope.reservedEnumHelpers)) => ({" + "return () => ({" ) printer.indent() @@ -3109,7 +3109,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const __bjs_create\(structName)Helpers = () => {") printer.indent() printer.write( - "return (\(JSGlueVariableScope.reservedTmpParamInts), \(JSGlueVariableScope.reservedTmpParamF32s), \(JSGlueVariableScope.reservedTmpParamF64s), \(JSGlueVariableScope.reservedTmpParamPointers), \(JSGlueVariableScope.reservedTmpRetPointers), textEncoder, \(JSGlueVariableScope.reservedSwift), \(JSGlueVariableScope.reservedEnumHelpers)) => ({" + "return () => ({" ) printer.indent() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 42176ae1f..7093fe417 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -48,7 +48,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createPointHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamF64s.push(value.x); tmpParamF64s.push(value.y); @@ -147,7 +147,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Point"] = function() { - const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Point.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -389,7 +389,7 @@ export async function createInstantiator(options, swift) { } } - const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const PointHelpers = __bjs_createPointHelpers()(); structHelpers.Point = PointHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 4317cc124..e19eb5fb4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -41,7 +41,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createConfigHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { const bytes = textEncoder.encode(value.name); const id = swift.memory.retain(bytes); @@ -63,7 +63,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createMathOperationsHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamF64s.push(value.baseValue); return { cleanup: undefined }; @@ -172,7 +172,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Config"] = function() { - const value = structHelpers.Config.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Config.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_MathOperations"] = function(objectId) { @@ -183,7 +183,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_MathOperations"] = function() { - const value = structHelpers.MathOperations.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.MathOperations.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -431,10 +431,10 @@ export async function createInstantiator(options, swift) { } } } - const ConfigHelpers = __bjs_createConfigHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const ConfigHelpers = __bjs_createConfigHelpers()(); structHelpers.Config = ConfigHelpers; - const MathOperationsHelpers = __bjs_createMathOperationsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const MathOperationsHelpers = __bjs_createMathOperationsHelpers()(); structHelpers.MathOperations = MathOperationsHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index b25276d9f..8491c08a2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -116,7 +116,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createPointHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamF64s.push(value.x); tmpParamF64s.push(value.y); @@ -130,7 +130,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -201,7 +201,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createComplexResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -321,7 +321,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -385,7 +385,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createNetworkingResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -431,7 +431,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createAPIOptionalResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -560,7 +560,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createTypedPayloadResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -635,7 +635,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createAllTypesResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -722,7 +722,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createOptionalAllTypesResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -965,7 +965,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Point"] = function() { - const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Point.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -1103,31 +1103,31 @@ export async function createInstantiator(options, swift) { } } - const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const PointHelpers = __bjs_createPointHelpers()(); structHelpers.Point = PointHelpers; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); enumHelpers.APIResult = APIResultHelpers; - const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(); enumHelpers.ComplexResult = ComplexResultHelpers; - const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const ResultHelpers = __bjs_createResultValuesHelpers()(); enumHelpers.Result = ResultHelpers; - const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(); enumHelpers.NetworkingResult = NetworkingResultHelpers; - const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(); enumHelpers.APIOptionalResult = APIOptionalResultHelpers; - const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers()(); enumHelpers.TypedPayloadResult = TypedPayloadResultHelpers; - const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers()(); enumHelpers.AllTypesResult = AllTypesResultHelpers; - const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers()(); enumHelpers.OptionalAllTypesResult = OptionalAllTypesResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 23db5be56..1e4e1f508 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -35,7 +35,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createFooContainerHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { let id; if (value.foo != null) { @@ -184,7 +184,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_FooContainer"] = function() { - const value = structHelpers.FooContainer.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.FooContainer.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -298,7 +298,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const FooContainerHelpers = __bjs_createFooContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const FooContainerHelpers = __bjs_createFooContainerHelpers()(); structHelpers.FooContainer = FooContainerHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 965df2b37..0ed0be7b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -59,7 +59,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -723,7 +723,7 @@ export async function createInstantiator(options, swift) { for (const cleanup of arrayCleanups) { cleanup(); } } } - const ResultHelpers = __bjs_createResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const ResultHelpers = __bjs_createResultValuesHelpers()(); enumHelpers.Result = ResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 451c356a5..7579c72f7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -46,7 +46,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -312,7 +312,7 @@ export async function createInstantiator(options, swift) { return ret; } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); enumHelpers.APIResult = APIResultHelpers; if (typeof globalThis.Utils === 'undefined') { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 00135e97d..bb3920888 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -46,7 +46,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -312,7 +312,7 @@ export async function createInstantiator(options, swift) { return ret; } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); enumHelpers.APIResult = APIResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 9f2c16b2d..36b712362 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -65,7 +65,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createAPIResultValuesHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers) => ({ + return () => ({ lower: (value) => { const enumTag = value.tag; switch (enumTag) { @@ -926,7 +926,7 @@ export async function createInstantiator(options, swift) { return bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"](ret); } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, structHelpers, enumHelpers); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); enumHelpers.APIResult = APIResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index 1198f1539..b22afee4d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -40,7 +40,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createDataPointHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamF64s.push(value.x); tmpParamF64s.push(value.y); @@ -92,7 +92,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createAddressHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { const bytes = textEncoder.encode(value.street); const id = swift.memory.retain(bytes); @@ -131,7 +131,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createPersonHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { const bytes = textEncoder.encode(value.name); const id = swift.memory.retain(bytes); @@ -175,7 +175,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createSessionHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamInts.push((value.id | 0)); tmpParamPointers.push(value.owner.pointer); @@ -190,7 +190,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createMeasurementHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamF64s.push(value.value); tmpParamF32s.push(Math.fround(value.precision)); @@ -219,7 +219,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createConfigStructHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { return { cleanup: undefined }; }, @@ -229,7 +229,7 @@ export async function createInstantiator(options, swift) { }); }; const __bjs_createContainerHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { let id; if (value.object != null) { @@ -377,7 +377,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_DataPoint"] = function() { - const value = structHelpers.DataPoint.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.DataPoint.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Address"] = function(objectId) { @@ -388,7 +388,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Address"] = function() { - const value = structHelpers.Address.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Address.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Person"] = function(objectId) { @@ -399,7 +399,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Person"] = function() { - const value = structHelpers.Person.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Person.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Session"] = function(objectId) { @@ -410,7 +410,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Session"] = function() { - const value = structHelpers.Session.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Session.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Measurement"] = function(objectId) { @@ -421,7 +421,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Measurement"] = function() { - const value = structHelpers.Measurement.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Measurement.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) { @@ -432,7 +432,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_ConfigStruct"] = function() { - const value = structHelpers.ConfigStruct.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.ConfigStruct.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Container"] = function(objectId) { @@ -443,7 +443,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Container"] = function() { - const value = structHelpers.Container.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Container.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -606,25 +606,25 @@ export async function createInstantiator(options, swift) { swift.memory.release(valueId); } } - const DataPointHelpers = __bjs_createDataPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const DataPointHelpers = __bjs_createDataPointHelpers()(); structHelpers.DataPoint = DataPointHelpers; - const AddressHelpers = __bjs_createAddressHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const AddressHelpers = __bjs_createAddressHelpers()(); structHelpers.Address = AddressHelpers; - const PersonHelpers = __bjs_createPersonHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const PersonHelpers = __bjs_createPersonHelpers()(); structHelpers.Person = PersonHelpers; - const SessionHelpers = __bjs_createSessionHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const SessionHelpers = __bjs_createSessionHelpers()(); structHelpers.Session = SessionHelpers; - const MeasurementHelpers = __bjs_createMeasurementHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const MeasurementHelpers = __bjs_createMeasurementHelpers()(); structHelpers.Measurement = MeasurementHelpers; - const ConfigStructHelpers = __bjs_createConfigStructHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const ConfigStructHelpers = __bjs_createConfigStructHelpers()(); structHelpers.ConfigStruct = ConfigStructHelpers; - const ContainerHelpers = __bjs_createContainerHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const ContainerHelpers = __bjs_createContainerHelpers()(); structHelpers.Container = ContainerHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 393cd6847..f6f63ba8d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -35,7 +35,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createPointHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamInts.push((value.x | 0)); tmpParamInts.push((value.y | 0)); @@ -134,7 +134,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_Point"] = function() { - const value = structHelpers.Point.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.Point.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -250,7 +250,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const PointHelpers = __bjs_createPointHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const PointHelpers = __bjs_createPointHelpers()(); structHelpers.Point = PointHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index a2240a9e6..9d94d5f0a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -35,7 +35,7 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; const __bjs_createPointerFieldsHelpers = () => { - return (tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers) => ({ + return () => ({ lower: (value) => { tmpParamPointers.push((value.raw | 0)); tmpParamPointers.push((value.mutRaw | 0)); @@ -139,7 +139,7 @@ export async function createInstantiator(options, swift) { return 0; } bjs["swift_js_struct_lift_PointerFields"] = function() { - const value = structHelpers.PointerFields.lift(tmpRetStrings, tmpRetInts, tmpRetF32s, tmpRetF64s, tmpRetPointers); + const value = structHelpers.PointerFields.lift(); return swift.memory.retain(value); } bjs["swift_js_return_optional_bool"] = function(isSome, value) { @@ -244,7 +244,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers()(tmpParamInts, tmpParamF32s, tmpParamF64s, tmpParamPointers, tmpRetPointers, textEncoder, swift, enumHelpers); + const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers()(); structHelpers.PointerFields = PointerFieldsHelpers; const exports = { From 516fb9d452057ae0083541df346bb9d21e1c47a0 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 19:00:44 +0900 Subject: [PATCH 163/252] BridgeJS: Make Stack ABI storage direction agnostic --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 36 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 160 ++++---- .../BridgeJSLinkTests/ArrayTypes.js | 328 ++++++++------- .../__Snapshots__/BridgeJSLinkTests/Async.js | 36 +- .../BridgeJSLinkTests/DefaultParameters.js | 104 +++-- .../BridgeJSLinkTests/EnumAssociatedValue.js | 378 +++++++++--------- .../BridgeJSLinkTests/EnumCase.js | 36 +- .../BridgeJSLinkTests/EnumNamespace.Global.js | 36 +- .../BridgeJSLinkTests/EnumNamespace.js | 36 +- .../BridgeJSLinkTests/EnumRawType.js | 36 +- .../BridgeJSLinkTests/GlobalGetter.js | 36 +- .../BridgeJSLinkTests/GlobalThisImports.js | 36 +- .../BridgeJSLinkTests/ImportArray.js | 48 +-- .../ImportedTypeInExportedInterface.js | 72 ++-- .../BridgeJSLinkTests/InvalidPropertyNames.js | 36 +- .../BridgeJSLinkTests/JSClass.js | 36 +- .../JSClassStaticFunctions.js | 36 +- .../BridgeJSLinkTests/JSValue.js | 134 +++---- .../BridgeJSLinkTests/MixedGlobal.js | 36 +- .../BridgeJSLinkTests/MixedModules.js | 36 +- .../BridgeJSLinkTests/MixedPrivate.js | 36 +- .../BridgeJSLinkTests/Namespaces.Global.js | 36 +- .../BridgeJSLinkTests/Namespaces.js | 36 +- .../BridgeJSLinkTests/Optionals.js | 36 +- .../BridgeJSLinkTests/PrimitiveParameters.js | 36 +- .../BridgeJSLinkTests/PrimitiveReturn.js | 36 +- .../BridgeJSLinkTests/PropertyTypes.js | 36 +- .../BridgeJSLinkTests/Protocol.js | 66 ++- .../StaticFunctions.Global.js | 48 +-- .../BridgeJSLinkTests/StaticFunctions.js | 48 +-- .../StaticProperties.Global.js | 36 +- .../BridgeJSLinkTests/StaticProperties.js | 36 +- .../BridgeJSLinkTests/StringParameter.js | 36 +- .../BridgeJSLinkTests/StringReturn.js | 36 +- .../BridgeJSLinkTests/SwiftClass.js | 36 +- .../BridgeJSLinkTests/SwiftClosure.js | 58 ++- .../BridgeJSLinkTests/SwiftClosureImports.js | 36 +- .../BridgeJSLinkTests/SwiftStruct.js | 156 ++++---- .../BridgeJSLinkTests/SwiftStructImports.js | 44 +- .../__Snapshots__/BridgeJSLinkTests/Throws.js | 36 +- .../BridgeJSLinkTests/UnsafePointer.js | 56 ++- .../VoidParameterVoidReturn.js | 36 +- 42 files changed, 1268 insertions(+), 1440 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index af6961711..9689f708d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -246,16 +246,12 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);", - "let \(JSGlueVariableScope.reservedTmpRetTag) = [];", - "let \(JSGlueVariableScope.reservedTmpRetStrings) = [];", - "let \(JSGlueVariableScope.reservedTmpRetInts) = [];", - "let \(JSGlueVariableScope.reservedTmpRetF32s) = [];", - "let \(JSGlueVariableScope.reservedTmpRetF64s) = [];", - "let \(JSGlueVariableScope.reservedTmpParamInts) = [];", - "let \(JSGlueVariableScope.reservedTmpParamF32s) = [];", - "let \(JSGlueVariableScope.reservedTmpParamF64s) = [];", - "let \(JSGlueVariableScope.reservedTmpRetPointers) = [];", - "let \(JSGlueVariableScope.reservedTmpParamPointers) = [];", + "let \(JSGlueVariableScope.reservedTagStack) = [];", + "let \(JSGlueVariableScope.reservedStringStack) = [];", + "let \(JSGlueVariableScope.reservedI32Stack) = [];", + "let \(JSGlueVariableScope.reservedF32Stack) = [];", + "let \(JSGlueVariableScope.reservedF64Stack) = [];", + "let \(JSGlueVariableScope.reservedPointerStack) = [];", "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", @@ -388,22 +384,22 @@ public struct BridgeJSLink { printer.write("}") printer.write("bjs[\"swift_js_push_tag\"] = function(tag) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetTag).push(tag);") + printer.write("\(JSGlueVariableScope.reservedTagStack).push(tag);") } printer.write("}") printer.write("bjs[\"swift_js_push_i32\"] = function(v) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(v | 0);") + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(v | 0);") } printer.write("}") printer.write("bjs[\"swift_js_push_f32\"] = function(v) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetF32s).push(Math.fround(v));") + printer.write("\(JSGlueVariableScope.reservedF32Stack).push(Math.fround(v));") } printer.write("}") printer.write("bjs[\"swift_js_push_f64\"] = function(v) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(v);") + printer.write("\(JSGlueVariableScope.reservedF64Stack).push(v);") } printer.write("}") printer.write("bjs[\"swift_js_push_string\"] = function(ptr, len) {") @@ -412,32 +408,32 @@ public struct BridgeJSLink { "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr, len)\(sharedMemory ? ".slice()" : "");" ) printer.write("const value = \(JSGlueVariableScope.reservedTextDecoder).decode(bytes);") - printer.write("\(JSGlueVariableScope.reservedTmpRetStrings).push(value);") + printer.write("\(JSGlueVariableScope.reservedStringStack).push(value);") } printer.write("}") printer.write("bjs[\"swift_js_pop_i32\"] = function() {") printer.indent { - printer.write("return \(JSGlueVariableScope.reservedTmpParamInts).pop();") + printer.write("return \(JSGlueVariableScope.reservedI32Stack).pop();") } printer.write("}") printer.write("bjs[\"swift_js_pop_f32\"] = function() {") printer.indent { - printer.write("return \(JSGlueVariableScope.reservedTmpParamF32s).pop();") + printer.write("return \(JSGlueVariableScope.reservedF32Stack).pop();") } printer.write("}") printer.write("bjs[\"swift_js_pop_f64\"] = function() {") printer.indent { - printer.write("return \(JSGlueVariableScope.reservedTmpParamF64s).pop();") + printer.write("return \(JSGlueVariableScope.reservedF64Stack).pop();") } printer.write("}") printer.write("bjs[\"swift_js_push_pointer\"] = function(pointer) {") printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(pointer);") + printer.write("\(JSGlueVariableScope.reservedPointerStack).push(pointer);") } printer.write("}") printer.write("bjs[\"swift_js_pop_pointer\"] = function() {") printer.indent { - printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();") + printer.write("return \(JSGlueVariableScope.reservedPointerStack).pop();") } printer.write("}") printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ff0343fd3..ae595d656 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -20,16 +20,12 @@ final class JSGlueVariableScope { static let reservedStorageToReturnOptionalHeapObject = "tmpRetOptionalHeapObject" static let reservedTextEncoder = "textEncoder" static let reservedTextDecoder = "textDecoder" - static let reservedTmpRetTag = "tmpRetTag" - static let reservedTmpRetStrings = "tmpRetStrings" - static let reservedTmpRetInts = "tmpRetInts" - static let reservedTmpRetF32s = "tmpRetF32s" - static let reservedTmpRetF64s = "tmpRetF64s" - static let reservedTmpParamInts = "tmpParamInts" - static let reservedTmpParamF32s = "tmpParamF32s" - static let reservedTmpParamF64s = "tmpParamF64s" - static let reservedTmpRetPointers = "tmpRetPointers" - static let reservedTmpParamPointers = "tmpParamPointers" + static let reservedTagStack = "tagStack" + static let reservedStringStack = "strStack" + static let reservedI32Stack = "i32Stack" + static let reservedF32Stack = "f32Stack" + static let reservedF64Stack = "f64Stack" + static let reservedPointerStack = "ptrStack" static let reservedTmpStructCleanups = "tmpStructCleanups" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" @@ -51,16 +47,12 @@ final class JSGlueVariableScope { reservedStorageToReturnOptionalHeapObject, reservedTextEncoder, reservedTextDecoder, - reservedTmpRetTag, - reservedTmpRetStrings, - reservedTmpRetInts, - reservedTmpRetF32s, - reservedTmpRetF64s, - reservedTmpParamInts, - reservedTmpParamF32s, - reservedTmpParamF64s, - reservedTmpRetPointers, - reservedTmpParamPointers, + reservedTagStack, + reservedStringStack, + reservedI32Stack, + reservedF32Stack, + reservedF64Stack, + reservedPointerStack, reservedTmpStructCleanups, reservedEnumHelpers, reservedStructHelpers, @@ -100,46 +92,46 @@ extension JSGlueVariableScope { // MARK: Parameter func emitPushI32Parameter(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(\(value));") } func emitPushF64Parameter(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpParamF64s).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedF64Stack).push(\(value));") } func emitPushF32Parameter(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpParamF32s).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedF32Stack).push(\(value));") } func emitPushPointerParameter(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpParamPointers).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));") } // MARK: Return func emitPushI32Return(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpRetInts).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(\(value));") } func emitPushF64Return(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpRetF64s).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedF64Stack).push(\(value));") } func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(\(value));") + printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));") } - func popTagReturn() -> String { - return "\(JSGlueVariableScope.reservedTmpRetTag).pop()" + func popTag() -> String { + return "\(JSGlueVariableScope.reservedTagStack).pop()" } - func popStringReturn() -> String { - return "\(JSGlueVariableScope.reservedTmpRetStrings).pop()" + func popString() -> String { + return "\(JSGlueVariableScope.reservedStringStack).pop()" } - func popI32Return() -> String { - return "\(JSGlueVariableScope.reservedTmpRetInts).pop()" + func popI32() -> String { + return "\(JSGlueVariableScope.reservedI32Stack).pop()" } - func popF64Return() -> String { - return "\(JSGlueVariableScope.reservedTmpRetF64s).pop()" + func popF64() -> String { + return "\(JSGlueVariableScope.reservedF64Stack).pop()" } - func popF32Return() -> String { - return "\(JSGlueVariableScope.reservedTmpRetF32s).pop()" + func popF32() -> String { + return "\(JSGlueVariableScope.reservedF32Stack).pop()" } - func popPointerReturn() -> String { - return "\(JSGlueVariableScope.reservedTmpRetPointers).pop()" + func popPointer() -> String { + return "\(JSGlueVariableScope.reservedPointerStack).pop()" } } @@ -544,9 +536,9 @@ struct IntrinsicJSFragment: Sendable { let payload2 = scope.variable("jsValuePayload2") let payload1 = scope.variable("jsValuePayload1") let kind = scope.variable("jsValueKind") - printer.write("const \(payload2) = \(scope.popF64Return());") - printer.write("const \(payload1) = \(scope.popI32Return());") - printer.write("const \(kind) = \(scope.popI32Return());") + printer.write("const \(payload2) = \(scope.popF64());") + printer.write("const \(payload1) = \(scope.popI32());") + printer.write("const \(kind) = \(scope.popI32());") let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( @@ -618,7 +610,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { _, scope, printer, _ in let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTagReturn()));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTag()));" ) return [retName] } @@ -933,7 +925,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let tagVar = scope.variable("tag") - printer.write("const \(tagVar) = \(scope.popTagReturn());") + printer.write("const \(tagVar) = \(scope.popTag());") let isNullVar = scope.variable("isNull") printer.write("const \(isNullVar) = (\(tagVar) === -1);") printer.write("let \(resultVar);") @@ -951,7 +943,7 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -966,7 +958,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") case .array(let elementType): let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -983,7 +975,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") case .jsValue: let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -1682,7 +1674,7 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()));" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()));" ) printer.write("return \(resultVar);") return [] @@ -2494,16 +2486,16 @@ struct IntrinsicJSFragment: Sendable { let optVar = scope.variable("optional") let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") printer.indent { // For optional associated value enums, Swift uses bridgeJSLowerParameter() - // which pushes caseId to tmpRetInts (not tmpRetTag like bridgeJSLowerReturn()). + // which pushes caseId to i32Stack (not tagStack like bridgeJSLowerReturn()). if case .associatedValueEnum(let fullName) = wrappedType { let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("caseId") - printer.write("const \(caseIdVar) = \(scope.popI32Return());") + printer.write("const \(caseIdVar) = \(scope.popI32());") printer.write( "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar));" ) @@ -2616,7 +2608,7 @@ struct IntrinsicJSFragment: Sendable { let lenVar = scope.variable("arrayLen") let iVar = scope.variable("i") - printer.write("const \(lenVar) = \(scope.popI32Return());") + printer.write("const \(lenVar) = \(scope.popI32());") printer.write("const \(resultVar) = [];") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") printer.indent { @@ -2643,9 +2635,9 @@ struct IntrinsicJSFragment: Sendable { let payload2Var = scope.variable("jsValuePayload2") let payload1Var = scope.variable("jsValuePayload1") let kindVar = scope.variable("jsValueKind") - printer.write("const \(payload2Var) = \(scope.popF64Return());") - printer.write("const \(payload1Var) = \(scope.popI32Return());") - printer.write("const \(kindVar) = \(scope.popI32Return());") + printer.write("const \(payload2Var) = \(scope.popF64());") + printer.write("const \(payload1Var) = \(scope.popI32());") + printer.write("const \(kindVar) = \(scope.popI32());") let resultVar = scope.variable("jsValue") printer.write( "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" @@ -2658,7 +2650,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let strVar = scope.variable("string") - printer.write("const \(strVar) = \(scope.popStringReturn());") + printer.write("const \(strVar) = \(scope.popString());") return [strVar] } ) @@ -2667,7 +2659,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let bVar = scope.variable("bool") - printer.write("const \(bVar) = \(scope.popI32Return()) !== 0;") + printer.write("const \(bVar) = \(scope.popI32()) !== 0;") return [bVar] } ) @@ -2676,7 +2668,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let iVar = scope.variable("int") - printer.write("const \(iVar) = \(scope.popI32Return());") + printer.write("const \(iVar) = \(scope.popI32());") return [iVar] } ) @@ -2685,7 +2677,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let fVar = scope.variable("f32") - printer.write("const \(fVar) = \(scope.popF32Return());") + printer.write("const \(fVar) = \(scope.popF32());") return [fVar] } ) @@ -2694,7 +2686,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let dVar = scope.variable("f64") - printer.write("const \(dVar) = \(scope.popF64Return());") + printer.write("const \(dVar) = \(scope.popF64());") return [dVar] } ) @@ -2715,7 +2707,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("caseId") - printer.write("const \(varName) = \(scope.popI32Return());") + printer.write("const \(varName) = \(scope.popI32());") return [varName] } ) @@ -2726,7 +2718,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popStringReturn());") + printer.write("const \(varName) = \(scope.popString());") return [varName] } ) @@ -2735,7 +2727,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popF32Return());") + printer.write("const \(varName) = \(scope.popF32());") return [varName] } ) @@ -2744,7 +2736,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popF64Return());") + printer.write("const \(varName) = \(scope.popF64());") return [varName] } ) @@ -2753,7 +2745,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popI32Return());") + printer.write("const \(varName) = \(scope.popI32());") return [varName] } ) @@ -2765,7 +2757,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTagReturn()), );" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()), );" ) return [resultVar] } @@ -2776,7 +2768,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let ptrVar = scope.variable("ptr") let objVar = scope.variable("obj") - printer.write("const \(ptrVar) = \(scope.popPointerReturn());") + printer.write("const \(ptrVar) = \(scope.popPointer());") printer.write("const \(objVar) = _exports['\(className)'].__construct(\(ptrVar));") return [objVar] } @@ -2787,7 +2779,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let idVar = scope.variable("objId") let objVar = scope.variable("obj") - printer.write("const \(idVar) = \(scope.popI32Return());") + printer.write("const \(idVar) = \(scope.popI32());") printer.write("const \(objVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [objVar] @@ -2802,7 +2794,7 @@ struct IntrinsicJSFragment: Sendable { parameters: [], printCode: { arguments, scope, printer, cleanup in let pVar = scope.variable("pointer") - printer.write("const \(pVar) = \(scope.popPointerReturn());") + printer.write("const \(pVar) = \(scope.popPointer());") return [pVar] } ) @@ -3021,7 +3013,7 @@ struct IntrinsicJSFragment: Sendable { let isSomeVar = scope.variable("isSome") let resultVar = scope.variable("optValue") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar) === 0) {") printer.indent { @@ -3477,7 +3469,7 @@ struct IntrinsicJSFragment: Sendable { pushOptionalPrimitive( value: value, isSomeVar: isSomeVar, - stack: .tmpParamInts, + stack: .i32Stack, convert: "| 0", zeroValue: "0", printer: printer, @@ -3487,7 +3479,7 @@ struct IntrinsicJSFragment: Sendable { pushOptionalPrimitive( value: value, isSomeVar: isSomeVar, - stack: .tmpParamInts, + stack: .i32Stack, convert: "? 1 : 0", zeroValue: "0", printer: printer, @@ -3497,7 +3489,7 @@ struct IntrinsicJSFragment: Sendable { pushOptionalPrimitive( value: value, isSomeVar: isSomeVar, - stack: .tmpParamF32s, + stack: .f32Stack, convert: "Math.fround", zeroValue: "0.0", printer: printer, @@ -3507,7 +3499,7 @@ struct IntrinsicJSFragment: Sendable { pushOptionalPrimitive( value: value, isSomeVar: isSomeVar, - stack: .tmpParamF64s, + stack: .f64Stack, convert: nil, zeroValue: "0.0", printer: printer, @@ -3622,9 +3614,9 @@ struct IntrinsicJSFragment: Sendable { ) { let stackName: String switch stack { - case .tmpParamInts: stackName = JSGlueVariableScope.reservedTmpParamInts - case .tmpParamF32s: stackName = JSGlueVariableScope.reservedTmpParamF32s - case .tmpParamF64s: stackName = JSGlueVariableScope.reservedTmpParamF64s + case .i32Stack: stackName = JSGlueVariableScope.reservedI32Stack + case .f32Stack: stackName = JSGlueVariableScope.reservedF32Stack + case .f64Stack: stackName = JSGlueVariableScope.reservedF64Stack } printer.write("if (\(isSomeVar)) {") @@ -3650,9 +3642,9 @@ struct IntrinsicJSFragment: Sendable { } private enum StackType { - case tmpParamInts - case tmpParamF32s - case tmpParamF64s + case i32Stack + case f32Stack + case f64Stack } private static func structFieldLiftFragment( @@ -3668,15 +3660,15 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let isSomeVar = scope.variable("isSome") let optVar = scope.variable("optional") - printer.write("const \(isSomeVar) = \(scope.popI32Return());") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - // Special handling for associated value enum - in struct fields, case ID is pushed to tmpRetInts + // Special handling for associated value enum - in struct fields, case ID is pushed to i32Stack if case .associatedValueEnum(let enumName) = wrappedType { let base = enumName.components(separatedBy: ".").last ?? enumName let caseIdVar = scope.variable("enumCaseId") - printer.write("const \(caseIdVar) = \(scope.popI32Return());") + printer.write("const \(caseIdVar) = \(scope.popI32());") printer.write( "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), );" ) @@ -3723,7 +3715,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanup in let objectIdVar = scope.variable("objectId") let varName = scope.variable("value") - printer.write("const \(objectIdVar) = \(scope.popI32Return());") + printer.write("const \(objectIdVar) = \(scope.popI32());") printer.write("let \(varName);") printer.write("if (\(objectIdVar) !== 0) {") printer.indent { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 7093fe417..5b8c451e2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -31,16 +31,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -50,13 +46,13 @@ export async function createInstantiator(options, swift) { const __bjs_createPointHelpers = () => { return () => ({ lower: (value) => { - tmpParamF64s.push(value.x); - tmpParamF64s.push(value.y); + f64Stack.push(value.x); + f64Stack.push(value.y); return { cleanup: undefined }; }, lift: () => { - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); return { x: f641, y: f64 }; } }); @@ -98,36 +94,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -265,10 +261,10 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_importProcessNumbers"] = function bjs_importProcessNumbers() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); arrayResult.push(f64); } arrayResult.reverse(); @@ -282,38 +278,38 @@ export async function createInstantiator(options, swift) { let ret = imports.importGetNumbers(); const arrayCleanups = []; for (const elem of ret) { - tmpParamF64s.push(elem); + f64Stack.push(elem); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } } TestModule["bjs_importTransformNumbers"] = function bjs_importTransformNumbers() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); arrayResult.push(f64); } arrayResult.reverse(); let ret = imports.importTransformNumbers(arrayResult); const arrayCleanups = []; for (const elem of ret) { - tmpParamF64s.push(elem); + f64Stack.push(elem); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } } TestModule["bjs_importProcessStrings"] = function bjs_importProcessStrings() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); arrayResult.push(string); } arrayResult.reverse(); @@ -322,32 +318,32 @@ export async function createInstantiator(options, swift) { for (const elem of ret) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } } TestModule["bjs_importProcessBooleans"] = function bjs_importProcessBooleans() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; arrayResult.push(bool); } arrayResult.reverse(); let ret = imports.importProcessBooleans(arrayResult); const arrayCleanups = []; for (const elem of ret) { - tmpParamInts.push(elem ? 1 : 0); + i32Stack.push(elem ? 1 : 0); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } @@ -397,14 +393,14 @@ export async function createInstantiator(options, swift) { processIntArray: function bjs_processIntArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processIntArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -416,18 +412,18 @@ export async function createInstantiator(options, swift) { for (const elem of values) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processStringArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); arrayResult.push(string); } arrayResult.reverse(); @@ -437,14 +433,14 @@ export async function createInstantiator(options, swift) { processDoubleArray: function bjs_processDoubleArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamF64s.push(elem); + f64Stack.push(elem); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processDoubleArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); arrayResult.push(f64); } arrayResult.reverse(); @@ -454,14 +450,14 @@ export async function createInstantiator(options, swift) { processBoolArray: function bjs_processBoolArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push(elem ? 1 : 0); + i32Stack.push(elem ? 1 : 0); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processBoolArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; arrayResult.push(bool); } arrayResult.reverse(); @@ -476,9 +472,9 @@ export async function createInstantiator(options, swift) { if (structCleanup) { structCleanup(); } }); } - tmpParamInts.push(points.length); + i32Stack.push(points.length); instance.exports.bjs_processPointArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { const struct = structHelpers.Point.lift(); @@ -491,14 +487,14 @@ export async function createInstantiator(options, swift) { processDirectionArray: function bjs_processDirectionArray(directions) { const arrayCleanups = []; for (const elem of directions) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(directions.length); + i32Stack.push(directions.length); instance.exports.bjs_processDirectionArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const caseId = tmpRetInts.pop(); + const caseId = i32Stack.pop(); arrayResult.push(caseId); } arrayResult.reverse(); @@ -508,14 +504,14 @@ export async function createInstantiator(options, swift) { processStatusArray: function bjs_processStatusArray(statuses) { const arrayCleanups = []; for (const elem of statuses) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(statuses.length); + i32Stack.push(statuses.length); instance.exports.bjs_processStatusArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const rawValue = tmpRetInts.pop(); + const rawValue = i32Stack.pop(); arrayResult.push(rawValue); } arrayResult.reverse(); @@ -525,9 +521,9 @@ export async function createInstantiator(options, swift) { sumIntArray: function bjs_sumIntArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); const ret = instance.exports.bjs_sumIntArray(); for (const cleanup of arrayCleanups) { cleanup(); } return ret; @@ -540,7 +536,7 @@ export async function createInstantiator(options, swift) { if (structCleanup) { structCleanup(); } }); } - tmpParamInts.push(points.length); + i32Stack.push(points.length); const matchingBytes = textEncoder.encode(matching); const matchingId = swift.memory.retain(matchingBytes); instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); @@ -552,14 +548,14 @@ export async function createInstantiator(options, swift) { processUnsafeRawPointerArray: function bjs_processUnsafeRawPointerArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamPointers.push((elem | 0)); + ptrStack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processUnsafeRawPointerArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const pointer = tmpRetPointers.pop(); + const pointer = ptrStack.pop(); arrayResult.push(pointer); } arrayResult.reverse(); @@ -569,14 +565,14 @@ export async function createInstantiator(options, swift) { processUnsafeMutableRawPointerArray: function bjs_processUnsafeMutableRawPointerArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamPointers.push((elem | 0)); + ptrStack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processUnsafeMutableRawPointerArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const pointer = tmpRetPointers.pop(); + const pointer = ptrStack.pop(); arrayResult.push(pointer); } arrayResult.reverse(); @@ -586,14 +582,14 @@ export async function createInstantiator(options, swift) { processOpaquePointerArray: function bjs_processOpaquePointerArray(values) { const arrayCleanups = []; for (const elem of values) { - tmpParamPointers.push((elem | 0)); + ptrStack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processOpaquePointerArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const pointer = tmpRetPointers.pop(); + const pointer = ptrStack.pop(); arrayResult.push(pointer); } arrayResult.reverse(); @@ -605,23 +601,23 @@ export async function createInstantiator(options, swift) { for (const elem of values) { const isSome = elem != null ? 1 : 0; if (isSome) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processOptionalIntArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); optValue = int; } arrayResult.push(optValue); @@ -637,26 +633,26 @@ export async function createInstantiator(options, swift) { if (isSome) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); } else { - tmpParamInts.push(0); - tmpParamInts.push(0); + i32Stack.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processOptionalStringArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); optValue = string; } arrayResult.push(optValue); @@ -671,19 +667,19 @@ export async function createInstantiator(options, swift) { if (isSome) { const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } instance.exports.bjs_processOptionalArray(+isSome); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -703,14 +699,14 @@ export async function createInstantiator(options, swift) { arrayCleanups.push(() => { if (structCleanup) { structCleanup(); } }); } else { } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(points.length); + i32Stack.push(points.length); instance.exports.bjs_processOptionalPointArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; @@ -729,23 +725,23 @@ export async function createInstantiator(options, swift) { for (const elem of directions) { const isSome = elem != null ? 1 : 0; if (isSome) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(directions.length); + i32Stack.push(directions.length); instance.exports.bjs_processOptionalDirectionArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const caseId = tmpRetInts.pop(); + const caseId = i32Stack.pop(); optValue = caseId; } arrayResult.push(optValue); @@ -759,23 +755,23 @@ export async function createInstantiator(options, swift) { for (const elem of statuses) { const isSome = elem != null ? 1 : 0; if (isSome) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(statuses.length); + i32Stack.push(statuses.length); instance.exports.bjs_processOptionalStatusArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const rawValue = tmpRetInts.pop(); + const rawValue = i32Stack.pop(); optValue = rawValue; } arrayResult.push(optValue); @@ -789,22 +785,22 @@ export async function createInstantiator(options, swift) { for (const elem of values) { const arrayCleanups1 = []; for (const elem1 of elem) { - tmpParamInts.push((elem1 | 0)); + i32Stack.push((elem1 | 0)); } - tmpParamInts.push(elem.length); + i32Stack.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processNestedIntArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetInts.pop(); + const arrayLen1 = i32Stack.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult1.push(int); } arrayResult1.reverse(); @@ -821,26 +817,26 @@ export async function createInstantiator(options, swift) { for (const elem1 of elem) { const bytes = textEncoder.encode(elem1); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups1.push(() => { swift.memory.release(id); }); } - tmpParamInts.push(elem.length); + i32Stack.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_processNestedStringArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetInts.pop(); + const arrayLen1 = i32Stack.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); arrayResult1.push(string); } arrayResult1.reverse(); @@ -860,17 +856,17 @@ export async function createInstantiator(options, swift) { if (structCleanup) { structCleanup(); } }); } - tmpParamInts.push(elem.length); + i32Stack.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(points.length); + i32Stack.push(points.length); instance.exports.bjs_processNestedPointArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetInts.pop(); + const arrayLen1 = i32Stack.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { const struct = structHelpers.Point.lift(); @@ -886,14 +882,14 @@ export async function createInstantiator(options, swift) { processItemArray: function bjs_processItemArray(items) { const arrayCleanups = []; for (const elem of items) { - tmpParamPointers.push(elem.pointer); + ptrStack.push(elem.pointer); } - tmpParamInts.push(items.length); + i32Stack.push(items.length); instance.exports.bjs_processItemArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['Item'].__construct(ptr); arrayResult.push(obj); } @@ -906,22 +902,22 @@ export async function createInstantiator(options, swift) { for (const elem of items) { const arrayCleanups1 = []; for (const elem1 of elem) { - tmpParamPointers.push(elem1.pointer); + ptrStack.push(elem1.pointer); } - tmpParamInts.push(elem.length); + i32Stack.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(items.length); + i32Stack.push(items.length); instance.exports.bjs_processNestedItemArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetInts.pop(); + const arrayLen1 = i32Stack.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['Item'].__construct(ptr); arrayResult1.push(obj); } @@ -936,14 +932,14 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of objects) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(objects.length); + i32Stack.push(objects.length); instance.exports.bjs_processJSObjectArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); arrayResult.push(obj); @@ -958,23 +954,23 @@ export async function createInstantiator(options, swift) { const isSome = elem != null ? 1 : 0; if (isSome) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(objects.length); + i32Stack.push(objects.length); instance.exports.bjs_processOptionalJSObjectArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); optValue = obj; @@ -991,22 +987,22 @@ export async function createInstantiator(options, swift) { const arrayCleanups1 = []; for (const elem1 of elem) { const objId = swift.memory.retain(elem1); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(elem.length); + i32Stack.push(elem.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(objects.length); + i32Stack.push(objects.length); instance.exports.bjs_processNestedJSObjectArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const arrayLen1 = tmpRetInts.pop(); + const arrayLen1 = i32Stack.pop(); const arrayResult1 = []; for (let i1 = 0; i1 < arrayLen1; i1++) { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); arrayResult1.push(obj); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index 0aa9148c1..40ff4884a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index e19eb5fb4..c7b1dc093 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -24,16 +24,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -45,19 +41,19 @@ export async function createInstantiator(options, swift) { lower: (value) => { const bytes = textEncoder.encode(value.name); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.value | 0)); - tmpParamInts.push(value.enabled ? 1 : 0); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.value | 0)); + i32Stack.push(value.enabled ? 1 : 0); const cleanup = () => { swift.memory.release(id); }; return { cleanup }; }, lift: () => { - const bool = tmpRetInts.pop() !== 0; - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); + const bool = i32Stack.pop() !== 0; + const int = i32Stack.pop(); + const string = strStack.pop(); return { name: string, value: int, enabled: bool }; } }); @@ -65,11 +61,11 @@ export async function createInstantiator(options, swift) { const __bjs_createMathOperationsHelpers = () => { return () => ({ lower: (value) => { - tmpParamF64s.push(value.baseValue); + f64Stack.push(value.baseValue); return { cleanup: undefined }; }, lift: () => { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); const instance1 = { baseValue: f64 }; instance1.add = function(a, b = 10.0) { const { cleanup: structCleanup } = structHelpers.MathOperations.lower(this); @@ -123,36 +119,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -525,7 +521,7 @@ export async function createInstantiator(options, swift) { pointCleanup = structResult.cleanup; } instance.exports.bjs_testOptionalStructDefault(+isSome); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { optResult = structHelpers.Config.lift(); @@ -543,7 +539,7 @@ export async function createInstantiator(options, swift) { pointCleanup = structResult.cleanup; } instance.exports.bjs_testOptionalStructWithValueDefault(+isSome); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { optResult = structHelpers.Config.lift(); @@ -556,14 +552,14 @@ export async function createInstantiator(options, swift) { testIntArrayDefault: function bjs_testIntArrayDefault(values = [1, 2, 3]) { const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_testIntArrayDefault(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -575,18 +571,18 @@ export async function createInstantiator(options, swift) { for (const elem of names) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); } - tmpParamInts.push(names.length); + i32Stack.push(names.length); instance.exports.bjs_testStringArrayDefault(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); arrayResult.push(string); } arrayResult.reverse(); @@ -596,14 +592,14 @@ export async function createInstantiator(options, swift) { testDoubleArrayDefault: function bjs_testDoubleArrayDefault(values = [1.5, 2.5, 3.5]) { const arrayCleanups = []; for (const elem of values) { - tmpParamF64s.push(elem); + f64Stack.push(elem); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_testDoubleArrayDefault(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); arrayResult.push(f64); } arrayResult.reverse(); @@ -613,14 +609,14 @@ export async function createInstantiator(options, swift) { testBoolArrayDefault: function bjs_testBoolArrayDefault(flags = [true, false, true]) { const arrayCleanups = []; for (const elem of flags) { - tmpParamInts.push(elem ? 1 : 0); + i32Stack.push(elem ? 1 : 0); } - tmpParamInts.push(flags.length); + i32Stack.push(flags.length); instance.exports.bjs_testBoolArrayDefault(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; arrayResult.push(bool); } arrayResult.reverse(); @@ -630,14 +626,14 @@ export async function createInstantiator(options, swift) { testEmptyArrayDefault: function bjs_testEmptyArrayDefault(items = []) { const arrayCleanups = []; for (const elem of items) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(items.length); + i32Stack.push(items.length); instance.exports.bjs_testEmptyArrayDefault(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -649,9 +645,9 @@ export async function createInstantiator(options, swift) { const nameId = swift.memory.retain(nameBytes); const arrayCleanups = []; for (const elem of values) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled); const ret = tmpRetString; tmpRetString = undefined; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 8491c08a2..f04b464c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -99,16 +99,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -118,13 +114,13 @@ export async function createInstantiator(options, swift) { const __bjs_createPointHelpers = () => { return () => ({ lower: (value) => { - tmpParamF64s.push(value.x); - tmpParamF64s.push(value.y); + f64Stack.push(value.x); + f64Stack.push(value.y); return { cleanup: undefined }; }, lift: () => { - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); return { x: f641, y: f64 }; } }); @@ -137,30 +133,30 @@ export async function createInstantiator(options, swift) { case APIResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Failure, cleanup }; } case APIResultValues.Tag.Flag: { - tmpParamInts.push(value.param0 ? 1 : 0); + i32Stack.push(value.param0 ? 1 : 0); const cleanup = undefined; return { caseId: APIResultValues.Tag.Flag, cleanup }; } case APIResultValues.Tag.Rate: { - tmpParamF32s.push(Math.fround(value.param0)); + f32Stack.push(Math.fround(value.param0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Rate, cleanup }; } case APIResultValues.Tag.Precise: { - tmpParamF64s.push(value.param0); + f64Stack.push(value.param0); const cleanup = undefined; return { caseId: APIResultValues.Tag.Precise, cleanup }; } @@ -175,23 +171,23 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: APIResultValues.Tag.Success, param0: string }; } case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { tag: APIResultValues.Tag.Failure, param0: int }; } case APIResultValues.Tag.Flag: { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; return { tag: APIResultValues.Tag.Flag, param0: bool }; } case APIResultValues.Tag.Rate: { - const f32 = tmpRetF32s.pop(); + const f32 = f32Stack.pop(); return { tag: APIResultValues.Tag.Rate, param0: f32 }; } case APIResultValues.Tag.Precise: { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); return { tag: APIResultValues.Tag.Precise, param0: f64 }; } case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; @@ -208,19 +204,19 @@ export async function createInstantiator(options, swift) { case ComplexResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: ComplexResultValues.Tag.Success, cleanup }; } case ComplexResultValues.Tag.Error: { - tmpParamInts.push((value.param1 | 0)); + i32Stack.push((value.param1 | 0)); const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; @@ -229,41 +225,41 @@ export async function createInstantiator(options, swift) { case ComplexResultValues.Tag.Status: { const bytes = textEncoder.encode(value.param2); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.param1 | 0)); - tmpParamInts.push(value.param0 ? 1 : 0); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.param1 | 0)); + i32Stack.push(value.param0 ? 1 : 0); const cleanup = () => { swift.memory.release(id); }; return { caseId: ComplexResultValues.Tag.Status, cleanup }; } case ComplexResultValues.Tag.Coordinates: { - tmpParamF64s.push(value.param2); - tmpParamF64s.push(value.param1); - tmpParamF64s.push(value.param0); + f64Stack.push(value.param2); + f64Stack.push(value.param1); + f64Stack.push(value.param0); const cleanup = undefined; return { caseId: ComplexResultValues.Tag.Coordinates, cleanup }; } case ComplexResultValues.Tag.Comprehensive: { const bytes = textEncoder.encode(value.param8); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const bytes1 = textEncoder.encode(value.param7); const id1 = swift.memory.retain(bytes1); - tmpParamInts.push(bytes1.length); - tmpParamInts.push(id1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); const bytes2 = textEncoder.encode(value.param6); const id2 = swift.memory.retain(bytes2); - tmpParamInts.push(bytes2.length); - tmpParamInts.push(id2); - tmpParamF64s.push(value.param5); - tmpParamF64s.push(value.param4); - tmpParamInts.push((value.param3 | 0)); - tmpParamInts.push((value.param2 | 0)); - tmpParamInts.push(value.param1 ? 1 : 0); - tmpParamInts.push(value.param0 ? 1 : 0); + i32Stack.push(bytes2.length); + i32Stack.push(id2); + f64Stack.push(value.param5); + f64Stack.push(value.param4); + i32Stack.push((value.param3 | 0)); + i32Stack.push((value.param2 | 0)); + i32Stack.push(value.param1 ? 1 : 0); + i32Stack.push(value.param0 ? 1 : 0); const cleanup = () => { swift.memory.release(id); swift.memory.release(id1); @@ -282,36 +278,36 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case ComplexResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: ComplexResultValues.Tag.Success, param0: string }; } case ComplexResultValues.Tag.Error: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); + const int = i32Stack.pop(); + const string = strStack.pop(); return { tag: ComplexResultValues.Tag.Error, param0: string, param1: int }; } case ComplexResultValues.Tag.Status: { - const string = tmpRetStrings.pop(); - const int = tmpRetInts.pop(); - const bool = tmpRetInts.pop() !== 0; + const string = strStack.pop(); + const int = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; return { tag: ComplexResultValues.Tag.Status, param0: bool, param1: int, param2: string }; } case ComplexResultValues.Tag.Coordinates: { - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); - const f642 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + const f642 = f64Stack.pop(); return { tag: ComplexResultValues.Tag.Coordinates, param0: f642, param1: f641, param2: f64 }; } case ComplexResultValues.Tag.Comprehensive: { - const string = tmpRetStrings.pop(); - const string1 = tmpRetStrings.pop(); - const string2 = tmpRetStrings.pop(); - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); - const int = tmpRetInts.pop(); - const int1 = tmpRetInts.pop(); - const bool = tmpRetInts.pop() !== 0; - const bool1 = tmpRetInts.pop() !== 0; + const string = strStack.pop(); + const string1 = strStack.pop(); + const string2 = strStack.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + const int = i32Stack.pop(); + const int1 = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; + const bool1 = i32Stack.pop() !== 0; return { tag: ComplexResultValues.Tag.Comprehensive, param0: bool1, param1: bool, param2: int1, param3: int, param4: f641, param5: f64, param6: string2, param7: string1, param8: string }; } case ComplexResultValues.Tag.Info: return { tag: ComplexResultValues.Tag.Info }; @@ -328,19 +324,19 @@ export async function createInstantiator(options, swift) { case ResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: ResultValues.Tag.Success, cleanup }; } case ResultValues.Tag.Failure: { - tmpParamInts.push((value.param1 | 0)); + i32Stack.push((value.param1 | 0)); const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; @@ -349,10 +345,10 @@ export async function createInstantiator(options, swift) { case ResultValues.Tag.Status: { const bytes = textEncoder.encode(value.param2); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.param1 | 0)); - tmpParamInts.push(value.param0 ? 1 : 0); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.param1 | 0)); + i32Stack.push(value.param0 ? 1 : 0); const cleanup = () => { swift.memory.release(id); }; @@ -365,18 +361,18 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case ResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: ResultValues.Tag.Success, param0: string }; } case ResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); + const int = i32Stack.pop(); + const string = strStack.pop(); return { tag: ResultValues.Tag.Failure, param0: string, param1: int }; } case ResultValues.Tag.Status: { - const string = tmpRetStrings.pop(); - const int = tmpRetInts.pop(); - const bool = tmpRetInts.pop() !== 0; + const string = strStack.pop(); + const int = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; return { tag: ResultValues.Tag.Status, param0: bool, param1: int, param2: string }; } default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); @@ -392,19 +388,19 @@ export async function createInstantiator(options, swift) { case NetworkingResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: NetworkingResultValues.Tag.Success, cleanup }; } case NetworkingResultValues.Tag.Failure: { - tmpParamInts.push((value.param1 | 0)); + i32Stack.push((value.param1 | 0)); const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; @@ -417,12 +413,12 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case NetworkingResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: NetworkingResultValues.Tag.Success, param0: string }; } case NetworkingResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); + const int = i32Stack.pop(); + const string = strStack.pop(); return { tag: NetworkingResultValues.Tag.Failure, param0: string, param1: int }; } default: throw new Error("Unknown NetworkingResultValues tag returned from Swift: " + String(tag)); @@ -441,13 +437,13 @@ export async function createInstantiator(options, swift) { if (isSome) { let bytes = textEncoder.encode(value.param0); id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); } else { - tmpParamInts.push(0); - tmpParamInts.push(0); + i32Stack.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if(id) { swift.memory.release(id); @@ -457,11 +453,11 @@ export async function createInstantiator(options, swift) { } case APIOptionalResultValues.Tag.Failure: { const isSome = value.param1 != null; - tmpParamInts.push(isSome ? (value.param1 ? 1 : 0) : 0); - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? (value.param1 ? 1 : 0) : 0); + i32Stack.push(isSome ? 1 : 0); const isSome1 = value.param0 != null; - tmpParamInts.push(isSome1 ? (value.param0 | 0) : 0); - tmpParamInts.push(isSome1 ? 1 : 0); + i32Stack.push(isSome1 ? (value.param0 | 0) : 0); + i32Stack.push(isSome1 ? 1 : 0); const cleanup = undefined; return { caseId: APIOptionalResultValues.Tag.Failure, cleanup }; } @@ -471,19 +467,19 @@ export async function createInstantiator(options, swift) { if (isSome) { let bytes = textEncoder.encode(value.param2); id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); } else { - tmpParamInts.push(0); - tmpParamInts.push(0); + i32Stack.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const isSome1 = value.param1 != null; - tmpParamInts.push(isSome1 ? (value.param1 | 0) : 0); - tmpParamInts.push(isSome1 ? 1 : 0); + i32Stack.push(isSome1 ? (value.param1 | 0) : 0); + i32Stack.push(isSome1 ? 1 : 0); const isSome2 = value.param0 != null; - tmpParamInts.push(isSome2 ? (value.param0 ? 1 : 0) : 0); - tmpParamInts.push(isSome2 ? 1 : 0); + i32Stack.push(isSome2 ? (value.param0 ? 1 : 0) : 0); + i32Stack.push(isSome2 ? 1 : 0); const cleanup = () => { if(id) { swift.memory.release(id); @@ -498,10 +494,10 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case APIOptionalResultValues.Tag.Success: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); optional = string; } else { optional = null; @@ -509,18 +505,18 @@ export async function createInstantiator(options, swift) { return { tag: APIOptionalResultValues.Tag.Success, param0: optional }; } case APIOptionalResultValues.Tag.Failure: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; optional = bool; } else { optional = null; } - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optional1; if (isSome1) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); optional1 = int; } else { optional1 = null; @@ -528,26 +524,26 @@ export async function createInstantiator(options, swift) { return { tag: APIOptionalResultValues.Tag.Failure, param0: optional1, param1: optional }; } case APIOptionalResultValues.Tag.Status: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); optional = string; } else { optional = null; } - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optional1; if (isSome1) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); optional1 = int; } else { optional1 = null; } - const isSome2 = tmpRetInts.pop(); + const isSome2 = i32Stack.pop(); let optional2; if (isSome2) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; optional2 = bool; } else { optional2 = null; @@ -565,26 +561,26 @@ export async function createInstantiator(options, swift) { const enumTag = value.tag; switch (enumTag) { case TypedPayloadResultValues.Tag.Precision: { - tmpParamF32s.push(Math.fround(value.param0)); + f32Stack.push(Math.fround(value.param0)); const cleanup = undefined; return { caseId: TypedPayloadResultValues.Tag.Precision, cleanup }; } case TypedPayloadResultValues.Tag.Direction: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: TypedPayloadResultValues.Tag.Direction, cleanup }; } case TypedPayloadResultValues.Tag.OptPrecision: { const isSome = value.param0 != null; - tmpParamF32s.push(isSome ? Math.fround(value.param0) : 0.0); - tmpParamInts.push(isSome ? 1 : 0); + f32Stack.push(isSome ? Math.fround(value.param0) : 0.0); + i32Stack.push(isSome ? 1 : 0); const cleanup = undefined; return { caseId: TypedPayloadResultValues.Tag.OptPrecision, cleanup }; } case TypedPayloadResultValues.Tag.OptDirection: { const isSome = value.param0 != null; - tmpParamInts.push(isSome ? (value.param0 | 0) : 0); - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? (value.param0 | 0) : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = undefined; return { caseId: TypedPayloadResultValues.Tag.OptDirection, cleanup }; } @@ -599,18 +595,18 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case TypedPayloadResultValues.Tag.Precision: { - const rawValue = tmpRetF32s.pop(); + const rawValue = f32Stack.pop(); return { tag: TypedPayloadResultValues.Tag.Precision, param0: rawValue }; } case TypedPayloadResultValues.Tag.Direction: { - const caseId = tmpRetInts.pop(); + const caseId = i32Stack.pop(); return { tag: TypedPayloadResultValues.Tag.Direction, param0: caseId }; } case TypedPayloadResultValues.Tag.OptPrecision: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const rawValue = tmpRetF32s.pop(); + const rawValue = f32Stack.pop(); optional = rawValue; } else { optional = null; @@ -618,10 +614,10 @@ export async function createInstantiator(options, swift) { return { tag: TypedPayloadResultValues.Tag.OptPrecision, param0: optional }; } case TypedPayloadResultValues.Tag.OptDirection: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const caseId = tmpRetInts.pop(); + const caseId = i32Stack.pop(); optional = caseId; } else { optional = null; @@ -647,19 +643,19 @@ export async function createInstantiator(options, swift) { return { caseId: AllTypesResultValues.Tag.StructPayload, cleanup }; } case AllTypesResultValues.Tag.ClassPayload: { - tmpParamPointers.push(value.param0.pointer); + ptrStack.push(value.param0.pointer); const cleanup = undefined; return { caseId: AllTypesResultValues.Tag.ClassPayload, cleanup }; } case AllTypesResultValues.Tag.JsObjectPayload: { const objId = swift.memory.retain(value.param0); - tmpParamInts.push(objId); + i32Stack.push(objId); const cleanup = undefined; return { caseId: AllTypesResultValues.Tag.JsObjectPayload, cleanup }; } case AllTypesResultValues.Tag.NestedEnum: { const { caseId: caseId, cleanup: enumCleanup } = enumHelpers.APIResult.lower(value.param0); - tmpParamInts.push(caseId); + i32Stack.push(caseId); const cleanup = () => { if (enumCleanup) { enumCleanup(); } }; @@ -668,9 +664,9 @@ export async function createInstantiator(options, swift) { case AllTypesResultValues.Tag.ArrayPayload: { const arrayCleanups = []; for (const elem of value.param0) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(value.param0.length); + i32Stack.push(value.param0.length); const cleanup = () => { for (const cleanup of arrayCleanups) { cleanup(); } }; @@ -691,25 +687,25 @@ export async function createInstantiator(options, swift) { return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct }; } case AllTypesResultValues.Tag.ClassPayload: { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['User'].__construct(ptr); return { tag: AllTypesResultValues.Tag.ClassPayload, param0: obj }; } case AllTypesResultValues.Tag.JsObjectPayload: { - const objId = tmpRetInts.pop(); + const objId = i32Stack.pop(); const obj = swift.memory.getObject(objId); swift.memory.release(objId); return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; } case AllTypesResultValues.Tag.NestedEnum: { - const enumValue = enumHelpers.APIResult.lift(tmpRetTag.pop(), ); + const enumValue = enumHelpers.APIResult.lift(tagStack.pop(), ); return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; } case AllTypesResultValues.Tag.ArrayPayload: { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -733,7 +729,7 @@ export async function createInstantiator(options, swift) { const structResult = structHelpers.Point.lower(value.param0); nestedCleanup = structResult.cleanup; } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if (nestedCleanup) { nestedCleanup(); } }; @@ -742,11 +738,11 @@ export async function createInstantiator(options, swift) { case OptionalAllTypesResultValues.Tag.OptClass: { const isSome = value.param0 != null; if (isSome) { - tmpParamPointers.push(value.param0.pointer); + ptrStack.push(value.param0.pointer); } else { - tmpParamPointers.push(0); + ptrStack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = undefined; return { caseId: OptionalAllTypesResultValues.Tag.OptClass, cleanup }; } @@ -755,12 +751,12 @@ export async function createInstantiator(options, swift) { let id; if (isSome) { id = swift.memory.retain(value.param0); - tmpParamInts.push(id); + i32Stack.push(id); } else { id = undefined; - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = undefined; return { caseId: OptionalAllTypesResultValues.Tag.OptJSObject, cleanup }; } @@ -771,11 +767,11 @@ export async function createInstantiator(options, swift) { const enumResult = enumHelpers.APIResult.lower(value.param0); enumCaseId = enumResult.caseId; enumCleanup = enumResult.cleanup; - tmpParamInts.push(enumCaseId); + i32Stack.push(enumCaseId); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if (enumCleanup) { enumCleanup(); } }; @@ -787,14 +783,14 @@ export async function createInstantiator(options, swift) { if (isSome) { const arrayCleanups = []; for (const elem of value.param0) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(value.param0.length); + i32Stack.push(value.param0.length); arrCleanup = () => { for (const cleanup of arrayCleanups) { cleanup(); } }; } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if (arrCleanup) { arrCleanup(); } }; @@ -811,7 +807,7 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case OptionalAllTypesResultValues.Tag.OptStruct: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { const struct = structHelpers.Point.lift(); @@ -822,10 +818,10 @@ export async function createInstantiator(options, swift) { return { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: optional }; } case OptionalAllTypesResultValues.Tag.OptClass: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['User'].__construct(ptr); optional = obj; } else { @@ -834,10 +830,10 @@ export async function createInstantiator(options, swift) { return { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: optional }; } case OptionalAllTypesResultValues.Tag.OptJSObject: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const objId = tmpRetInts.pop(); + const objId = i32Stack.pop(); const obj = swift.memory.getObject(objId); swift.memory.release(objId); optional = obj; @@ -847,10 +843,10 @@ export async function createInstantiator(options, swift) { return { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: optional }; } case OptionalAllTypesResultValues.Tag.OptNestedEnum: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const caseId = tmpRetInts.pop(); + const caseId = i32Stack.pop(); optional = enumHelpers.APIResult.lift(caseId); } else { optional = null; @@ -858,13 +854,13 @@ export async function createInstantiator(options, swift) { return { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: optional }; } case OptionalAllTypesResultValues.Tag.OptArray: { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); @@ -916,36 +912,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -1139,13 +1135,13 @@ export async function createInstantiator(options, swift) { }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.APIResult.lift(tagStack.pop()); return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.APIResult.lift(tagStack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1158,7 +1154,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1176,13 +1172,13 @@ export async function createInstantiator(options, swift) { }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.ComplexResult.lift(tagStack.pop()); return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); - const ret = enumHelpers.ComplexResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.ComplexResult.lift(tagStack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1195,7 +1191,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalComplexResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1215,7 +1211,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1235,7 +1231,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1255,7 +1251,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1282,7 +1278,7 @@ export async function createInstantiator(options, swift) { result2Cleanup = enumResult1.cleanup; } instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1297,7 +1293,7 @@ export async function createInstantiator(options, swift) { roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.TypedPayloadResult.lower(result); instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId); - const ret = enumHelpers.TypedPayloadResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.TypedPayloadResult.lift(tagStack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1310,7 +1306,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1324,7 +1320,7 @@ export async function createInstantiator(options, swift) { roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.AllTypesResult.lower(result); instance.exports.bjs_roundTripAllTypesResult(resultCaseId); - const ret = enumHelpers.AllTypesResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.AllTypesResult.lift(tagStack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1337,7 +1333,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1351,7 +1347,7 @@ export async function createInstantiator(options, swift) { roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.OptionalAllTypesResult.lower(result); instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId); - const ret = enumHelpers.OptionalAllTypesResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.OptionalAllTypesResult.lift(tagStack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1364,7 +1360,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, isSome ? resultCaseId : 0); - const tag = tmpRetTag.pop(); + const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 9ca596a6e..0c8eee729 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -42,16 +42,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,36 +90,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index a7a2c4b98..28cfe9dd9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -62,16 +62,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -114,36 +110,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index b195b6945..a933ed735 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -43,16 +43,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,36 +91,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index c906f27ff..06ebbe269 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -93,16 +93,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -146,36 +142,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index ac6170b08..97f34b1bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index dc2220715..bc186d4c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index daa601aed..3a04c5308 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -205,29 +201,29 @@ export async function createInstantiator(options, swift) { const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_roundtrip"] = function bjs_roundtrip() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); let ret = imports.roundtrip(arrayResult); const arrayCleanups = []; for (const elem of ret) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } } TestModule["bjs_logStrings"] = function bjs_logStrings() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); arrayResult.push(string); } arrayResult.reverse(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 1e4e1f508..4f3fa39a6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -43,17 +39,17 @@ export async function createInstantiator(options, swift) { } else { id = undefined; } - tmpParamInts.push(id !== undefined ? id : 0); + i32Stack.push(id !== undefined ? id : 0); const isSome = value.optionalFoo != null; let id1; if (isSome) { id1 = swift.memory.retain(value.optionalFoo); - tmpParamInts.push(id1); + i32Stack.push(id1); } else { id1 = undefined; - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if(id !== undefined && id !== 0) { try { @@ -71,10 +67,10 @@ export async function createInstantiator(options, swift) { return { cleanup }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const objectId = tmpRetInts.pop(); + const objectId = i32Stack.pop(); let value; if (objectId !== 0) { value = swift.memory.getObject(objectId); @@ -86,7 +82,7 @@ export async function createInstantiator(options, swift) { } else { optional = null; } - const objectId1 = tmpRetInts.pop(); + const objectId1 = i32Stack.pop(); let value1; if (objectId1 !== 0) { value1 = swift.memory.getObject(objectId1); @@ -135,36 +131,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -318,14 +314,14 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of foos) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(foos.length); + i32Stack.push(foos.length); instance.exports.bjs_processFooArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); arrayResult.push(obj); @@ -340,23 +336,23 @@ export async function createInstantiator(options, swift) { const isSome = elem != null ? 1 : 0; if (isSome) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(foos.length); + i32Stack.push(foos.length); instance.exports.bjs_processOptionalFooArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); optValue = obj; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index d64ff7e96..d3514253a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 096e3a345..2bbddd396 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index cacaa87a3..c05e4e114 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index f5c360bb0..754a17e3c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -160,36 +156,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -305,21 +301,21 @@ export async function createInstantiator(options, swift) { const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2); let ret = imports.jsEchoJSValue(jsValue); const [retKind, retPayload1, retPayload2] = __bjs_jsValueLower(ret); - tmpParamInts.push(retKind); - tmpParamInts.push(retPayload1); - tmpParamF64s.push(retPayload2); + i32Stack.push(retKind); + i32Stack.push(retPayload1); + f64Stack.push(retPayload2); } catch (error) { setException(error); } } TestModule["bjs_jsEchoJSValueArray"] = function bjs_jsEchoJSValueArray() { try { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); arrayResult.push(jsValue); } @@ -328,11 +324,11 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of ret) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); - tmpParamInts.push(elemKind); - tmpParamInts.push(elemPayload1); - tmpParamF64s.push(elemPayload2); + i32Stack.push(elemKind); + i32Stack.push(elemPayload1); + f64Stack.push(elemPayload2); } - tmpParamInts.push(ret.length); + i32Stack.push(ret.length); } catch (error) { setException(error); } @@ -389,9 +385,9 @@ export async function createInstantiator(options, swift) { echo(value) { const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); instance.exports.bjs_JSValueHolder_echo(this.pointer, valueKind, valuePayload1, valuePayload2); - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } @@ -399,12 +395,12 @@ export async function createInstantiator(options, swift) { const isSome = value != null; const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); instance.exports.bjs_JSValueHolder_echoOptional(this.pointer, +isSome, valueKind, valuePayload1, valuePayload2); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { @@ -414,9 +410,9 @@ export async function createInstantiator(options, swift) { } get value() { instance.exports.bjs_JSValueHolder_value_get(this.pointer); - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } @@ -426,12 +422,12 @@ export async function createInstantiator(options, swift) { } get optionalValue() { instance.exports.bjs_JSValueHolder_optionalValue_get(this.pointer); - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optResult; if (isSome) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { @@ -450,9 +446,9 @@ export async function createInstantiator(options, swift) { roundTripJSValue: function bjs_roundTripJSValue(value) { const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); instance.exports.bjs_roundTripJSValue(valueKind, valuePayload1, valuePayload2); - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, @@ -460,12 +456,12 @@ export async function createInstantiator(options, swift) { const isSome = value != null; const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); instance.exports.bjs_roundTripOptionalJSValue(+isSome, valueKind, valuePayload1, valuePayload2); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { @@ -477,18 +473,18 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of values) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); - tmpParamInts.push(elemKind); - tmpParamInts.push(elemPayload1); - tmpParamF64s.push(elemPayload2); + i32Stack.push(elemKind); + i32Stack.push(elemPayload1); + f64Stack.push(elemPayload2); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); instance.exports.bjs_roundTripJSValueArray(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); arrayResult.push(jsValue); } @@ -503,23 +499,23 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of values) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); - tmpParamInts.push(elemKind); - tmpParamInts.push(elemPayload1); - tmpParamF64s.push(elemPayload2); + i32Stack.push(elemKind); + i32Stack.push(elemPayload1); + f64Stack.push(elemPayload2); } - tmpParamInts.push(values.length); + i32Stack.push(values.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } instance.exports.bjs_roundTripOptionalJSValueArray(+isSome); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const jsValuePayload2 = tmpRetF64s.pop(); - const jsValuePayload1 = tmpRetInts.pop(); - const jsValueKind = tmpRetInts.pop(); + const jsValuePayload2 = f64Stack.pop(); + const jsValuePayload1 = i32Stack.pop(); + const jsValueKind = i32Stack.pop(); const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); arrayResult.push(jsValue); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 4ac3b11b7..d9521754f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 9eb55f30b..907e955b1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index e81a95669..cbeae41d8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index c8d0b935e..92aeeae95 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index bb2c93649..e2f425455 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 0d45b2169..923a1f354 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index 2d754a5c3..e148b94ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index f348869b2..b803936d0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 7be6cd924..916d5e1b5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 0ed0be7b6..ee1a2345c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -42,16 +42,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -66,15 +62,15 @@ export async function createInstantiator(options, swift) { case ResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: ResultValues.Tag.Success, cleanup }; } case ResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: ResultValues.Tag.Failure, cleanup }; } @@ -85,11 +81,11 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case ResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: ResultValues.Tag.Success, param0: string }; } case ResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { tag: ResultValues.Tag.Failure, param0: int }; } default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); @@ -133,36 +129,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -689,9 +685,9 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of delegates) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(delegates.length); + i32Stack.push(delegates.length); const ret = instance.exports.bjs_DelegateManager_init(); for (const cleanup of arrayCleanups) { cleanup(); } return DelegateManager.__construct(ret); @@ -701,10 +697,10 @@ export async function createInstantiator(options, swift) { } get delegates() { instance.exports.bjs_DelegateManager_delegates_get(this.pointer); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const objId = tmpRetInts.pop(); + const objId = i32Stack.pop(); const obj = swift.memory.getObject(objId); swift.memory.release(objId); arrayResult.push(obj); @@ -716,9 +712,9 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of value) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(value.length); + i32Stack.push(value.length); instance.exports.bjs_DelegateManager_delegates_set(this.pointer); for (const cleanup of arrayCleanups) { cleanup(); } } @@ -734,14 +730,14 @@ export async function createInstantiator(options, swift) { const arrayCleanups = []; for (const elem of delegates) { const objId = swift.memory.retain(elem); - tmpParamInts.push(objId); + i32Stack.push(objId); } - tmpParamInts.push(delegates.length); + i32Stack.push(delegates.length); instance.exports.bjs_processDelegates(); - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { - const objId1 = tmpRetInts.pop(); + const objId1 = i32Stack.pop(); const obj = swift.memory.getObject(objId1); swift.memory.release(objId1); arrayResult.push(obj); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 7579c72f7..d07af4cdb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -29,16 +29,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -53,15 +49,15 @@ export async function createInstantiator(options, swift) { case APIResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Failure, cleanup }; } @@ -72,11 +68,11 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: APIResultValues.Tag.Success, param0: string }; } case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { tag: APIResultValues.Tag.Failure, param0: int }; } default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); @@ -120,36 +116,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -335,7 +331,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.APIResult.lift(tagStack.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index bb3920888..63c5c964b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -29,16 +29,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -53,15 +49,15 @@ export async function createInstantiator(options, swift) { case APIResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Failure, cleanup }; } @@ -72,11 +68,11 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: APIResultValues.Tag.Success, param0: string }; } case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { tag: APIResultValues.Tag.Failure, param0: int }; } default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); @@ -120,36 +116,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -329,7 +325,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tmpRetTag.pop()); + const ret = enumHelpers.APIResult.lift(tagStack.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 293ae4f7d..c1d59bf69 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -23,16 +23,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -75,36 +71,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index 27e3df464..f086f2919 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -23,16 +23,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -75,36 +71,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index e57c5153d..20ea91e3c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 74d140236..0f002bf31 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 27398d2a4..ee4333f03 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 36b712362..bc0def6f1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -48,16 +48,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -72,30 +68,30 @@ export async function createInstantiator(options, swift) { case APIResultValues.Tag.Success: { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const cleanup = () => { swift.memory.release(id); }; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { - tmpParamInts.push((value.param0 | 0)); + i32Stack.push((value.param0 | 0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Failure, cleanup }; } case APIResultValues.Tag.Flag: { - tmpParamInts.push(value.param0 ? 1 : 0); + i32Stack.push(value.param0 ? 1 : 0); const cleanup = undefined; return { caseId: APIResultValues.Tag.Flag, cleanup }; } case APIResultValues.Tag.Rate: { - tmpParamF32s.push(Math.fround(value.param0)); + f32Stack.push(Math.fround(value.param0)); const cleanup = undefined; return { caseId: APIResultValues.Tag.Rate, cleanup }; } case APIResultValues.Tag.Precise: { - tmpParamF64s.push(value.param0); + f64Stack.push(value.param0); const cleanup = undefined; return { caseId: APIResultValues.Tag.Precise, cleanup }; } @@ -110,23 +106,23 @@ export async function createInstantiator(options, swift) { tag = tag | 0; switch (tag) { case APIResultValues.Tag.Success: { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); return { tag: APIResultValues.Tag.Success, param0: string }; } case APIResultValues.Tag.Failure: { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { tag: APIResultValues.Tag.Failure, param0: int }; } case APIResultValues.Tag.Flag: { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; return { tag: APIResultValues.Tag.Flag, param0: bool }; } case APIResultValues.Tag.Rate: { - const f32 = tmpRetF32s.pop(); + const f32 = f32Stack.pop(); return { tag: APIResultValues.Tag.Rate, param0: f32 }; } case APIResultValues.Tag.Precise: { - const f64 = tmpRetF64s.pop(); + const f64 = f64Stack.pop(); return { tag: APIResultValues.Tag.Precise, param0: f64 }; } case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; @@ -171,36 +167,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 52e12ef7c..6c1397fff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index b22afee4d..b4cf995cb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -23,16 +23,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -42,51 +38,51 @@ export async function createInstantiator(options, swift) { const __bjs_createDataPointHelpers = () => { return () => ({ lower: (value) => { - tmpParamF64s.push(value.x); - tmpParamF64s.push(value.y); + f64Stack.push(value.x); + f64Stack.push(value.y); const bytes = textEncoder.encode(value.label); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const isSome = value.optCount != null; if (isSome) { - tmpParamInts.push(value.optCount | 0); + i32Stack.push(value.optCount | 0); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const isSome1 = value.optFlag != null; if (isSome1) { - tmpParamInts.push(value.optFlag ? 1 : 0); + i32Stack.push(value.optFlag ? 1 : 0); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome1 ? 1 : 0); + i32Stack.push(isSome1 ? 1 : 0); const cleanup = () => { swift.memory.release(id); }; return { cleanup }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const bool = tmpRetInts.pop() !== 0; + const bool = i32Stack.pop() !== 0; optional = bool; } else { optional = null; } - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optional1; if (isSome1) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); optional1 = int; } else { optional1 = null; } - const string = tmpRetStrings.pop(); - const f64 = tmpRetF64s.pop(); - const f641 = tmpRetF64s.pop(); + const string = strStack.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); return { x: f641, y: f64, label: string, optCount: optional1, optFlag: optional }; } }); @@ -96,19 +92,19 @@ export async function createInstantiator(options, swift) { lower: (value) => { const bytes = textEncoder.encode(value.street); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); const bytes1 = textEncoder.encode(value.city); const id1 = swift.memory.retain(bytes1); - tmpParamInts.push(bytes1.length); - tmpParamInts.push(id1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); const isSome = value.zipCode != null; if (isSome) { - tmpParamInts.push(value.zipCode | 0); + i32Stack.push(value.zipCode | 0); } else { - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { swift.memory.release(id); swift.memory.release(id1); @@ -116,16 +112,16 @@ export async function createInstantiator(options, swift) { return { cleanup }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); optional = int; } else { optional = null; } - const string = tmpRetStrings.pop(); - const string1 = tmpRetStrings.pop(); + const string = strStack.pop(); + const string1 = strStack.pop(); return { street: string1, city: string, zipCode: optional }; } }); @@ -135,22 +131,22 @@ export async function createInstantiator(options, swift) { lower: (value) => { const bytes = textEncoder.encode(value.name); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); - tmpParamInts.push((value.age | 0)); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.age | 0)); const structResult = structHelpers.Address.lower(value.address); const isSome = value.email != null; let id1; if (isSome) { const bytes1 = textEncoder.encode(value.email); id1 = swift.memory.retain(bytes1); - tmpParamInts.push(bytes1.length); - tmpParamInts.push(id1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); } else { - tmpParamInts.push(0); - tmpParamInts.push(0); + i32Stack.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { swift.memory.release(id); if (structResult.cleanup) { structResult.cleanup(); } @@ -159,17 +155,17 @@ export async function createInstantiator(options, swift) { return { cleanup }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const string = tmpRetStrings.pop(); + const string = strStack.pop(); optional = string; } else { optional = null; } const struct = structHelpers.Address.lift(); - const int = tmpRetInts.pop(); - const string1 = tmpRetStrings.pop(); + const int = i32Stack.pop(); + const string1 = strStack.pop(); return { name: string1, age: int, address: struct, email: optional }; } }); @@ -177,14 +173,14 @@ export async function createInstantiator(options, swift) { const __bjs_createSessionHelpers = () => { return () => ({ lower: (value) => { - tmpParamInts.push((value.id | 0)); - tmpParamPointers.push(value.owner.pointer); + i32Stack.push((value.id | 0)); + ptrStack.push(value.owner.pointer); return { cleanup: undefined }; }, lift: () => { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['Greeter'].__construct(ptr); - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); return { id: int, owner: obj }; } }); @@ -192,28 +188,28 @@ export async function createInstantiator(options, swift) { const __bjs_createMeasurementHelpers = () => { return () => ({ lower: (value) => { - tmpParamF64s.push(value.value); - tmpParamF32s.push(Math.fround(value.precision)); + f64Stack.push(value.value); + f32Stack.push(Math.fround(value.precision)); const isSome = value.optionalPrecision != null; if (isSome) { - tmpParamF32s.push(Math.fround(value.optionalPrecision)); + f32Stack.push(Math.fround(value.optionalPrecision)); } else { - tmpParamF32s.push(0.0); + f32Stack.push(0.0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); return { cleanup: undefined }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const rawValue = tmpRetF32s.pop(); + const rawValue = f32Stack.pop(); optional = rawValue; } else { optional = null; } - const rawValue1 = tmpRetF32s.pop(); - const f64 = tmpRetF64s.pop(); + const rawValue1 = f32Stack.pop(); + const f64 = f64Stack.pop(); return { value: f64, precision: rawValue1, optionalPrecision: optional }; } }); @@ -237,17 +233,17 @@ export async function createInstantiator(options, swift) { } else { id = undefined; } - tmpParamInts.push(id !== undefined ? id : 0); + i32Stack.push(id !== undefined ? id : 0); const isSome = value.optionalObject != null; let id1; if (isSome) { id1 = swift.memory.retain(value.optionalObject); - tmpParamInts.push(id1); + i32Stack.push(id1); } else { id1 = undefined; - tmpParamInts.push(0); + i32Stack.push(0); } - tmpParamInts.push(isSome ? 1 : 0); + i32Stack.push(isSome ? 1 : 0); const cleanup = () => { if(id !== undefined && id !== 0) { try { @@ -265,10 +261,10 @@ export async function createInstantiator(options, swift) { return { cleanup }; }, lift: () => { - const isSome = tmpRetInts.pop(); + const isSome = i32Stack.pop(); let optional; if (isSome) { - const objectId = tmpRetInts.pop(); + const objectId = i32Stack.pop(); let value; if (objectId !== 0) { value = swift.memory.getObject(objectId); @@ -280,7 +276,7 @@ export async function createInstantiator(options, swift) { } else { optional = null; } - const objectId1 = tmpRetInts.pop(); + const objectId1 = i32Stack.pop(); let value1; if (objectId1 !== 0) { value1 = swift.memory.getObject(objectId1); @@ -328,36 +324,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index f6f63ba8d..959572255 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -37,13 +33,13 @@ export async function createInstantiator(options, swift) { const __bjs_createPointHelpers = () => { return () => ({ lower: (value) => { - tmpParamInts.push((value.x | 0)); - tmpParamInts.push((value.y | 0)); + i32Stack.push((value.x | 0)); + i32Stack.push((value.y | 0)); return { cleanup: undefined }; }, lift: () => { - const int = tmpRetInts.pop(); - const int1 = tmpRetInts.pop(); + const int = i32Stack.pop(); + const int1 = i32Stack.pop(); return { x: int1, y: int }; } }); @@ -85,36 +81,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 2e2f8bf6a..487645d70 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -70,36 +66,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 9d94d5f0a..dc478a642 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -37,19 +33,19 @@ export async function createInstantiator(options, swift) { const __bjs_createPointerFieldsHelpers = () => { return () => ({ lower: (value) => { - tmpParamPointers.push((value.raw | 0)); - tmpParamPointers.push((value.mutRaw | 0)); - tmpParamPointers.push((value.opaque | 0)); - tmpParamPointers.push((value.ptr | 0)); - tmpParamPointers.push((value.mutPtr | 0)); + ptrStack.push((value.raw | 0)); + ptrStack.push((value.mutRaw | 0)); + ptrStack.push((value.opaque | 0)); + ptrStack.push((value.ptr | 0)); + ptrStack.push((value.mutPtr | 0)); return { cleanup: undefined }; }, lift: () => { - const pointer = tmpRetPointers.pop(); - const pointer1 = tmpRetPointers.pop(); - const pointer2 = tmpRetPointers.pop(); - const pointer3 = tmpRetPointers.pop(); - const pointer4 = tmpRetPointers.pop(); + const pointer = ptrStack.pop(); + const pointer1 = ptrStack.pop(); + const pointer2 = ptrStack.pop(); + const pointer3 = ptrStack.pop(); + const pointer4 = ptrStack.pop(); return { raw: pointer4, mutRaw: pointer3, opaque: pointer2, ptr: pointer1, mutPtr: pointer }; } }); @@ -90,36 +86,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 45374093b..428c422e0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } From 72ec08dda19736c2f94c0908a3e5727955a44b6a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 19:49:56 +0900 Subject: [PATCH 164/252] BridgeJS: Add Dictionary support (#581) --- .../Sources/BridgeJSCore/ExportSwift.swift | 136 +++++- .../Sources/BridgeJSCore/ImportTS.swift | 4 +- .../BridgeJSCore/SwiftToSkeleton.swift | 39 ++ .../Sources/BridgeJSLink/BridgeJSLink.swift | 5 + .../Sources/BridgeJSLink/JSGlueGen.swift | 190 ++++++- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 7 + .../Inputs/MacroSwift/DictionaryTypes.swift | 15 + .../BridgeJSCodegenTests/DictionaryTypes.json | 259 ++++++++++ .../DictionaryTypes.swift | 97 ++++ .../BridgeJSLinkTests/DictionaryTypes.d.ts | 34 ++ .../BridgeJSLinkTests/DictionaryTypes.js | 462 ++++++++++++++++++ .../JavaScriptKit/BridgeJSIntrinsics.swift | 119 +++++ .../DictionaryTests.swift | 96 ++++ .../BridgeJSRuntimeTests/ExportAPITests.swift | 8 + .../Generated/BridgeJS.swift | 166 +++++++ .../Generated/JavaScript/BridgeJS.json | 319 ++++++++++++ Tests/prelude.mjs | 29 ++ 17 files changed, 1978 insertions(+), 7 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DictionaryTypes.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js create mode 100644 Tests/BridgeJSRuntimeTests/DictionaryTests.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 51ff91695..aa01a2c5c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -832,6 +832,8 @@ struct StackCodegen { return liftNullableExpression(wrappedType: wrappedType, kind: kind) case .array(let elementType): return liftArrayExpression(elementType: elementType) + case .dictionary(let valueType): + return liftDictionaryExpression(valueType: valueType) case .closure: return "JSObject.bridgeJSLiftParameter()" case .void, .namespaceEnum: @@ -849,7 +851,7 @@ struct StackCodegen { return liftArrayExpressionInline(elementType: elementType) case .swiftProtocol(let protocolName): return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" - case .nullable, .array, .closure: + case .nullable, .array, .closure, .dictionary: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") @@ -873,6 +875,51 @@ struct StackCodegen { """ } + func liftDictionaryExpression(valueType: BridgeType) -> ExprSyntax { + switch valueType { + case .int, .uint, .float, .double, .string, .bool, .jsValue, + .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, + .unsafePointer, .rawValueEnum, .associatedValueEnum: + return "[String: \(raw: valueType.swiftType)].bridgeJSLiftParameter()" + case .jsObject(let className?): + return """ + { + let __dict = [String: JSObject].bridgeJSLiftParameter() + return __dict.mapValues { \(raw: className)(unsafelyWrapping: $0) } + }() + """ + case .swiftProtocol(let protocolName): + return """ + { + let __dict = [String: JSObject].bridgeJSLiftParameter() + return __dict.mapValues { $0 as! Any\(raw: protocolName) } + }() + """ + case .nullable, .array, .dictionary, .closure: + return liftDictionaryExpressionInline(valueType: valueType) + case .void, .namespaceEnum: + fatalError("Invalid dictionary value type: \(valueType)") + } + } + + private func liftDictionaryExpressionInline(valueType: BridgeType) -> ExprSyntax { + let valueLift = liftExpression(for: valueType) + let swiftTypeName = valueType.swiftType + return """ + { + let __count = Int(_swift_js_pop_i32()) + var __result: [String: \(raw: swiftTypeName)] = [:] + __result.reserveCapacity(__count) + for _ in 0..<__count { + let __value = \(valueLift) + let __key = String.bridgeJSLiftParameter() + __result[__key] = __value + } + return __result + }() + """ + } + private func liftNullableExpression(wrappedType: BridgeType, kind: JSOptionalKind) -> ExprSyntax { let typeName = kind == .null ? "Optional" : "JSUndefinedOr" switch wrappedType { @@ -897,6 +944,23 @@ struct StackCodegen { } }() """ + case .dictionary(let valueType): + let dictionaryLift = liftDictionaryExpression(valueType: valueType) + let swiftTypeName = valueType.swiftType + let absentExpr = + kind == .null + ? "\(typeName)<[String: \(swiftTypeName)]>.none" + : "\(typeName)<[String: \(swiftTypeName)]>.undefinedValue" + return """ + { + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return \(raw: absentExpr) + } else { + return \(dictionaryLift) + } + }() + """ case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol: fatalError("Invalid nullable wrapped type: \(wrappedType)") } @@ -935,6 +999,8 @@ struct StackCodegen { return [] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: accessor, varPrefix: varPrefix) + case .dictionary(let valueType): + return lowerDictionaryStatements(valueType: valueType, accessor: accessor, varPrefix: varPrefix) } } @@ -952,7 +1018,7 @@ struct StackCodegen { return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] - case .nullable, .array, .closure: + case .nullable, .array, .closure, .dictionary: return lowerArrayStatementsInline( elementType: elementType, accessor: accessor, @@ -986,6 +1052,65 @@ struct StackCodegen { return statements } + private func lowerDictionaryStatements( + valueType: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + switch valueType { + case .int, .uint, .float, .double, .string, .bool, .jsValue, + .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, + .unsafePointer, .rawValueEnum, .associatedValueEnum: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + case .jsObject(_?): + return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSLowerReturn()"] + case .swiftProtocol(let protocolName): + return ["\(raw: accessor).mapValues { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] + case .nullable, .array, .dictionary, .closure: + return lowerDictionaryStatementsInline( + valueType: valueType, + accessor: accessor, + varPrefix: varPrefix + ) + case .void, .namespaceEnum: + fatalError("Invalid dictionary value type: \(valueType)") + } + } + + private func lowerDictionaryStatementsInline( + valueType: BridgeType, + accessor: String, + varPrefix: String + ) -> [CodeBlockItemSyntax] { + var statements: [CodeBlockItemSyntax] = [] + let pairVarName = "__bjs_kv_\(varPrefix)" + statements.append("for \(raw: pairVarName) in \(raw: accessor) {") + statements.append("let __bjs_key_\(raw: varPrefix) = \(raw: pairVarName).key") + statements.append("let __bjs_value_\(raw: varPrefix) = \(raw: pairVarName).value") + + let keyStatements = lowerStatements( + for: .string, + accessor: "__bjs_key_\(varPrefix)", + varPrefix: "\(varPrefix)_key" + ) + for stmt in keyStatements { + statements.append(stmt) + } + + let valueStatements = lowerStatements( + for: valueType, + accessor: "__bjs_value_\(varPrefix)", + varPrefix: "\(varPrefix)_value" + ) + for stmt in valueStatements { + statements.append(stmt) + } + + statements.append("}") + statements.append("_swift_js_push_i32(Int32(\(raw: accessor).count))") + return statements + } + private func lowerOptionalStatements( wrappedType: BridgeType, accessor: String, @@ -1033,6 +1158,8 @@ struct StackCodegen { return ["\(raw: unwrappedVar).jsObject.bridgeJSLowerStackReturn()"] case .array(let elementType): return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) + case .dictionary(let valueType): + return lowerDictionaryStatements(valueType: valueType, accessor: unwrappedVar, varPrefix: varPrefix) default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } @@ -1616,6 +1743,7 @@ extension BridgeType { case .nullable(let wrappedType, let kind): return kind == .null ? "Optional<\(wrappedType.swiftType)>" : "JSUndefinedOr<\(wrappedType.swiftType)>" case .array(let elementType): return "[\(elementType.swiftType)]" + case .dictionary(let valueType): return "[String: \(valueType.swiftType)]" case .caseEnum(let name): return name case .rawValueEnum(let name, _): return name case .associatedValueEnum(let name): return name @@ -1675,7 +1803,7 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: return LiftingIntrinsicInfo(parameters: [("callbackId", .i32)]) - case .array: + case .array, .dictionary: return LiftingIntrinsicInfo(parameters: []) } } @@ -1726,7 +1854,7 @@ extension BridgeType { throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: return .swiftHeapObject - case .array: + case .array, .dictionary: return .array } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 8db872c6e..7c3ecd6ea 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -980,7 +980,7 @@ extension BridgeType { var params = [("isSome", WasmCoreType.i32)] params.append(contentsOf: wrappedInfo.loweredParameters) return LoweringParameterInfo(loweredParameters: params) - case .array: + case .array, .dictionary: return LoweringParameterInfo(loweredParameters: []) } } @@ -1059,7 +1059,7 @@ extension BridgeType { case .nullable(let wrappedType, _): let wrappedInfo = try wrappedType.liftingReturnInfo(context: context) return LiftingReturnInfo(valueToLift: wrappedInfo.valueToLift) - case .array: + case .array, .dictionary: return LiftingReturnInfo(valueToLift: nil) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 3de74f74b..e571d955e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -213,6 +213,45 @@ public final class SwiftToSkeleton { return .array(elementType) } } + // [String: T] + if let dictType = type.as(DictionaryTypeSyntax.self) { + if let keyType = lookupType(for: dictType.key, errors: &errors), + keyType == .string, + let valueType = lookupType(for: dictType.value, errors: &errors) + { + return .dictionary(valueType) + } + } + // Dictionary + if let identifierType = type.as(IdentifierTypeSyntax.self), + identifierType.name.text == "Dictionary", + let genericArgs = identifierType.genericArgumentClause?.arguments, + genericArgs.count == 2, + let keyArg = TypeSyntax(genericArgs.first?.argument), + let valueArg = TypeSyntax(genericArgs.last?.argument), + let keyType = lookupType(for: keyArg, errors: &errors), + keyType == .string + { + if let valueType = lookupType(for: valueArg, errors: &errors) { + return .dictionary(valueType) + } + } + // Swift.Dictionary + if let memberType = type.as(MemberTypeSyntax.self), + let baseType = memberType.baseType.as(IdentifierTypeSyntax.self), + baseType.name.text == "Swift", + memberType.name.text == "Dictionary", + let genericArgs = memberType.genericArgumentClause?.arguments, + genericArgs.count == 2, + let keyArg = TypeSyntax(genericArgs.first?.argument), + let valueArg = TypeSyntax(genericArgs.last?.argument), + let keyType = lookupType(for: keyArg, errors: &errors), + keyType == .string + { + if let valueType = lookupType(for: valueArg, errors: &errors) { + return .dictionary(valueType) + } + } if let aliasDecl = typeDeclResolver.resolveTypeAlias(type) { if let resolvedType = lookupType(for: aliasDecl.initializer.value, errors: &errors) { return resolvedType diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index c2b0c6ed3..9303962a6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1462,6 +1462,9 @@ public struct BridgeJSLink { return "(\(elementTypeStr))[]" } return "\(elementTypeStr)[]" + case .dictionary(let valueType): + let valueTypeStr = resolveTypeScriptType(valueType, exportedSkeletons: exportedSkeletons) + return "Record" default: return type.tsType } @@ -3564,6 +3567,8 @@ extension BridgeType { return "(\(inner))[]" } return "\(inner)[]" + case .dictionary(let valueType): + return "Record" } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ae83f33e6..0b170d5d5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -737,6 +737,23 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") resultExpr = arrayVar + case .dictionary(let valueType): + let dictVar = scope.variable("dictValue") + printer.write("let \(dictVar);") + printer.write("if (\(isSome)) {") + printer.indent { + let dictLiftFragment = try! dictionaryLift(valueType: valueType) + let liftResults = dictLiftFragment.printCode([], scope, printer, cleanupCode) + if let liftResult = liftResults.first { + printer.write("\(dictVar) = \(liftResult);") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(dictVar) = \(absenceLiteral);") + } + printer.write("}") + resultExpr = dictVar default: resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" } @@ -830,6 +847,23 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return ["+\(isSomeVar)"] + case .dictionary(let valueType): + let cleanupArrayVar = scope.variable("\(value)Cleanups") + printer.write("const \(cleanupArrayVar) = [];") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let dictLowerFragment = try! dictionaryLower(valueType: valueType) + let dictCleanup = CodeFragmentPrinter() + let _ = dictLowerFragment.printCode([value], scope, printer, dictCleanup) + if !dictCleanup.lines.isEmpty { + for line in dictCleanup.lines { + printer.write("\(cleanupArrayVar).push(() => { \(line) });") + } + } + } + printer.write("}") + cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") + return ["+\(isSomeVar)"] default: switch wrappedType { case .swiftHeapObject: @@ -981,6 +1015,23 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("}") + case .dictionary(let valueType): + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + let dictLiftFragment = try! dictionaryLift(valueType: valueType) + let liftResults = dictLiftFragment.printCode([], scope, printer, cleanupCode) + if let liftResult = liftResults.first { + printer.write("\(resultVar) = \(liftResult);") + } + } + printer.write("} else {") + printer.indent { + printer.write("\(resultVar) = \(absenceLiteral);") + } + printer.write("}") case .jsValue: let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(scope.popI32Return());") @@ -1133,6 +1184,52 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") + case .dictionary(let valueType): + printer.write("if (\(isSomeVar)) {") + printer.indent { + let cleanupArrayVar = scope.variable("arrayCleanups") + let entriesVar = scope.variable("entries") + let entryVar = scope.variable("entry") + printer.write("const \(cleanupArrayVar) = [];") + printer.write("const \(entriesVar) = Object.entries(\(value));") + printer.write("for (const \(entryVar) of \(entriesVar)) {") + printer.indent { + let keyVar = scope.variable("key") + let valueVar = scope.variable("value") + printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") + + let keyFragment = try! stackLowerFragment(elementType: .string) + let keyCleanup = CodeFragmentPrinter() + let _ = keyFragment.printCode([keyVar], scope, printer, keyCleanup) + if !keyCleanup.lines.isEmpty { + printer.write("\(cleanupArrayVar).push(() => {") + printer.indent { + for line in keyCleanup.lines { + printer.write(line) + } + } + printer.write("});") + } + + let valueFragment = try! stackLowerFragment(elementType: valueType) + let valueCleanup = CodeFragmentPrinter() + let _ = valueFragment.printCode([valueVar], scope, printer, valueCleanup) + if !valueCleanup.lines.isEmpty { + printer.write("\(cleanupArrayVar).push(() => {") + printer.indent { + for line in valueCleanup.lines { + printer.write(line) + } + } + printer.write("});") + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(entriesVar).length);") + cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") default: () } @@ -1807,6 +1904,8 @@ struct IntrinsicJSFragment: Sendable { throw BridgeJSLinkError(message: "Namespace enums are not supported to be passed as parameters: \(string)") case .array(let elementType): return try arrayLower(elementType: elementType) + case .dictionary(let valueType): + return try dictionaryLower(valueType: valueType) } } @@ -1854,6 +1953,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let elementType): return try arrayLift(elementType: elementType) + case .dictionary(let valueType): + return try dictionaryLift(valueType: valueType) } } @@ -1945,6 +2046,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let elementType): return try arrayLift(elementType: elementType) + case .dictionary(let valueType): + return try dictionaryLift(valueType: valueType) } } @@ -2014,6 +2117,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let elementType): return try arrayLower(elementType: elementType) + case .dictionary(let valueType): + return try dictionaryLower(valueType: valueType) } } @@ -2607,6 +2712,58 @@ struct IntrinsicJSFragment: Sendable { ) } + /// Lowers a dictionary from JS to Swift by iterating entries and pushing to stacks + static func dictionaryLower(valueType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: ["dict"], + printCode: { arguments, scope, printer, cleanupCode in + let dict = arguments[0] + let cleanupArrayVar = scope.variable("arrayCleanups") + + printer.write("const \(cleanupArrayVar) = [];") + let entriesVar = scope.variable("entries") + let entryVar = scope.variable("entry") + printer.write("const \(entriesVar) = Object.entries(\(dict));") + printer.write("for (const \(entryVar) of \(entriesVar)) {") + printer.indent { + let keyVar = scope.variable("key") + let valueVar = scope.variable("value") + printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") + + let keyFragment = try! stackLowerFragment(elementType: .string) + let keyCleanup = CodeFragmentPrinter() + let _ = keyFragment.printCode([keyVar], scope, printer, keyCleanup) + if !keyCleanup.lines.isEmpty { + printer.write("\(cleanupArrayVar).push(() => {") + printer.indent { + for line in keyCleanup.lines { + printer.write(line) + } + } + printer.write("});") + } + + let valueFragment = try! stackLowerFragment(elementType: valueType) + let valueCleanup = CodeFragmentPrinter() + let _ = valueFragment.printCode([valueVar], scope, printer, valueCleanup) + if !valueCleanup.lines.isEmpty { + printer.write("\(cleanupArrayVar).push(() => {") + printer.indent { + for line in valueCleanup.lines { + printer.write(line) + } + } + printer.write("});") + } + } + printer.write("}") + printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(entriesVar).length);") + cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") + return [] + } + ) + } + /// Lifts an array from Swift to JS by popping elements from stacks static func arrayLift(elementType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( @@ -2633,13 +2790,39 @@ struct IntrinsicJSFragment: Sendable { ) } + /// Lifts a dictionary from Swift to JS by popping key/value pairs from stacks + static func dictionaryLift(valueType: BridgeType) throws -> IntrinsicJSFragment { + return IntrinsicJSFragment( + parameters: [], + printCode: { arguments, scope, printer, cleanupCode in + let resultVar = scope.variable("dictResult") + let lenVar = scope.variable("dictLen") + let iVar = scope.variable("i") + + printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(resultVar) = {};") + printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") + printer.indent { + let valueFragment = try! stackLiftFragment(elementType: valueType) + let valueResults = valueFragment.printCode([], scope, printer, cleanupCode) + let keyFragment = try! stackLiftFragment(elementType: .string) + let keyResults = keyFragment.printCode([], scope, printer, cleanupCode) + if let keyExpr = keyResults.first, let valueExpr = valueResults.first { + printer.write("\(resultVar)[\(keyExpr)] = \(valueExpr);") + } + } + printer.write("}") + return [resultVar] + } + ) + } + private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: return IntrinsicJSFragment( parameters: [], printCode: { _, scope, printer, cleanup in - registerJSValueHelpers(scope: scope) let payload2Var = scope.variable("jsValuePayload2") let payload1Var = scope.variable("jsValuePayload1") let kindVar = scope.variable("jsValueKind") @@ -2647,6 +2830,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(payload1Var) = \(scope.popI32Return());") printer.write("const \(kindVar) = \(scope.popI32Return());") let resultVar = scope.variable("jsValue") + registerJSValueHelpers(scope: scope) printer.write( "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" ) @@ -2795,6 +2979,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let innerElementType): return try! arrayLift(elementType: innerElementType) + case .dictionary(let valueType): + return try! dictionaryLift(valueType: valueType) case .nullable(let wrappedType, let kind): return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind) case .unsafePointer: @@ -2980,6 +3166,8 @@ struct IntrinsicJSFragment: Sendable { ) case .array(let innerElementType): return try! arrayLower(elementType: innerElementType) + case .dictionary(let valueType): + return try! dictionaryLower(valueType: valueType) case .nullable(let wrappedType, let kind): return try optionalElementLowerFragment( wrappedType: wrappedType, diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 0d4a78d3e..3029fe0c9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -153,6 +153,7 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable { case unsafePointer(UnsafePointerType) indirect case nullable(BridgeType, JSOptionalKind) indirect case array(BridgeType) + indirect case dictionary(BridgeType) case caseEnum(String) case rawValueEnum(String, SwiftEnumRawType) case associatedValueEnum(String) @@ -959,6 +960,9 @@ extension BridgeType { case .array: // Arrays use stack-based return with length prefix (no direct WASM return type) return nil + case .dictionary: + // Dictionaries use stack-based return with entry count (no direct WASM return type) + return nil } } @@ -1024,6 +1028,9 @@ extension BridgeType { case .array(let elementType): // Array mangling: "Sa" prefix followed by element type return "Sa\(elementType.mangleTypeName)" + case .dictionary(let valueType): + // Dictionary mangling: "SD" prefix followed by value type (key is always String) + return "SD\(valueType.mangleTypeName)" } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DictionaryTypes.swift new file mode 100644 index 000000000..c699ea79b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/DictionaryTypes.swift @@ -0,0 +1,15 @@ +@JS class Box { + var value: Int + + init(value: Int) { + self.value = value + } +} + +@JS func mirrorDictionary(_ values: [String: Int]) -> [String: Int] +@JS func optionalDictionary(_ values: [String: String]?) -> [String: String]? +@JS func nestedDictionary(_ values: [String: [Int]]) -> [String: [Int]] +@JS func boxDictionary(_ boxes: [String: Box]) -> [String: Box] +@JS func optionalBoxDictionary(_ boxes: [String: Box?]) -> [String: Box?] + +@JSFunction func importMirrorDictionary(_ values: [String: Double]) throws(JSException) -> [String: Double] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json new file mode 100644 index 000000000..af5b83dc7 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.json @@ -0,0 +1,259 @@ +{ + "exported" : { + "classes" : [ + { + "methods" : [ + + ], + "name" : "Box", + "properties" : [ + + ], + "swiftCallName" : "Box" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_mirrorDictionary", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "mirrorDictionary", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_optionalDictionary", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "optionalDictionary", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + }, + { + "abiName" : "bjs_nestedDictionary", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "nestedDictionary", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + } + } + }, + { + "abiName" : "bjs_boxDictionary", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "boxDictionary", + "parameters" : [ + { + "label" : "_", + "name" : "boxes", + "type" : { + "dictionary" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Box" + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Box" + } + } + } + } + }, + { + "abiName" : "bjs_optionalBoxDictionary", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "optionalBoxDictionary", + "parameters" : [ + { + "label" : "_", + "name" : "boxes", + "type" : { + "dictionary" : { + "_0" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Box" + } + }, + "_1" : "null" + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Box" + } + }, + "_1" : "null" + } + } + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "importMirrorDictionary", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule" +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift new file mode 100644 index 000000000..2a41c35a7 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift @@ -0,0 +1,97 @@ +@_expose(wasm, "bjs_mirrorDictionary") +@_cdecl("bjs_mirrorDictionary") +public func _bjs_mirrorDictionary() -> Void { + #if arch(wasm32) + let ret = mirrorDictionary(_: [String: Int].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_optionalDictionary") +@_cdecl("bjs_optionalDictionary") +public func _bjs_optionalDictionary(_ values: Int32) -> Void { + #if arch(wasm32) + let ret = optionalDictionary(_: Optional<[String: String]>.bridgeJSLiftParameter(values)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_nestedDictionary") +@_cdecl("bjs_nestedDictionary") +public func _bjs_nestedDictionary() -> Void { + #if arch(wasm32) + let ret = nestedDictionary(_: [String: [Int]].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_boxDictionary") +@_cdecl("bjs_boxDictionary") +public func _bjs_boxDictionary() -> Void { + #if arch(wasm32) + let ret = boxDictionary(_: [String: Box].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_optionalBoxDictionary") +@_cdecl("bjs_optionalBoxDictionary") +public func _bjs_optionalBoxDictionary() -> Void { + #if arch(wasm32) + let ret = optionalBoxDictionary(_: [String: Optional].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Box_deinit") +@_cdecl("bjs_Box_deinit") +public func _bjs_Box_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Box: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Box_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Box_wrap") +fileprivate func _bjs_Box_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Box_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importMirrorDictionary") +fileprivate func bjs_importMirrorDictionary() -> Void +#else +fileprivate func bjs_importMirrorDictionary() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$importMirrorDictionary(_ values: [String: Double]) throws(JSException) -> [String: Double] { + let _ = values.bridgeJSLowerParameter() + bjs_importMirrorDictionary() + if let error = _swift_js_take_exception() { + throw error + } + return [String: Double].bridgeJSLiftReturn() +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts new file mode 100644 index 000000000..dadcc74ba --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.d.ts @@ -0,0 +1,34 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface Box extends SwiftHeapObject { +} +export type Exports = { + Box: { + } + mirrorDictionary(values: Record): Record; + optionalDictionary(values: Record | null): Record | null; + nestedDictionary(values: Record): Record; + boxDictionary(boxes: Record): Record; + optionalBoxDictionary(boxes: Record): Record; +} +export type Imports = { + importMirrorDictionary(values: Record): Record; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js new file mode 100644 index 000000000..0388f7de1 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -0,0 +1,462 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + const textDecoder = new TextDecoder("utf-8"); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let tmpRetTag = []; + let tmpRetStrings = []; + let tmpRetInts = []; + let tmpRetF32s = []; + let tmpRetF64s = []; + let tmpParamInts = []; + let tmpParamF32s = []; + let tmpParamF64s = []; + let tmpRetPointers = []; + let tmpParamPointers = []; + let tmpStructCleanups = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + return swift.memory.retain(textDecoder.decode(bytes)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr, len); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_tag"] = function(tag) { + tmpRetTag.push(tag); + } + bjs["swift_js_push_i32"] = function(v) { + tmpRetInts.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + tmpRetF32s.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + tmpRetF64s.push(v); + } + bjs["swift_js_push_string"] = function(ptr, len) { + const bytes = new Uint8Array(memory.buffer, ptr, len); + const value = textDecoder.decode(bytes); + tmpRetStrings.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return tmpParamInts.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return tmpParamF32s.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return tmpParamF64s.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + tmpRetPointers.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return tmpParamPointers.pop(); + } + bjs["swift_js_struct_cleanup"] = function(cleanupId) { + if (cleanupId === 0) { return; } + const index = (cleanupId | 0) - 1; + const cleanup = tmpStructCleanups[index]; + tmpStructCleanups[index] = null; + if (cleanup) { cleanup(); } + while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { + tmpStructCleanups.pop(); + } + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + if (isSome === 0) { + tmpRetString = null; + } else { + const bytes = new Uint8Array(memory.buffer, ptr, len); + tmpRetString = textDecoder.decode(bytes); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_Box_wrap"] = function(pointer) { + const obj = Box.__construct(pointer); + return swift.memory.retain(obj); + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_importMirrorDictionary"] = function bjs_importMirrorDictionary() { + try { + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const f64 = tmpRetF64s.pop(); + const string = tmpRetStrings.pop(); + dictResult[string] = f64; + } + let ret = imports.importMirrorDictionary(dictResult); + const arrayCleanups = []; + const entries = Object.entries(ret); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + tmpParamF64s.push(value); + } + tmpParamInts.push(entries.length); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + instance = i; + memory = instance.exports.memory; + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype) { + const obj = Object.create(prototype); + obj.pointer = pointer; + obj.hasReleased = false; + obj.deinit = deinit; + obj.registry = new FinalizationRegistry((pointer) => { + deinit(pointer); + }); + obj.registry.register(this, obj.pointer); + return obj; + } + + release() { + this.registry.unregister(this); + this.deinit(this.pointer); + } + } + class Box extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Box_deinit, Box.prototype); + } + + } + const exports = { + Box, + mirrorDictionary: function bjs_mirrorDictionary(values) { + const arrayCleanups = []; + const entries = Object.entries(values); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + tmpParamInts.push((value | 0)); + } + tmpParamInts.push(entries.length); + instance.exports.bjs_mirrorDictionary(); + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const int = tmpRetInts.pop(); + const string = tmpRetStrings.pop(); + dictResult[string] = int; + } + for (const cleanup of arrayCleanups) { cleanup(); } + return dictResult; + }, + optionalDictionary: function bjs_optionalDictionary(values) { + const isSome = values != null; + const valuesCleanups = []; + if (isSome) { + const arrayCleanups = []; + const entries = Object.entries(values); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + const bytes1 = textEncoder.encode(value); + const id1 = swift.memory.retain(bytes1); + tmpParamInts.push(bytes1.length); + tmpParamInts.push(id1); + arrayCleanups.push(() => { + swift.memory.release(id1); + }); + } + tmpParamInts.push(entries.length); + valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); + } + instance.exports.bjs_optionalDictionary(+isSome); + const isSome1 = tmpRetInts.pop(); + let optResult; + if (isSome1) { + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const string = tmpRetStrings.pop(); + const string1 = tmpRetStrings.pop(); + dictResult[string1] = string; + } + optResult = dictResult; + } else { + optResult = null; + } + for (const cleanup of valuesCleanups) { cleanup(); } + return optResult; + }, + nestedDictionary: function bjs_nestedDictionary(values) { + const arrayCleanups = []; + const entries = Object.entries(values); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + const arrayCleanups1 = []; + for (const elem of value) { + tmpParamInts.push((elem | 0)); + } + tmpParamInts.push(value.length); + arrayCleanups.push(() => { + for (const cleanup of arrayCleanups1) { cleanup(); } + }); + } + tmpParamInts.push(entries.length); + instance.exports.bjs_nestedDictionary(); + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const arrayLen = tmpRetInts.pop(); + const arrayResult = []; + for (let i1 = 0; i1 < arrayLen; i1++) { + const int = tmpRetInts.pop(); + arrayResult.push(int); + } + arrayResult.reverse(); + const string = tmpRetStrings.pop(); + dictResult[string] = arrayResult; + } + for (const cleanup of arrayCleanups) { cleanup(); } + return dictResult; + }, + boxDictionary: function bjs_boxDictionary(boxes) { + const arrayCleanups = []; + const entries = Object.entries(boxes); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + tmpParamPointers.push(value.pointer); + } + tmpParamInts.push(entries.length); + instance.exports.bjs_boxDictionary(); + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const ptr = tmpRetPointers.pop(); + const obj = _exports['Box'].__construct(ptr); + const string = tmpRetStrings.pop(); + dictResult[string] = obj; + } + for (const cleanup of arrayCleanups) { cleanup(); } + return dictResult; + }, + optionalBoxDictionary: function bjs_optionalBoxDictionary(boxes) { + const arrayCleanups = []; + const entries = Object.entries(boxes); + for (const entry of entries) { + const [key, value] = entry; + const bytes = textEncoder.encode(key); + const id = swift.memory.retain(bytes); + tmpParamInts.push(bytes.length); + tmpParamInts.push(id); + arrayCleanups.push(() => { + swift.memory.release(id); + }); + const isSome = value != null ? 1 : 0; + if (isSome) { + tmpParamPointers.push(value.pointer); + } else { + tmpParamPointers.push(0); + } + tmpParamInts.push(isSome); + } + tmpParamInts.push(entries.length); + instance.exports.bjs_optionalBoxDictionary(); + const dictLen = tmpRetInts.pop(); + const dictResult = {}; + for (let i = 0; i < dictLen; i++) { + const isSome1 = tmpRetInts.pop(); + let optValue; + if (isSome1 === 0) { + optValue = null; + } else { + const ptr = tmpRetPointers.pop(); + const obj = _exports['Box'].__construct(ptr); + optValue = obj; + } + const string = tmpRetStrings.pop(); + dictResult[string] = optValue; + } + for (const cleanup of arrayCleanups) { cleanup(); } + return dictResult; + }, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 1c8592724..fd2cbd909 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -2375,3 +2375,122 @@ extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, E bridgeJSLowerReturn() } } + +// MARK: - Dictionary Support + +public protocol _BridgedSwiftDictionaryStackType: _BridgedSwiftTypeLoweredIntoVoidType { + associatedtype DictionaryValue: _BridgedSwiftStackType + where DictionaryValue.StackLiftResult == DictionaryValue +} + +extension Dictionary: _BridgedSwiftStackType +where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value { + public typealias StackLiftResult = [String: Value] + // Lowering/return use stack-based encoding, so dictionary also behaves like a void-lowered type. + // Optional/JSUndefinedOr wrappers rely on this conformance to push an isSome flag and + // then delegate to the stack-based lowering defined below. + // swiftlint:disable:next type_name +} + +extension Dictionary: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftDictionaryStackType +where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value { + public typealias DictionaryValue = Value + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Value] { + let count = Int(_swift_js_pop_i32()) + var result: [String: Value] = [:] + result.reserveCapacity(count) + for _ in 0.. [String: Value] { + bridgeJSLiftParameter() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + let count = Int32(self.count) + for (key, value) in self { + key.bridgeJSLowerStackReturn() + value.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(count) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() { + bridgeJSLowerReturn() + } +} + +extension Optional where Wrapped: _BridgedSwiftDictionaryStackType { + typealias DictionaryValue = Wrapped.DictionaryValue + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + switch consume self { + case .none: + return 0 + case .some(let dict): + dict.bridgeJSLowerReturn() + return 1 + } + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + switch consume self { + case .none: + _swift_js_push_i32(0) + case .some(let dict): + dict.bridgeJSLowerReturn() + _swift_js_push_i32(1) + } + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? { + if isSome == 0 { + return nil + } + return Dictionary.bridgeJSLiftParameter() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Wrapped.DictionaryValue]? { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [String: Wrapped.DictionaryValue]? { + let isSome = _swift_js_pop_i32() + if isSome == 0 { + return nil + } + return Dictionary.bridgeJSLiftParameter() + } +} + +extension _BridgedAsOptional where Wrapped: _BridgedSwiftDictionaryStackType { + typealias DictionaryValue = Wrapped.DictionaryValue + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + let opt = optionalRepresentation + if let dict = opt { + dict.bridgeJSLowerReturn() + return 1 + } + return 0 + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> Self { + let isSome = _swift_js_pop_i32() + if isSome == 0 { + return Self(optional: nil) + } + let value = Dictionary.bridgeJSLiftParameter() as! Wrapped + return Self(optional: value) + } +} diff --git a/Tests/BridgeJSRuntimeTests/DictionaryTests.swift b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift new file mode 100644 index 000000000..83ca72d04 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift @@ -0,0 +1,96 @@ +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +import XCTest + +final class DictionaryTests: XCTestCase { + func testRoundTripDictionary() throws { + let input: [String: Int] = ["a": 1, "b": 2] + let result = try jsRoundTripDictionary(input) + XCTAssertEqual(result, input) + } + + func testRoundTripDictionaryBool() throws { + let input: [String: Bool] = ["yes": true, "no": false] + let result = try jsRoundTripDictionaryBool(input) + XCTAssertEqual(result, input) + } + + func testRoundTripDictionaryDouble() throws { + let input: [String: Double] = ["pi": 3.14, "tau": 6.28] + let result = try jsRoundTripDictionaryDouble(input) + XCTAssertEqual(result, input) + } + + func testRoundTripDictionaryJSObject() throws { + let global = JSObject.global + let input: [String: JSObject] = [ + "global": global + ] + let result = try jsRoundTripDictionaryJSObject(input) + XCTAssertEqual(result, input) + } + + func testRoundTripDictionaryJSValue() throws { + let input: [String: JSValue] = [ + "number": .number(123.5), + "boolean": .boolean(true), + "string": .string("hello"), + "null": .null, + ] + let result = try jsRoundTripDictionaryJSValue(input) + XCTAssertEqual(result, input) + } + + func testRoundTripNestedDictionary() throws { + let input: [String: [Double]] = [ + "xs": [1.0, 2.5], + "ys": [], + ] + let result = try jsRoundTripNestedDictionary(input) + XCTAssertEqual(result, input) + } + + func testRoundTripOptionalDictionaryNull() throws { + let some: [String: String]? = ["k": "v"] + XCTAssertEqual(try jsRoundTripOptionalDictionary(some), some) + XCTAssertNil(try jsRoundTripOptionalDictionary(nil)) + } + + func testRoundTripOptionalDictionaryUndefined() throws { + let some: JSUndefinedOr<[String: Int]> = .value(["n": 42]) + let undefined: JSUndefinedOr<[String: Int]> = .undefinedValue + + let returnedSome = try jsRoundTripUndefinedDictionary(some) + switch returnedSome { + case .value(let dict): + XCTAssertEqual(dict, ["n": 42]) + case .undefined: + XCTFail("Expected defined dictionary") + } + + let returnedUndefined = try jsRoundTripUndefinedDictionary(undefined) + switch returnedUndefined { + case .value: + XCTFail("Expected undefined") + case .undefined: + break + } + } +} + +@JSFunction func jsRoundTripDictionary(_ values: [String: Int]) throws(JSException) -> [String: Int] + +@JSFunction func jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) -> [String: Bool] + +@JSFunction func jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSException) -> [String: Double] + +@JSFunction func jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSException) -> [String: JSObject] + +@JSFunction func jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSException) -> [String: JSValue] + +@JSFunction func jsRoundTripNestedDictionary(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] + +@JSFunction func jsRoundTripOptionalDictionary(_ values: [String: String]?) throws(JSException) -> [String: String]? + +@JSFunction func jsRoundTripUndefinedDictionary( + _ values: JSUndefinedOr<[String: Int]> +) throws(JSException) -> JSUndefinedOr<[String: Int]> diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 74817d82b..7f9a20586 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -52,6 +52,14 @@ func runJsWorks() -> Void return v } +@JS func roundTripDictionaryExport(v: [String: Int]) -> [String: Int] { + return v +} + +@JS func roundTripOptionalDictionaryExport(v: [String: String]?) -> [String: String]? { + return v +} + @JS func roundTripJSValue(v: JSValue) -> JSValue { return v } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 194ed04b3..7ca92b35c 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -3810,6 +3810,28 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #endif } +@_expose(wasm, "bjs_roundTripDictionaryExport") +@_cdecl("bjs_roundTripDictionaryExport") +public func _bjs_roundTripDictionaryExport() -> Void { + #if arch(wasm32) + let ret = roundTripDictionaryExport(v: [String: Int].bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_roundTripOptionalDictionaryExport") +@_cdecl("bjs_roundTripOptionalDictionaryExport") +public func _bjs_roundTripOptionalDictionaryExport(_ v: Int32) -> Void { + #if arch(wasm32) + let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter(v)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripJSValue") @_cdecl("bjs_roundTripJSValue") public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { @@ -8437,6 +8459,150 @@ fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int3 } #endif +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionary") +fileprivate func bjs_jsRoundTripDictionary() -> Void +#else +fileprivate func bjs_jsRoundTripDictionary() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripDictionary(_ values: [String: Int]) throws(JSException) -> [String: Int] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripDictionary() + if let error = _swift_js_take_exception() { + throw error + } + return [String: Int].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryBool") +fileprivate func bjs_jsRoundTripDictionaryBool() -> Void +#else +fileprivate func bjs_jsRoundTripDictionaryBool() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) -> [String: Bool] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripDictionaryBool() + if let error = _swift_js_take_exception() { + throw error + } + return [String: Bool].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryDouble") +fileprivate func bjs_jsRoundTripDictionaryDouble() -> Void +#else +fileprivate func bjs_jsRoundTripDictionaryDouble() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSException) -> [String: Double] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripDictionaryDouble() + if let error = _swift_js_take_exception() { + throw error + } + return [String: Double].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryJSObject") +fileprivate func bjs_jsRoundTripDictionaryJSObject() -> Void +#else +fileprivate func bjs_jsRoundTripDictionaryJSObject() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSException) -> [String: JSObject] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripDictionaryJSObject() + if let error = _swift_js_take_exception() { + throw error + } + return [String: JSObject].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryJSValue") +fileprivate func bjs_jsRoundTripDictionaryJSValue() -> Void +#else +fileprivate func bjs_jsRoundTripDictionaryJSValue() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSException) -> [String: JSValue] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripDictionaryJSValue() + if let error = _swift_js_take_exception() { + throw error + } + return [String: JSValue].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNestedDictionary") +fileprivate func bjs_jsRoundTripNestedDictionary() -> Void +#else +fileprivate func bjs_jsRoundTripNestedDictionary() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripNestedDictionary(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] { + let _ = values.bridgeJSLowerParameter() + bjs_jsRoundTripNestedDictionary() + if let error = _swift_js_take_exception() { + throw error + } + return [String: [Double]].bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalDictionary") +fileprivate func bjs_jsRoundTripOptionalDictionary(_ values: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripOptionalDictionary(_ values: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalDictionary(_ values: Optional<[String: String]>) throws(JSException) -> Optional<[String: String]> { + let valuesIsSome = values.bridgeJSLowerParameter() + bjs_jsRoundTripOptionalDictionary(valuesIsSome) + if let error = _swift_js_take_exception() { + throw error + } + return Optional<[String: String]>.bridgeJSLiftReturn() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripUndefinedDictionary") +fileprivate func bjs_jsRoundTripUndefinedDictionary(_ values: Int32) -> Void +#else +fileprivate func bjs_jsRoundTripUndefinedDictionary(_ values: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripUndefinedDictionary(_ values: JSUndefinedOr<[String: Int]>) throws(JSException) -> JSUndefinedOr<[String: Int]> { + let valuesIsSome = values.bridgeJSLowerParameter() + bjs_jsRoundTripUndefinedDictionary(valuesIsSome) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr<[String: Int]>.bridgeJSLiftReturn() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init") fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 10ca73fe8..8171fd95f 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -5577,6 +5577,82 @@ } } }, + { + "abiName" : "bjs_roundTripDictionaryExport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDictionaryExport", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "abiName" : "bjs_roundTripOptionalDictionaryExport", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripOptionalDictionaryExport", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + }, { "abiName" : "bjs_roundTripJSValue", "effects" : { @@ -12838,6 +12914,249 @@ }, "imported" : { "children" : [ + { + "functions" : [ + { + "name" : "jsRoundTripDictionary", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripDictionaryBool", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripDictionaryDouble", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripDictionaryJSObject", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "jsObject" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "jsObject" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripDictionaryJSValue", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "jsValue" : { + + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "jsValue" : { + + } + } + } + } + }, + { + "name" : "jsRoundTripNestedDictionary", + "parameters" : [ + { + "name" : "values", + "type" : { + "dictionary" : { + "_0" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + } + } + ], + "returnType" : { + "dictionary" : { + "_0" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + } + }, + { + "name" : "jsRoundTripOptionalDictionary", + "parameters" : [ + { + "name" : "values", + "type" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + }, + { + "name" : "jsRoundTripUndefinedDictionary", + "parameters" : [ + { + "name" : "values", + "type" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + }, + "_1" : "undefined" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "dictionary" : { + "_0" : { + "int" : { + + } + } + } + }, + "_1" : "undefined" + } + } + } + ], + "types" : [ + + ] + }, { "functions" : [ diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 92f5079d4..934c4f01c 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -64,6 +64,30 @@ export async function setupOptions(options, context) { "jsRoundTripString": (v) => { return v; }, + "jsRoundTripDictionary": (dict) => { + return { ...dict }; + }, + "jsRoundTripDictionaryBool": (dict) => { + return { ...dict }; + }, + "jsRoundTripDictionaryDouble": (dict) => { + return { ...dict }; + }, + "jsRoundTripDictionaryJSObject": (dict) => { + return dict; + }, + "jsRoundTripDictionaryJSValue": (dict) => { + return dict; + }, + "jsRoundTripNestedDictionary": (dict) => { + return Object.fromEntries(Object.entries(dict).map(([k, v]) => [k, [...v]])); + }, + "jsRoundTripOptionalDictionary": (dict) => { + return dict ?? null; + }, + "jsRoundTripUndefinedDictionary": (dict) => { + return dict; + }, "jsRoundTripOptionalNumberNull": (v) => { return v ?? null; }, @@ -279,6 +303,11 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { ]) { assert.equal(exports.roundTripString(v), v); } + const dict = { a: 1, b: 2 }; + assert.deepEqual(exports.roundTripDictionaryExport(dict), dict); + const optDict = { hello: "world" }; + assert.deepEqual(exports.roundTripOptionalDictionaryExport(optDict), optDict); + assert.equal(exports.roundTripOptionalDictionaryExport(null), null); const arrayStruct = { ints: [1, 2, 3], optStrings: ["a", "b"] }; const arrayStructRoundTrip = exports.roundTripArrayMembers(arrayStruct); assert.deepEqual(arrayStructRoundTrip.ints, [1, 2, 3]); From 3da2172ec333e73fff759c2c41da83c223851de7 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 5 Feb 2026 12:14:53 +0100 Subject: [PATCH 165/252] PackageToJS: Fix skeleton file discovery path for build plugin output The SkeletonCollector was looking for BridgeJS.json at the wrong path for build-time generated files. Since commit 91d2f061, BridgeJSTool writes skeleton files to `destination/BridgeJS/JavaScript/BridgeJS.json`, but PackageToJS was searching in `destination/BridgeJS/BridgeJS.json` (missing the JavaScript/ subdirectory). This caused projects using dynamic BridgeJS generation via the build plugin to fail - PackageToJS couldn't find the skeleton files, resulting in HAS_BRIDGE=false and stub implementations in instantiate.js. --- Plugins/PackageToJS/Sources/PackageToJSPlugin.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 3cbd29014..7e335c68e 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -751,9 +751,9 @@ class SkeletonCollector { let directories = [ target.directoryURL.appending(path: "Generated/JavaScript"), // context.pluginWorkDirectoryURL: ".build/plugins/PackageToJS/outputs/" - // .build/plugins/outputs/exportswift/MyApp/destination/BridgeJS/BridgeJS.ExportSwift.json + // .build/plugins/outputs/[package]/[target]/destination/BridgeJS/JavaScript/BridgeJS.json context.pluginWorkDirectoryURL.deletingLastPathComponent().deletingLastPathComponent() - .appending(path: "outputs/\(package.id)/\(target.name)/destination/BridgeJS"), + .appending(path: "outputs/\(package.id)/\(target.name)/destination/BridgeJS/JavaScript"), ] for directory in directories { let skeletonURL = directory.appending(path: skeletonFile) From 6b3a697340cf5d1e3a861f25c589b136a107b179 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 22:22:59 +0900 Subject: [PATCH 166/252] Add ts2swift Record to Dictionary mapping (#582) --- .../TS2Swift/JavaScript/src/processor.js | 54 +++++++++++++++++++ .../test/__snapshots__/ts2swift.test.js.snap | 30 +++++++++++ .../test/fixtures/RecordDictionary.d.ts | 17 ++++++ 3 files changed, 101 insertions(+) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/RecordDictionary.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index ef446af0f..04578e9ea 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -663,6 +663,7 @@ export class TypeProcessor { * @private */ visitType(type, node) { + const typeArguments = this.getTypeArguments(type); if (this.checker.isArrayType(type)) { const typeArgs = this.checker.getTypeArguments(type); if (typeArgs && typeArgs.length > 0) { @@ -672,6 +673,11 @@ export class TypeProcessor { return "[JSObject]"; } + const recordType = this.convertRecordType(type, typeArguments, node); + if (recordType) { + return recordType; + } + // Treat A and A as the same type if (isTypeReference(type)) { type = type.target; @@ -760,6 +766,54 @@ export class TypeProcessor { return swiftType; } + /** + * Convert a `Record` TypeScript type into a Swift dictionary type. + * Falls back to `JSObject` when keys are not string-compatible or type arguments are missing. + * @param {ts.Type} type + * @param {ts.Type[]} typeArguments + * @param {ts.Node} node + * @returns {string | null} + * @private + */ + convertRecordType(type, typeArguments, node) { + const symbol = type.aliasSymbol ?? type.getSymbol(); + if (!symbol || symbol.name !== "Record") { + return null; + } + if (typeArguments.length !== 2) { + this.diagnosticEngine.print("warning", "Record expects two type arguments", node); + return "JSObject"; + } + const [keyType, valueType] = typeArguments; + const stringType = this.checker.getStringType(); + if (!this.checker.isTypeAssignableTo(keyType, stringType)) { + this.diagnosticEngine.print( + "warning", + `Record key type must be assignable to string: ${this.checker.typeToString(keyType)}`, + node + ); + return "JSObject"; + } + + const valueSwiftType = this.visitType(valueType, node); + return `[String: ${valueSwiftType}]`; + } + + /** + * Retrieve type arguments for a given type, including type alias instantiations. + * @param {ts.Type} type + * @returns {ts.Type[]} + * @private + */ + getTypeArguments(type) { + if (isTypeReference(type)) { + return this.checker.getTypeArguments(type); + } + // Non-TypeReference alias instantiations store type arguments separately. + // @ts-ignore: `aliasTypeArguments` is intentionally accessed for alias instantiations. + return type.aliasTypeArguments ?? []; + } + /** * Derive the type name from a type * @param {ts.Type} type - TypeScript type diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 6fdb79f78..e6fb234c4 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -251,6 +251,36 @@ exports[`ts2swift > snapshots Swift output for ReExportFrom.d.ts > ReExportFrom " `; +exports[`ts2swift > snapshots Swift output for RecordDictionary.d.ts > RecordDictionary 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func takeRecord(_ value: [String: Double]) throws(JSException) -> Void + +@JSFunction func returnRecord() throws(JSException) -> [String: String] + +@JSFunction func optionalRecord(_ value: Optional<[String: Bool]>) throws(JSException) -> Optional<[String: Bool]> + +@JSFunction func nestedRecord(_ value: [String: [String: Double]]) throws(JSException) -> [String: [String: Double]] + +@JSFunction func recordWithArrayValues(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] + +@JSFunction func recordWithObjects(_ values: [String: Optional]) throws(JSException) -> [String: Optional] + +@JSClass struct Box { + @JSGetter var value: Double + @JSSetter func setValue(_ value: Double) throws(JSException) +} + +@JSFunction func unsupportedKeyRecord(_ values: JSObject) throws(JSException) -> Void +" +`; + exports[`ts2swift > snapshots Swift output for StringEnum.d.ts > StringEnum 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/RecordDictionary.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/RecordDictionary.d.ts new file mode 100644 index 000000000..cfaf5f309 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/RecordDictionary.d.ts @@ -0,0 +1,17 @@ +export interface Box { + value: number; +} + +export function takeRecord(value: Record): void; + +export function returnRecord(): Record; + +export function optionalRecord(value: Record | null): Record | null; + +export function nestedRecord(value: Record>): Record>; + +export function recordWithArrayValues(values: Record): Record; + +export function recordWithObjects(values: Record): Record; + +export function unsupportedKeyRecord(values: Record): void; From b1fb45edf79e44d5b73136c3303d8fa9104be478 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 5 Feb 2026 21:30:36 +0700 Subject: [PATCH 167/252] BridgeJS: Add missing `function` keyword for namespace function declarations in TypeScript (#592) --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 2 +- .../BridgeJSLinkTests/EnumNamespace.Global.d.ts | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts | 2 +- .../__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts | 2 +- .../BridgeJSLinkTests/StaticFunctions.Global.d.ts | 2 +- .../Exporting-Swift/Exporting-Swift-Static-Functions.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 39fb77b7d..fb232355d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -3094,7 +3094,7 @@ extension BridgeJSLink { let sortedFunctions = childNode.content.functions.sorted { $0.name < $1.name } for function in sortedFunctions { let signature = - "\(function.name)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));" + "function \(function.name)\(renderTSSignatureCallback(function.parameters, function.returnType, function.effects));" printer.write(signature) } let sortedProperties = childNode.content.staticProperties.sorted { $0.name < $1.name } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts index f1dc0a926..be77e759c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts @@ -61,9 +61,9 @@ declare global { namespace Services { namespace Graph { namespace GraphOperations { - createGraph(rootId: number): number; - nodeCount(graphId: number): number; - validate(graphId: number): boolean; + function createGraph(rootId: number): number; + function nodeCount(graphId: number): number; + function validate(graphId: number): boolean; } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts index 67a6eebcf..6f18e53ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.d.ts @@ -12,7 +12,7 @@ declare global { constructor(); greet(): string; } - globalFunction(): string; + function globalFunction(): string; } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts index cdf83f36d..77d9cc0e9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts @@ -9,7 +9,7 @@ export {}; declare global { namespace MyModule { namespace Utils { - namespacedFunction(): string; + function namespacedFunction(): string; } } namespace Utils { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts index 069c1628c..a2f1c7d6d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.d.ts @@ -33,7 +33,7 @@ export {}; declare global { namespace Utils { namespace String { - uppercase(text: string): string; + function uppercase(text: string): string; } } } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md index 00e7c1f22..b6f680d1f 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md @@ -140,7 +140,7 @@ Generated TypeScript definitions: declare global { namespace Utils { namespace String { - uppercase(text: string): string; + function uppercase(text: string): string; } } } From 444393fc387337bff355adadda094250003fb7f6 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 6 Feb 2026 04:33:32 +0700 Subject: [PATCH 168/252] BridgeJS: Fix Dictionary bridging after Stack ABI refactor (#594) --- .../Sources/BridgeJSLink/JSGlueGen.swift | 10 +- .../BridgeJSLinkTests/DictionaryTypes.js | 134 +++++++++--------- 2 files changed, 70 insertions(+), 74 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 1507d76c0..8d909623c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1009,7 +1009,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") case .dictionary(let valueType): let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") printer.indent { @@ -1217,11 +1217,11 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(entriesVar).length);") + scope.emitPushI32Parameter("\(entriesVar).length", printer: printer) cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(isSomeVar) ? 1 : 0);") + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) default: () } @@ -2749,7 +2749,7 @@ struct IntrinsicJSFragment: Sendable { } } printer.write("}") - printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(\(entriesVar).length);") + scope.emitPushI32Parameter("\(entriesVar).length", printer: printer) cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return [] } @@ -2791,7 +2791,7 @@ struct IntrinsicJSFragment: Sendable { let lenVar = scope.variable("dictLen") let iVar = scope.variable("i") - printer.write("const \(lenVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();") + printer.write("const \(lenVar) = \(scope.popI32());") printer.write("const \(resultVar) = {};") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") printer.indent { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 0388f7de1..5453ec525 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -18,16 +18,12 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tmpRetTag = []; - let tmpRetStrings = []; - let tmpRetInts = []; - let tmpRetF32s = []; - let tmpRetF64s = []; - let tmpParamInts = []; - let tmpParamF32s = []; - let tmpParamF64s = []; - let tmpRetPointers = []; - let tmpParamPointers = []; + let tagStack = []; + let strStack = []; + let i32Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -71,36 +67,36 @@ export async function createInstantiator(options, swift) { swift.memory.release(id); } bjs["swift_js_push_tag"] = function(tag) { - tmpRetTag.push(tag); + tagStack.push(tag); } bjs["swift_js_push_i32"] = function(v) { - tmpRetInts.push(v | 0); + i32Stack.push(v | 0); } bjs["swift_js_push_f32"] = function(v) { - tmpRetF32s.push(Math.fround(v)); + f32Stack.push(Math.fround(v)); } bjs["swift_js_push_f64"] = function(v) { - tmpRetF64s.push(v); + f64Stack.push(v); } bjs["swift_js_push_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); const value = textDecoder.decode(bytes); - tmpRetStrings.push(value); + strStack.push(value); } bjs["swift_js_pop_i32"] = function() { - return tmpParamInts.pop(); + return i32Stack.pop(); } bjs["swift_js_pop_f32"] = function() { - return tmpParamF32s.pop(); + return f32Stack.pop(); } bjs["swift_js_pop_f64"] = function() { - return tmpParamF64s.pop(); + return f64Stack.pop(); } bjs["swift_js_push_pointer"] = function(pointer) { - tmpRetPointers.push(pointer); + ptrStack.push(pointer); } bjs["swift_js_pop_pointer"] = function() { - return tmpParamPointers.pop(); + return ptrStack.pop(); } bjs["swift_js_struct_cleanup"] = function(cleanupId) { if (cleanupId === 0) { return; } @@ -213,11 +209,11 @@ export async function createInstantiator(options, swift) { const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_importMirrorDictionary"] = function bjs_importMirrorDictionary() { try { - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const f64 = tmpRetF64s.pop(); - const string = tmpRetStrings.pop(); + const f64 = f64Stack.pop(); + const string = strStack.pop(); dictResult[string] = f64; } let ret = imports.importMirrorDictionary(dictResult); @@ -227,14 +223,14 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); - tmpParamF64s.push(value); + f64Stack.push(value); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); } catch (error) { setException(error); } @@ -285,20 +281,20 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); - tmpParamInts.push((value | 0)); + i32Stack.push((value | 0)); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); instance.exports.bjs_mirrorDictionary(); - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const int = tmpRetInts.pop(); - const string = tmpRetStrings.pop(); + const int = i32Stack.pop(); + const string = strStack.pop(); dictResult[string] = int; } for (const cleanup of arrayCleanups) { cleanup(); } @@ -314,31 +310,31 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); const bytes1 = textEncoder.encode(value); const id1 = swift.memory.retain(bytes1); - tmpParamInts.push(bytes1.length); - tmpParamInts.push(id1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); arrayCleanups.push(() => { swift.memory.release(id1); }); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } instance.exports.bjs_optionalDictionary(+isSome); - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const string = tmpRetStrings.pop(); - const string1 = tmpRetStrings.pop(); + const string = strStack.pop(); + const string1 = strStack.pop(); dictResult[string1] = string; } optResult = dictResult; @@ -355,33 +351,33 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); const arrayCleanups1 = []; for (const elem of value) { - tmpParamInts.push((elem | 0)); + i32Stack.push((elem | 0)); } - tmpParamInts.push(value.length); + i32Stack.push(value.length); arrayCleanups.push(() => { for (const cleanup of arrayCleanups1) { cleanup(); } }); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); instance.exports.bjs_nestedDictionary(); - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const arrayLen = tmpRetInts.pop(); + const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i1 = 0; i1 < arrayLen; i1++) { - const int = tmpRetInts.pop(); + const int = i32Stack.pop(); arrayResult.push(int); } arrayResult.reverse(); - const string = tmpRetStrings.pop(); + const string = strStack.pop(); dictResult[string] = arrayResult; } for (const cleanup of arrayCleanups) { cleanup(); } @@ -394,21 +390,21 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); - tmpParamPointers.push(value.pointer); + ptrStack.push(value.pointer); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); instance.exports.bjs_boxDictionary(); - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['Box'].__construct(ptr); - const string = tmpRetStrings.pop(); + const string = strStack.pop(); dictResult[string] = obj; } for (const cleanup of arrayCleanups) { cleanup(); } @@ -421,34 +417,34 @@ export async function createInstantiator(options, swift) { const [key, value] = entry; const bytes = textEncoder.encode(key); const id = swift.memory.retain(bytes); - tmpParamInts.push(bytes.length); - tmpParamInts.push(id); + i32Stack.push(bytes.length); + i32Stack.push(id); arrayCleanups.push(() => { swift.memory.release(id); }); const isSome = value != null ? 1 : 0; if (isSome) { - tmpParamPointers.push(value.pointer); + ptrStack.push(value.pointer); } else { - tmpParamPointers.push(0); + ptrStack.push(0); } - tmpParamInts.push(isSome); + i32Stack.push(isSome); } - tmpParamInts.push(entries.length); + i32Stack.push(entries.length); instance.exports.bjs_optionalBoxDictionary(); - const dictLen = tmpRetInts.pop(); + const dictLen = i32Stack.pop(); const dictResult = {}; for (let i = 0; i < dictLen; i++) { - const isSome1 = tmpRetInts.pop(); + const isSome1 = i32Stack.pop(); let optValue; if (isSome1 === 0) { optValue = null; } else { - const ptr = tmpRetPointers.pop(); + const ptr = ptrStack.pop(); const obj = _exports['Box'].__construct(ptr); optValue = obj; } - const string = tmpRetStrings.pop(); + const string = strStack.pop(); dictResult[string] = optValue; } for (const cleanup of arrayCleanups) { cleanup(); } From bc752fc534be8bfd6604f2ff6229f699a8f35671 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 6 Feb 2026 13:57:50 +0900 Subject: [PATCH 169/252] BridgeJS: Generate Swift doc-comment based on JSDoc (#596) * Doc comments from .d.ts JSDoc now flow into generated Swift DocC output. - Added JSDoc parsing (description/@param/@returns) and DocC emission for callable/typed declarations, including classes/interfaces/enums, in `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js`, with guards to only read param/return tags on callable nodes. - Added a documented fixture to cover the new behavior and updated the Vitest snapshot (`Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Documentation.d.ts`, `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap`). Tests: - `npm test -- -u` (Plugins/BridgeJS/Sources/TS2Swift/JavaScript) Next steps: optionally run `swift test --package-path ./Plugins/BridgeJS` to keep the Swift-side suite green. * Added richer WebIDL-derived doc coverage using the bridgejs-development skill: new fixtures model lib.dom-style comments (MDN reference blocks, @param text) and updated Vitest snapshots to show how those JSDoc comments render into DocC. Key files: `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/WebIDLDOMDocs.d.ts`, `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/DOMLike.d.ts`, and the refreshed snapshot in `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap`. Tests run: `npm test -- -u` (TS2Swift JavaScript). * Removed the DOM-like fixture and refreshed snapshots to drop its output. Changes: deleted `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/DOMLike.d.ts` and updated `Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap`. Tests: `npm test -- -u` (TS2Swift JavaScript). --- .../TS2Swift/JavaScript/src/processor.js | 230 +++++++++++++++--- .../test/__snapshots__/ts2swift.test.js.snap | 144 +++++++++++ .../test/fixtures/Documentation.d.ts | 56 +++++ .../test/fixtures/WebIDLDOMDocs.d.ts | 81 ++++++ 4 files changed, 476 insertions(+), 35 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Documentation.d.ts create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/WebIDLDOMDocs.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 04578e9ea..302058036 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -157,10 +157,9 @@ export class TypeProcessor { this.visitEnumType(type, node); continue; } - const typeString = this.checker.typeToString(type); const members = type.getProperties(); if (members) { - this.visitStructuredType(typeString, members); + this.visitStructuredType(type, node, members); } } }); @@ -284,6 +283,7 @@ export class TypeProcessor { if (fromArg) args.push(fromArg); const annotation = this.renderMacroAnnotation("JSGetter", args); + this.emitDocComment(decl, { indent: "" }); this.swiftLines.push(`${annotation} var ${swiftVarName}: ${swiftType}`); this.swiftLines.push(""); } @@ -338,6 +338,7 @@ export class TypeProcessor { this.emittedEnumNames.add(enumName); const members = decl.members ?? []; + this.emitDocComment(decl, { indent: "" }); if (members.length === 0) { this.diagnosticEngine.print("warning", `Empty enum is not supported: ${enumName}`, diagnosticNode); this.swiftLines.push(`typealias ${this.renderIdentifier(enumName)} = String`); @@ -448,54 +449,194 @@ export class TypeProcessor { const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; - const params = this.renderParameters(signature.getParameters(), node); + const parameters = signature.getParameters(); + const parameterNameMap = this.buildParameterNameMap(parameters); + const params = this.renderParameters(parameters, node); const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); const swiftFuncName = this.renderIdentifier(swiftName); + this.emitDocComment(node, { parameterNameMap }); this.swiftLines.push(`${annotation} func ${swiftFuncName}(${params}) ${effects} -> ${returnType}`); this.swiftLines.push(""); } /** - * Get the full JSDoc text from a node - * @param {ts.Node} node - The node to get the JSDoc text from - * @returns {string | undefined} The full JSDoc text + * Convert a JSDoc comment node content to plain text. + * @param {string | ts.NodeArray | undefined} comment + * @returns {string} + * @private */ - getFullJSDocText(node) { - const docs = ts.getJSDocCommentsAndTags(node); - const parts = []; - for (const doc of docs) { - if (ts.isJSDoc(doc)) { - parts.push(doc.comment ?? ""); + renderJSDocText(comment) { + if (!comment) return ""; + if (typeof comment === "string") return comment; + let result = ""; + for (const part of comment) { + if (typeof part === "string") { + result += part; + continue; + } + // JSDocText/JSDocLink both have a `text` field + // https://github.com/microsoft/TypeScript/blob/main/src/compiler/types.ts + // @ts-ignore + if (typeof part.text === "string") { + // @ts-ignore + result += part.text; + continue; + } + if (typeof part.getText === "function") { + result += part.getText(); } } - if (parts.length === 0) return undefined; - return parts.join("\n"); + return result; } - /** @returns {string} */ - renderDefaultJSImportFromArgument() { - if (this.defaultImportFromGlobal) return "from: .global"; - return ""; + /** + * Split documentation text into lines suitable for DocC rendering. + * @param {string} text + * @returns {string[]} + * @private + */ + splitDocumentationText(text) { + if (!text) return []; + return text.split(/\r?\n/).map(line => line.trimEnd()); } /** - * Render constructor parameters - * @param {ts.ConstructorDeclaration} node - * @returns {string} Rendered parameters + * @param {string[]} lines + * @returns {boolean} * @private */ - renderConstructorParameters(node) { - const signature = this.checker.getSignatureFromDeclaration(node); - if (!signature) return ""; + hasMeaningfulLine(lines) { + return lines.some(line => line.trim().length > 0); + } + + /** + * Render Swift doc comments from a node's JSDoc, including parameter/return tags. + * @param {ts.Node} node + * @param {{ indent?: string, parameterNameMap?: Map }} options + * @private + */ + emitDocComment(node, options = {}) { + const indent = options.indent ?? ""; + const parameterNameMap = options.parameterNameMap ?? new Map(); + + /** @type {string[]} */ + const descriptionLines = []; + for (const doc of ts.getJSDocCommentsAndTags(node)) { + if (!ts.isJSDoc(doc)) continue; + const text = this.renderJSDocText(doc.comment); + if (text) { + descriptionLines.push(...this.splitDocumentationText(text)); + } + } + + /** @type {Array<{ name: string, lines: string[] }>} */ + const parameterDocs = []; + const supportsParameters = ( + ts.isFunctionLike(node) || + ts.isMethodSignature(node) || + ts.isCallSignatureDeclaration(node) || + ts.isConstructSignatureDeclaration(node) + ); + /** @type {ts.JSDocReturnTag | undefined} */ + let returnTag = undefined; + if (supportsParameters) { + for (const tag of ts.getJSDocTags(node)) { + if (ts.isJSDocParameterTag(tag)) { + const tsName = tag.name.getText(); + const name = parameterNameMap.get(tsName) ?? this.renderIdentifier(tsName); + const text = this.renderJSDocText(tag.comment); + const lines = this.splitDocumentationText(text); + parameterDocs.push({ name, lines }); + } else if (!returnTag && ts.isJSDocReturnTag(tag)) { + returnTag = tag; + } + } + } + + const returnLines = returnTag ? this.splitDocumentationText(this.renderJSDocText(returnTag.comment)) : []; + const hasDescription = this.hasMeaningfulLine(descriptionLines); + const hasParameters = parameterDocs.length > 0; + const hasReturns = returnTag !== undefined; + + if (!hasDescription && !hasParameters && !hasReturns) { + return; + } - return this.renderParameters(signature.getParameters(), node); + /** @type {string[]} */ + const docLines = []; + if (hasDescription) { + docLines.push(...descriptionLines); + } + + if (hasDescription && (hasParameters || hasReturns)) { + docLines.push(""); + } + + if (hasParameters) { + docLines.push("- Parameters:"); + for (const param of parameterDocs) { + const hasParamDescription = this.hasMeaningfulLine(param.lines); + const [firstParamLine, ...restParamLines] = param.lines; + if (hasParamDescription) { + docLines.push(` - ${param.name}: ${firstParamLine}`); + for (const line of restParamLines) { + docLines.push(` ${line}`); + } + } else { + docLines.push(` - ${param.name}:`); + } + } + } + + if (hasReturns) { + const hasReturnDescription = this.hasMeaningfulLine(returnLines); + const [firstReturnLine, ...restReturnLines] = returnLines; + if (hasReturnDescription) { + docLines.push(`- Returns: ${firstReturnLine}`); + for (const line of restReturnLines) { + docLines.push(` ${line}`); + } + } else { + docLines.push("- Returns:"); + } + } + + const prefix = `${indent}///`; + for (const line of docLines) { + if (line.length === 0) { + this.swiftLines.push(prefix); + } else { + this.swiftLines.push(`${prefix} ${line}`); + } + } } /** + * Build a map from TypeScript parameter names to rendered Swift identifiers. + * @param {ts.Symbol[]} parameters + * @returns {Map} + * @private + */ + buildParameterNameMap(parameters) { + const map = new Map(); + for (const parameter of parameters) { + map.set(parameter.name, this.renderIdentifier(parameter.name)); + } + return map; + } + + /** @returns {string} */ + renderDefaultJSImportFromArgument() { + if (this.defaultImportFromGlobal) return "from: .global"; + return ""; + } + + /** + * Visit a property declaration and extract metadata * @param {ts.PropertyDeclaration | ts.PropertySignature} node - * @returns {{ jsName: string, swiftName: string, type: string, isReadonly: boolean, documentation: string | undefined } | null} + * @returns {{ jsName: string, swiftName: string, type: string, isReadonly: boolean } | null} */ visitPropertyDecl(node) { if (!node.name) return null; @@ -515,8 +656,7 @@ export class TypeProcessor { const type = this.checker.getTypeAtLocation(node) const swiftType = this.visitType(type, node); const isReadonly = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ReadonlyKeyword) ?? false; - const documentation = this.getFullJSDocText(node); - return { jsName, swiftName, type: swiftType, isReadonly, documentation }; + return { jsName, swiftName, type: swiftType, isReadonly }; } /** @@ -551,6 +691,7 @@ export class TypeProcessor { if (fromArg) args.push(fromArg); const annotation = this.renderMacroAnnotation("JSClass", args); const className = this.renderIdentifier(swiftName); + this.emitDocComment(node, { indent: "" }); this.swiftLines.push(`${annotation} struct ${className} {`); // Process members in declaration order @@ -600,11 +741,15 @@ export class TypeProcessor { /** * Visit a structured type (interface) and render Swift code - * @param {string} name + * @param {ts.Type} type + * @param {ts.Node} diagnosticNode * @param {ts.Symbol[]} members * @private */ - visitStructuredType(name, members) { + visitStructuredType(type, diagnosticNode, members) { + const symbol = type.getSymbol() ?? type.aliasSymbol; + const name = symbol?.name ?? this.checker.typeToString(type); + if (!name) return; if (this.emittedStructuredTypeNames.has(name)) return; this.emittedStructuredTypeNames.add(name); @@ -615,17 +760,22 @@ export class TypeProcessor { if (jsNameArg) args.push(jsNameArg); const annotation = this.renderMacroAnnotation("JSClass", args); const typeName = this.renderIdentifier(swiftName); + const docNode = symbol?.getDeclarations()?.[0] ?? diagnosticNode; + if (docNode) { + this.emitDocComment(docNode, { indent: "" }); + } this.swiftLines.push(`${annotation} struct ${typeName} {`); // Collect all declarations with their positions to preserve order /** @type {Array<{ decl: ts.Node, symbol: ts.Symbol, position: number }>} */ const allDecls = []; - for (const symbol of members) { - for (const decl of symbol.getDeclarations() ?? []) { + const typeMembers = members ?? type.getProperties() ?? []; + for (const memberSymbol of typeMembers) { + for (const decl of memberSymbol.getDeclarations() ?? []) { const sourceFile = decl.getSourceFile(); const pos = sourceFile ? decl.getStart() : 0; - allDecls.push({ decl, symbol, position: pos }); + allDecls.push({ decl, symbol: memberSymbol, position: pos }); } } @@ -854,6 +1004,7 @@ export class TypeProcessor { const getterAnnotation = this.renderMacroAnnotation("JSGetter", getterArgs); // Always render getter + this.emitDocComment(node, { indent: " " }); this.swiftLines.push(` ${getterAnnotation} var ${swiftName}: ${type}`); // Render setter if not readonly @@ -903,7 +1054,9 @@ export class TypeProcessor { const signature = this.checker.getSignatureFromDeclaration(node); if (!signature) return; - const params = this.renderParameters(signature.getParameters(), node); + const parameters = signature.getParameters(); + const parameterNameMap = this.buildParameterNameMap(parameters); + const params = this.renderParameters(parameters, node); const returnType = this.visitType(signature.getReturnType(), node); const effects = this.renderEffects({ isAsync: false }); const swiftMethodName = this.renderIdentifier(swiftName); @@ -912,6 +1065,7 @@ export class TypeProcessor { ) ?? false; const staticKeyword = isStatic ? "static " : ""; + this.emitDocComment(node, { indent: " ", parameterNameMap }); this.swiftLines.push(` ${annotation} ${staticKeyword}func ${swiftMethodName}(${params}) ${effects} -> ${returnType}`); } @@ -930,8 +1084,14 @@ export class TypeProcessor { * @private */ renderConstructor(node) { - const params = this.renderConstructorParameters(node); + const signature = this.checker.getSignatureFromDeclaration(node); + if (!signature) return; + + const parameters = signature.getParameters(); + const parameterNameMap = this.buildParameterNameMap(parameters); + const params = this.renderParameters(parameters, node); const effects = this.renderEffects({ isAsync: false }); + this.emitDocComment(node, { indent: " ", parameterNameMap }); this.swiftLines.push(` @JSFunction init(${params}) ${effects}`); } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index e6fb234c4..343f8795b 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -48,6 +48,63 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` " `; +exports[`ts2swift > snapshots Swift output for Documentation.d.ts > Documentation 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +/// Return a greeting for a user. +/// +/// - Parameters: +/// - name: The user's name. +/// - Returns: The greeting message. +@JSFunction func greet(_ name: String) throws(JSException) -> String + +@JSFunction func origin() throws(JSException) -> Point + +/// Represents a 2D point. +@JSClass struct Point { + /// The horizontal position. + @JSGetter var x: Double + @JSSetter func setX(_ value: Double) throws(JSException) + /// Translate the point. + /// + /// - Parameters: + /// - dx: Delta to apply on x. + /// - dy: Delta to apply on y. + /// - Returns: The moved point. + @JSFunction func translate(_ dx: Double, _ dy: Double) throws(JSException) -> Point +} + +/// Move a point by the given delta. +/// +/// - Parameters: +/// - point: The point to move. +/// - dx: Delta to apply on x. +/// - dy: Delta to apply on y. +@JSFunction func translatePoint(_ point: Point, _ dx: Double, _ dy: Double) throws(JSException) -> Point + +/// A greeter that keeps the target name. +@JSClass struct Greeter { + /// Create a greeter. + /// + /// - Parameters: + /// - name: Name to greet. + @JSFunction init(_ name: String) throws(JSException) + /// The configured name. + @JSGetter var targetName: String + /// Say hello. + /// + /// - Returns: Greeting message. + @JSFunction func greet() throws(JSException) -> String +} +" +`; + exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. @@ -402,3 +459,90 @@ exports[`ts2swift > snapshots Swift output for VoidParameterVoidReturn.d.ts > Vo @JSFunction func check() throws(JSException) -> Void " `; + +exports[`ts2swift > snapshots Swift output for WebIDLDOMDocs.d.ts > WebIDLDOMDocs 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +/// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document) +@JSGetter var document: Document + +/// A simple Document subset with WebIDL-derived comments. +@JSClass struct Document { + /// Creates an instance of the element for the specified tag. + /// + /// - Parameters: + /// - tagName: The name of an element. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createElement) + @JSFunction func createElement(_ tagName: String, _ options: JSUndefinedOr) throws(JSException) -> Element + /// Returns an element with namespace namespace. Its namespace prefix will be everything before ":" (U+003E) in qualifiedName or null. Its local name will be everything after ":" (U+003E) in qualifiedName or qualifiedName. + /// + /// If localName does not match the Name production an "InvalidCharacterError" DOMException will be thrown. + /// + /// If one of the following conditions is true a "NamespaceError" DOMException will be thrown: + /// + /// localName does not match the QName production. + /// Namespace prefix is not null and namespace is the empty string. + /// Namespace prefix is "xml" and namespace is not the XML namespace. + /// qualifiedName or namespace prefix is "xmlns" and namespace is not the XMLNS namespace. + /// namespace is the XMLNS namespace and neither qualifiedName nor namespace prefix is "xmlns". + /// + /// When supplied, options's is can be used to create a customized built-in element. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createElementNS) + @JSFunction func createElementNS(_ namespaceURI: Optional, _ qualifiedName: String, _ options: JSObject) throws(JSException) -> Element + /// Creates a TreeWalker object. + /// + /// - Parameters: + /// - root: The root element or node to start traversing on. + /// - whatToShow: The type of nodes or elements to appear in the node list + /// - filter: A custom NodeFilter function to use. For more information, see filter. Use null for no filter. + /// - Returns: The created TreeWalker. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createTreeWalker) + @JSFunction func createTreeWalker(_ root: Node, _ whatToShow: JSUndefinedOr, _ filter: JSUndefinedOr) throws(JSException) -> TreeWalker +} + +@JSClass struct ElementCreationOptions { + @JSGetter var \`is\`: JSUndefinedOr + @JSSetter func setIs(_ value: JSUndefinedOr) throws(JSException) +} + +@JSClass struct Element { + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/textContent) + @JSGetter var textContent: Optional + @JSSetter func setTextContent(_ value: Optional) throws(JSException) + /// Returns a copy of node. If deep is true, the copy also includes the node's descendants. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/cloneNode) + @JSFunction func cloneNode(_ subtree: JSObject) throws(JSException) -> Node +} + +/// Minimal stubs to mirror lib.dom.d.ts documentation converted from WebIDL. +@JSClass struct Node { + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/textContent) + @JSGetter var textContent: Optional + @JSSetter func setTextContent(_ value: Optional) throws(JSException) + /// Returns a copy of node. If deep is true, the copy also includes the node's descendants. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/cloneNode) + @JSFunction func cloneNode(_ subtree: JSObject) throws(JSException) -> Node +} + +@JSClass struct TreeWalker { + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/TreeWalker/currentNode) + @JSGetter var currentNode: Node + @JSSetter func setCurrentNode(_ value: Node) throws(JSException) + /// Moves the currentNode to the next visible node in the document order. + /// + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/TreeWalker/nextNode) + @JSFunction func nextNode() throws(JSException) -> Optional +} +" +`; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Documentation.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Documentation.d.ts new file mode 100644 index 000000000..90ba064bb --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/Documentation.d.ts @@ -0,0 +1,56 @@ +/** + * Return a greeting for a user. + * @param name The user's name. + * @returns The greeting message. + */ +export function greet(name: string): string; + +/** + * Represents a 2D point. + */ +export interface Point { + /** + * The horizontal position. + */ + x: number; + + /** + * Translate the point. + * @param dx Delta to apply on x. + * @param dy Delta to apply on y. + * @returns The moved point. + */ + translate(dx: number, dy: number): Point; +} + +export function origin(): Point; + +/** + * Move a point by the given delta. + * @param point The point to move. + * @param dx Delta to apply on x. + * @param dy Delta to apply on y. + */ +export function translatePoint(point: Point, dx: number, dy: number): Point; + +/** + * A greeter that keeps the target name. + */ +export class Greeter { + /** + * Create a greeter. + * @param name Name to greet. + */ + constructor(name: string); + + /** + * The configured name. + */ + readonly targetName: string; + + /** + * Say hello. + * @returns Greeting message. + */ + greet(): string; +} diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/WebIDLDOMDocs.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/WebIDLDOMDocs.d.ts new file mode 100644 index 000000000..ace4011a4 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/WebIDLDOMDocs.d.ts @@ -0,0 +1,81 @@ +/** + * Minimal stubs to mirror lib.dom.d.ts documentation converted from WebIDL. + */ + +interface Node { + /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/textContent) */ + textContent: string | null; + /** + * Returns a copy of node. If deep is true, the copy also includes the node's descendants. + * + * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/cloneNode) + */ + cloneNode(subtree?: boolean): Node; +} + +interface Element extends Node {} +type HTMLElement = Element; +type SVGElement = Element; +type MathMLElement = Element; +type DocumentFragment = Node; + +interface ElementCreationOptions { + is?: string; +} + +/** + * A simple Document subset with WebIDL-derived comments. + */ +interface Document { + /** + * Creates an instance of the element for the specified tag. + * @param tagName The name of an element. + * + * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createElement) + */ + createElement(tagName: string, options?: ElementCreationOptions): HTMLElement; + + /** + * Returns an element with namespace namespace. Its namespace prefix will be everything before ":" (U+003E) in qualifiedName or null. Its local name will be everything after ":" (U+003E) in qualifiedName or qualifiedName. + * + * If localName does not match the Name production an "InvalidCharacterError" DOMException will be thrown. + * + * If one of the following conditions is true a "NamespaceError" DOMException will be thrown: + * + * localName does not match the QName production. + * Namespace prefix is not null and namespace is the empty string. + * Namespace prefix is "xml" and namespace is not the XML namespace. + * qualifiedName or namespace prefix is "xmlns" and namespace is not the XMLNS namespace. + * namespace is the XMLNS namespace and neither qualifiedName nor namespace prefix is "xmlns". + * + * When supplied, options's is can be used to create a customized built-in element. + * + * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createElementNS) + */ + createElementNS(namespaceURI: string | null, qualifiedName: string, options?: string | ElementCreationOptions): Element; + + /** + * Creates a TreeWalker object. + * @param root The root element or node to start traversing on. + * @param whatToShow The type of nodes or elements to appear in the node list + * @param filter A custom NodeFilter function to use. For more information, see filter. Use null for no filter. + * @returns The created TreeWalker. + * + * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/createTreeWalker) + */ + createTreeWalker(root: Node, whatToShow?: number, filter?: (node: Node) => number | null): TreeWalker; +} + +interface TreeWalker { + /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/TreeWalker/currentNode) */ + currentNode: Node; + /** + * Moves the currentNode to the next visible node in the document order. + * + * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TreeWalker/nextNode) + */ + nextNode(): Node | null; +} + +/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document) */ +export const document: Document; From 610b1a60bde271d90d7a2d74b94fedac909dd35e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 5 Feb 2026 09:39:48 +0900 Subject: [PATCH 170/252] BridgeJS: Improve diagnostics and fix-its for macros Examples added/covered in this change: - @JSFunction: enforce throws(JSException) (missing or wrong type) with note + fix-it ("Declare throws(JSException)"). - @JSFunction: instance members outside @JSClass emit a clear diagnostic. - @JSGetter/@JSSetter: members (instance/static/class) outside @JSClass emit a clear diagnostic. - @JSSetter: invalid setter names (e.g. updateFoo) emit a diagnostic and suggest a rename fix-it (e.g. setFoo). - @JSSetter: missing value parameter emits a diagnostic and suggests adding a placeholder parameter. - @JSClass: using @JSClass on non-struct declarations emits a diagnostic; for "class" also suggests "Change 'class' to 'struct'". --- .../Sources/BridgeJSMacros/JSClassMacro.swift | 29 +- .../BridgeJSMacros/JSFunctionMacro.swift | 69 ++++- .../BridgeJSMacros/JSGetterMacro.swift | 36 ++- .../BridgeJSMacros/JSMacroSupport.swift | 188 ++++++++++++- .../BridgeJSMacros/JSSetterMacro.swift | 162 ++++++++++- .../JSClassMacroTests.swift | 30 +- .../JSFunctionMacroTests.swift | 261 ++++++++++++++---- .../JSGetterMacroTests.swift | 60 +++- .../JSSetterMacroTests.swift | 189 ++++++++++++- Sources/JavaScriptKit/Macros.swift | 2 +- 10 files changed, 937 insertions(+), 89 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift index 2641df4bf..79c3105ee 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -13,8 +13,35 @@ extension JSClassMacro: MemberMacro { in context: some MacroExpansionContext ) throws -> [DeclSyntax] { guard declaration.is(StructDeclSyntax.self) else { + var fixIts: [FixIt] = [] + let note = Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "Use @JSClass on a struct wrapper to synthesize jsObject and JS bridging members." + ) + ) + + if let classDecl = declaration.as(ClassDeclSyntax.self) { + let structKeyword = classDecl.classKeyword.with(\.tokenKind, .keyword(.struct)) + fixIts.append( + FixIt( + message: JSMacroFixItMessage(message: "Change 'class' to 'struct'"), + changes: [ + .replace( + oldNode: Syntax(classDecl.classKeyword), + newNode: Syntax(structKeyword) + ) + ] + ) + ) + } context.diagnose( - Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedJSClassDeclaration) + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedJSClassDeclaration, + notes: [note], + fixIts: fixIts + ) ) return [] } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift index a51bf10c5..0fff3546a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSFunctionMacro.swift @@ -14,7 +14,17 @@ extension JSFunctionMacro: BodyMacro { if let functionDecl = declaration.as(FunctionDeclSyntax.self) { let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) let isStatic = JSMacroHelper.isStatic(functionDecl.modifiers) - let isInstanceMember = enclosingTypeName != nil && !isStatic + let isTopLevel = enclosingTypeName == nil + let isInstanceMember = !isTopLevel && !isStatic + if !isTopLevel { + JSMacroHelper.diagnoseMissingJSClass(node: node, for: "JSFunction", in: context) + } + + JSMacroHelper.diagnoseThrowsRequiresJSException( + signature: functionDecl.signature, + on: Syntax(functionDecl), + in: context + ) // Strip backticks from function name (e.g., "`prefix`" -> "prefix") // Backticks are only needed for Swift identifiers, not function names @@ -34,8 +44,7 @@ extension JSFunctionMacro: BodyMacro { let effects = functionDecl.signature.effectSpecifiers let isAsync = effects?.asyncSpecifier != nil - let isThrows = effects?.throwsClause != nil - let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows) + let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: true) let isVoid = JSMacroHelper.isVoidReturn(functionDecl.signature.returnClause?.type) let line = isVoid ? "\(prefix)\(call)" : "return \(prefix)\(call)" @@ -45,11 +54,29 @@ extension JSFunctionMacro: BodyMacro { if let initializerDecl = declaration.as(InitializerDeclSyntax.self) { guard let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) else { context.diagnose( - Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration) + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedDeclaration, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "Move this initializer inside a JS wrapper type annotated with @JSClass." + ) + ) + ] + ) ) return [CodeBlockItemSyntax(stringLiteral: "fatalError(\"@JSFunction init must be inside a type\")")] } + JSMacroHelper.diagnoseMissingJSClass(node: node, for: "JSFunction", in: context) + JSMacroHelper.diagnoseThrowsRequiresJSException( + signature: initializerDecl.signature, + on: Syntax(initializerDecl), + in: context + ) + let glueName = JSMacroHelper.glueName(baseName: "init", enclosingTypeName: enclosingTypeName) let parameters = initializerDecl.signature.parameterClause.parameters let arguments = JSMacroHelper.parameterNames(parameters) @@ -57,8 +84,7 @@ extension JSFunctionMacro: BodyMacro { let effects = initializerDecl.signature.effectSpecifiers let isAsync = effects?.asyncSpecifier != nil - let isThrows = effects?.throwsClause != nil - let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: isThrows) + let prefix = JSMacroHelper.tryAwaitPrefix(isAsync: isAsync, isThrows: true) return [ CodeBlockItemSyntax(stringLiteral: "let jsObject = \(prefix)\(call)"), @@ -66,7 +92,20 @@ extension JSFunctionMacro: BodyMacro { ] } - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedDeclaration, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "Apply @JSFunction to a function or initializer on your @JSClass wrapper type." + ) + ) + ] + ) + ) return [] } } @@ -82,7 +121,21 @@ extension JSFunctionMacro: PeerMacro { ) throws -> [DeclSyntax] { if declaration.is(FunctionDeclSyntax.self) { return [] } if declaration.is(InitializerDeclSyntax.self) { return [] } - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedDeclaration)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedDeclaration, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: + "Place @JSFunction on a function or initializer; use @JSGetter/@JSSetter for properties." + ) + ) + ] + ) + ) return [] } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift index 44c3620cf..a3b9435ea 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSGetterMacro.swift @@ -15,13 +15,30 @@ extension JSGetterMacro: AccessorMacro { let binding = variableDecl.bindings.first, let identifier = binding.pattern.as(IdentifierPatternSyntax.self) else { - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedVariable)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedVariable, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "@JSGetter must be attached to a single stored or computed property." + ) + ) + ] + ) + ) return [] } let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) let isStatic = JSMacroHelper.isStatic(variableDecl.modifiers) - let isInstanceMember = enclosingTypeName != nil && !isStatic + let isTopLevel = enclosingTypeName == nil + let isInstanceMember = !isTopLevel && !isStatic + if !isTopLevel { + JSMacroHelper.diagnoseMissingJSClass(node: node, for: "JSGetter", in: context) + } // Strip backticks from property name (e.g., "`prefix`" -> "prefix") // Backticks are only needed for Swift identifiers, not function names @@ -71,7 +88,20 @@ extension JSGetterMacro: PeerMacro { in context: some MacroExpansionContext ) throws -> [DeclSyntax] { guard declaration.is(VariableDeclSyntax.self) else { - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedVariable)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedVariable, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "@JSGetter must be attached to a single stored or computed property." + ) + ) + ] + ) + ) return [] } return [] diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift index 59fa1c4c2..c30d91dd1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -11,26 +11,41 @@ enum JSMacroMessage: String, DiagnosticMessage { case invalidSetterName = "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo')." case setterRequiresParameter = "@JSSetter function must have at least one parameter." + case setterRequiresThrows = "@JSSetter function must declare throws(JSException)." + case jsFunctionRequiresThrows = "@JSFunction throws must be declared as throws(JSException)." + case requiresJSClass = "JavaScript members must be declared inside a @JSClass struct." var message: String { rawValue } var diagnosticID: MessageID { MessageID(domain: "JavaScriptKitMacros", id: rawValue) } var severity: DiagnosticSeverity { .error } } +struct JSMacroNoteMessage: NoteMessage { + let message: String + var noteID: MessageID { MessageID(domain: "JavaScriptKitMacros", id: message) } +} + +struct JSMacroFixItMessage: FixItMessage { + let message: String + var fixItID: MessageID { MessageID(domain: "JavaScriptKitMacros", id: message) } +} + +enum JSMacroText { + static let jsExceptionPropagation = "@JSFunction must propagate JavaScript errors as JSException." + static let jsSetterExceptionPropagation = "@JSSetter must propagate JavaScript errors as JSException." +} + enum JSMacroHelper { static func enclosingTypeName(from context: some MacroExpansionContext) -> String? { + enclosingTypeSyntax(from: context).flatMap(typeName(of:)) + } + + static func enclosingTypeSyntax(from context: some MacroExpansionContext) -> Syntax? { for syntax in context.lexicalContext { - if let decl = syntax.as(ClassDeclSyntax.self) { - return decl.name.text - } - if let decl = syntax.as(StructDeclSyntax.self) { - return decl.name.text - } - if let decl = syntax.as(EnumDeclSyntax.self) { - return decl.name.text - } - if let decl = syntax.as(ActorDeclSyntax.self) { - return decl.name.text + if syntax.is(ClassDeclSyntax.self) || syntax.is(StructDeclSyntax.self) + || syntax.is(EnumDeclSyntax.self) || syntax.is(ActorDeclSyntax.self) + { + return Syntax(syntax) } } return nil @@ -98,4 +113,155 @@ enum JSMacroHelper { } return name } + + static func capitalizingFirstLetter(_ value: String) -> String { + guard let first = value.first else { return value } + return first.uppercased() + value.dropFirst() + } + + static func hasJSClassAttribute(_ typeSyntax: Syntax) -> Bool { + guard let attributes = attributes(of: typeSyntax) else { return false } + for attribute in attributes.compactMap({ $0.as(AttributeSyntax.self) }) { + let name = attribute.attributeName.trimmedDescription + if name == "JSClass" || name == "@JSClass" { + return true + } + } + return false + } + + static func typeName(of syntax: Syntax) -> String? { + switch syntax.as(SyntaxEnum.self) { + case .structDecl(let decl): return decl.name.text + case .classDecl(let decl): return decl.name.text + case .enumDecl(let decl): return decl.name.text + case .actorDecl(let decl): return decl.name.text + default: return nil + } + } + + private static func attributes(of syntax: Syntax) -> AttributeListSyntax? { + switch syntax.as(SyntaxEnum.self) { + case .structDecl(let decl): return decl.attributes + case .classDecl(let decl): return decl.attributes + case .enumDecl(let decl): return decl.attributes + case .actorDecl(let decl): return decl.attributes + default: return nil + } + } + + static func diagnoseThrowsRequiresJSException( + signature: FunctionSignatureSyntax, + on node: Syntax, + in context: some MacroExpansionContext, + additionalNotes: [Note] = [] + ) { + let throwsClause = signature.effectSpecifiers?.throwsClause + let throwsTypeName = throwsClause?.type?.as(IdentifierTypeSyntax.self)?.name.text + let isJSException = throwsTypeName == "JSException" + let isAllowedGenericError = + throwsClause != nil + && (throwsTypeName == nil || throwsTypeName == "Error" || throwsTypeName == "Swift.Error") + guard !isJSException else { return } + guard !isAllowedGenericError else { return } + + let newThrowsClause = jsExceptionThrowsClause(from: throwsClause) + + let fixIt: FixIt + if let throwsClause = signature.effectSpecifiers?.throwsClause { + fixIt = FixIt( + message: JSMacroFixItMessage(message: "Declare throws(JSException)"), + changes: [.replace(oldNode: Syntax(throwsClause), newNode: Syntax(newThrowsClause))] + ) + } else { + let adjustedParameterClause = signature.parameterClause.with(\.rightParen.trailingTrivia, .spaces(0)) + let newEffects = FunctionEffectSpecifiersSyntax( + asyncSpecifier: signature.effectSpecifiers?.asyncSpecifier, + throwsClause: newThrowsClause + ) + let newSignature = + signature + .with(\.parameterClause, adjustedParameterClause) + .with(\.effectSpecifiers, newEffects) + fixIt = FixIt( + message: JSMacroFixItMessage(message: "Declare throws(JSException)"), + changes: [.replace(oldNode: Syntax(signature), newNode: Syntax(newSignature))] + ) + } + + var notes: [Note] = [ + jsExceptionPropagationNote(on: node) + ] + notes.append(contentsOf: additionalNotes) + + context.diagnose( + Diagnostic( + node: node, + message: JSMacroMessage.jsFunctionRequiresThrows, + notes: notes, + fixIts: [fixIt] + ) + ) + } + + static func diagnoseMissingJSClass( + node: some SyntaxProtocol, + for macroName: String, + in context: some MacroExpansionContext + ) { + guard let typeSyntax = enclosingTypeSyntax(from: context) else { return } + guard !hasJSClassAttribute(typeSyntax) else { return } + context.diagnose(Diagnostic(node: node, message: JSMacroMessage.requiresJSClass)) + } + + static func setterPropertyBase(from parameter: FunctionParameterSyntax?) -> String? { + guard let parameter else { return nil } + let candidateNames = [ + parameter.secondName, + parameter.firstName.tokenKind == .wildcard ? nil : parameter.firstName, + ].compactMap { $0?.text }.filter { $0 != "_" } + if let explicitName = candidateNames.first(where: { name in name != "value" && name != "newValue" }) { + return explicitName + } + if let identifierType = parameter.type.as(IdentifierTypeSyntax.self) { + let typeName = identifierType.name.text + guard let first = typeName.first else { return nil } + return first.lowercased() + typeName.dropFirst() + } + return candidateNames.first + } + + static func suggestedSetterName(rawFunctionName: String, firstParameter: FunctionParameterSyntax?) -> String? { + guard let base = setterPropertyBase(from: firstParameter) else { return nil } + return "set" + capitalizingFirstLetter(base) + } + + /// Build a typed throws(JSException) clause preserving trivia when possible. + static func jsExceptionThrowsClause(from throwsClause: ThrowsClauseSyntax?) -> ThrowsClauseSyntax { + let throwsSpecifier = (throwsClause?.throwsSpecifier ?? .keyword(.throws, leadingTrivia: .space)) + .with(\.trailingTrivia, .spaces(0)) + .with(\.leadingTrivia, throwsClause?.throwsSpecifier.leadingTrivia ?? .space) + let leftParen = throwsClause?.leftParen ?? .leftParenToken() + let rightParen = (throwsClause?.rightParen ?? .rightParenToken()) + .with(\.trailingTrivia, throwsClause?.rightParen?.trailingTrivia ?? .space) + + return ThrowsClauseSyntax( + throwsSpecifier: throwsSpecifier, + leftParen: leftParen, + type: TypeSyntax(IdentifierTypeSyntax(name: .identifier("JSException"))), + rightParen: rightParen + ) + } + + static func jsExceptionPropagationNote( + on node: Syntax, + message: String = JSMacroText.jsExceptionPropagation + ) -> Note { + Note( + node: node, + message: JSMacroNoteMessage( + message: message + ) + ) + } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift index 3c7280079..ba171e8eb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift @@ -13,18 +13,86 @@ extension JSSetterMacro: BodyMacro { ) throws -> [CodeBlockItemSyntax] { guard let functionDecl = declaration.as(FunctionDeclSyntax.self) else { context.diagnose( - Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedSetterDeclaration) + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedSetterDeclaration, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "@JSSetter can only be used on methods that set a JavaScript property." + ) + ) + ] + ) ) return [] } let functionName = functionDecl.name.text + let parameters = functionDecl.signature.parameterClause.parameters + let suggestedSetterName = JSMacroHelper.suggestedSetterName( + rawFunctionName: JSMacroHelper.stripBackticks(functionName), + firstParameter: parameters.first + ) + let renameFixIts: [FixIt] + if let name = suggestedSetterName { + let replacement = functionDecl.name.with(\.tokenKind, .identifier(name)) + .with(\.leadingTrivia, functionDecl.name.leadingTrivia) + .with(\.trailingTrivia, functionDecl.name.trailingTrivia) + renameFixIts = [ + FixIt( + message: JSMacroFixItMessage(message: "Rename setter to '\(name)'"), + changes: [.replace(oldNode: Syntax(functionDecl.name), newNode: Syntax(replacement))] + ) + ] + } else { + renameFixIts = [] + } + let addParameterFixIts: [FixIt] = { + let placeholderParameter = FunctionParameterSyntax( + firstName: .wildcardToken(trailingTrivia: .space), + secondName: .identifier("value"), + colon: .colonToken(trailingTrivia: .space), + type: TypeSyntax(stringLiteral: "<#Type#>") + ) + let newClause = FunctionParameterClauseSyntax( + leftParen: .leftParenToken(), + parameters: FunctionParameterListSyntax([placeholderParameter]), + rightParen: .rightParenToken(trailingTrivia: .space) + ) + return [ + FixIt( + message: JSMacroFixItMessage(message: "Add a value parameter to the setter"), + changes: [ + .replace( + oldNode: Syntax(functionDecl.signature.parameterClause), + newNode: Syntax(newClause) + ) + ] + ) + ] + }() // Extract property name from setter function name (e.g., "setFoo" -> "foo") // Strip backticks if present (e.g., "set`prefix`" -> "prefix") let rawFunctionName = JSMacroHelper.stripBackticks(functionName) guard rawFunctionName.hasPrefix("set"), rawFunctionName.count > 3 else { - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.invalidSetterName, + notes: [ + Note( + node: Syntax(functionDecl.name), + message: JSMacroNoteMessage( + message: "Setter names must start with 'set' followed by the property name." + ) + ) + ], + fixIts: renameFixIts + ) + ) return [ CodeBlockItemSyntax( stringLiteral: @@ -35,7 +103,21 @@ extension JSSetterMacro: BodyMacro { let propertyName = String(rawFunctionName.dropFirst(3)) guard !propertyName.isEmpty else { - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.invalidSetterName)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.invalidSetterName, + notes: [ + Note( + node: Syntax(functionDecl.name), + message: JSMacroNoteMessage( + message: "Setter names must include the property after 'set'." + ) + ) + ], + fixIts: renameFixIts + ) + ) return [ CodeBlockItemSyntax( stringLiteral: @@ -49,7 +131,11 @@ extension JSSetterMacro: BodyMacro { let enclosingTypeName = JSMacroHelper.enclosingTypeName(from: context) let isStatic = JSMacroHelper.isStatic(functionDecl.modifiers) - let isInstanceMember = enclosingTypeName != nil && !isStatic + let isTopLevel = enclosingTypeName == nil + let isInstanceMember = !isTopLevel && !isStatic + if !isTopLevel { + JSMacroHelper.diagnoseMissingJSClass(node: node, for: "JSSetter", in: context) + } let glueName = JSMacroHelper.glueName( baseName: baseName, @@ -63,9 +149,22 @@ extension JSSetterMacro: BodyMacro { } // Get the parameter name(s) - setters typically have one parameter - let parameters = functionDecl.signature.parameterClause.parameters guard let firstParam = parameters.first else { - context.diagnose(Diagnostic(node: Syntax(declaration), message: JSMacroMessage.setterRequiresParameter)) + context.diagnose( + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.setterRequiresParameter, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "@JSSetter needs a parameter for the value being assigned." + ) + ) + ], + fixIts: addParameterFixIts + ) + ) return [ CodeBlockItemSyntax( stringLiteral: "fatalError(\"@JSSetter function must have at least one parameter\")" @@ -76,6 +175,44 @@ extension JSSetterMacro: BodyMacro { let paramName = firstParam.secondName ?? firstParam.firstName arguments.append(paramName.text) + // Ensure throws(JSException) is declared to match the generated body. + let existingThrowsClause = functionDecl.signature.effectSpecifiers?.throwsClause + let existingThrowsType = existingThrowsClause?.type + .flatMap { $0.as(IdentifierTypeSyntax.self)?.name.text } + let hasTypedJSException = existingThrowsType == "JSException" + let isAllowedGenericError = + existingThrowsClause != nil + && (existingThrowsType == nil || existingThrowsType == "Error" || existingThrowsType == "Swift.Error") + + if !hasTypedJSException && !isAllowedGenericError { + let throwsClause = JSMacroHelper.jsExceptionThrowsClause( + from: existingThrowsClause + ) + let newEffects = + (functionDecl.signature.effectSpecifiers + ?? FunctionEffectSpecifiersSyntax(asyncSpecifier: nil, throwsClause: nil)) + .with(\.throwsClause, throwsClause) + let newSignature = functionDecl.signature.with(\.effectSpecifiers, newEffects) + let fixIt = FixIt( + message: JSMacroFixItMessage(message: "Declare throws(JSException)"), + changes: [.replace(oldNode: Syntax(functionDecl.signature), newNode: Syntax(newSignature))] + ) + let notes: [Note] = [ + JSMacroHelper.jsExceptionPropagationNote( + on: Syntax(functionDecl), + message: JSMacroText.jsSetterExceptionPropagation + ) + ] + context.diagnose( + Diagnostic( + node: Syntax(functionDecl), + message: JSMacroMessage.setterRequiresThrows, + notes: notes, + fixIts: [fixIt] + ) + ) + } + let argsJoined = arguments.joined(separator: ", ") let call = "\(glueName)(\(argsJoined))" @@ -94,7 +231,18 @@ extension JSSetterMacro: PeerMacro { ) throws -> [DeclSyntax] { guard declaration.is(FunctionDeclSyntax.self) else { context.diagnose( - Diagnostic(node: Syntax(declaration), message: JSMacroMessage.unsupportedSetterDeclaration) + Diagnostic( + node: Syntax(declaration), + message: JSMacroMessage.unsupportedSetterDeclaration, + notes: [ + Note( + node: Syntax(declaration), + message: JSMacroNoteMessage( + message: "@JSSetter should be attached to a method that writes a JavaScript property." + ) + ) + ] + ) ) return [] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift index 7640916e4..86a1f6b7c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -159,7 +159,17 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSClass can only be applied to structs.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Use @JSClass on a struct wrapper to synthesize jsObject and JS bridging members.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Change 'class' to 'struct'") + ] ) ], macroSpecs: macroSpecs, @@ -182,7 +192,14 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSClass can only be applied to structs.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Use @JSClass on a struct wrapper to synthesize jsObject and JS bridging members.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, @@ -205,7 +222,14 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSClass can only be applied to structs.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Use @JSClass on a struct wrapper to synthesize jsObject and JS bridging members.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift index 756935e7d..28eade958 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSFunctionMacroTests.swift @@ -15,13 +15,40 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func greet(name: String) -> String + func greet(name: String) throws(JSException) -> String """, expandedSource: """ - func greet(name: String) -> String { - return _$greet(name) + func greet(name: String) throws(JSException) -> String { + return try _$greet(name) + } + """, + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, + ) + } + + @Test func instanceMethodRequiresJSClass() { + TestSupport.assertMacroExpansion( + """ + struct MyClass { + @JSFunction + func getName() throws(JSException) -> String + } + """, + expandedSource: """ + struct MyClass { + func getName() throws(JSException) -> String { + return try _$MyClass_getName(self.jsObject) + } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -31,11 +58,11 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func log(message: String) + func log(message: String) throws(JSException) """, expandedSource: """ - func log(message: String) { - _$log(message) + func log(message: String) throws(JSException) { + try _$log(message) } """, macroSpecs: macroSpecs, @@ -47,11 +74,11 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func log(message: String) -> Void + func log(message: String) throws(JSException) -> Void """, expandedSource: """ - func log(message: String) -> Void { - _$log(message) + func log(message: String) throws(JSException) -> Void { + try _$log(message) } """, macroSpecs: macroSpecs, @@ -63,11 +90,11 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func log(message: String) -> () + func log(message: String) throws(JSException) -> () """, expandedSource: """ - func log(message: String) -> () { - _$log(message) + func log(message: String) throws(JSException) -> () { + try _$log(message) } """, macroSpecs: macroSpecs, @@ -76,6 +103,22 @@ import BridgeJSMacros } @Test func topLevelFunctionThrows() { + TestSupport.assertMacroExpansion( + """ + @JSFunction + func parse(json: String) throws(JSException) -> [String: Any] + """, + expandedSource: """ + func parse(json: String) throws(JSException) -> [String: Any] { + return try _$parse(json) + } + """, + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, + ) + } + + @Test func topLevelFunctionThrowsMissingType() { TestSupport.assertMacroExpansion( """ @JSFunction @@ -91,15 +134,92 @@ import BridgeJSMacros ) } + @Test func topLevelFunctionThrowsWrongType() { + TestSupport.assertMacroExpansion( + """ + @JSFunction + func parse(json: String) throws(CustomError) -> [String: Any] + """, + expandedSource: """ + func parse(json: String) throws(CustomError) -> [String: Any] { + return try _$parse(json) + } + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSFunction throws must be declared as throws(JSException).", + line: 1, + column: 1, + severity: .error, + notes: [ + NoteSpec( + message: "@JSFunction must propagate JavaScript errors as JSException.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Declare throws(JSException)") + ] + ) + ], + macroSpecs: macroSpecs, + applyFixIts: ["Declare throws(JSException)"], + fixedSource: """ + @JSFunction + func parse(json: String) throws(JSException) -> [String: Any] + """, + indentationWidth: indentationWidth, + ) + } + + @Test func topLevelFunctionMissingThrowsClause() { + TestSupport.assertMacroExpansion( + """ + @JSFunction + func greet(name: String) -> String + """, + expandedSource: """ + func greet(name: String) -> String { + return try _$greet(name) + } + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSFunction throws must be declared as throws(JSException).", + line: 1, + column: 1, + notes: [ + NoteSpec( + message: "@JSFunction must propagate JavaScript errors as JSException.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Declare throws(JSException)") + ] + ) + ], + macroSpecs: macroSpecs, + applyFixIts: ["Declare throws(JSException)"], + fixedSource: """ + @JSFunction + func greet(name: String) throws(JSException) -> String + """, + indentationWidth: indentationWidth, + ) + } + @Test func topLevelFunctionAsync() { TestSupport.assertMacroExpansion( """ @JSFunction - func fetch(url: String) async -> String + func fetch(url: String) async throws(JSException) -> String """, expandedSource: """ - func fetch(url: String) async -> String { - return await _$fetch(url) + func fetch(url: String) async throws(JSException) -> String { + return try await _$fetch(url) } """, macroSpecs: macroSpecs, @@ -111,10 +231,10 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func fetch(url: String) async throws -> String + func fetch(url: String) async throws(JSException) -> String """, expandedSource: """ - func fetch(url: String) async throws -> String { + func fetch(url: String) async throws(JSException) -> String { return try await _$fetch(url) } """, @@ -127,11 +247,11 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func process(_ value: Int) -> Int + func process(_ value: Int) throws(JSException) -> Int """, expandedSource: """ - func process(_ value: Int) -> Int { - return _$process(value) + func process(_ value: Int) throws(JSException) -> Int { + return try _$process(value) } """, macroSpecs: macroSpecs, @@ -143,11 +263,11 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func add(a: Int, b: Int) -> Int + func add(a: Int, b: Int) throws(JSException) -> Int """, expandedSource: """ - func add(a: Int, b: Int) -> Int { - return _$add(a, b) + func add(a: Int, b: Int) throws(JSException) -> Int { + return try _$add(a, b) } """, macroSpecs: macroSpecs, @@ -158,15 +278,17 @@ import BridgeJSMacros @Test func instanceMethod() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSFunction - func getName() -> String + func getName() throws(JSException) -> String } """, expandedSource: """ + @JSClass struct MyClass { - func getName() -> String { - return _$MyClass_getName(self.jsObject) + func getName() throws(JSException) -> String { + return try _$MyClass_getName(self.jsObject) } } """, @@ -180,16 +302,23 @@ import BridgeJSMacros """ struct MyClass { @JSFunction - static func create() -> MyClass + static func create() throws(JSException) -> MyClass } """, expandedSource: """ struct MyClass { - static func create() -> MyClass { - return _$MyClass_create() + static func create() throws(JSException) -> MyClass { + return try _$MyClass_create() } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -200,16 +329,23 @@ import BridgeJSMacros """ class MyClass { @JSFunction - class func create() -> MyClass + class func create() throws(JSException) -> MyClass } """, expandedSource: """ class MyClass { - class func create() -> MyClass { - return _$MyClass_create() + class func create() throws(JSException) -> MyClass { + return try _$MyClass_create() } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -218,15 +354,17 @@ import BridgeJSMacros @Test func initializer() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSFunction - init(name: String) + init(name: String) throws(JSException) } """, expandedSource: """ + @JSClass struct MyClass { - init(name: String) { - let jsObject = _$MyClass_init(name) + init(name: String) throws(JSException) { + let jsObject = try _$MyClass_init(name) self.init(unsafelyWrapping: jsObject) } } @@ -239,14 +377,16 @@ import BridgeJSMacros @Test func initializerThrows() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSFunction - init(name: String) throws + init(name: String) throws(JSException) } """, expandedSource: """ + @JSClass struct MyClass { - init(name: String) throws { + init(name: String) throws(JSException) { let jsObject = try _$MyClass_init(name) self.init(unsafelyWrapping: jsObject) } @@ -260,14 +400,16 @@ import BridgeJSMacros @Test func initializerAsyncThrows() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSFunction - init(name: String) async throws + init(name: String) async throws(JSException) } """, expandedSource: """ + @JSClass struct MyClass { - init(name: String) async throws { + init(name: String) async throws(JSException) { let jsObject = try await _$MyClass_init(name) self.init(unsafelyWrapping: jsObject) } @@ -293,7 +435,14 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSFunction can only be applied to functions or initializers.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Move this initializer inside a JS wrapper type annotated with @JSClass.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, @@ -314,7 +463,15 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSFunction can only be applied to functions or initializers.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: + "Place @JSFunction on a function or initializer; use @JSGetter/@JSSetter for properties.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, @@ -325,15 +482,17 @@ import BridgeJSMacros @Test func enumInstanceMethod() { TestSupport.assertMacroExpansion( """ + @JSClass enum MyEnum { @JSFunction - func getValue() -> Int + func getValue() throws(JSException) -> Int } """, expandedSource: """ + @JSClass enum MyEnum { - func getValue() -> Int { - return _$MyEnum_getValue(self.jsObject) + func getValue() throws(JSException) -> Int { + return try _$MyEnum_getValue(self.jsObject) } } """, @@ -345,15 +504,17 @@ import BridgeJSMacros @Test func actorInstanceMethod() { TestSupport.assertMacroExpansion( """ + @JSClass actor MyActor { @JSFunction - func getValue() -> Int + func getValue() throws(JSException) -> Int } """, expandedSource: """ + @JSClass actor MyActor { - func getValue() -> Int { - return _$MyActor_getValue(self.jsObject) + func getValue() throws(JSException) -> Int { + return try _$MyActor_getValue(self.jsObject) } } """, @@ -366,13 +527,13 @@ import BridgeJSMacros TestSupport.assertMacroExpansion( """ @JSFunction - func greet(name: String) -> String { + func greet(name: String) throws(JSException) -> String { return "Hello, \\(name)" } """, expandedSource: """ - func greet(name: String) -> String { - return _$greet(name) + func greet(name: String) throws(JSException) -> String { + return try _$greet(name) } """, macroSpecs: macroSpecs, diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift index 6e47475b1..0e4cea844 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSGetterMacroTests.swift @@ -50,12 +50,14 @@ import BridgeJSMacros @Test func instanceProperty() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSGetter var name: String } """, expandedSource: """ + @JSClass struct MyClass { var name: String { get throws(JSException) { @@ -69,15 +71,46 @@ import BridgeJSMacros ) } + @Test func instancePropertyRequiresJSClass() { + TestSupport.assertMacroExpansion( + """ + struct MyClass { + @JSGetter + var name: String + } + """, + expandedSource: """ + struct MyClass { + var name: String { + get throws(JSException) { + return try _$MyClass_name_get(self.jsObject) + } + } + } + """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, + ) + } + @Test func instanceLetProperty() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSGetter let id: Int } """, expandedSource: """ + @JSClass struct MyClass { let id: Int { get throws(JSException) { @@ -108,6 +141,13 @@ import BridgeJSMacros } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -130,6 +170,13 @@ import BridgeJSMacros } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -138,12 +185,14 @@ import BridgeJSMacros @Test func enumProperty() { TestSupport.assertMacroExpansion( """ + @JSClass enum MyEnum { @JSGetter var value: Int } """, expandedSource: """ + @JSClass enum MyEnum { var value: Int { get throws(JSException) { @@ -160,12 +209,14 @@ import BridgeJSMacros @Test func actorProperty() { TestSupport.assertMacroExpansion( """ + @JSClass actor MyActor { @JSGetter var state: String } """, expandedSource: """ + @JSClass actor MyActor { var state: String { get throws(JSException) { @@ -262,7 +313,14 @@ import BridgeJSMacros message: "@JSGetter can only be applied to single-variable declarations.", line: 1, column: 1, - severity: .error + severity: .error, + notes: [ + NoteSpec( + message: "@JSGetter must be attached to a single stored or computed property.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift index 1ed4e1081..00d959921 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSSetterMacroTests.swift @@ -46,12 +46,14 @@ import BridgeJSMacros @Test func instanceSetter() { TestSupport.assertMacroExpansion( """ + @JSClass struct MyClass { @JSSetter func setName(_ name: String) throws(JSException) } """, expandedSource: """ + @JSClass struct MyClass { func setName(_ name: String) throws(JSException) { try _$MyClass_name_set(self.jsObject, name) @@ -63,6 +65,33 @@ import BridgeJSMacros ) } + @Test func instanceSetterRequiresJSClass() { + TestSupport.assertMacroExpansion( + """ + struct MyClass { + @JSSetter + func setName(_ name: String) throws(JSException) + } + """, + expandedSource: """ + struct MyClass { + func setName(_ name: String) throws(JSException) { + try _$MyClass_name_set(self.jsObject, name) + } + } + """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], + macroSpecs: macroSpecs, + indentationWidth: indentationWidth, + ) + } + @Test func staticSetter() { TestSupport.assertMacroExpansion( """ @@ -78,6 +107,13 @@ import BridgeJSMacros } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -98,6 +134,13 @@ import BridgeJSMacros } } """, + diagnostics: [ + DiagnosticSpec( + message: "JavaScript members must be declared inside a @JSClass struct.", + line: 2, + column: 5 + ) + ], macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) @@ -106,12 +149,14 @@ import BridgeJSMacros @Test func enumSetter() { TestSupport.assertMacroExpansion( """ + @JSClass enum MyEnum { @JSSetter func setValue(_ value: Int) throws(JSException) } """, expandedSource: """ + @JSClass enum MyEnum { func setValue(_ value: Int) throws(JSException) { try _$MyEnum_value_set(self.jsObject, value) @@ -126,12 +171,14 @@ import BridgeJSMacros @Test func actorSetter() { TestSupport.assertMacroExpansion( """ + @JSClass actor MyActor { @JSSetter func setState(_ state: String) throws(JSException) } """, expandedSource: """ + @JSClass actor MyActor { func setState(_ state: String) throws(JSException) { try _$MyActor_state_set(self.jsObject, state) @@ -177,7 +224,17 @@ import BridgeJSMacros message: "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo').", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Setter names must start with 'set' followed by the property name.", + line: 2, + column: 6 + ) + ], + fixIts: [ + FixItSpec(message: "Rename setter to 'setFoo'") + ] ) ], macroSpecs: macroSpecs, @@ -201,7 +258,17 @@ import BridgeJSMacros message: "@JSSetter function name must start with 'set' followed by a property name (e.g., 'setFoo').", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "Setter names must start with 'set' followed by the property name.", + line: 2, + column: 6 + ) + ], + fixIts: [ + FixItSpec(message: "Rename setter to 'setFoo'") + ] ) ], macroSpecs: macroSpecs, @@ -224,10 +291,117 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSSetter function must have at least one parameter.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "@JSSetter needs a parameter for the value being assigned.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Add a value parameter to the setter") + ] + ) + ], + macroSpecs: macroSpecs, + applyFixIts: ["Add a value parameter to the setter"], + fixedSource: """ + @JSSetter + func setFoo(_ value: <#Type#>) throws(JSException) + """, + indentationWidth: indentationWidth, + ) + } + + @Test func setterMissingThrows() { + TestSupport.assertMacroExpansion( + """ + @JSSetter + func setFoo(_ value: Foo) + """, + expandedSource: """ + func setFoo(_ value: Foo) { + try _$foo_set(value) + } + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSSetter function must declare throws(JSException).", + line: 1, + column: 1, + notes: [ + NoteSpec( + message: "@JSSetter must propagate JavaScript errors as JSException.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Declare throws(JSException)") + ] ) ], macroSpecs: macroSpecs, + applyFixIts: ["Declare throws(JSException)"], + fixedSource: """ + @JSSetter + func setFoo(_ value: Foo) throws(JSException) + """, + indentationWidth: indentationWidth, + ) + } + + @Test func setterThrowsWrongType() { + TestSupport.assertMacroExpansion( + """ + @JSSetter + func setFoo(_ value: Foo) throws(CustomError) + """, + expandedSource: """ + func setFoo(_ value: Foo) throws(CustomError) { + try _$foo_set(value) + } + """, + diagnostics: [ + DiagnosticSpec( + message: "@JSSetter function must declare throws(JSException).", + line: 1, + column: 1, + notes: [ + NoteSpec( + message: "@JSSetter must propagate JavaScript errors as JSException.", + line: 1, + column: 1 + ) + ], + fixIts: [ + FixItSpec(message: "Declare throws(JSException)") + ] + ) + ], + macroSpecs: macroSpecs, + applyFixIts: ["Declare throws(JSException)"], + fixedSource: """ + @JSSetter + func setFoo(_ value: Foo) throws(JSException) + """, + indentationWidth: indentationWidth, + ) + } + + @Test func setterThrowsErrorAccepted() { + TestSupport.assertMacroExpansion( + """ + @JSSetter + func setFoo(_ value: Foo) throws(Error) + """, + expandedSource: """ + func setFoo(_ value: Foo) throws(Error) { + try _$foo_set(value) + } + """, + macroSpecs: macroSpecs, indentationWidth: indentationWidth, ) } @@ -245,7 +419,14 @@ import BridgeJSMacros DiagnosticSpec( message: "@JSSetter can only be applied to functions.", line: 1, - column: 1 + column: 1, + notes: [ + NoteSpec( + message: "@JSSetter should be attached to a method that writes a JavaScript property.", + line: 1, + column: 1 + ) + ] ) ], macroSpecs: macroSpecs, diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 329945f2f..8decf1a76 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -202,7 +202,7 @@ public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) = /// /// - Parameter from: Selects where the constructor is looked up from. /// Use `.global` to construct globals like `WebSocket` via `globalThis`. -@attached(member, names: arbitrary) +@attached(member, names: named(jsObject), named(init(unsafelyWrapping:))) @attached(extension, conformances: _JSBridgedClass) @_spi(Experimental) public macro JSClass(jsName: String? = nil, from: JSImportFrom? = nil) = From 8217d069d66d1efa353f2894c31a2b3370abcf88 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 6 Feb 2026 18:39:14 +0900 Subject: [PATCH 171/252] BridgeJS: Add `JSTypedClosure` API (#578) The new API allows managing JS closures converted from Swift closures from Swift side. It allows us to get the underlying `JSObject` and manage its lifetime manually from Swift. ```swift @JS func makeIntToInt() throws(JSException) -> JSTypedClosure<(Int) -> Int> { return JSTypedClosure { x in return x + 1 } } @JSFunction func takeIntToInt(_ transform: JSTypedClosure<(Int) -> Int>) throws(JSException) let closure = JSTypedClosure<(Int) -> Int> { x in return x * 2 } defer { closure.release() } try takeIntToInt(closure) ``` Likewise to `JSClosure`, API users are responsible for "manually" releasing the closure when it's no longer needed by calling `release()`. After releasing, the closure becomes unusable and calling it will throw a JS exception (note that we will not segfault even if the closure is called after releasing). ```swift let closure = JSTypedClosure<(Int) -> Int> { x in return x * 2 } closure.release() try closure(10) // "JSException: Attempted to call a released JSTypedClosure created at :" ``` As a belt-and-suspenders measure, the underlying JS closure is also registered with a `FinalizationRegistry` to ensure that the Swift closure box is released when the JS closure is garbage collected, in case the API user forgets to call `release()`. However, relying on this mechanism is **not recommended** because the timing of garbage collection is non-deterministic and it's not guaranteed that it will happen in a timely manner. ---- On the top of the new API, this commit also fixes memory leak issues of closures exported to JS. --- Package.swift | 15 +- Package@swift-6.2.swift | 15 +- .../Sources/BridgeJSCore/ClosureCodegen.swift | 81 +- .../Sources/BridgeJSCore/ExportSwift.swift | 27 +- .../Sources/BridgeJSCore/ImportTS.swift | 61 +- .../BridgeJSCore/SwiftToSkeleton.swift | 31 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 188 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 44 +- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 19 +- .../BridgeJSCodegenTests/SwiftClosure.json | 60 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 435 ++-- .../SwiftClosureImports.json | 6 +- .../SwiftClosureImports.swift | 42 +- .../BridgeJSLinkTests/SwiftClosure.js | 399 ++-- .../BridgeJSLinkTests/SwiftClosureImports.js | 49 +- Plugins/PackageToJS/Templates/instantiate.js | 1 + .../JavaScriptKit/BridgeJSIntrinsics.swift | 49 + .../FundamentalObjects/JSClosure.swift | 91 + .../ClosureSupportTests.swift | 290 +++ .../Generated/BridgeJS.swift | 1769 ++++++++++++----- .../Generated/JavaScript/BridgeJS.json | 1527 ++++++++++---- .../BridgeJSRuntimeTests/ImportAPITests.swift | 30 - .../ImportClosureAPIs.swift | 11 - .../JavaScript/ClosureSupportTests.mjs | 311 +++ .../JavaScriptKitTests.swift | 4 + Tests/prelude.mjs | 215 +- 26 files changed, 4105 insertions(+), 1665 deletions(-) create mode 100644 Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift delete mode 100644 Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift create mode 100644 Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs diff --git a/Package.swift b/Package.swift index c7f3517e8..60adb7a5f 100644 --- a/Package.swift +++ b/Package.swift @@ -9,12 +9,15 @@ let useLegacyResourceBundling = Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false let testingLinkerFlags: [LinkerSetting] = [ - .unsafeFlags([ - "-Xlinker", "--stack-first", - "-Xlinker", "--global-base=524288", - "-Xlinker", "-z", - "-Xlinker", "stack-size=524288", - ]) + .unsafeFlags( + [ + "-Xlinker", "--stack-first", + "-Xlinker", "--global-base=524288", + "-Xlinker", "-z", + "-Xlinker", "stack-size=524288", + ], + .when(platforms: [.wasi]) + ) ] let package = Package( diff --git a/Package@swift-6.2.swift b/Package@swift-6.2.swift index f640feeb7..20583865b 100644 --- a/Package@swift-6.2.swift +++ b/Package@swift-6.2.swift @@ -16,12 +16,15 @@ let tracingTrait = Trait( ) let testingLinkerFlags: [LinkerSetting] = [ - .unsafeFlags([ - "-Xlinker", "--stack-first", - "-Xlinker", "--global-base=524288", - "-Xlinker", "-z", - "-Xlinker", "stack-size=524288", - ]) + .unsafeFlags( + [ + "-Xlinker", "--stack-first", + "-Xlinker", "--global-base=524288", + "-Xlinker", "-z", + "-Xlinker", "stack-size=524288", + ], + .when(platforms: [.wasi]) + ) ] let package = Package( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 30cf8b2c2..12e4a413c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -16,7 +16,7 @@ public struct ClosureCodegen { func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { switch type { - case .closure(let signature): + case .closure(let signature, _): signatures.insert(signature) for paramType in signature.parameters { collectClosureSignatures(from: paramType, into: &signatures) @@ -32,7 +32,6 @@ public struct ClosureCodegen { func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { let mangledName = signature.mangleName let helperName = "_BJS_Closure_\(mangledName)" - let boxClassName = "_BJS_ClosureBox_\(mangledName)" let closureParams = signature.parameters.enumerated().map { _, type in "\(type.swiftType)" @@ -40,7 +39,7 @@ public struct ClosureCodegen { let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") let swiftReturnType = signature.returnType.swiftType - let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + let swiftClosureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" @@ -69,13 +68,15 @@ public struct ClosureCodegen { // Generate extern declaration using CallJSEmission let externDecl = builder.renderImportDecl() - let boxClassDecl: DeclSyntax = """ - private final class \(raw: boxClassName): _BridgedSwiftClosureBox { - let closure: \(raw: closureType) - init(_ closure: @escaping \(raw: closureType)) { - self.closure = closure - } + let makeClosureExternDecl: DeclSyntax = """ + #if arch(wasm32) + @_extern(wasm, module: "bjs", name: "make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)") + fileprivate func make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 + #else + fileprivate func make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } + #endif """ let helperEnumDecl = EnumDeclSyntax( @@ -84,33 +85,6 @@ public struct ClosureCodegen { }, name: .identifier(helperName), memberBlockBuilder: { - DeclSyntax( - FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.static)) - }, - name: .identifier("bridgeJSLower"), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier("closure"), - colon: .colonToken(), - type: TypeSyntax("@escaping \(raw: closureType)") - ) - }, - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier("UnsafeMutableRawPointer")) - ) - ), - body: CodeBlockSyntax { - "let box = \(raw: boxClassName)(closure)" - "return Unmanaged.passRetained(box).toOpaque()" - } - ) - ) - DeclSyntax( FunctionDeclSyntax( modifiers: DeclModifierListSyntax { @@ -128,7 +102,7 @@ public struct ClosureCodegen { }, returnClause: ReturnClauseSyntax( arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(closureType)) + type: IdentifierTypeSyntax(name: .identifier(swiftClosureType)) ) ), body: CodeBlockSyntax { @@ -178,11 +152,32 @@ public struct ClosureCodegen { ) } ) - return [externDecl, boxClassDecl, DeclSyntax(helperEnumDecl)] + let typedClosureExtension: DeclSyntax = """ + extension JSTypedClosure where Signature == \(raw: swiftClosureType) { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping \(raw: swiftClosureType)) { + self.init( + makeClosure: make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName), + body: body, + fileID: fileID, + line: line + ) + } + } + """ + + return [ + externDecl, makeClosureExternDecl, DeclSyntax(helperEnumDecl), typedClosureExtension, + ] } func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { - let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)" + let closureParams = signature.parameters.enumerated().map { _, type in + "\(type.swiftType)" + }.joined(separator: ", ") + let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + let swiftReturnType = signature.returnType.swiftType + let swiftClosureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + let boxType = "_BridgeJSTypedClosureBox<\(swiftClosureType)>" let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" // Build ABI parameters directly with WasmCoreType (no string conversion needed) @@ -205,7 +200,7 @@ public struct ClosureCodegen { liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))") } - let closureCallExpr = ExprSyntax("box.closure(\(raw: liftedParams.joined(separator: ", ")))") + let closureCallExpr = ExprSyntax("closure(\(raw: liftedParams.joined(separator: ", ")))") // Determine return type let abiReturnWasmType: WasmCoreType? @@ -217,6 +212,8 @@ public struct ClosureCodegen { abiReturnWasmType = nil } + let throwReturn = abiReturnWasmType?.swiftReturnPlaceholderStmt ?? "return" + // Build signature using SwiftSignatureBuilder let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( abiParameters: abiParams, @@ -225,7 +222,7 @@ public struct ClosureCodegen { // Build body let body = CodeBlockItemListSyntax { - "let box = Unmanaged<\(raw: boxClassName)>.fromOpaque(boxPtr).takeUnretainedValue()" + "let closure = Unmanaged<\(raw: boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure" if signature.returnType == .void { closureCallExpr } else { @@ -315,7 +312,7 @@ public struct ClosureCodegen { for setter in type.setters { collectClosureSignatures(from: setter.type, into: &closureSignatures) } - for method in type.methods { + for method in type.methods + type.staticMethods { collectClosureSignatures(from: method.parameters, into: &closureSignatures) collectClosureSignatures(from: method.returnType, into: &closureSignatures) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index aa01a2c5c..acff21847 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -124,7 +124,7 @@ public class ExportSwift { let liftingExpr: ExprSyntax switch param.type { - case .closure(let signature): + case .closure(let signature, _): typeNameForIntrinsic = param.type.swiftType liftingExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: param.name))") case .swiftStruct(let structName): @@ -364,8 +364,8 @@ public class ExportSwift { } switch returnType { - case .closure(let signature): - append("return _BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(ret)") + case .closure(_, useJSTypedClosure: false): + append("return JSTypedClosure(ret).bridgeJSLowerReturn()") case .array, .nullable(.array, _): let stackCodegen = StackCodegen() for stmt in stackCodegen.lowerStatements(for: returnType, accessor: "ret", varPrefix: "ret") { @@ -423,14 +423,7 @@ public class ExportSwift { } private func returnPlaceholderStmt() -> String { - switch abiReturnType { - case .i32: return "return 0" - case .i64: return "return 0" - case .f32: return "return 0.0" - case .f64: return "return 0.0" - case .pointer: return "return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped" - case .none: return "return" - } + return abiReturnType?.swiftReturnPlaceholderStmt ?? "return" } } @@ -1749,13 +1742,19 @@ extension BridgeType { case .associatedValueEnum(let name): return name case .swiftStruct(let name): return name case .namespaceEnum(let name): return name - case .closure(let signature): + case .closure(let signature, let useJSTypedClosure): let paramTypes = signature.parameters.map { $0.swiftType }.joined(separator: ", ") let effectsStr = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") - return "(\(paramTypes))\(effectsStr) -> \(signature.returnType.swiftType)" + let closureType = "(\(paramTypes))\(effectsStr) -> \(signature.returnType.swiftType)" + return useJSTypedClosure ? "JSTypedClosure<\(closureType)>" : closureType } } + var isClosureType: Bool { + if case .closure = self { return true } + return false + } + struct LiftingIntrinsicInfo: Sendable { let parameters: [(name: String, type: WasmCoreType)] @@ -1853,7 +1852,7 @@ extension BridgeType { case .namespaceEnum: throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters") case .closure: - return .swiftHeapObject + return .jsObject case .array, .dictionary: return .array } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 7c3ecd6ea..0424d8ca0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -85,6 +85,8 @@ public struct ImportTS { var destructuredVarNames: [String] = [] // Stack-lowered parameters should be evaluated in reverse order to match LIFO stacks var stackLoweringStmts: [CodeBlockItemSyntax] = [] + // Values to extend lifetime during call + var valuesToExtendLifetimeDuringCall: [ExprSyntax] = [] init(moduleName: String, abiName: String, context: BridgeContext = .importTS) { self.moduleName = moduleName @@ -95,15 +97,17 @@ public struct ImportTS { func lowerParameter(param: Parameter) throws { let loweringInfo = try param.type.loweringParameterInfo(context: context) - let initializerExpr: ExprSyntax switch param.type { - case .closure(let signature): - initializerExpr = ExprSyntax( - "_BJS_Closure_\(raw: signature.mangleName).bridgeJSLower(\(raw: param.name))" - ) + case .closure(let signature, useJSTypedClosure: false): + let jsTypedClosureType = BridgeType.closure(signature, useJSTypedClosure: true).swiftType + body.append("let \(raw: param.name) = \(raw: jsTypedClosureType)(\(raw: param.name))") + // The just created JSObject is not owned by the caller unlike those passed in parameters, + // so we need to extend its lifetime during the call to ensure the JSObject.id is valid. + valuesToExtendLifetimeDuringCall.append("\(raw: param.name)") default: - initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + break } + let initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") if loweringInfo.loweredParameters.isEmpty { let stmt = CodeBlockItemSyntax( @@ -193,7 +197,7 @@ public struct ImportTS { let liftingInfo = try returnType.liftingReturnInfo(context: context) body.append(contentsOf: stackLoweringStmts) - let callExpr = FunctionCallExprSyntax( + var callExpr = FunctionCallExprSyntax( calledExpression: ExprSyntax("\(raw: abiName)"), leftParen: .leftParenToken(), arguments: LabeledExprListSyntax { @@ -204,12 +208,33 @@ public struct ImportTS { rightParen: .rightParenToken() ) - if returnType == .void { - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) - } else if returnType.usesSideChannelForOptionalReturn() { - // Side channel returns don't need "let ret =" - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) - } else if liftingInfo.valueToLift == nil { + if !valuesToExtendLifetimeDuringCall.isEmpty { + callExpr = FunctionCallExprSyntax( + calledExpression: ExprSyntax("withExtendedLifetime"), + leftParen: .leftParenToken(), + arguments: LabeledExprListSyntax { + LabeledExprSyntax( + expression: TupleExprSyntax( + elements: LabeledExprListSyntax { + for value in valuesToExtendLifetimeDuringCall { + LabeledExprSyntax(expression: value) + } + } + ) + ) + }, + rightParen: .rightParenToken(), + trailingClosure: ClosureExprSyntax( + leftBrace: .leftBraceToken(), + statements: CodeBlockItemListSyntax { + CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr)))) + }, + rightBrace: .rightBraceToken() + ) + ) + } + + if returnType == .void || returnType.usesSideChannelForOptionalReturn() || liftingInfo.valueToLift == nil { body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) } else { body.append("let ret = \(raw: callExpr)") @@ -249,7 +274,7 @@ public struct ImportTS { abiReturnType = liftingInfo.valueToLift let liftExpr: ExprSyntax switch returnType { - case .closure(let signature): + case .closure(let signature, _): liftExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(ret)") default: if liftingInfo.valueToLift != nil { @@ -722,11 +747,9 @@ struct SwiftSignatureBuilder { } /// Builds a parameter type syntax from a BridgeType. - /// - /// Swift closure parameters must be `@escaping` because they are boxed and can be invoked from JavaScript. static func buildParameterTypeSyntax(from type: BridgeType) -> TypeSyntax { switch type { - case .closure: + case .closure(_, useJSTypedClosure: false): return TypeSyntax("@escaping \(raw: type.swiftType)") default: return buildTypeSyntax(from: type) @@ -930,8 +953,8 @@ extension BridgeType { case .jsValue: return .jsValue case .void: return .void case .closure: - // Swift closure is boxed and passed to JS as a pointer. - return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) + // Swift closure is passed to JS as a JS function reference. + return LoweringParameterInfo(loweredParameters: [("funcRef", .i32)]) case .unsafePointer: return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) case .swiftHeapObject(let className): diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index e571d955e..1d775fbc6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -100,6 +100,17 @@ public final class SwiftToSkeleton { return lookupType(for: attributedType.baseType, errors: &errors) } + if let identifierType = type.as(IdentifierTypeSyntax.self), + identifierType.name.text == "JSTypedClosure", + let genericArgs = identifierType.genericArgumentClause?.arguments, + genericArgs.count == 1, + let argument = genericArgs.firstAsTypeSyntax, + let signatureType = lookupType(for: argument, errors: &errors), + case .closure(let signature, false) = signatureType + { + return .closure(signature, useJSTypedClosure: true) + } + // (T1, T2, ...) -> R if let functionType = type.as(FunctionTypeSyntax.self) { var parameters: [BridgeType] = [] @@ -124,7 +135,8 @@ public final class SwiftToSkeleton { moduleName: moduleName, isAsync: isAsync, isThrows: isThrows - ) + ), + useJSTypedClosure: false ) } @@ -889,7 +901,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard let type = resolvedType else { continue // Skip unsupported types } - if case .closure(let signature) = type { + if case .closure(let signature, _) = type { if signature.isAsync { diagnose( node: param.type, @@ -2537,3 +2549,18 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } } } + +extension GenericArgumentListSyntax { + /// Compatibility helper for accessing the first argument as a TypeSyntax + /// + /// Note: SwiftSyntax 601 and later support InlineArrayTypeSyntax and + /// ``GenericArgumentSyntax/argument`` is now a ``TypeSyntax`` or ``ExprSyntax``. + fileprivate var firstAsTypeSyntax: TypeSyntax? { + guard let first = self.first else { return nil } + #if canImport(SwiftSyntax601) + return first.argument.as(TypeSyntax.self) + #else + return TypeSyntax(first.argument) + #endif + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index e77bfd870..1be1f4966 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -261,46 +261,6 @@ public struct BridgeJSLink { ] } - /// Checks if a skeleton contains any closure types - private func hasClosureTypes(in skeleton: ExportedSkeleton) -> Bool { - for function in skeleton.functions { - if containsClosureType(in: function.parameters) || containsClosureType(in: function.returnType) { - return true - } - } - for klass in skeleton.classes { - if let constructor = klass.constructor, containsClosureType(in: constructor.parameters) { - return true - } - for method in klass.methods { - if containsClosureType(in: method.parameters) || containsClosureType(in: method.returnType) { - return true - } - } - for property in klass.properties { - if containsClosureType(in: property.type) { - return true - } - } - } - return false - } - - private func containsClosureType(in parameters: [Parameter]) -> Bool { - parameters.contains { containsClosureType(in: $0.type) } - } - - private func containsClosureType(in type: BridgeType) -> Bool { - switch type { - case .closure: - return true - case .nullable(let wrapped, _): - return containsClosureType(in: wrapped) - default: - return false - } - } - private func generateAddImports(needsImportsObject: Bool) -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() let allStructs = skeletons.compactMap { $0.exported?.structs }.flatMap { $0 } @@ -655,6 +615,71 @@ public struct BridgeJSLink { guard !closureSignatures.isEmpty else { continue } + intrinsicRegistry.register(name: "swiftClosureHelpers") { helperPrinter in + helperPrinter.write( + "const \(JSGlueVariableScope.reservedSwiftClosureRegistry) = (typeof FinalizationRegistry === \"undefined\") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => {" + ) + helperPrinter.indent { + helperPrinter.write("if (state.unregistered) { return; }") + helperPrinter.write( + "\(JSGlueVariableScope.reservedInstance)?.exports?.bjs_release_swift_closure(state.pointer);" + ) + } + helperPrinter.write("});") + helperPrinter.write( + "const \(JSGlueVariableScope.reservedMakeSwiftClosure) = (pointer, file, line, func) => {" + ) + helperPrinter.indent { + helperPrinter.write( + "const state = { pointer, file, line, unregistered: false };" + ) + helperPrinter.write("const real = (...args) => {") + helperPrinter.indent { + helperPrinter.write("if (state.unregistered) {") + helperPrinter.indent { + helperPrinter.write( + "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, state.file);" + ) + helperPrinter.write("let length = 0;") + helperPrinter.write("while (bytes[length] !== 0) { length += 1; }") + helperPrinter.write( + "const fileID = \(JSGlueVariableScope.reservedTextDecoder).decode(bytes.subarray(0, length));" + ) + helperPrinter.write( + "throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`);" + ) + } + helperPrinter.write("}") + helperPrinter.write("return func(...args);") + } + helperPrinter.write("};") + helperPrinter.write( + "real.__unregister = () => {" + ) + helperPrinter.indent { + helperPrinter.write( + "if (state.unregistered) { return; }" + ) + helperPrinter.write("state.unregistered = true;") + helperPrinter.write( + "\(JSGlueVariableScope.reservedSwiftClosureRegistry).unregister(state);" + ) + } + helperPrinter.write("};") + helperPrinter.write( + "\(JSGlueVariableScope.reservedSwiftClosureRegistry).register(real, state, state);" + ) + helperPrinter.write("return \(JSGlueVariableScope.reservedSwift).memory.retain(real);") + } + helperPrinter.write("};") + } + printer.write("bjs[\"swift_js_closure_unregister\"] = function(funcRef) {") + printer.indent { + printer.write("const func = \(JSGlueVariableScope.reservedSwift).memory.getObject(funcRef);") + printer.write("func.__unregister();") + } + printer.write("}") + for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { let invokeFuncName = "invoke_js_callback_\(moduleName)_\(signature.mangleName)" printer.write( @@ -665,12 +690,17 @@ public struct BridgeJSLink { ) let lowerFuncName = "lower_closure_\(moduleName)_\(signature.mangleName)" - printer.write( - lines: generateLowerClosureFunction( - signature: signature, - functionName: lowerFuncName + let makeFuncName = "make_swift_closure_\(moduleName)_\(signature.mangleName)" + printer.write("bjs[\"\(makeFuncName)\"] = function(boxPtr, file, line) {") + printer.indent { + printer.write( + lines: generateLowerClosureFunction(signature: signature, functionName: lowerFuncName) ) - ) + printer.write( + "return \(JSGlueVariableScope.reservedMakeSwiftClosure)(boxPtr, file, line, \(lowerFuncName));" + ) + } + printer.write("}") } } } @@ -721,7 +751,7 @@ public struct BridgeJSLink { for setter in type.setters { collectClosureSignatures(from: setter.type, into: &signatures) } - for method in type.methods { + for method in type.methods + type.staticMethods { collectClosureSignatures(from: method.parameters, into: &signatures) collectClosureSignatures(from: method.returnType, into: &signatures) } @@ -737,7 +767,7 @@ public struct BridgeJSLink { private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { switch type { - case .closure(let signature): + case .closure(let signature, _): signatures.insert(signature) for paramType in signature.parameters { collectClosureSignatures(from: paramType, into: &signatures) @@ -827,44 +857,40 @@ public struct BridgeJSLink { let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanupCode = CodeFragmentPrinter() - printer.nextLine() - printer.write("bjs[\"\(functionName)\"] = function(closurePtr) {") + printer.write( + "const \(functionName) = function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" + ) printer.indent { - printer.write( - "return function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" - ) - printer.indent { - printer.write("try {") - printer.indent { - var invokeArgs: [String] = ["closurePtr"] + var invokeArgs: [String] = ["boxPtr"] - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - let fragment = try! IntrinsicJSFragment.lowerParameter(type: paramType) - let lowered = fragment.printCode([paramName], scope, printer, cleanupCode) - invokeArgs.append(contentsOf: lowered) - } + for (index, paramType) in signature.parameters.enumerated() { + let paramName = "param\(index)" + let fragment = try! IntrinsicJSFragment.lowerParameter(type: paramType) + let lowered = fragment.printCode([paramName], scope, printer, cleanupCode) + invokeArgs.append(contentsOf: lowered) + } - // Call the Swift invoke function - let invokeCall = - "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))" + // Call the Swift invoke function + let invokeCall = + "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))" + let invokeResultName = "invokeResult" + printer.write("const \(invokeResultName) = \(invokeCall);") - let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) - _ = returnFragment.printCode([invokeCall], scope, printer, cleanupCode) - } - printer.write("} catch (error) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") - switch signature.returnType { - case .void: - printer.write("return;") - default: - printer.write("throw error;") - } - } - printer.write("}") + printer.write("if (\(JSGlueVariableScope.reservedStorageToReturnException)) {") + printer.indent { + printer.write( + "const error = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(JSGlueVariableScope.reservedStorageToReturnException));" + ) + printer.write( + "\(JSGlueVariableScope.reservedSwift).memory.release(\(JSGlueVariableScope.reservedStorageToReturnException));" + ) + printer.write("\(JSGlueVariableScope.reservedStorageToReturnException) = undefined;") + printer.write("throw error;") } - printer.write("};") + printer.write("}") + + let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) + _ = returnFragment.printCode([invokeResultName], scope, printer, cleanupCode) } printer.write("};") @@ -3552,7 +3578,7 @@ extension BridgeType { return name case .swiftProtocol(let name): return name - case .closure(let signature): + case .closure(let signature, _): let paramTypes = signature.parameters.enumerated().map { index, param in "arg\(index): \(param.tsType)" }.joined(separator: ", ") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 8d909623c..dec77b3cb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -29,6 +29,8 @@ final class JSGlueVariableScope { static let reservedTmpStructCleanups = "tmpStructCleanups" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" + static let reservedSwiftClosureRegistry = "swiftClosureRegistry" + static let reservedMakeSwiftClosure = "makeClosure" private let intrinsicRegistry: JSIntrinsicRegistry @@ -56,6 +58,8 @@ final class JSGlueVariableScope { reservedTmpStructCleanups, reservedEnumHelpers, reservedStructHelpers, + reservedSwiftClosureRegistry, + reservedMakeSwiftClosure, ] init(intrinsicRegistry: JSIntrinsicRegistry) { @@ -660,6 +664,9 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") resultExpr = "\(isSome) ? \(objectLabel) : \(absenceLiteral)" + case .closure: + resultExpr = + "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" case .swiftHeapObject(let name): resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : \(absenceLiteral)" case .jsObject: @@ -1392,7 +1399,7 @@ struct IntrinsicJSFragment: Sendable { let absenceLiteral = kind.absenceLiteral switch wrappedType { case .string, .rawValueEnum, .int, .bool, .double, .float, .jsObject, .swiftHeapObject, .caseEnum, - .associatedValueEnum: + .associatedValueEnum, .closure: break default: throw BridgeJSLinkError( @@ -1445,6 +1452,9 @@ struct IntrinsicJSFragment: Sendable { printer.write( "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value));" ) + case .closure: + printer.write("\(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));") + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") default: fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") } @@ -1731,6 +1741,20 @@ struct IntrinsicJSFragment: Sendable { return [] } ) + case .closure: + return IntrinsicJSFragment( + parameters: ["invokeCall"], + printCode: { arguments, scope, printer, cleanupCode in + let funcRefVar = scope.variable("swiftClosureFuncRef") + printer.write("const \(funcRefVar) = \(arguments[0]);") + printer.write( + "const funcObj = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRefVar));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(funcRefVar));") + printer.write("return funcObj;") + return [] + } + ) case .rawValueEnum(_, let rawType): switch rawType { case .string: @@ -1929,14 +1953,12 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return swiftStructLiftReturn(structBase: base) - case .closure(let signature): - let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)" + case .closure: return IntrinsicJSFragment( - parameters: ["boxPtr"], + parameters: ["funcRef"], printCode: { arguments, scope, printer, cleanupCode in - let boxPtr = arguments[0] - printer.write("return bjs[\"\(lowerFuncName)\"](\(boxPtr));") - return [] + let funcRef = arguments[0] + return ["\(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRef))"] } ) case .namespaceEnum(let string): @@ -2023,12 +2045,12 @@ struct IntrinsicJSFragment: Sendable { } ) } - case .closure(let signature): - let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)" + case .closure: return IntrinsicJSFragment( - parameters: ["boxPtr"], + parameters: ["funcRef"], printCode: { arguments, scope, printer, cleanupCode in - return ["bjs[\"\(lowerFuncName)\"](\(arguments[0]))"] + let funcRef = arguments[0] + return ["\(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRef))"] } ) case .namespaceEnum(let string): diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 3029fe0c9..3ebc91306 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -160,7 +160,7 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable { case namespaceEnum(String) case swiftProtocol(String) case swiftStruct(String) - indirect case closure(ClosureSignature) + indirect case closure(ClosureSignature, useJSTypedClosure: Bool) } public enum WasmCoreType: String, Codable, Sendable { @@ -1019,12 +1019,12 @@ extension BridgeType { return "\(name.count)\(name)P" case .swiftStruct(let name): return "\(name.count)\(name)V" - case .closure(let signature): + case .closure(let signature, let useJSTypedClosure): let params = signature.parameters.isEmpty ? "y" : signature.parameters.map { $0.mangleTypeName }.joined() - return "K\(params)_\(signature.returnType.mangleTypeName)" + return "K\(params)_\(signature.returnType.mangleTypeName)\(useJSTypedClosure ? "J" : "")" case .array(let elementType): // Array mangling: "Sa" prefix followed by element type return "Sa\(elementType.mangleTypeName)" @@ -1060,3 +1060,16 @@ extension BridgeType { } } } + +extension WasmCoreType { + /// Returns a Swift statement that returns a placeholder value for this Wasm core type. + public var swiftReturnPlaceholderStmt: String { + switch self { + case .i32: return "return 0" + case .i64: return "return 0" + case .f32: return "return 0.0" + case .f64: return "return 0.0" + case .pointer: return "return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped" + } + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json index d71726828..ee551fa47 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json @@ -62,7 +62,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -99,7 +100,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -143,7 +145,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -237,7 +240,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -279,7 +283,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -303,7 +308,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -343,7 +349,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -372,7 +379,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -407,7 +415,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -450,7 +459,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -493,7 +503,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -535,7 +546,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -576,7 +588,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -611,7 +624,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -646,7 +660,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -680,7 +695,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -720,7 +736,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -768,7 +785,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -815,7 +833,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -861,7 +880,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index 94351dbdf..e659988d1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -7,18 +7,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ ca } #endif -private final class _BJS_ClosureBox_10TestModule10HttpStatusO_Si: _BridgedSwiftClosureBox { - let closure: (HttpStatus) -> Int - init(_ closure: @escaping (HttpStatus) -> Int) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule10HttpStatusO_Si") +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule10HttpStatusO_Si { - static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule10HttpStatusO_Si(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -34,12 +32,23 @@ private enum _BJS_Closure_10TestModule10HttpStatusO_Si { } } +extension JSTypedClosure where Signature == (HttpStatus) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (HttpStatus) -> Int) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule10HttpStatusO_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") @_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(HttpStatus.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -55,18 +64,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_ callback } #endif -private final class _BJS_ClosureBox_10TestModule5ThemeO_SS: _BridgedSwiftClosureBox { - let closure: (Theme) -> String - init(_ closure: @escaping (Theme) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_SS") +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule5ThemeO_SS { - static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule5ThemeO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -82,12 +89,23 @@ private enum _BJS_Closure_10TestModule5ThemeO_SS { } } +extension JSTypedClosure where Signature == (Theme) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule5ThemeO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -103,18 +121,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_ callback } #endif -private final class _BJS_ClosureBox_10TestModule5ThemeO_Sb: _BridgedSwiftClosureBox { - let closure: (Theme) -> Bool - init(_ closure: @escaping (Theme) -> Bool) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_Sb") +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule5ThemeO_Sb { - static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule5ThemeO_Sb(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -130,12 +146,23 @@ private enum _BJS_Closure_10TestModule5ThemeO_Sb { } } +extension JSTypedClosure where Signature == (Theme) -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> Bool) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule5ThemeO_Sb, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") @_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -151,18 +178,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_ callbac } #endif -private final class _BJS_ClosureBox_10TestModule6PersonC_SS: _BridgedSwiftClosureBox { - let closure: (Person) -> String - init(_ closure: @escaping (Person) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule6PersonC_SS") +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule6PersonC_SS { - static func bridgeJSLower(_ closure: @escaping (Person) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule6PersonC_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -178,12 +203,23 @@ private enum _BJS_Closure_10TestModule6PersonC_SS { } } +extension JSTypedClosure where Signature == (Person) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Person) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule6PersonC_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule6PersonC_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_SS") public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Person.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Person) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Person.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -199,18 +235,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_ call } #endif -private final class _BJS_ClosureBox_10TestModule9APIResultO_SS: _BridgedSwiftClosureBox { - let closure: (APIResult) -> String - init(_ closure: @escaping (APIResult) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9APIResultO_SS") +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule9APIResultO_SS { - static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule9APIResultO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -226,12 +260,23 @@ private enum _BJS_Closure_10TestModule9APIResultO_SS { } } +extension JSTypedClosure where Signature == (APIResult) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (APIResult) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule9APIResultO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(APIResult.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -247,18 +292,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_ call } #endif -private final class _BJS_ClosureBox_10TestModule9DirectionO_SS: _BridgedSwiftClosureBox { - let closure: (Direction) -> String - init(_ closure: @escaping (Direction) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_SS") +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule9DirectionO_SS { - static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule9DirectionO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -274,12 +317,23 @@ private enum _BJS_Closure_10TestModule9DirectionO_SS { } } +extension JSTypedClosure where Signature == (Direction) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule9DirectionO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -295,18 +349,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_ call } #endif -private final class _BJS_ClosureBox_10TestModule9DirectionO_Sb: _BridgedSwiftClosureBox { - let closure: (Direction) -> Bool - init(_ closure: @escaping (Direction) -> Bool) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_Sb") +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModule9DirectionO_Sb { - static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModule9DirectionO_Sb(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -322,12 +374,23 @@ private enum _BJS_Closure_10TestModule9DirectionO_Sb { } } +extension JSTypedClosure where Signature == (Direction) -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> Bool) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModule9DirectionO_Sb, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") @_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModule9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -343,18 +406,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int } #endif -private final class _BJS_ClosureBox_10TestModuleSS_SS: _BridgedSwiftClosureBox { - let closure: (String) -> String - init(_ closure: @escaping (String) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSS_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSS_SS { - static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSS_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -370,12 +431,23 @@ private enum _BJS_Closure_10TestModuleSS_SS { } } +extension JSTypedClosure where Signature == (String) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSS_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSS_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -391,18 +463,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_ callba } #endif -private final class _BJS_ClosureBox_10TestModuleSq5ThemeO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSq5ThemeO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -418,12 +488,23 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -439,18 +520,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS } #endif -private final class _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS: _BridgedSwiftClosureBox { - let closure: (Optional, Optional, Optional) -> String - init(_ closure: @escaping (Optional, Optional, Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { - static func bridgeJSLower(_ closure: @escaping (Optional, Optional, Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0, param1, param2 in @@ -468,12 +547,23 @@ private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { } } +extension JSTypedClosure where Signature == (Optional, Optional, Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional, Optional, Optional) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonCSqSSSqSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional, Optional, Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -489,18 +579,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_ callb } #endif -private final class _BJS_ClosureBox_10TestModuleSq6PersonC_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonC_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSq6PersonC_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSq6PersonC_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -516,12 +604,23 @@ private enum _BJS_Closure_10TestModuleSq6PersonC_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSq6PersonC_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq6PersonC_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -537,18 +636,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_ ca } #endif -private final class _BJS_ClosureBox_10TestModuleSq9APIResultO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSq9APIResultO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -564,12 +661,23 @@ private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -585,18 +693,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_ ca } #endif -private final class _BJS_ClosureBox_10TestModuleSq9DirectionO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSq9DirectionO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -612,12 +718,23 @@ private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -799,10 +916,10 @@ public func _bjs_TestProcessor_init(_ transform: Int32) -> UnsafeMutableRawPoint @_expose(wasm, "bjs_TestProcessor_getTransform") @_cdecl("bjs_TestProcessor_getTransform") -public func _bjs_TestProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).getTransform() - return _BJS_Closure_10TestModuleSS_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -832,10 +949,10 @@ public func _bjs_TestProcessor_printTogether(_ _self: UnsafeMutableRawPointer, _ @_expose(wasm, "bjs_TestProcessor_roundtrip") @_cdecl("bjs_TestProcessor_roundtrip") -public func _bjs_TestProcessor_roundtrip(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_roundtrip(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLift(personClosure)) - return _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -843,10 +960,10 @@ public func _bjs_TestProcessor_roundtrip(_ _self: UnsafeMutableRawPointer, _ per @_expose(wasm, "bjs_TestProcessor_roundtripOptional") @_cdecl("bjs_TestProcessor_roundtripOptional") -public func _bjs_TestProcessor_roundtripOptional(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_roundtripOptional(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLift(personClosure)) - return _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -898,10 +1015,10 @@ public func _bjs_TestProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer @_expose(wasm, "bjs_TestProcessor_makeDirectionChecker") @_cdecl("bjs_TestProcessor_makeDirectionChecker") -public func _bjs_TestProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() - return _BJS_Closure_10TestModule9DirectionO_Sb.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -909,10 +1026,10 @@ public func _bjs_TestProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPoi @_expose(wasm, "bjs_TestProcessor_makeThemeValidator") @_cdecl("bjs_TestProcessor_makeThemeValidator") -public func _bjs_TestProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() - return _BJS_Closure_10TestModule5ThemeO_Sb.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -920,10 +1037,10 @@ public func _bjs_TestProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TestProcessor_makeStatusCodeExtractor") @_cdecl("bjs_TestProcessor_makeStatusCodeExtractor") -public func _bjs_TestProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() - return _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -931,10 +1048,10 @@ public func _bjs_TestProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRaw @_expose(wasm, "bjs_TestProcessor_makeAPIResultHandler") @_cdecl("bjs_TestProcessor_makeAPIResultHandler") -public func _bjs_TestProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() - return _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -975,10 +1092,10 @@ public func _bjs_TestProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRa @_expose(wasm, "bjs_TestProcessor_makeOptionalDirectionFormatter") @_cdecl("bjs_TestProcessor_makeOptionalDirectionFormatter") -public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TestProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json index 9e0e0a491..0013c810c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.json @@ -35,7 +35,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -77,7 +78,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift index c833a54d1..c42c3b36f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift @@ -7,18 +7,16 @@ fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int } #endif -private final class _BJS_ClosureBox_10TestModuleSi_Si: _BridgedSwiftClosureBox { - let closure: (Int) -> Int - init(_ closure: @escaping (Int) -> Int) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSi_Si") +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_10TestModuleSi_Si { - static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_10TestModuleSi_Si(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -34,12 +32,23 @@ private enum _BJS_Closure_10TestModuleSi_Si { } } +extension JSTypedClosure where Signature == (Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Int) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSi_Si") @_cdecl("invoke_swift_closure_TestModule_10TestModuleSi_Si") public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_10TestModuleSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Int.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -48,17 +57,20 @@ public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_applyInt") -fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 +fileprivate func bjs_applyInt(_ value: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_applyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { +fileprivate func bjs_applyInt(_ value: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { let valueValue = value.bridgeJSLowerParameter() - let transformPointer = _BJS_Closure_10TestModuleSi_Si.bridgeJSLower(transform) - let ret = bjs_applyInt(valueValue, transformPointer) + let transform = JSTypedClosure<(Int) -> Int>(transform) + let transformFuncRef = transform.bridgeJSLowerParameter() + let ret = withExtendedLifetime((transform)) { + bjs_applyInt(valueValue, transformFuncRef) + } if let error = _swift_js_take_exception() { throw error } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index bc0def6f1..a6966ae40 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -60,6 +60,31 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.unregistered) { return; } + instance?.exports?.bjs_release_swift_closure(state.pointer); + }); + const makeClosure = (pointer, file, line, func) => { + const state = { pointer, file, line, unregistered: false }; + const real = (...args) => { + if (state.unregistered) { + const bytes = new Uint8Array(memory.buffer, state.file); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = textDecoder.decode(bytes.subarray(0, length)); + throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); + } + return func(...args); + }; + real.__unregister = () => { + if (state.unregistered) { return; } + state.unregistered = true; + swiftClosureRegistry.unregister(state); + }; + swiftClosureRegistry.register(real, state, state); + return swift.memory.retain(real); + }; + const __bjs_createAPIResultValuesHelpers = () => { return () => ({ lower: (value) => { @@ -298,6 +323,10 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) { + const func = swift.memory.getObject(funcRef); + func.__unregister(); + } bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si"] = function(callbackId, param0Id) { try { @@ -310,17 +339,19 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule10HttpStatusO_Si"] = function(closurePtr) { - return function(param0) { - try { - return instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(closurePtr, param0) | 0; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule10HttpStatusO_Si"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule10HttpStatusO_Si = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + return invokeResult | 0; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10HttpStatusO_Si); + } bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_SS"] = function(callbackId, param0Id) { try { @@ -340,22 +371,24 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule5ThemeO_SS"] = function(closurePtr) { - return function(param0) { - try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(closurePtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule5ThemeO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule5ThemeO_SS = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr, param0Id, param0Bytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_SS); + } bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_Sb"] = function(callbackId, param0Id) { try { @@ -370,19 +403,21 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule5ThemeO_Sb"] = function(closurePtr) { - return function(param0) { - try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - return instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(closurePtr, param0Id, param0Bytes.length) !== 0; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule5ThemeO_Sb"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule5ThemeO_Sb = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr, param0Id, param0Bytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + return invokeResult !== 0; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_Sb); + } bjs["invoke_js_callback_TestModule_10TestModule6PersonC_SS"] = function(callbackId, param0Id) { try { @@ -400,20 +435,22 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule6PersonC_SS"] = function(closurePtr) { - return function(param0) { - try { - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_SS(closurePtr, param0.pointer); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule6PersonC_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule6PersonC_SS = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr, param0.pointer); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6PersonC_SS); + } bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { try { @@ -431,21 +468,23 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule9APIResultO_SS"] = function(closurePtr) { - return function(param0) { - try { - const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(closurePtr, param0CaseId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule9APIResultO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule9APIResultO_SS = function(param0) { + const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr, param0CaseId); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_SS); + } bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_SS"] = function(callbackId, param0Id) { try { @@ -463,20 +502,22 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule9DirectionO_SS"] = function(closurePtr) { - return function(param0) { - try { - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(closurePtr, param0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule9DirectionO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule9DirectionO_SS = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_SS); + } bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_Sb"] = function(callbackId, param0Id) { try { @@ -489,17 +530,19 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModule9DirectionO_Sb"] = function(closurePtr) { - return function(param0) { - try { - return instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(closurePtr, param0) !== 0; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModule9DirectionO_Sb"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule9DirectionO_Sb = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + return invokeResult !== 0; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_Sb); + } bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { try { @@ -519,22 +562,24 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSS_SS"] = function(closurePtr) { - return function(param0) { - try { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(closurePtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSS_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSS_SS = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); + } bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS"] = function(callbackId, param0IsSome, param0Value) { try { @@ -559,26 +604,28 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSq5ThemeO_SS"] = function(closurePtr) { - return function(param0) { - try { - const isSome = param0 != null; - let param0Id, param0Bytes; - if (isSome) { - param0Bytes = textEncoder.encode(param0); - param0Id = swift.memory.retain(param0Bytes); - } - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(closurePtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq5ThemeO_SS = function(param0) { + const isSome = param0 != null; + let param0Id, param0Bytes; + if (isSome) { + param0Bytes = textEncoder.encode(param0); + param0Id = swift.memory.retain(param0Bytes); + } + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_SS); + } bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { try { @@ -615,28 +662,30 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(closurePtr) { - return function(param0, param1, param2) { - try { - const isSome = param0 != null; - const isSome1 = param1 != null; - let param1Id, param1Bytes; - if (isSome1) { - param1Bytes = textEncoder.encode(param1); - param1Id = swift.memory.retain(param1Bytes); - } - const isSome2 = param2 != null; - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(closurePtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS = function(param0, param1, param2) { + const isSome = param0 != null; + const isSome1 = param1 != null; + let param1Id, param1Bytes; + if (isSome1) { + param1Bytes = textEncoder.encode(param1); + param1Id = swift.memory.retain(param1Bytes); + } + const isSome2 = param2 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(boxPtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS); + } bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS"] = function(callbackId, param0IsSome, param0Value) { try { @@ -659,21 +708,23 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSq6PersonC_SS"] = function(closurePtr) { - return function(param0) { - try { - const isSome = param0 != null; - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(closurePtr, +isSome, isSome ? param0.pointer : 0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSq6PersonC_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq6PersonC_SS = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr, +isSome, isSome ? param0.pointer : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_SS); + } bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS"] = function(callbackId, param0IsSome, param0Value) { try { @@ -696,27 +747,29 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSq9APIResultO_SS"] = function(closurePtr) { - return function(param0) { - try { - const isSome = param0 != null; - let param0CaseId, param0Cleanup; - if (isSome) { - const enumResult = enumHelpers.APIResult.lower(param0); - param0CaseId = enumResult.caseId; - param0Cleanup = enumResult.cleanup; - } - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(closurePtr, +isSome, isSome ? param0CaseId : 0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq9APIResultO_SS = function(param0) { + const isSome = param0 != null; + let param0CaseId, param0Cleanup; + if (isSome) { + const enumResult = enumHelpers.APIResult.lower(param0); + param0CaseId = enumResult.caseId; + param0Cleanup = enumResult.cleanup; + } + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr, +isSome, isSome ? param0CaseId : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_SS); + } bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS"] = function(callbackId, param0IsSome, param0Value) { try { @@ -739,21 +792,23 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"] = function(closurePtr) { - return function(param0) { - try { - const isSome = param0 != null; - const resultLen = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(closurePtr, +isSome, isSome ? param0 : 0); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq9DirectionO_SS = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(boxPtr, +isSome, isSome ? param0 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + const resultLen = invokeResult; + const ret = tmpRetString; + tmpRetString = undefined; + return ret; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_SS); + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -822,7 +877,7 @@ export async function createInstantiator(options, swift) { } getTransform() { const ret = instance.exports.bjs_TestProcessor_getTransform(this.pointer); - return bjs["lower_closure_TestModule_10TestModuleSS_SS"](ret); + return swift.memory.getObject(ret); } processWithCustom(text, customTransform) { const textBytes = textEncoder.encode(text); @@ -847,12 +902,12 @@ export async function createInstantiator(options, swift) { roundtrip(personClosure) { const callbackId = swift.memory.retain(personClosure); const ret = instance.exports.bjs_TestProcessor_roundtrip(this.pointer, callbackId); - return bjs["lower_closure_TestModule_10TestModule6PersonC_SS"](ret); + return swift.memory.getObject(ret); } roundtripOptional(personClosure) { const callbackId = swift.memory.retain(personClosure); const ret = instance.exports.bjs_TestProcessor_roundtripOptional(this.pointer, callbackId); - return bjs["lower_closure_TestModule_10TestModuleSq6PersonC_SS"](ret); + return swift.memory.getObject(ret); } processDirection(callback) { const callbackId = swift.memory.retain(callback); @@ -882,19 +937,19 @@ export async function createInstantiator(options, swift) { } makeDirectionChecker() { const ret = instance.exports.bjs_TestProcessor_makeDirectionChecker(this.pointer); - return bjs["lower_closure_TestModule_10TestModule9DirectionO_Sb"](ret); + return swift.memory.getObject(ret); } makeThemeValidator() { const ret = instance.exports.bjs_TestProcessor_makeThemeValidator(this.pointer); - return bjs["lower_closure_TestModule_10TestModule5ThemeO_Sb"](ret); + return swift.memory.getObject(ret); } makeStatusCodeExtractor() { const ret = instance.exports.bjs_TestProcessor_makeStatusCodeExtractor(this.pointer); - return bjs["lower_closure_TestModule_10TestModule10HttpStatusO_Si"](ret); + return swift.memory.getObject(ret); } makeAPIResultHandler() { const ret = instance.exports.bjs_TestProcessor_makeAPIResultHandler(this.pointer); - return bjs["lower_closure_TestModule_10TestModule9APIResultO_SS"](ret); + return swift.memory.getObject(ret); } processOptionalDirection(callback) { const callbackId = swift.memory.retain(callback); @@ -919,7 +974,7 @@ export async function createInstantiator(options, swift) { } makeOptionalDirectionFormatter() { const ret = instance.exports.bjs_TestProcessor_makeOptionalDirectionFormatter(this.pointer); - return bjs["lower_closure_TestModule_10TestModuleSq9DirectionO_SS"](ret); + return swift.memory.getObject(ret); } } const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 6c1397fff..c61b71313 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -30,6 +30,31 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; + const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.unregistered) { return; } + instance?.exports?.bjs_release_swift_closure(state.pointer); + }); + const makeClosure = (pointer, file, line, func) => { + const state = { pointer, file, line, unregistered: false }; + const real = (...args) => { + if (state.unregistered) { + const bytes = new Uint8Array(memory.buffer, state.file); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = textDecoder.decode(bytes.subarray(0, length)); + throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); + } + return func(...args); + }; + real.__unregister = () => { + if (state.unregistered) { return; } + state.unregistered = true; + swiftClosureRegistry.unregister(state); + }; + swiftClosureRegistry.register(real, state, state); + return swift.memory.retain(real); + }; + return { /** @@ -198,6 +223,10 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) { + const func = swift.memory.getObject(funcRef); + func.__unregister(); + } bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { try { @@ -210,21 +239,23 @@ export async function createInstantiator(options, swift) { return 0; } }; - - bjs["lower_closure_TestModule_10TestModuleSi_Si"] = function(closurePtr) { - return function(param0) { - try { - return instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(closurePtr, param0) | 0; - } catch (error) { - setException?.(error); + bjs["make_swift_closure_TestModule_10TestModuleSi_Si"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSi_Si = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; throw error; } + return invokeResult | 0; }; - }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si); + } const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_applyInt"] = function bjs_applyInt(value, transform) { try { - let ret = imports.applyInt(value, bjs["lower_closure_TestModule_10TestModuleSi_Si"](transform)); + let ret = imports.applyInt(value, swift.memory.getObject(transform)); return ret; } catch (error) { setException(error); diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index c17d78841..a0920964b 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -65,6 +65,7 @@ async function createInstantiator(options, swift) { swift_js_push_pointer: unexpectedBjsCall, swift_js_pop_pointer: unexpectedBjsCall, swift_js_struct_cleanup: unexpectedBjsCall, + swift_js_closure_unregister: unexpectedBjsCall, } }, /** @param {WebAssembly.Instance} instance */ diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index fd2cbd909..4c8fdf3db 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -49,6 +49,40 @@ import _CJavaScriptKit #endif } +/// Releases a Swift closure from the FinalizationRegistry +/// +/// This function is called by the BridgeJS code generator when a Swift closure is released. +/// The closure is released from the FinalizationRegistry so it can be garbage collected to +/// balance the +/// +/// - Parameter pointer: The pointer to `_BridgeJSTypedClosureBox` instance +@_expose(wasm, "bjs_release_swift_closure") +public func _bjs_release_swift_closure(_ pointer: UnsafeMutableRawPointer) { + Unmanaged.fromOpaque(pointer).release() +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_closure_unregister") +internal func _swift_js_closure_unregister(_ id: Int32) +#else +/// Unregisters a Swift closure from the FinalizationRegistry +/// +/// - Parameter id: The JavaScriptObjectRef of the JS closure object created by +/// the BridgeJS's `make_swift_closure_{signature}` function. +/// +/// - Note: This is a best-effort operation. +/// According to the ECMAScript specification, calling +/// `FinalizationRegistry.prototype.unregister` does not guarantee that +/// a finalization callback will be suppressed if the target object has +/// already been garbage-collected and cleanup has been scheduled. +/// This means that the finalization callback should be tolerant of the +/// object being already collected. +/// See: https://tc39.es/ecma262/multipage/managing-memory.html#sec-finalization-registry.prototype.unregister +internal func _swift_js_closure_unregister(_ id: Int32) { + _onlyAvailableOnWasm() +} +#endif + // MARK: Type lowering/lifting // // The following part defines the parameter and return value lowering/lifting @@ -1108,6 +1142,21 @@ extension UnsafeMutablePointer: _BridgedSwiftStackType { } } +// Optional support for JSTypedClosure +extension Optional { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> ( + isSome: Int32, value: Int32 + ) where Wrapped == JSTypedClosure { + switch consume self { + case .none: + return (isSome: 0, value: 0) + case .some(let wrapped): + // Use return lowering to retain the JS function so JS lifting can fetch it from the heap. + return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + } + } +} + extension Optional where Wrapped == Bool { // MARK: ExportSwift diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift index 941b3f468..b3e80e66f 100644 --- a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift +++ b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift @@ -245,6 +245,97 @@ public class JSClosure: JSObject, JSClosureProtocol { #endif } +/// Heap storage for typed closures generated by BridgeJS. +/// +/// The storage is owned by the JavaScript closure and keeps the call-site metadata +/// so that calls after `release()` can report a helpful error. +@_spi(BridgeJS) public final class _BridgeJSTypedClosureBox: _BridgedSwiftClosureBox { + @_spi(BridgeJS) public var closure: Signature + var isManuallyReleased: Bool = false + + init(_ closure: Signature) { + self.closure = closure + } +} + +/// A typed handle to a JavaScript closure generated by BridgeJS. +/// +/// Use `JSTypedClosure` when you need to pass a Swift closure to JavaScript and then +/// manage its lifetime explicitly from Swift. You must call `release()` when the closure +/// is no longer needed. After releasing, any attempt to invoke the closure from JavaScript +/// throws a `JSException` (no crash), including a file/line message pointing to where the +/// typed closure was created. +/// +/// The underlying JavaScript function is also registered with a `FinalizationRegistry` as a +/// safety net to release the Swift closure storage if `release()` is forgotten, but this +/// is non-deterministic and should not be relied on for timely cleanup. +/// +/// ```swift +/// @JSFunction func someJSFunction(_ c: JSTypedClosure<(Int) -> Int>) throws(JSException) +/// let closure = JSTypedClosure<(Int) -> Int> { $0 + 1 } +/// defer { closure.release() } +/// try someJSFunction(closure) +/// ``` +public struct JSTypedClosure { + private let storage: _BridgeJSTypedClosureBox + private let _jsObject: JSObject + + @_spi(BridgeJS) + public init( + makeClosure: (_ pointer: UnsafeMutableRawPointer, _ fileID: UnsafePointer, _ line: UInt32) -> Int32, + body: Signature, + fileID: StaticString, + line: UInt32 + ) { + let storage = _BridgeJSTypedClosureBox(body) + // NOTE: Perform an unbalanced retain to give the closure box storage ownership + // to the JavaScript side. It will be balanced by two code paths: + // + // 1. When the JS closure made by `makeClosure` is GC'ed, the FinalizationRegistry + // will call `_bjs_release_swift_closure` to release the closure box storage. + // 2. When Swift side manually calls `release()` on the closure, it will release + // the closure box storage. + let pointer = Unmanaged.passRetained(storage).toOpaque() + let id = makeClosure(pointer, fileID.utf8Start, line) + self._jsObject = JSObject(id: UInt32(bitPattern: id)) + self.storage = storage + } + + @_spi(BridgeJS) + public func bridgeJSLowerParameter() -> Int32 { + return _jsObject.bridgeJSLowerParameter() + } + + @_spi(BridgeJS) + public func bridgeJSLowerReturn() -> Int32 { + return _jsObject.bridgeJSLowerReturn() + } + + /// The underlying JavaScript function handle. + /// + /// Use this when you need to store or compare the JS function identity on the JavaScript side. + public var jsObject: JSObject { _jsObject } + + /// Releases the Swift closure storage owned by this typed closure. + /// + /// Call this exactly once when the closure is no longer needed by JavaScript. + /// After release, any attempt to invoke the closure from JavaScript throws a `JSException` + /// describing a call on a released `JSTypedClosure`. + /// Calling `release()` multiple times has no effect. + public func release() { + guard !storage.isManuallyReleased else { + // Already manually released + return + } + storage.isManuallyReleased = true + // Unregister the closure from the FinalizationRegistry because we here decrement + // the refcount of the storage, so the finalizer won't be responsible for releasing it. + _swift_js_closure_unregister(Int32(bitPattern: _jsObject.id)) + // Balance the retain given to the JavaScript side + Unmanaged.passUnretained(storage).release() + } +} + #if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI)) @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) private func makeAsyncClosure( diff --git a/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift new file mode 100644 index 000000000..320fec526 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift @@ -0,0 +1,290 @@ +import XCTest +@_spi(Experimental) import JavaScriptKit + +@JSClass struct ClosureSupportImports { + + @JSFunction static func jsApplyVoid(_ callback: JSTypedClosure<() -> Void>) throws(JSException) + @JSFunction static func jsApplyBool(_ callback: JSTypedClosure<() -> Bool>) throws(JSException) -> Bool + @JSFunction static func jsApplyInt( + _ value: Int, + _ transform: JSTypedClosure<(Int) -> Int> + ) throws(JSException) -> Int + @JSFunction static func jsApplyDouble( + _ value: Double, + _ transform: JSTypedClosure<(Double) -> Double> + ) throws(JSException) -> Double + @JSFunction static func jsApplyString( + _ value: String, + _ transform: JSTypedClosure<(String) -> String> + ) throws(JSException) -> String + // @JSFunction static func jsApplyJSValue( + // _ value: JSValue, + // _ transform: JSTypedClosure<(JSValue) -> JSValue> + // ) throws(JSException) -> JSValue + @JSFunction static func jsApplyJSObject( + _ value: JSObject, + _ transform: JSTypedClosure<(JSObject) -> JSObject> + ) throws(JSException) -> JSObject + // @JSFunction static func jsApplyArrayInt( + // _ value: [Int], + // _ transform: JSTypedClosure<([Int]) -> [Int]> + // ) throws(JSException) -> [Int] + // @JSFunction static func jsApplyArrayDouble( + // _ value: [Double], + // _ transform: JSTypedClosure<([Double]) -> [Double]> + // ) throws(JSException) -> [Double] + // @JSFunction static func jsApplyArrayString( + // _ value: [String], + // _ transform: JSTypedClosure<([String]) -> [String]> + // ) throws(JSException) -> [String] + // @JSFunction static func jsApplyArrayJSValue( + // _ value: [JSValue], + // _ transform: JSTypedClosure<([JSValue]) -> [JSValue]> + // ) throws(JSException) -> [JSValue] + // @JSFunction static func jsApplyArrayJSObject( + // _ value: [JSObject], + // _ transform: JSTypedClosure<([JSObject]) -> [JSObject]> + // ) throws(JSException) -> [JSObject] + + @JSFunction static func jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int + @JSFunction static func jsMakeDoubleToDouble(_ base: Double) throws(JSException) -> (Double) -> Double + @JSFunction static func jsMakeStringToString(_ `prefix`: String) throws(JSException) -> (String) -> String + + @JSFunction static func jsCallTwice( + _ value: Int, + _ callback: JSTypedClosure<(Int) -> Void> + ) throws(JSException) -> Int + @JSFunction static func jsCallBinary(_ callback: JSTypedClosure<(Int, Int) -> Int>) throws(JSException) -> Int + @JSFunction static func jsCallTriple(_ callback: JSTypedClosure<(Int, Int, Int) -> Int>) throws(JSException) -> Int + @JSFunction static func jsCallAfterRelease(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> String + @JSFunction static func jsOptionalInvoke(_ callback: JSTypedClosure<() -> Bool>?) throws(JSException) -> Bool + @JSFunction static func jsStoreClosure(_ callback: JSTypedClosure<() -> Void>) throws(JSException) + @JSFunction static func jsCallStoredClosure() throws(JSException) + @JSFunction static func jsHeapCount() throws(JSException) -> Int + + @JSFunction static func runJsClosureSupportTests() throws(JSException) +} + +@JS class ClosureSupportExports { + @JS static func makeIntToInt(_ base: Int) -> (Int) -> Int { + return { $0 + base } + } + @JS static func makeDoubleToDouble(_ base: Double) -> (Double) -> Double { + return { $0 + base } + } + @JS static func makeStringToString(_ prefix: String) -> (String) -> String { + return { prefix + $0 } + } + + @JS static func makeJSIntToInt(_ base: Int) -> JSTypedClosure<(Int) -> Int> { + return JSTypedClosure { $0 + base } + } + @JS static func makeJSDoubleToDouble(_ base: Double) -> JSTypedClosure<(Double) -> Double> { + return JSTypedClosure { $0 + base } + } + @JS static func makeJSStringToString(_ prefix: String) -> JSTypedClosure<(String) -> String> { + return JSTypedClosure { prefix + $0 } + } +} + +final class ClosureSupportTests: XCTestCase { + + func testRunJsClosureSupportTests() throws { + try ClosureSupportImports.runJsClosureSupportTests() + } + + func testClosureParameterVoidToVoid() throws { + var called = false + let transform = JSTypedClosure<() -> Void> { + called = true + } + defer { transform.release() } + try ClosureSupportImports.jsApplyVoid(transform) + XCTAssertTrue(called) + } + + func testClosureParameterBoolToBool() throws { + let transform = JSTypedClosure<() -> Bool> { true } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyBool(transform) + XCTAssertTrue(result) + } + + func testClosureParameterIntToInt() throws { + let transform = JSTypedClosure { $0 * 2 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyInt(21, transform) + XCTAssertEqual(result, 42) + } + + func testClosureParameterDoubleToDouble() throws { + let transform = JSTypedClosure<(Double) -> Double> { $0 * 2 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyDouble(21.0, transform) + XCTAssertEqual(result, 42.0) + } + + func testClosureParameterStringToString() throws { + let transform = JSTypedClosure { (value: String) in + value + ", world!" + } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyString("Hello", transform) + XCTAssertEqual(result, "Hello, world!") + } + + // func testClosureParameterJSValueToJSValue() throws { + // let transform = JSTypedClosure<(JSValue) -> JSValue> { $0 } + // defer { transform.release() } + // let result = try JSTypedClosureImports.jsApplyJSValue(.number(1), transform) + // XCTAssertEqual(result, .number(1)) + // } + + func testClosureParameterJSObjectToJSObject() throws { + let transform = JSTypedClosure<(JSObject) -> JSObject> { $0 } + defer { transform.release() } + let obj = JSObject() + let result = try ClosureSupportImports.jsApplyJSObject(obj, transform) + XCTAssertEqual(result, obj) + } + + // func testClosureParameterArrayIntToArrayInt() throws { + // let transform = JSTypedClosure<([Int]) -> [Int]> { $0 } + // defer { transform.release() } + // let result = try ClosureSupportImports.jsApplyArrayInt([1, 2, 3], transform) + // XCTAssertEqual(result, [1, 2, 3]) + // } + + // func testClosureParameterArrayDoubleToArrayDouble() throws { + // let transform = JSTypedClosure<([Double]) -> [Double]> { $0 } + // defer { transform.release() } + // let result = try ClosureSupportImports.jsApplyArrayDouble([1.0, 2.0, 3.0], transform) + // XCTAssertEqual(result, [1.0, 2.0, 3.0]) + // } + + // func testClosureParameterArrayStringToArrayString() throws { + // let transform = JSTypedClosure<([String]) -> [String]> { $0 } + // defer { transform.release() } + // let result = try ClosureSupportImports.jsApplyArrayString(["a", "b", "c"], transform) + // XCTAssertEqual(result, ["a", "b", "c"]) + // } + + // func testClosureParameterArrayJSValueToArrayJSValue() throws { + // let transform = JSTypedClosure<([JSValue]) -> [JSValue]> { $0 } + // defer { transform.release() } + // let result = try ClosureSupportImports.jsApplyArrayJSValue([.number(1), .number(2), .number(3)], transform) + // XCTAssertEqual(result, [.number(1), .number(2), .number(3)]) + // } + + // func testClosureParameterArrayJSObjectToArrayJSObject() throws { + // let transform = JSTypedClosure<([JSObject]) -> [JSObject]> { $0 } + // defer { transform.release() } + // let obj1 = JSObject() + // let obj2 = JSObject() + // let obj3 = JSObject() + // let result = try ClosureSupportImports.jsApplyArrayJSObject([obj1, obj2, obj3], transform) + // XCTAssertEqual(result, [obj1, obj2, obj3]) + // } + + func testClosureReturnIntToInt() throws { + let c = try ClosureSupportImports.jsMakeIntToInt(10) + XCTAssertEqual(c(0), 10) + XCTAssertEqual(c(32), 42) + } + + func testClosureReturnDoubleToDouble() throws { + let c = try ClosureSupportImports.jsMakeDoubleToDouble(10.0) + XCTAssertEqual(c(0.0), 10.0) + XCTAssertEqual(c(32.0), 42.0) + } + + func testClosureReturnStringToString() throws { + let c = try ClosureSupportImports.jsMakeStringToString("Hello, ") + XCTAssertEqual(c("world!"), "Hello, world!") + } + + func testClosureParameterIntToVoid() throws { + var total = 0 + let callback = JSTypedClosure<(Int) -> Void> { value in + total += value + } + defer { callback.release() } + let ret = try ClosureSupportImports.jsCallTwice(5, callback) + XCTAssertEqual(ret, 5) + XCTAssertEqual(total, 10) + } + + func testCallingReleasedClosureThrows() { + let transform = JSTypedClosure<(Int) -> Int> { $0 + 1 } + transform.release() + + do { + _ = try ClosureSupportImports.jsApplyInt(41, transform) + XCTFail("Expected JSException for released closure") + } catch let error { + let message = error.thrownValue.object?["message"].string + XCTAssertNotNil(message) + XCTAssertTrue(message?.contains(#fileID) ?? false, "message=\(message ?? "nil")") + } + } + + func testMultipleArity() throws { + let sum = JSTypedClosure<(Int, Int) -> Int> { $0 + $1 } + defer { sum.release() } + XCTAssertEqual(try ClosureSupportImports.jsCallBinary(sum), 3) + } + + func testTripleArity() throws { + let sum = JSTypedClosure<(Int, Int, Int) -> Int> { $0 + $1 + $2 } + defer { sum.release() } + XCTAssertEqual(try ClosureSupportImports.jsCallTriple(sum), 6) + } + + func testOptionalNoneSkipsCall() throws { + XCTAssertFalse(try ClosureSupportImports.jsOptionalInvoke(nil)) + } + + func testOptionalSomeCalls() throws { + var called = false + let closure = JSTypedClosure<() -> Bool> { + called = true + return true + } + defer { closure.release() } + XCTAssertTrue(try ClosureSupportImports.jsOptionalInvoke(closure)) + XCTAssertTrue(called) + } + + func testDropDuringCallThenThrows() throws { + var closure: JSTypedClosure<() -> Void>! = nil + closure = JSTypedClosure { + closure.release() + } + let message = try ClosureSupportImports.jsCallAfterRelease(closure) + XCTAssertTrue( + message.contains(#fileID), + "\"\(message)\" does not contain expected file name" + ) + } + + func testStoredClosureAfterReleaseThrows() throws { + let closure = JSTypedClosure<() -> Void> {} + try ClosureSupportImports.jsStoreClosure(closure) + closure.release() + XCTAssertThrowsError(try ClosureSupportImports.jsCallStoredClosure()) + } + + func testClosuresDoNotLeakHeapEntries() throws { + let baseline = try ClosureSupportImports.jsHeapCount() + + for _ in 0..<50 { + let closure: JSTypedClosure<(Int) -> Void> = JSTypedClosure { _ in } + _ = try? ClosureSupportImports.jsCallTwice(0, closure) + } + + // Trigger GC and read heap size from JS side + let after = try ClosureSupportImports.jsHeapCount() + XCTAssertEqual(after, baseline, "Heap entry count should return to baseline after GC") + } + +} diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 7ca92b35c..163c9e479 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -16,18 +16,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests1 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si: _BridgedSwiftClosureBox { - let closure: (HttpStatus) -> Int - init(_ closure: @escaping (HttpStatus) -> Int) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { - static func bridgeJSLower(_ closure: @escaping (HttpStatus) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -43,12 +41,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { } } +extension JSTypedClosure where Signature == (HttpStatus) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (HttpStatus) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests10HttpStatusO_Si>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(HttpStatus.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(HttpStatus.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -64,18 +73,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS: _BridgedSwiftClosureBox { - let closure: (Theme) -> String - init(_ closure: @escaping (Theme) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { - static func bridgeJSLower(_ closure: @escaping (Theme) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -91,12 +98,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { } } +extension JSTypedClosure where Signature == (Theme) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -112,18 +130,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb: _BridgedSwiftClosureBox { - let closure: (Theme) -> Bool - init(_ closure: @escaping (Theme) -> Bool) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { - static func bridgeJSLower(_ closure: @escaping (Theme) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -139,12 +155,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { } } +extension JSTypedClosure where Signature == (Theme) -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> Bool) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests5ThemeO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -160,18 +187,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS: _BridgedSwiftClosureBox { - let closure: (Greeter) -> String - init(_ closure: @escaping (Greeter) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { - static func bridgeJSLower(_ closure: @escaping (Greeter) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Greeter) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -187,12 +212,80 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { } } +extension JSTypedClosure where Signature == (Greeter) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Greeter) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Greeter.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Greeter) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Greeter.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC { + static func bridgeJSLift(_ callbackId: Int32) -> (JSObject) -> JSObject { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(callbackValue, param0Value) + return JSObject.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (JSObject) -> JSObject { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (JSObject) -> JSObject) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(JSObject) -> JSObject>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(JSObject.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -208,18 +301,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS: _BridgedSwiftClosureBox { - let closure: (APIResult) -> String - init(_ closure: @escaping (APIResult) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { - static func bridgeJSLower(_ closure: @escaping (APIResult) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -235,12 +326,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { } } +extension JSTypedClosure where Signature == (APIResult) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (APIResult) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(APIResult.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(APIResult.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -256,18 +358,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS: _BridgedSwiftClosureBox { - let closure: (Direction) -> String - init(_ closure: @escaping (Direction) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { - static func bridgeJSLower(_ closure: @escaping (Direction) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -283,12 +383,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { } } +extension JSTypedClosure where Signature == (Direction) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -304,18 +415,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9 } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb: _BridgedSwiftClosureBox { - let closure: (Direction) -> Bool - init(_ closure: @escaping (Direction) -> Bool) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { - static func bridgeJSLower(_ closure: @escaping (Direction) -> Bool) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -331,12 +440,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { } } +extension JSTypedClosure where Signature == (Direction) -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> Bool) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTests9DirectionO_Sb>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -352,18 +472,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC: _BridgedSwiftClosureBox { - let closure: (String) -> Greeter - init(_ closure: @escaping (String) -> Greeter) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { - static func bridgeJSLower(_ closure: @escaping (String) -> Greeter) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -379,12 +497,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { } } +extension JSTypedClosure where Signature == (String) -> Greeter { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) -> Greeter) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> Greeter>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -400,18 +529,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS: _BridgedSwiftClosureBox { - let closure: (String) -> String - init(_ closure: @escaping (String) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { - static func bridgeJSLower(_ closure: @escaping (String) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -427,12 +554,80 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { } } +extension JSTypedClosure where Signature == (String) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd { + static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(callbackValue, param0Value) + return Double.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Double) -> Double { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Double) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Float64 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Double>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Double.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -448,18 +643,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS: _BridgedSwiftClosureBox { - let closure: (Int, String, Double) -> String - init(_ closure: @escaping (Int, String, Double) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { - static func bridgeJSLower(_ closure: @escaping (Int, String, Double) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0, param1, param2 in @@ -477,12 +670,140 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { } } +extension JSTypedClosure where Signature == (Int, String, Double) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, String, Double) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSiSSSd_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, String, Double) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int, Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1, param2 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let param1Value = param1.bridgeJSLowerParameter() + let param2Value = param2.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(callbackValue, param0Value, param1Value, param2Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int, Int, Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int, Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0), Int.bridgeJSLiftParameter(param1), Int.bridgeJSLiftParameter(param2)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0, param1 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let param1Value = param1.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(callbackValue, param0Value, param1Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int, Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32) -> Int32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0), Int.bridgeJSLiftParameter(param1)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -498,18 +819,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si: _BridgedSwiftClosureBox { - let closure: (Int) -> Int - init(_ closure: @escaping (Int) -> Int) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { - static func bridgeJSLower(_ closure: @escaping (Int) -> Int) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -525,12 +844,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { } } +extension JSTypedClosure where Signature == (Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSi_Si>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Int.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -546,18 +876,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y: _BridgedSwiftClosureBox { - let closure: (Int) -> Void - init(_ closure: @escaping (Int) -> Void) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { - static func bridgeJSLower(_ closure: @escaping (Int) -> Void) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Void { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -572,12 +900,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { } } +extension JSTypedClosure where Signature == (Int) -> Void { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Void) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSi_y>.fromOpaque(boxPtr).takeUnretainedValue() - box.closure(Int.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(Int.bridgeJSLiftParameter(param0)) #else fatalError("Only available on WebAssembly") #endif @@ -592,18 +931,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -619,12 +956,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq5ThemeO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -640,18 +988,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -667,12 +1013,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -688,18 +1045,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC: _BridgedSwiftClosureBox { - let closure: (Optional) -> Optional - init(_ closure: @escaping (Optional) -> Optional) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC { - static func bridgeJSLower(_ closure: @escaping (Optional) -> Optional) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -715,12 +1070,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC { } } +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -736,18 +1102,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -763,12 +1127,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9APIResultO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -784,18 +1159,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -811,12 +1184,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSq9DirectionO_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -832,18 +1216,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -859,12 +1241,23 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSS_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -880,18 +1273,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS: _BridgedSwiftClosureBox { - let closure: (Optional) -> String - init(_ closure: @escaping (Optional) -> String) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { - static func bridgeJSLower(_ closure: @escaping (Optional) -> String) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in @@ -907,12 +1298,79 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { } } +extension JSTypedClosure where Signature == (Optional) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsSqSi_SS>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sb { + static func bridgeJSLift(_ callbackId: Int32) -> () -> Bool { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(callbackValue) + return Bool.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == () -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Bool) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure() return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -928,18 +1386,16 @@ fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy } #endif -private final class _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC: _BridgedSwiftClosureBox { - let closure: () -> Optional - init(_ closure: @escaping () -> Optional) { - self.closure = closure - } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") } +#endif private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { - static func bridgeJSLower(_ closure: @escaping () -> Optional) -> UnsafeMutableRawPointer { - let box = _BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC(closure) - return Unmanaged.passRetained(box).toOpaque() - } static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] in @@ -954,18 +1410,83 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { } } +extension JSTypedClosure where Signature == () -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Optional) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC, + body: body, + fileID: fileID, + line: line + ) + } +} + @_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let box = Unmanaged<_BJS_ClosureBox_20BridgeJSRuntimeTestsy_Sq7GreeterC>.fromOpaque(boxPtr).takeUnretainedValue() - let result = box.closure() + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure() return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_20BridgeJSRuntimeTestsy_y { + static func bridgeJSLift(_ callbackId: Int32) -> () -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(callbackValue) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == () -> Void { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Void) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure() + #else + fatalError("Only available on WebAssembly") + #endif +} + struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { let jsObject: JSObject @@ -4934,10 +5455,10 @@ public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform @_expose(wasm, "bjs_makeFormatter") @_cdecl("bjs_makeFormatter") -public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { #if arch(wasm32) let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) - return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -4945,10 +5466,10 @@ public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> U @_expose(wasm, "bjs_makeAdder") @_cdecl("bjs_makeAdder") -public func _bjs_makeAdder(_ base: Int32) -> UnsafeMutableRawPointer { +public func _bjs_makeAdder(_ base: Int32) -> Int32 { #if arch(wasm32) let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) - return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6081,6 +6602,97 @@ public func _bjs_arrayMembersFirst() -> Void { #endif } +@_expose(wasm, "bjs_ClosureSupportExports_static_makeIntToInt") +@_cdecl("bjs_ClosureSupportExports_static_makeIntToInt") +public func _bjs_ClosureSupportExports_static_makeIntToInt(_ base: Int32) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeIntToInt(_: Int.bridgeJSLiftParameter(base)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_static_makeDoubleToDouble") +@_cdecl("bjs_ClosureSupportExports_static_makeDoubleToDouble") +public func _bjs_ClosureSupportExports_static_makeDoubleToDouble(_ base: Float64) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeDoubleToDouble(_: Double.bridgeJSLiftParameter(base)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_static_makeStringToString") +@_cdecl("bjs_ClosureSupportExports_static_makeStringToString") +public func _bjs_ClosureSupportExports_static_makeStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSIntToInt") +@_cdecl("bjs_ClosureSupportExports_static_makeJSIntToInt") +public func _bjs_ClosureSupportExports_static_makeJSIntToInt(_ base: Int32) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeJSIntToInt(_: Int.bridgeJSLiftParameter(base)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSDoubleToDouble") +@_cdecl("bjs_ClosureSupportExports_static_makeJSDoubleToDouble") +public func _bjs_ClosureSupportExports_static_makeJSDoubleToDouble(_ base: Float64) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeJSDoubleToDouble(_: Double.bridgeJSLiftParameter(base)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_static_makeJSStringToString") +@_cdecl("bjs_ClosureSupportExports_static_makeJSStringToString") +public func _bjs_ClosureSupportExports_static_makeJSStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeJSStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ClosureSupportExports_deinit") +@_cdecl("bjs_ClosureSupportExports_deinit") +public func _bjs_ClosureSupportExports_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ClosureSupportExports: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ClosureSupportExports_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportExports_wrap") +fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { @@ -6126,10 +6738,10 @@ public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: @_expose(wasm, "bjs_Greeter_makeFormatter") @_cdecl("bjs_Greeter_makeFormatter") -public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> Int32 { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) - return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6137,10 +6749,10 @@ public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffi @_expose(wasm, "bjs_Greeter_static_makeCreator") @_cdecl("bjs_Greeter_static_makeCreator") -public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> Int32 { #if arch(wasm32) let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) - return _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6148,10 +6760,10 @@ public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ default @_expose(wasm, "bjs_Greeter_makeCustomGreeter") @_cdecl("bjs_Greeter_makeCustomGreeter") -public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter() - return _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -7981,10 +8593,10 @@ public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointe @_expose(wasm, "bjs_TextProcessor_getTransform") @_cdecl("bjs_TextProcessor_getTransform") -public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform() - return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8025,10 +8637,10 @@ public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawP @_expose(wasm, "bjs_TextProcessor_makeOptionalStringFormatter") @_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") -public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() - return _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8036,10 +8648,10 @@ public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutabl @_expose(wasm, "bjs_TextProcessor_makeOptionalGreeterCreator") @_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") -public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() - return _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8091,10 +8703,10 @@ public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer @_expose(wasm, "bjs_TextProcessor_makeDirectionChecker") @_cdecl("bjs_TextProcessor_makeDirectionChecker") -public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() - return _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8102,10 +8714,10 @@ public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPoi @_expose(wasm, "bjs_TextProcessor_makeThemeValidator") @_cdecl("bjs_TextProcessor_makeThemeValidator") -public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() - return _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8113,10 +8725,10 @@ public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPoint @_expose(wasm, "bjs_TextProcessor_makeStatusCodeExtractor") @_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") -public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() - return _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8124,10 +8736,10 @@ public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRaw @_expose(wasm, "bjs_TextProcessor_makeAPIResultHandler") @_cdecl("bjs_TextProcessor_makeAPIResultHandler") -public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() - return _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8168,10 +8780,10 @@ public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRa @_expose(wasm, "bjs_TextProcessor_makeOptionalDirectionFormatter") @_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") -public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLower(ret) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -8302,162 +8914,484 @@ public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableR #endif } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalName_set") -public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) - #else - fatalError("Only available on WebAssembly") - #endif +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalName_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalName_set") +public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { + #if arch(wasm32) + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") +@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") +public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") +public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + #if arch(wasm32) + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") +@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") +public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") +@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") +public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_OptionalPropertyHolder_deinit") +@_cdecl("bjs_OptionalPropertyHolder_deinit") +public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_Container_init") +@_cdecl("bjs_Container_init") +public func _bjs_Container_init(_ config: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let _tmp_config = Optional.bridgeJSLiftParameter(config) + let _tmp_location = DataPoint.bridgeJSLiftParameter() + let ret = Container(location: _tmp_location, config: _tmp_config) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_location_get") +@_cdecl("bjs_Container_location_get") +public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Container.bridgeJSLiftParameter(_self).location + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_location_set") +@_cdecl("bjs_Container_location_set") +public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_config_get") +@_cdecl("bjs_Container_config_get") +public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let ret = Container.bridgeJSLiftParameter(_self).config + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_config_set") +@_cdecl("bjs_Container_config_set") +public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { + #if arch(wasm32) + Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter(value) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Container_deinit") +@_cdecl("bjs_Container_deinit") +public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap") +fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyVoid_static") +fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyBool_static") +fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyInt_static") +fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyDouble_static") +fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 +#else +fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyString_static") +fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ value: Int32, _ transform: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ value: Int32, _ transform: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyJSObject_static") +fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeIntToInt_static") +fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeDoubleToDouble_static") +fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeStringToString_static") +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefix: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefix: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTwice_static") +fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallBinary_static") +fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTriple_static") +fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallAfterRelease_static") +fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsOptionalInvoke_static") +fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsStoreClosure_static") +fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallStoredClosure_static") +fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsHeapCount_static") +fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 +#else +fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_runJsClosureSupportTests_static") +fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void +#else +fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$ClosureSupportImports_jsApplyVoid(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void { + let callbackFuncRef = callback.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyVoid_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } +} + +func _$ClosureSupportImports_jsApplyBool(_ callback: JSTypedClosure<() -> Bool>) throws(JSException) -> Bool { + let callbackFuncRef = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsApplyBool_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) +} + +func _$ClosureSupportImports_jsApplyInt(_ value: Int, _ transform: JSTypedClosure<(Int) -> Int>) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let transformFuncRef = transform.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsApplyInt_static(valueValue, transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_get") -@_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") -public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsApplyDouble(_ value: Double, _ transform: JSTypedClosure<(Double) -> Double>) throws(JSException) -> Double { + let valueValue = value.bridgeJSLowerParameter() + let transformFuncRef = transform.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsApplyDouble_static(valueValue, transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Double.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalAge_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") -public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { - #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsApplyString(_ value: String, _ transform: JSTypedClosure<(String) -> String>) throws(JSException) -> String { + let valueValue = value.bridgeJSLowerParameter() + let transformFuncRef = transform.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsApplyString_static(valueValue, transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_get") -@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") -public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsApplyJSObject(_ value: JSObject, _ transform: JSTypedClosure<(JSObject) -> JSObject>) throws(JSException) -> JSObject { + let valueValue = value.bridgeJSLowerParameter() + let transformFuncRef = transform.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsApplyJSObject_static(valueValue, transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_OptionalPropertyHolder_optionalGreeter_set") -@_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") -public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int { + let baseValue = base.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsMakeIntToInt_static(baseValue) + if let error = _swift_js_take_exception() { + throw error + } + return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLift(ret) } -@_expose(wasm, "bjs_OptionalPropertyHolder_deinit") -@_cdecl("bjs_OptionalPropertyHolder_deinit") -public func _bjs_OptionalPropertyHolder_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsMakeDoubleToDouble(_ base: Double) throws(JSException) -> (Double) -> Double { + let baseValue = base.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(baseValue) + if let error = _swift_js_take_exception() { + throw error + } + return _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd.bridgeJSLift(ret) } -extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_OptionalPropertyHolder_wrap(Unmanaged.passRetained(self).toOpaque())))) +func _$ClosureSupportImports_jsMakeStringToString(_ prefix: String) throws(JSException) -> (String) -> String { + let prefixValue = prefix.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsMakeStringToString_static(prefixValue) + if let error = _swift_js_take_exception() { + throw error } + return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(ret) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") +func _$ClosureSupportImports_jsCallTwice(_ value: Int, _ callback: JSTypedClosure<(Int) -> Void>) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let callbackFuncRef = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsCallTwice_static(valueValue, callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) } -#endif -@_expose(wasm, "bjs_Container_init") -@_cdecl("bjs_Container_init") -public func _bjs_Container_init(_ config: Int32) -> UnsafeMutableRawPointer { - #if arch(wasm32) - let _tmp_config = Optional.bridgeJSLiftParameter(config) - let _tmp_location = DataPoint.bridgeJSLiftParameter() - let ret = Container(location: _tmp_location, config: _tmp_config) - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsCallBinary(_ callback: JSTypedClosure<(Int, Int) -> Int>) throws(JSException) -> Int { + let callbackFuncRef = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsCallBinary_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_Container_location_get") -@_cdecl("bjs_Container_location_get") -public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).location - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsCallTriple(_ callback: JSTypedClosure<(Int, Int, Int) -> Int>) throws(JSException) -> Int { + let callbackFuncRef = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsCallTriple_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Int.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_Container_location_set") -@_cdecl("bjs_Container_location_set") -public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsCallAfterRelease(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> String { + let callbackFuncRef = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsCallAfterRelease_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_Container_config_get") -@_cdecl("bjs_Container_config_get") -public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).config - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsOptionalInvoke(_ callback: Optional Bool>>) throws(JSException) -> Bool { + let (callbackIsSome, callbackFuncRef) = callback.bridgeJSLowerParameter() + let ret = bjs_ClosureSupportImports_jsOptionalInvoke_static(callbackIsSome, callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return Bool.bridgeJSLiftReturn(ret) } -@_expose(wasm, "bjs_Container_config_set") -@_cdecl("bjs_Container_config_set") -public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { - #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter(value) - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsStoreClosure(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void { + let callbackFuncRef = callback.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsStoreClosure_static(callbackFuncRef) + if let error = _swift_js_take_exception() { + throw error + } } -@_expose(wasm, "bjs_Container_deinit") -@_cdecl("bjs_Container_deinit") -public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif +func _$ClosureSupportImports_jsCallStoredClosure() throws(JSException) -> Void { + bjs_ClosureSupportImports_jsCallStoredClosure_static() + if let error = _swift_js_take_exception() { + throw error + } } -extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque())))) +func _$ClosureSupportImports_jsHeapCount() throws(JSException) -> Int { + let ret = bjs_ClosureSupportImports_jsHeapCount_static() + if let error = _swift_js_take_exception() { + throw error } + return Int.bridgeJSLiftReturn(ret) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap") -fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") +func _$ClosureSupportImports_runJsClosureSupportTests() throws(JSException) -> Void { + bjs_ClosureSupportImports_runJsClosureSupportTests_static() + if let error = _swift_js_take_exception() { + throw error + } } -#endif #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionary") @@ -9626,99 +10560,6 @@ func _$ArrayHost_firstLabel(_ self: JSObject, _ values: [String]) throws(JSExcep return String.bridgeJSLiftReturn(ret) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsApplyInt") -fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func bjs_jsApplyInt(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsApplyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { - let valueValue = value.bridgeJSLowerParameter() - let transformPointer = _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLower(transform) - let ret = bjs_jsApplyInt(valueValue, transformPointer) - if let error = _swift_js_take_exception() { - throw error - } - return Int.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMakeAdder") -fileprivate func bjs_jsMakeAdder(_ base: Int32) -> Int32 -#else -fileprivate func bjs_jsMakeAdder(_ base: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsMakeAdder(_ base: Int) throws(JSException) -> (Int) -> Int { - let baseValue = base.bridgeJSLowerParameter() - let ret = bjs_jsMakeAdder(baseValue) - if let error = _swift_js_take_exception() { - throw error - } - return _BJS_Closure_20BridgeJSRuntimeTestsSi_Si.bridgeJSLift(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMapString") -fileprivate func bjs_jsMapString(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func bjs_jsMapString(_ value: Int32, _ transform: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsMapString(_ value: String, _ transform: @escaping (String) -> String) throws(JSException) -> String { - let valueValue = value.bridgeJSLowerParameter() - let transformPointer = _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLower(transform) - let ret = bjs_jsMapString(valueValue, transformPointer) - if let error = _swift_js_take_exception() { - throw error - } - return String.bridgeJSLiftReturn(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsMakePrefixer") -fileprivate func bjs_jsMakePrefixer(_ prefix: Int32) -> Int32 -#else -fileprivate func bjs_jsMakePrefixer(_ prefix: Int32) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsMakePrefixer(_ prefix: String) throws(JSException) -> (String) -> String { - let prefixValue = prefix.bridgeJSLowerParameter() - let ret = bjs_jsMakePrefixer(prefixValue) - if let error = _swift_js_take_exception() { - throw error - } - return _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(ret) -} - -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsCallTwice") -fileprivate func bjs_jsCallTwice(_ value: Int32, _ callback: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func bjs_jsCallTwice(_ value: Int32, _ callback: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsCallTwice(_ value: Int, _ callback: @escaping (Int) -> Void) throws(JSException) -> Int { - let valueValue = value.bridgeJSLowerParameter() - let callbackPointer = _BJS_Closure_20BridgeJSRuntimeTestsSi_y.bridgeJSLower(callback) - let ret = bjs_jsCallTwice(valueValue, callbackPointer) - if let error = _swift_js_take_exception() { - throw error - } - return Int.bridgeJSLiftReturn(ret) -} - #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsTranslatePoint") fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 8171fd95f..23f47b03d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -2,134 +2,165 @@ "exported" : { "classes" : [ { - "constructor" : { - "abiName" : "bjs_Greeter_init", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "parameters" : [ - { - "label" : "name", - "name" : "name", - "type" : { - "string" : { - - } - } - } - ] - }, - "explicitAccessControl" : "public", "methods" : [ { - "abiName" : "bjs_Greeter_greet", + "abiName" : "bjs_ClosureSupportExports_static_makeIntToInt", "effects" : { "isAsync" : false, - "isStatic" : false, + "isStatic" : true, "isThrows" : false }, - "name" : "greet", + "name" : "makeIntToInt", "parameters" : [ + { + "label" : "_", + "name" : "base", + "type" : { + "int" : { + } + } + } ], "returnType" : { - "string" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + } + } + }, + "useJSTypedClosure" : false + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" } } }, { - "abiName" : "bjs_Greeter_changeName", + "abiName" : "bjs_ClosureSupportExports_static_makeDoubleToDouble", "effects" : { "isAsync" : false, - "isStatic" : false, + "isStatic" : true, "isThrows" : false }, - "name" : "changeName", + "name" : "makeDoubleToDouble", "parameters" : [ { - "label" : "name", - "name" : "name", + "label" : "_", + "name" : "base", "type" : { - "string" : { + "double" : { } } } ], "returnType" : { - "void" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "double" : { + + } + } + ], + "returnType" : { + "double" : { + } + } + }, + "useJSTypedClosure" : false + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" } } }, { - "abiName" : "bjs_Greeter_greetWith", + "abiName" : "bjs_ClosureSupportExports_static_makeStringToString", "effects" : { "isAsync" : false, - "isStatic" : false, + "isStatic" : true, "isThrows" : false }, - "name" : "greetWith", + "name" : "makeStringToString", "parameters" : [ { - "label" : "greeter", - "name" : "greeter", - "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - }, - { - "label" : "customGreeting", - "name" : "customGreeting", + "label" : "_", + "name" : "prefix", "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Greeter" - } - } - ], - "returnType" : { - "string" : { + "string" : { - } - } - } } } } ], "returnType" : { - "string" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + } + } + }, + "useJSTypedClosure" : false + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" } } }, { - "abiName" : "bjs_Greeter_makeFormatter", + "abiName" : "bjs_ClosureSupportExports_static_makeJSIntToInt", "effects" : { "isAsync" : false, - "isStatic" : false, + "isStatic" : true, "isThrows" : false }, - "name" : "makeFormatter", + "name" : "makeJSIntToInt", "parameters" : [ { - "label" : "suffix", - "name" : "suffix", + "label" : "_", + "name" : "base", "type" : { - "string" : { + "int" : { } } @@ -140,38 +171,44 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "string" : { + "int" : { } } ], "returnType" : { - "string" : { + "int" : { } } - } + }, + "useJSTypedClosure" : true + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" } } }, { - "abiName" : "bjs_Greeter_static_makeCreator", + "abiName" : "bjs_ClosureSupportExports_static_makeJSDoubleToDouble", "effects" : { "isAsync" : false, "isStatic" : true, "isThrows" : false }, - "name" : "makeCreator", + "name" : "makeJSDoubleToDouble", "parameters" : [ { - "label" : "defaultName", - "name" : "defaultName", + "label" : "_", + "name" : "base", "type" : { - "string" : { + "double" : { } } @@ -182,51 +219,60 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_7GreeterC", + "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "string" : { + "double" : { } } ], "returnType" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "double" : { + } } - } + }, + "useJSTypedClosure" : true } }, "staticContext" : { "className" : { - "_0" : "Greeter" + "_0" : "ClosureSupportExports" } } }, { - "abiName" : "bjs_Greeter_makeCustomGreeter", + "abiName" : "bjs_ClosureSupportExports_static_makeJSStringToString", "effects" : { "isAsync" : false, - "isStatic" : false, + "isStatic" : true, "isThrows" : false }, - "name" : "makeCustomGreeter", + "name" : "makeJSStringToString", "parameters" : [ + { + "label" : "_", + "name" : "prefix", + "type" : { + "string" : { + } + } + } ], "returnType" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "swiftHeapObject" : { - "_0" : "Greeter" + "string" : { + } } ], @@ -235,50 +281,305 @@ } } - } + }, + "useJSTypedClosure" : true + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" } } } ], - "name" : "Greeter", + "name" : "ClosureSupportExports", "properties" : [ - { - "isReadonly" : false, - "isStatic" : false, - "name" : "name", - "type" : { - "string" : { - } - } - }, - { - "isReadonly" : true, + ], + "swiftCallName" : "ClosureSupportExports" + }, + { + "constructor" : { + "abiName" : "bjs_Greeter_init", + "effects" : { + "isAsync" : false, "isStatic" : false, - "name" : "prefix", - "type" : { - "string" : { + "isThrows" : false + }, + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + } } } - } - ], - "swiftCallName" : "Greeter" - }, - { + ] + }, + "explicitAccessControl" : "public", "methods" : [ { - "abiName" : "bjs_Calculator_square", + "abiName" : "bjs_Greeter_greet", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "square", + "name" : "greet", "parameters" : [ - { - "label" : "value", - "name" : "value", + + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_changeName", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "changeName", + "parameters" : [ + { + "label" : "name", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_greetWith", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "greetWith", + "parameters" : [ + { + "label" : "greeter", + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "label" : "customGreeting", + "name" : "customGreeting", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_Greeter_makeFormatter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeFormatter", + "parameters" : [ + { + "label" : "suffix", + "name" : "suffix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_Greeter_static_makeCreator", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "makeCreator", + "parameters" : [ + { + "label" : "defaultName", + "name" : "defaultName", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_7GreeterC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + "useJSTypedClosure" : false + } + }, + "staticContext" : { + "className" : { + "_0" : "Greeter" + } + } + }, + { + "abiName" : "bjs_Greeter_makeCustomGreeter", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeCustomGreeter", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests7GreeterC_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "name" : "Greeter", + "properties" : [ + { + "isReadonly" : false, + "isStatic" : false, + "name" : "name", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "swiftCallName" : "Greeter" + }, + { + "methods" : [ + { + "abiName" : "bjs_Calculator_square", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "square", + "parameters" : [ + { + "label" : "value", + "name" : "value", "type" : { "int" : { @@ -2246,7 +2547,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2328,7 +2630,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2369,7 +2672,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2409,7 +2713,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2456,7 +2761,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2503,7 +2809,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2549,7 +2856,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2584,7 +2892,8 @@ "_1" : "null" } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2619,7 +2928,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2662,7 +2972,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2705,7 +3016,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2747,7 +3059,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2788,7 +3101,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2823,7 +3137,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2858,7 +3173,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2892,7 +3208,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -2932,7 +3249,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -2980,7 +3298,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -3027,7 +3346,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -3073,7 +3393,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -8141,7 +8462,8 @@ } } - } + }, + "useJSTypedClosure" : false } } } @@ -8190,7 +8512,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -8232,7 +8555,8 @@ } } - } + }, + "useJSTypedClosure" : false } } }, @@ -10539,7 +10863,8 @@ "_1" : "null" } } - } + }, + "useJSTypedClosure" : false } } } @@ -12866,54 +13191,688 @@ "string" : { } - }, - "_1" : "null" - } - } - } - ], - "name" : "ArrayMembers", - "properties" : [ - { - "isReadonly" : true, - "isStatic" : false, - "name" : "ints", - "type" : { - "array" : { - "_0" : { + }, + "_1" : "null" + } + } + } + ], + "name" : "ArrayMembers", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "ints", + "type" : { + "array" : { + "_0" : { + "int" : { + + } + } + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "optStrings", + "type" : { + "nullable" : { + "_0" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + }, + "_1" : "null" + } + } + } + ], + "swiftCallName" : "ArrayMembers" + } + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "ClosureSupportImports", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "jsApplyVoid", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsApplyBool", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_Sb", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "name" : "jsApplyInt", + "parameters" : [ + { + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "jsApplyDouble", + "parameters" : [ + { + "name" : "value", + "type" : { + "double" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "double" : { + + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "name" : "jsApplyString", + "parameters" : [ + { + "name" : "value", + "type" : { + "string" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "jsApplyJSObject", + "parameters" : [ + { + "name" : "value", + "type" : { + "jsObject" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTests8JSObjectC_8JSObjectC", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "jsObject" : { + + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "name" : "jsMakeIntToInt", + "parameters" : [ + { + "name" : "base", + "type" : { + "int" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "name" : "jsMakeDoubleToDouble", + "parameters" : [ + { + "name" : "base", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "double" : { + + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "name" : "jsMakeStringToString", + "parameters" : [ + { + "name" : "prefix", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "name" : "jsCallTwice", + "parameters" : [ + { + "name" : "value", + "type" : { + "int" : { + + } + } + }, + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "jsCallBinary", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSiSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + }, + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "jsCallTriple", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSiSiSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "int" : { + + } + }, + { + "int" : { + + } + }, + { + "int" : { + + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "int" : { + + } + } + }, + { + "name" : "jsCallAfterRelease", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "name" : "jsOptionalInvoke", + "parameters" : [ + { + "name" : "callback", + "type" : { + "nullable" : { + "_0" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_Sb", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "bool" : { + + } + } + }, + "useJSTypedClosure" : true + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "name" : "jsStoreClosure", + "parameters" : [ + { + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + "useJSTypedClosure" : true + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsCallStoredClosure", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsHeapCount", + "parameters" : [ + + ], + "returnType" : { "int" : { } } - } - } - }, - { - "isReadonly" : true, - "isStatic" : false, - "name" : "optStrings", - "type" : { - "nullable" : { - "_0" : { - "array" : { - "_0" : { - "string" : { + }, + { + "name" : "runJsClosureSupportTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { - } - } } - }, - "_1" : "null" + } } - } + ] } - ], - "swiftCallName" : "ArrayMembers" - } - ] - }, - "imported" : { - "children" : [ + ] + }, { "functions" : [ { @@ -14181,212 +15140,6 @@ } ] }, - { - "functions" : [ - { - "name" : "jsApplyInt", - "parameters" : [ - { - "name" : "value", - "type" : { - "int" : { - - } - } - }, - { - "name" : "transform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - } - ], - "returnType" : { - "int" : { - - } - } - }, - { - "name" : "jsMakeAdder", - "parameters" : [ - { - "name" : "base", - "type" : { - "int" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_Si", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - } - ], - "returnType" : { - "int" : { - - } - } - } - } - } - }, - { - "name" : "jsMapString", - "parameters" : [ - { - "name" : "value", - "type" : { - "string" : { - - } - } - }, - { - "name" : "transform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "name" : "jsMakePrefixer", - "parameters" : [ - { - "name" : "prefix", - "type" : { - "string" : { - - } - } - } - ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "string" : { - - } - } - ], - "returnType" : { - "string" : { - - } - } - } - } - } - }, - { - "name" : "jsCallTwice", - "parameters" : [ - { - "name" : "value", - "type" : { - "int" : { - - } - } - }, - { - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_y", - "moduleName" : "BridgeJSRuntimeTests", - "parameters" : [ - { - "int" : { - - } - } - ], - "returnType" : { - "void" : { - - } - } - } - } - } - } - ], - "returnType" : { - "int" : { - - } - } - } - ], - "types" : [ - - ] - }, { "functions" : [ { diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index 4aa96e1b2..fa97c3197 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -135,29 +135,6 @@ class ImportAPITests: XCTestCase { XCTAssertEqual(try greeter.prefix, "Hello") } - func testClosureParameterIntToInt() throws { - let result = try jsApplyInt(21) { $0 * 2 } - XCTAssertEqual(result, 42) - } - - func testClosureReturnIntToInt() throws { - let add10 = try jsMakeAdder(10) - XCTAssertEqual(add10(0), 10) - XCTAssertEqual(add10(32), 42) - } - - func testClosureParameterStringToString() throws { - let result = try jsMapString("Hello") { value in - value + ", world!" - } - XCTAssertEqual(result, "Hello, world!") - } - - func testClosureReturnStringToString() throws { - let prefixer = try jsMakePrefixer("Hello, ") - XCTAssertEqual(prefixer("world!"), "Hello, world!") - } - func testRoundTripIntArray() throws { let values = [1, 2, 3, 4, 5] let result = try jsRoundTripIntArray(values) @@ -185,13 +162,6 @@ class ImportAPITests: XCTestCase { XCTAssertEqual(try host.firstLabel(["zeta"]), "zeta") } - func testClosureParameterIntToVoid() throws { - var total = 0 - let ret = try jsCallTwice(5) { total += $0 } - XCTAssertEqual(ret, 5) - XCTAssertEqual(total, 10) - } - func testJSNameFunctionAndClass() throws { XCTAssertEqual(try _jsWeirdFunction(), 42) diff --git a/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift deleted file mode 100644 index bb913300b..000000000 --- a/Tests/BridgeJSRuntimeTests/ImportClosureAPIs.swift +++ /dev/null @@ -1,11 +0,0 @@ -@_spi(Experimental) import JavaScriptKit - -@JSFunction func jsApplyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int - -@JSFunction func jsMakeAdder(_ base: Int) throws(JSException) -> (Int) -> Int - -@JSFunction func jsMapString(_ value: String, _ transform: @escaping (String) -> String) throws(JSException) -> String - -@JSFunction func jsMakePrefixer(_ `prefix`: String) throws(JSException) -> (String) -> String - -@JSFunction func jsCallTwice(_ value: Int, _ callback: @escaping (Int) -> Void) throws(JSException) -> Int diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs new file mode 100644 index 000000000..0d5560fae --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs @@ -0,0 +1,311 @@ +/** + * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["ClosureSupportImports"]} + */ +export function getImports(importsContext) { + return { + jsApplyVoid: (fn) => { + fn(); + }, + jsApplyBool: (fn) => { + return fn(); + }, + jsApplyInt: (v, fn) => { + return fn(v); + }, + jsApplyDouble: (v, fn) => { + return fn(v); + }, + jsApplyString: (v, fn) => { + return fn(v); + }, + jsApplyJSValue: (v, fn) => { + return fn(v); + }, + jsApplyJSObject: (v, fn) => { + return fn(v); + }, + jsApplyArrayInt: (v, fn) => { + return fn(v); + }, + jsApplyArrayDouble: (v, fn) => { + return fn(v); + }, + jsApplyArrayString: (v, fn) => { + return fn(v); + }, + jsApplyArrayJSValue: (v, fn) => { + return fn(v); + }, + jsApplyArrayJSObject: (v, fn) => { + return fn(v); + }, + jsMakeIntToInt: (base) => { + return (v) => base + v; + }, + jsMakeDoubleToDouble: (base) => { + return (v) => base + v; + }, + jsMakeStringToString: (prefix) => { + return (name) => `${prefix}${name}`; + }, + jsCallTwice: (v, fn) => { + fn(v); + fn(v); + return v; + }, + jsCallBinary: (fn) => fn(1, 2), + jsCallTriple: (fn) => fn(1, 2, 3), + jsCallTripleMut: (fn) => { + fn(1, 2, 3); + fn(4, 5, 6); + }, + jsCallTwiceMut: (fn) => { + fn(); + fn(); + }, + jsHeapCount: () => { + globalThis.gc?.(); + return globalThis.swift?.memory?._heapValueById?.size ?? -1; + }, + jsCallAfterRelease: (fn) => { + try { + fn(); + fn(); + return "null"; + } catch (e) { + return e?.message ?? "error"; + } + }, + jsOptionalInvoke: (fn) => { + if (fn == null) { return false; } + return fn(); + }, + jsStoreClosure: (fn) => { globalThis.__storedClosure = fn; }, + jsCallStoredClosure: () => { return globalThis.__storedClosure?.(); }, + + runJsClosureSupportTests: () => { + const exports = importsContext.getExports(); + if (!exports) { throw new Error("No exports!?"); } + runJsClosureSupportTests(exports); + }, + }; +} + +import assert from "node:assert"; + +/** @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +export function runJsClosureSupportTests(exports) { + const upperTransform = (text) => text.toUpperCase(); + const processor = new exports.TextProcessor(upperTransform); + + assert.equal(processor.process("hello"), "HELLO"); + + const multiParamTransform = (count, text, ratio) => { + return `${text.toUpperCase()}-${count}-${ratio.toFixed(2)}`; + }; + assert.equal(processor.processWithCustom("world", multiParamTransform), "WORLD-42-3.14"); + assert.equal(processor.process("test"), "TEST"); + + const greeterForClosure = new exports.Greeter("World"); + const greeterCaller = new exports.Greeter("Caller"); + const customGreeting = (greeter) => `Custom greeting for ${greeter.name}: ${greeter.greet()}`; + const greetResult = greeterCaller.greetWith(greeterForClosure, customGreeting); + assert.equal(greetResult, "Custom greeting for World: Hello, World!"); + greeterForClosure.release(); + greeterCaller.release(); + + assert.equal(exports.formatName("ada", (name) => name.toUpperCase()), "ADA"); + assert.equal(exports.formatName("grace", (name) => `Dr. ${name}`), "Dr. grace"); + + const addDr = exports.makeFormatter("Dr."); + assert.equal(addDr("Ada"), "Dr. Ada"); + assert.equal(addDr("Grace"), "Dr. Grace"); + + const addProf = exports.makeFormatter("Prof."); + assert.equal(addProf("Hopper"), "Prof. Hopper"); + + const add10 = exports.makeAdder(10); + assert.equal(add10(5), 15); + assert.equal(add10(32), 42); + + const add100 = exports.makeAdder(100); + assert.equal(add100(23), 123); + + const storedTransform = processor.getTransform(); + assert.equal(storedTransform("hello"), "HELLO"); + assert.equal(storedTransform("world"), "WORLD"); + + const greeterForFormatter = new exports.Greeter("Formatter"); + const greeterFormatter = greeterForFormatter.makeFormatter(" [suffix]"); + assert.equal(greeterFormatter("test"), "Hello, Formatter! - test - [suffix]"); + assert.equal(greeterFormatter("data"), "Hello, Formatter! - data - [suffix]"); + greeterForFormatter.release(); + + const greeterCreator = exports.Greeter.makeCreator("Default"); + const createdG1 = greeterCreator("Alice"); + assert.equal(createdG1.name, "Alice"); + assert.equal(createdG1.greet(), "Hello, Alice!"); + const createdG2 = greeterCreator(""); + assert.equal(createdG2.name, "Default"); + assert.equal(createdG2.greet(), "Hello, Default!"); + createdG1.release(); + createdG2.release(); + + const greeterHost = new exports.Greeter("Host"); + const greeterGreeter = greeterHost.makeCustomGreeter(); + const guest1 = new exports.Greeter("Guest1"); + const guest2 = new exports.Greeter("Guest2"); + assert.equal(greeterGreeter(guest1), "Host greets Guest1: Hello, Guest1!"); + assert.equal(greeterGreeter(guest2), "Host greets Guest2: Hello, Guest2!"); + greeterHost.release(); + guest1.release(); + guest2.release(); + + const greeterForMethod = new exports.Greeter("Method"); + const greeterParam = new exports.Greeter("Param"); + const methodResult = greeterForMethod.greetWith(greeterParam, (g) => { + return `Custom: ${g.name} says ${g.greet()}`; + }); + assert.equal(methodResult, "Custom: Param says Hello, Param!"); + greeterForMethod.release(); + greeterParam.release(); + + const optResult1 = processor.processOptionalString((value) => { + return value !== null ? `Got: ${value}` : `Got: null`; + }); + assert.equal(optResult1, "Got: test | Got: null"); + + const optResult2 = processor.processOptionalInt((value) => { + return value !== null ? `Number: ${value}` : `Number: null`; + }); + assert.equal(optResult2, "Number: 42 | Number: null"); + + const optResult3 = processor.processOptionalGreeter((greeter) => { + return greeter !== null ? `Greeter: ${greeter.name}` : `Greeter: null`; + }); + assert.equal(optResult3, "Greeter: Alice | Greeter: null"); + + const optFormatter = processor.makeOptionalStringFormatter(); + assert.equal(optFormatter("world"), "Got: world"); + assert.equal(optFormatter(null), "Got: nil"); + + const optCreator = processor.makeOptionalGreeterCreator(); + const opt1 = optCreator(); + assert.equal(opt1, null); + const opt2 = optCreator(); + assert.notEqual(opt2, null); + assert.equal(opt2.name, "Greeter2"); + assert.equal(opt2.greet(), "Hello, Greeter2!"); + opt2.release(); + const opt3 = optCreator(); + assert.equal(opt3, null); + const opt4 = optCreator(); + assert.notEqual(opt4, null); + assert.equal(opt4.name, "Greeter4"); + opt4.release(); + + const dirResult = processor.processDirection((dir) => { + switch (dir) { + case exports.Direction.North: return "Going North"; + case exports.Direction.South: return "Going South"; + case exports.Direction.East: return "Going East"; + case exports.Direction.West: return "Going West"; + default: return "Unknown"; + } + }); + assert.equal(dirResult, "Going North"); + + const themeResult = processor.processTheme((theme) => { + return theme === exports.Theme.Dark ? "Dark mode" : "Light mode"; + }); + assert.equal(themeResult, "Dark mode"); + + const statusResult = processor.processHttpStatus((status) => { + return status; + }); + assert.equal(statusResult, exports.HttpStatus.Ok); + + const apiResult = processor.processAPIResult((result) => { + if (result.tag === exports.APIResult.Tag.Success) { + return `API Success: ${result.param0}`; + } + return "API Other"; + }); + assert.equal(apiResult, "API Success: test"); + + const dirChecker = processor.makeDirectionChecker(); + assert.equal(dirChecker(exports.Direction.North), true); + assert.equal(dirChecker(exports.Direction.South), true); + assert.equal(dirChecker(exports.Direction.East), false); + assert.equal(dirChecker(exports.Direction.West), false); + + const themeValidator = processor.makeThemeValidator(); + assert.equal(themeValidator(exports.Theme.Dark), true); + assert.equal(themeValidator(exports.Theme.Light), false); + assert.equal(themeValidator(exports.Theme.Auto), false); + + const statusExtractor = processor.makeStatusCodeExtractor(); + assert.equal(statusExtractor(exports.HttpStatus.Ok), 200); + assert.equal(statusExtractor(exports.HttpStatus.NotFound), 404); + assert.equal(statusExtractor(exports.HttpStatus.ServerError), 500); + assert.equal(statusExtractor(exports.HttpStatus.Unknown), -1); + + const apiHandler = processor.makeAPIResultHandler(); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Success, param0: "done" }), "Success: done"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Failure, param0: 500 }), "Failure: 500"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Info }), "Info"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Flag, param0: true }), "Flag: true"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Rate, param0: 1.5 }), "Rate: 1.5"); + assert.equal(apiHandler({ tag: exports.APIResult.Tag.Precise, param0: 3.14159 }), "Precise: 3.14159"); + + const optDirResult = processor.processOptionalDirection((dir) => { + return dir !== null ? `Dir: ${dir}` : "Dir: null"; + }); + assert.equal(optDirResult, `Dir: ${exports.Direction.North} | Dir: null`); + + const optThemeResult = processor.processOptionalTheme((theme) => { + return theme !== null ? `Theme: ${theme}` : "Theme: null"; + }); + assert.equal(optThemeResult, `Theme: ${exports.Theme.Light} | Theme: null`); + + const optApiResult = processor.processOptionalAPIResult((result) => { + if (result === null) return "Result: null"; + if (result.tag === exports.APIResult.Tag.Success) { + return `Result: Success(${result.param0})`; + } + return "Result: other"; + }); + assert.equal(optApiResult, "Result: Success(ok) | Result: null"); + + const optDirFormatter = processor.makeOptionalDirectionFormatter(); + assert.equal(optDirFormatter(exports.Direction.North), "N"); + assert.equal(optDirFormatter(exports.Direction.South), "S"); + assert.equal(optDirFormatter(exports.Direction.East), "E"); + assert.equal(optDirFormatter(exports.Direction.West), "W"); + assert.equal(optDirFormatter(null), "nil"); + + processor.release(); + + + const intToInt = exports.ClosureSupportExports.makeIntToInt(10); + assert.equal(intToInt(0), 10); + assert.equal(intToInt(32), 42); + + const doubleToDouble = exports.ClosureSupportExports.makeDoubleToDouble(10.0); + assert.equal(doubleToDouble(0.0), 10.0); + assert.equal(doubleToDouble(32.0), 42.0); + + const stringToString = exports.ClosureSupportExports.makeStringToString("Hello, "); + assert.equal(stringToString("world!"), "Hello, world!"); + + const jsIntToInt = exports.ClosureSupportExports.makeJSIntToInt(10); + assert.equal(jsIntToInt(0), 10); + assert.equal(jsIntToInt(32), 42); + + const jsDoubleToDouble = exports.ClosureSupportExports.makeJSDoubleToDouble(10.0); + assert.equal(jsDoubleToDouble(0.0), 10.0); + assert.equal(jsDoubleToDouble(32.0), 42.0); + + const jsStringToString = exports.ClosureSupportExports.makeJSStringToString("Hello, "); + assert.equal(jsStringToString("world!"), "Hello, world!"); +} diff --git a/Tests/JavaScriptKitTests/JavaScriptKitTests.swift b/Tests/JavaScriptKitTests/JavaScriptKitTests.swift index b69334ce5..280a17b62 100644 --- a/Tests/JavaScriptKitTests/JavaScriptKitTests.swift +++ b/Tests/JavaScriptKitTests/JavaScriptKitTests.swift @@ -523,5 +523,9 @@ class JavaScriptKitTests: XCTestCase { } } +#if arch(wasm32) @_extern(c, "llvm.wasm.memory.grow.i32") func growMemory(_ memory: Int32, _ pages: Int32) -> Int32 +#else +func growMemory(_ memory: Int32, _ pages: Int32) -> Int32 { return 0 } +#endif diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 934c4f01c..95573b34e 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -5,6 +5,7 @@ import { } from '../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.js'; import { ImportedFoo } from './BridgeJSRuntimeTests/JavaScript/Types.mjs'; import { runJsOptionalSupportTests } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; +import { getImports as getClosureSupportImports } from './BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ export async function setupOptions(options, context) { @@ -185,23 +186,6 @@ export async function setupOptions(options, context) { BridgeJSRuntimeTests_runAsyncWorks(exports); return; }, - jsApplyInt: (v, fn) => { - return fn(v); - }, - jsMakeAdder: (base) => { - return (v) => base + v; - }, - jsMapString: (value, fn) => { - return fn(value); - }, - jsMakePrefixer: (prefix) => { - return (name) => `${prefix}${name}`; - }, - jsCallTwice: (v, fn) => { - fn(v); - fn(v); - return v; - }, jsTranslatePoint: (point, dx, dy) => { return { x: (point.x | 0) + (dx | 0), y: (point.y | 0) + (dy | 0) }; }, @@ -227,7 +211,8 @@ export async function setupOptions(options, context) { const exports = importsContext.getExports(); if (!exports) { throw new Error("No exports!?"); } runJsOptionalSupportTests(exports); - } + }, + ClosureSupportImports: getClosureSupportImports(importsContext), }; }, addToCoreImports(importObject, importsContext) { @@ -893,202 +878,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { cd5.release(); testProtocolSupport(exports); - testClosureSupport(exports); testArraySupport(exports); } -/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ -function testClosureSupport(exports) { - const upperTransform = (text) => text.toUpperCase(); - const processor = new exports.TextProcessor(upperTransform); - - assert.equal(processor.process("hello"), "HELLO"); - - const multiParamTransform = (count, text, ratio) => { - return `${text.toUpperCase()}-${count}-${ratio.toFixed(2)}`; - }; - assert.equal(processor.processWithCustom("world", multiParamTransform), "WORLD-42-3.14"); - assert.equal(processor.process("test"), "TEST"); - - const greeterForClosure = new exports.Greeter("World"); - const greeterCaller = new exports.Greeter("Caller"); - const customGreeting = (greeter) => `Custom greeting for ${greeter.name}: ${greeter.greet()}`; - const greetResult = greeterCaller.greetWith(greeterForClosure, customGreeting); - assert.equal(greetResult, "Custom greeting for World: Hello, World!"); - greeterForClosure.release(); - greeterCaller.release(); - - assert.equal(exports.formatName("ada", (name) => name.toUpperCase()), "ADA"); - assert.equal(exports.formatName("grace", (name) => `Dr. ${name}`), "Dr. grace"); - - const addDr = exports.makeFormatter("Dr."); - assert.equal(addDr("Ada"), "Dr. Ada"); - assert.equal(addDr("Grace"), "Dr. Grace"); - - const addProf = exports.makeFormatter("Prof."); - assert.equal(addProf("Hopper"), "Prof. Hopper"); - - const add10 = exports.makeAdder(10); - assert.equal(add10(5), 15); - assert.equal(add10(32), 42); - - const add100 = exports.makeAdder(100); - assert.equal(add100(23), 123); - - const storedTransform = processor.getTransform(); - assert.equal(storedTransform("hello"), "HELLO"); - assert.equal(storedTransform("world"), "WORLD"); - - const greeterForFormatter = new exports.Greeter("Formatter"); - const greeterFormatter = greeterForFormatter.makeFormatter(" [suffix]"); - assert.equal(greeterFormatter("test"), "Hello, Formatter! - test - [suffix]"); - assert.equal(greeterFormatter("data"), "Hello, Formatter! - data - [suffix]"); - greeterForFormatter.release(); - - const greeterCreator = exports.Greeter.makeCreator("Default"); - const createdG1 = greeterCreator("Alice"); - assert.equal(createdG1.name, "Alice"); - assert.equal(createdG1.greet(), "Hello, Alice!"); - const createdG2 = greeterCreator(""); - assert.equal(createdG2.name, "Default"); - assert.equal(createdG2.greet(), "Hello, Default!"); - createdG1.release(); - createdG2.release(); - - const greeterHost = new exports.Greeter("Host"); - const greeterGreeter = greeterHost.makeCustomGreeter(); - const guest1 = new exports.Greeter("Guest1"); - const guest2 = new exports.Greeter("Guest2"); - assert.equal(greeterGreeter(guest1), "Host greets Guest1: Hello, Guest1!"); - assert.equal(greeterGreeter(guest2), "Host greets Guest2: Hello, Guest2!"); - greeterHost.release(); - guest1.release(); - guest2.release(); - - const greeterForMethod = new exports.Greeter("Method"); - const greeterParam = new exports.Greeter("Param"); - const methodResult = greeterForMethod.greetWith(greeterParam, (g) => { - return `Custom: ${g.name} says ${g.greet()}`; - }); - assert.equal(methodResult, "Custom: Param says Hello, Param!"); - greeterForMethod.release(); - greeterParam.release(); - - const optResult1 = processor.processOptionalString((value) => { - return value !== null ? `Got: ${value}` : `Got: null`; - }); - assert.equal(optResult1, "Got: test | Got: null"); - - const optResult2 = processor.processOptionalInt((value) => { - return value !== null ? `Number: ${value}` : `Number: null`; - }); - assert.equal(optResult2, "Number: 42 | Number: null"); - - const optResult3 = processor.processOptionalGreeter((greeter) => { - return greeter !== null ? `Greeter: ${greeter.name}` : `Greeter: null`; - }); - assert.equal(optResult3, "Greeter: Alice | Greeter: null"); - - const optFormatter = processor.makeOptionalStringFormatter(); - assert.equal(optFormatter("world"), "Got: world"); - assert.equal(optFormatter(null), "Got: nil"); - - const optCreator = processor.makeOptionalGreeterCreator(); - const opt1 = optCreator(); - assert.equal(opt1, null); - const opt2 = optCreator(); - assert.notEqual(opt2, null); - assert.equal(opt2.name, "Greeter2"); - assert.equal(opt2.greet(), "Hello, Greeter2!"); - opt2.release(); - const opt3 = optCreator(); - assert.equal(opt3, null); - const opt4 = optCreator(); - assert.notEqual(opt4, null); - assert.equal(opt4.name, "Greeter4"); - opt4.release(); - - const dirResult = processor.processDirection((dir) => { - switch (dir) { - case exports.Direction.North: return "Going North"; - case exports.Direction.South: return "Going South"; - case exports.Direction.East: return "Going East"; - case exports.Direction.West: return "Going West"; - default: return "Unknown"; - } - }); - assert.equal(dirResult, "Going North"); - - const themeResult = processor.processTheme((theme) => { - return theme === exports.Theme.Dark ? "Dark mode" : "Light mode"; - }); - assert.equal(themeResult, "Dark mode"); - - const statusResult = processor.processHttpStatus((status) => { - return status; - }); - assert.equal(statusResult, exports.HttpStatus.Ok); - - const apiResult = processor.processAPIResult((result) => { - if (result.tag === exports.APIResult.Tag.Success) { - return `API Success: ${result.param0}`; - } - return "API Other"; - }); - assert.equal(apiResult, "API Success: test"); - - const dirChecker = processor.makeDirectionChecker(); - assert.equal(dirChecker(exports.Direction.North), true); - assert.equal(dirChecker(exports.Direction.South), true); - assert.equal(dirChecker(exports.Direction.East), false); - assert.equal(dirChecker(exports.Direction.West), false); - - const themeValidator = processor.makeThemeValidator(); - assert.equal(themeValidator(exports.Theme.Dark), true); - assert.equal(themeValidator(exports.Theme.Light), false); - assert.equal(themeValidator(exports.Theme.Auto), false); - - const statusExtractor = processor.makeStatusCodeExtractor(); - assert.equal(statusExtractor(exports.HttpStatus.Ok), 200); - assert.equal(statusExtractor(exports.HttpStatus.NotFound), 404); - assert.equal(statusExtractor(exports.HttpStatus.ServerError), 500); - assert.equal(statusExtractor(exports.HttpStatus.Unknown), -1); - - const apiHandler = processor.makeAPIResultHandler(); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Success, param0: "done" }), "Success: done"); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Failure, param0: 500 }), "Failure: 500"); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Info }), "Info"); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Flag, param0: true }), "Flag: true"); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Rate, param0: 1.5 }), "Rate: 1.5"); - assert.equal(apiHandler({ tag: exports.APIResult.Tag.Precise, param0: 3.14159 }), "Precise: 3.14159"); - - const optDirResult = processor.processOptionalDirection((dir) => { - return dir !== null ? `Dir: ${dir}` : "Dir: null"; - }); - assert.equal(optDirResult, `Dir: ${exports.Direction.North} | Dir: null`); - - const optThemeResult = processor.processOptionalTheme((theme) => { - return theme !== null ? `Theme: ${theme}` : "Theme: null"; - }); - assert.equal(optThemeResult, `Theme: ${exports.Theme.Light} | Theme: null`); - - const optApiResult = processor.processOptionalAPIResult((result) => { - if (result === null) return "Result: null"; - if (result.tag === exports.APIResult.Tag.Success) { - return `Result: Success(${result.param0})`; - } - return "Result: other"; - }); - assert.equal(optApiResult, "Result: Success(ok) | Result: null"); - - const optDirFormatter = processor.makeOptionalDirectionFormatter(); - assert.equal(optDirFormatter(exports.Direction.North), "N"); - assert.equal(optDirFormatter(exports.Direction.South), "S"); - assert.equal(optDirFormatter(exports.Direction.East), "E"); - assert.equal(optDirFormatter(exports.Direction.West), "W"); - assert.equal(optDirFormatter(null), "nil"); - - processor.release(); -} /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testStructSupport(exports) { From 18339d39239438e36cf5419625f346dc4ed92004 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Fri, 6 Feb 2026 18:20:32 +0100 Subject: [PATCH 172/252] BridgeJS: Always provide swift_js_closure_unregister intrinsic in generated bridge-js.js --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 5 +++++ .../__Snapshots__/BridgeJSLinkTests/ArrayTypes.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Async.js | 1 + .../__Snapshots__/BridgeJSLinkTests/DefaultParameters.js | 1 + .../__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js | 1 + .../__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js | 1 + .../__Snapshots__/BridgeJSLinkTests/EnumCase.js | 1 + .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js | 1 + .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.js | 1 + .../__Snapshots__/BridgeJSLinkTests/EnumRawType.js | 1 + .../__Snapshots__/BridgeJSLinkTests/GlobalGetter.js | 1 + .../__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js | 1 + .../__Snapshots__/BridgeJSLinkTests/ImportArray.js | 1 + .../BridgeJSLinkTests/ImportedTypeInExportedInterface.js | 1 + .../__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js | 1 + .../__Snapshots__/BridgeJSLinkTests/JSClass.js | 1 + .../BridgeJSLinkTests/JSClassStaticFunctions.js | 1 + .../__Snapshots__/BridgeJSLinkTests/JSValue.js | 1 + .../__Snapshots__/BridgeJSLinkTests/MixedGlobal.js | 1 + .../__Snapshots__/BridgeJSLinkTests/MixedModules.js | 1 + .../__Snapshots__/BridgeJSLinkTests/MixedPrivate.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Namespaces.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Optionals.js | 1 + .../__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js | 1 + .../__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js | 1 + .../__Snapshots__/BridgeJSLinkTests/PropertyTypes.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Protocol.js | 1 + .../BridgeJSLinkTests/StaticFunctions.Global.js | 1 + .../__Snapshots__/BridgeJSLinkTests/StaticFunctions.js | 1 + .../BridgeJSLinkTests/StaticProperties.Global.js | 1 + .../__Snapshots__/BridgeJSLinkTests/StaticProperties.js | 1 + .../__Snapshots__/BridgeJSLinkTests/StringParameter.js | 1 + .../__Snapshots__/BridgeJSLinkTests/StringReturn.js | 1 + .../__Snapshots__/BridgeJSLinkTests/SwiftClass.js | 1 + .../__Snapshots__/BridgeJSLinkTests/SwiftClosure.js | 1 + .../__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js | 1 + .../__Snapshots__/BridgeJSLinkTests/SwiftStruct.js | 1 + .../__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Throws.js | 1 + .../__Snapshots__/BridgeJSLinkTests/UnsafePointer.js | 1 + .../BridgeJSLinkTests/VoidParameterVoidReturn.js | 1 + 42 files changed, 46 insertions(+) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 1be1f4966..13ea4e910 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -602,6 +602,11 @@ public struct BridgeJSLink { printer.write("return pointer || 0;") } printer.write("}") + // Always provide swift_js_closure_unregister as a no-op by default. + // The @_extern(wasm) declaration in BridgeJSIntrinsics.swift is unconditional, + // so the WASM binary always imports this symbol. When closures ARE used, + // the real implementation below will override this no-op. + printer.write("bjs[\"swift_js_closure_unregister\"] = function(funcRef) {}") for unified in skeletons { let moduleName = unified.moduleName diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 5b8c451e2..d858d8e38 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -236,6 +236,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index 40ff4884a..0f4dce413 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index c7b1dc093..079618bbf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -272,6 +272,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 5453ec525..54f00021d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index f04b464c6..18c6999c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -1054,6 +1054,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 0c8eee729..6ed445811 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -221,6 +221,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 28cfe9dd9..55f995024 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -241,6 +241,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index a933ed735..179712fef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -222,6 +222,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 06ebbe269..0855f11ec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -273,6 +273,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flag) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index 97f34b1bb..c9ccf98fe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_console_get"] = function bjs_console_get() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index bc186d4c1..947ee4d11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_console_get"] = function bjs_console_get() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index 3a04c5308..6c56cce6f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_roundtrip"] = function bjs_roundtrip() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 4f3fa39a6..b0674f388 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -273,6 +273,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_Foo_init"] = function bjs_Foo_init() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index d3514253a..9ac03ee73 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_createWeirdObject"] = function bjs_createWeirdObject() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 2bbddd396..6e9100b11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_returnAnimatable"] = function bjs_returnAnimatable() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index c05e4e114..b466d0900 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 754a17e3c..888a11a4c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -287,6 +287,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index d9521754f..7bb3c14d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 907e955b1..ac2270b9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: GlobalModule if (!importObject["GlobalModule"]) { importObject["GlobalModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index cbeae41d8..3205ef5d0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 92aeeae95..ed8f6db8b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index e2f425455..c148f0761 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 923a1f354..b69033543 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index e148b94ac..11a199b71 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check(a, b) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index b803936d0..bb1e7ad40 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkNumber"] = function bjs_checkNumber() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 916d5e1b5..4e8e86821 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index ee1a2345c..57587d84a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -260,6 +260,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index d07af4cdb..fcf19c54f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -247,6 +247,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 63c5c964b..5e82061d9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -247,6 +247,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index c1d59bf69..ad44e80fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -202,6 +202,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index f086f2919..fb43d426b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -202,6 +202,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index 20ea91e3c..1ee9f519e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString(a) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 0f002bf31..02833d1c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_checkString"] = function bjs_checkString() { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index ee4333f03..6002d190f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index a6966ae40..38c248cae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -323,6 +323,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} bjs["swift_js_closure_unregister"] = function(funcRef) { const func = swift.memory.getObject(funcRef); func.__unregister(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index c61b71313..57b34d426 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -223,6 +223,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} bjs["swift_js_closure_unregister"] = function(funcRef) { const func = swift.memory.getObject(funcRef); func.__unregister(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index b4cf995cb..3f42f3103 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -532,6 +532,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 959572255..751b28959 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -223,6 +223,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_translate"] = function bjs_translate(point, dx, dy) { try { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 487645d70..50276543c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -197,6 +197,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index dc478a642..29474892f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -228,6 +228,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { instance = i; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 428c422e0..de17f5edc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -198,6 +198,7 @@ export async function createInstantiator(options, swift) { tmpRetOptionalHeapObject = undefined; return pointer || 0; } + bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; TestModule["bjs_check"] = function bjs_check() { try { From 180c0100c8ab7a6d18783bdab29892e4b33c0c0f Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 8 Feb 2026 12:44:51 +0900 Subject: [PATCH 173/252] BridgeJS: show unified diff on snapshot mismatch (#600) --- .../BridgeJSToolTests/SnapshotTesting.swift | 41 ++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/SnapshotTesting.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/SnapshotTesting.swift index ce7066a6d..de7ebd0c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/SnapshotTesting.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/SnapshotTesting.swift @@ -22,17 +22,26 @@ func assertSnapshot( if FileManager.default.fileExists(atPath: snapshotPath.path) { let existingSnapshot = try String(contentsOf: snapshotPath, encoding: .utf8) - let ok = existingSnapshot == String(data: input, encoding: .utf8)! + let actual = String(data: input, encoding: .utf8)! + let ok = existingSnapshot == actual let actualFilePath = snapshotPath.path + ".actual" let updateSnapshots = ProcessInfo.processInfo.environment["UPDATE_SNAPSHOTS"] != nil - func buildComment() -> Comment { - "Snapshot mismatch: \(actualFilePath) \(snapshotPath.path)" - } + if !updateSnapshots { - #expect(ok, buildComment(), sourceLocation: sourceLocation) if !ok { - try input.write(to: URL(fileURLWithPath: actualFilePath)) + try actual.write(toFile: actualFilePath, atomically: true, encoding: .utf8) } + + let diff = ok ? nil : unifiedDiff(expectedPath: snapshotPath.path, actualPath: actualFilePath) + func buildComment() -> Comment { + var message = "Snapshot mismatch: \(actualFilePath) \(snapshotPath.path)" + if let diff { + message.append("\n\n" + diff) + } + return Comment(rawValue: message) + } + + #expect(ok, buildComment(), sourceLocation: sourceLocation) } else { try input.write(to: snapshotPath) } @@ -41,3 +50,23 @@ func assertSnapshot( #expect(Bool(false), "Snapshot created at \(snapshotPath.path)", sourceLocation: sourceLocation) } } + +private func unifiedDiff(expectedPath: String, actualPath: String) -> String? { + let process = Process() + process.executableURL = URL(fileURLWithPath: "/usr/bin/env") + process.arguments = ["diff", "-u", expectedPath, actualPath] + let output = Pipe() + process.standardOutput = output + process.standardError = Pipe() + + do { + try process.run() + } catch { + return nil + } + process.waitUntilExit() + + let data = output.fileHandleForReading.readDataToEndOfFile() + guard !data.isEmpty else { return nil } + return String(data: data, encoding: .utf8) +} From 6d103abc6438505220c45829fb6d48c12aa180fa Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 08:54:16 +0900 Subject: [PATCH 174/252] [NFC] BridgeJS: Cover more types in closure snapshot tests (#602) --- .../Inputs/MacroSwift/SwiftClosure.swift | 53 +- .../BridgeJSCodegenTests/SwiftClosure.json | 2192 +++++++++++------ .../BridgeJSCodegenTests/SwiftClosure.swift | 1111 ++++++--- .../BridgeJSLinkTests/SwiftClosure.d.ts | 38 +- .../BridgeJSLinkTests/SwiftClosure.js | 745 +++--- 5 files changed, 2729 insertions(+), 1410 deletions(-) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift index 129f53b50..791b1b7a9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClosure.swift @@ -9,41 +9,34 @@ import JavaScriptKit } @JS class TestProcessor { - private var transform: (String) -> String - - @JS init(transform: @escaping (String) -> String) { - self.transform = transform - } - - @JS func getTransform() -> (String) -> String - - @JS func processWithCustom(_ text: String, customTransform: (String) -> String) -> String + @JS init(transform: @escaping (String) -> String) {} +} - @JS func printTogether( - person: Person, - name: String, - ratio: Double, - customTransform: (Person?, String?, Double?) -> String - ) -> String +@JS func roundtripString(_ stringClosure: (String) -> String) -> (String) -> String +@JS func roundtripInt(_ intClosure: (Int) -> Int) -> (Int) -> Int +@JS func roundtripBool(_ boolClosure: (Bool) -> Bool) -> (Bool) -> Bool +@JS func roundtripFloat(_ floatClosure: (Float) -> Float) -> (Float) -> Float +@JS func roundtripDouble(_ doubleClosure: (Double) -> Double) -> (Double) -> Double - @JS func roundtrip(_ personClosure: (Person) -> String) -> (Person) -> String - @JS func roundtripOptional(_ personClosure: (Person?) -> String) -> (Person?) -> String +@JS func roundtripOptionalString(_ stringClosure: (String?) -> String?) -> (String?) -> String? +@JS func roundtripOptionalInt(_ intClosure: (Int?) -> Int?) -> (Int?) -> Int? +@JS func roundtripOptionalBool(_ boolClosure: (Bool?) -> Bool?) -> (Bool?) -> Bool? +@JS func roundtripOptionalFloat(_ floatClosure: (Float?) -> Float?) -> (Float?) -> Float? +@JS func roundtripOptionalDouble(_ doubleClosure: (Double?) -> Double?) -> (Double?) -> Double? - @JS func processDirection(_ callback: (Direction) -> String) -> String - @JS func processTheme(_ callback: (Theme) -> String) -> String - @JS func processHttpStatus(_ callback: (HttpStatus) -> Int) -> Int - @JS func processAPIResult(_ callback: (APIResult) -> String) -> String +@JS func roundtripPerson(_ personClosure: (Person) -> Person) -> (Person) -> Person +@JS func roundtripOptionalPerson(_ personClosure: (Person?) -> Person?) -> (Person?) -> Person? - @JS func makeDirectionChecker() -> (Direction) -> Bool - @JS func makeThemeValidator() -> (Theme) -> Bool - @JS func makeStatusCodeExtractor() -> (HttpStatus) -> Int - @JS func makeAPIResultHandler() -> (APIResult) -> String +@JS func roundtripDirection(_ callback: (Direction) -> Direction) -> (Direction) -> Direction +@JS func roundtripTheme(_ callback: (Theme) -> Theme) -> (Theme) -> Theme +@JS func roundtripHttpStatus(_ callback: (HttpStatus) -> HttpStatus) -> (HttpStatus) -> HttpStatus +@JS func roundtripAPIResult(_ callback: (APIResult) -> APIResult) -> (APIResult) -> APIResult - @JS func processOptionalDirection(_ callback: (Direction?) -> String) -> String - @JS func processOptionalTheme(_ callback: (Theme?) -> String) -> String - @JS func processOptionalAPIResult(_ callback: (APIResult?) -> String) -> String - @JS func makeOptionalDirectionFormatter() -> (Direction?) -> String -} +@JS func roundtripOptionalDirection(_ callback: (Direction?) -> Direction?) -> (Direction?) -> Direction? +@JS func roundtripOptionalTheme(_ callback: (Theme?) -> Theme?) -> (Theme?) -> Theme? +@JS func roundtripOptionalHttpStatus(_ callback: (HttpStatus?) -> HttpStatus?) -> (HttpStatus?) -> HttpStatus? +@JS func roundtripOptionalAPIResult(_ callback: (APIResult?) -> APIResult?) -> (APIResult?) -> APIResult? +@JS func roundtripOptionalDirection(_ callback: (Direction?) -> Direction?) -> (Direction?) -> Direction? @JS enum Direction { case north diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json index ee551fa47..11c6cb893 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.json @@ -70,236 +70,239 @@ ] }, "methods" : [ + + ], + "name" : "TestProcessor", + "properties" : [ + + ], + "swiftCallName" : "TestProcessor" + } + ], + "enums" : [ + { + "cases" : [ { - "abiName" : "bjs_TestProcessor_getTransform", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "getTransform", - "parameters" : [ + "associatedValues" : [ ], - "returnType" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSS_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "string" : { + "name" : "north" + }, + { + "associatedValues" : [ - } - } - ], - "returnType" : { - "string" : { + ], + "name" : "south" + }, + { + "associatedValues" : [ - } - } - }, - "useJSTypedClosure" : false - } - } + ], + "name" : "east" }, { - "abiName" : "bjs_TestProcessor_processWithCustom", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processWithCustom", - "parameters" : [ - { - "label" : "_", - "name" : "text", - "type" : { - "string" : { + "associatedValues" : [ - } - } - }, - { - "label" : "customTransform", - "name" : "customTransform", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSS_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "string" : { + ], + "name" : "west" + } + ], + "emitStyle" : "const", + "name" : "Direction", + "staticMethods" : [ - } - } - ], - "returnType" : { - "string" : { + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Direction", + "tsFullPath" : "Direction" + }, + { + "cases" : [ + { + "associatedValues" : [ - } - } - }, - "useJSTypedClosure" : false - } - } - } ], - "returnType" : { - "string" : { + "name" : "light", + "rawValue" : "light" + }, + { + "associatedValues" : [ - } - } + ], + "name" : "dark", + "rawValue" : "dark" }, { - "abiName" : "bjs_TestProcessor_printTogether", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "printTogether", - "parameters" : [ + "associatedValues" : [ + + ], + "name" : "auto", + "rawValue" : "auto" + } + ], + "emitStyle" : "const", + "name" : "Theme", + "rawType" : "String", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "Theme", + "tsFullPath" : "Theme" + }, + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "ok", + "rawValue" : "200" + }, + { + "associatedValues" : [ + + ], + "name" : "notFound", + "rawValue" : "404" + }, + { + "associatedValues" : [ + + ], + "name" : "serverError", + "rawValue" : "500" + }, + { + "associatedValues" : [ + + ], + "name" : "unknown", + "rawValue" : "-1" + } + ], + "emitStyle" : "const", + "name" : "HttpStatus", + "rawType" : "Int", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "HttpStatus", + "tsFullPath" : "HttpStatus" + }, + { + "cases" : [ + { + "associatedValues" : [ { - "label" : "person", - "name" : "person", "type" : { - "swiftHeapObject" : { - "_0" : "Person" + "string" : { + } } - }, + } + ], + "name" : "success" + }, + { + "associatedValues" : [ { - "label" : "name", - "name" : "name", "type" : { - "string" : { + "int" : { } } - }, + } + ], + "name" : "failure" + }, + { + "associatedValues" : [ { - "label" : "ratio", - "name" : "ratio", "type" : { - "double" : { + "bool" : { } } - }, + } + ], + "name" : "flag" + }, + { + "associatedValues" : [ { - "label" : "customTransform", - "name" : "customTransform", "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonCSqSSSqSd_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - }, - "_1" : "null" - } - }, - { - "nullable" : { - "_0" : { - "string" : { - - } - }, - "_1" : "null" - } - }, - { - "nullable" : { - "_0" : { - "double" : { - - } - }, - "_1" : "null" - } - } - ], - "returnType" : { - "string" : { + "float" : { - } - } - }, - "useJSTypedClosure" : false } } } ], - "returnType" : { - "string" : { - - } - } + "name" : "rate" }, { - "abiName" : "bjs_TestProcessor_roundtrip", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtrip", - "parameters" : [ + "associatedValues" : [ { - "label" : "_", - "name" : "personClosure", "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "swiftHeapObject" : { - "_0" : "Person" - } - } - ], - "returnType" : { - "string" : { + "double" : { - } - } - }, - "useJSTypedClosure" : false } } } ], - "returnType" : { + "name" : "precise" + }, + { + "associatedValues" : [ + + ], + "name" : "info" + } + ], + "emitStyle" : "const", + "name" : "APIResult", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "APIResult", + "tsFullPath" : "APIResult" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_roundtripString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripString", + "parameters" : [ + { + "label" : "_", + "name" : "stringClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModule6PersonC_SS", + "mangleName" : "10TestModuleSS_SS", "moduleName" : "TestModule", "parameters" : [ { - "swiftHeapObject" : { - "_0" : "Person" + "string" : { + } } ], @@ -312,70 +315,60 @@ "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_roundtripOptional", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundtripOptional", - "parameters" : [ - { - "label" : "_", - "name" : "personClosure", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonC_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - }, - "_1" : "null" - } - } - ], - "returnType" : { - "string" : { + "isThrows" : false, + "mangleName" : "10TestModuleSS_SS", + "moduleName" : "TestModule", + "parameters" : [ + { + "string" : { - } - } - }, - "useJSTypedClosure" : false } } + ], + "returnType" : { + "string" : { + + } } - ], - "returnType" : { + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripInt", + "parameters" : [ + { + "label" : "_", + "name" : "intClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModuleSq6PersonC_SS", + "mangleName" : "10TestModuleSi_Si", "moduleName" : "TestModule", "parameters" : [ { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Person" - } - }, - "_1" : "null" + "int" : { + } } ], "returnType" : { - "string" : { + "int" : { } } @@ -383,208 +376,121 @@ "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_processDirection", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9DirectionO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "caseEnum" : { - "_0" : "Direction" - } - } - ], - "returnType" : { - "string" : { + "isThrows" : false, + "mangleName" : "10TestModuleSi_Si", + "moduleName" : "TestModule", + "parameters" : [ + { + "int" : { - } - } - }, - "useJSTypedClosure" : false } } - } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule5ThemeO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - } - ], - "returnType" : { - "string" : { + ], + "returnType" : { + "int" : { - } - } - }, - "useJSTypedClosure" : false - } } } - ], - "returnType" : { - "string" : { - - } - } - }, - { - "abiName" : "bjs_TestProcessor_processHttpStatus", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false }, - "name" : "processHttpStatus", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule10HttpStatusO_Si", - "moduleName" : "TestModule", - "parameters" : [ - { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - } - ], - "returnType" : { - "int" : { + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripBool", + "parameters" : [ + { + "label" : "_", + "name" : "boolClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSb_Sb", + "moduleName" : "TestModule", + "parameters" : [ + { + "bool" : { - } } - }, - "useJSTypedClosure" : false - } - } - } - ], - "returnType" : { - "int" : { + } + ], + "returnType" : { + "bool" : { + } + } + }, + "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_processAPIResult", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModule9APIResultO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "associatedValueEnum" : { - "_0" : "APIResult" - } - } - ], - "returnType" : { - "string" : { + "isThrows" : false, + "mangleName" : "10TestModuleSb_Sb", + "moduleName" : "TestModule", + "parameters" : [ + { + "bool" : { - } - } - }, - "useJSTypedClosure" : false } } - } - ], - "returnType" : { - "string" : { + ], + "returnType" : { + "bool" : { + } } - } - }, - { - "abiName" : "bjs_TestProcessor_makeDirectionChecker", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false }, - "name" : "makeDirectionChecker", - "parameters" : [ - - ], - "returnType" : { + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripFloat", + "parameters" : [ + { + "label" : "_", + "name" : "floatClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModule9DirectionO_Sb", + "mangleName" : "10TestModuleSf_Sf", "moduleName" : "TestModule", "parameters" : [ { - "caseEnum" : { - "_0" : "Direction" + "float" : { + } } ], "returnType" : { - "bool" : { + "float" : { } } @@ -592,35 +498,60 @@ "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_makeThemeValidator", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeThemeValidator", - "parameters" : [ + "isThrows" : false, + "mangleName" : "10TestModuleSf_Sf", + "moduleName" : "TestModule", + "parameters" : [ + { + "float" : { - ], - "returnType" : { + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripDouble", + "parameters" : [ + { + "label" : "_", + "name" : "doubleClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModule5ThemeO_Sb", + "mangleName" : "10TestModuleSd_Sd", "moduleName" : "TestModule", "parameters" : [ { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" + "double" : { + } } ], "returnType" : { - "bool" : { + "double" : { } } @@ -628,247 +559,300 @@ "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_makeStatusCodeExtractor", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeStatusCodeExtractor", - "parameters" : [ + "isThrows" : false, + "mangleName" : "10TestModuleSd_Sd", + "moduleName" : "TestModule", + "parameters" : [ + { + "double" : { - ], - "returnType" : { + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalString", + "parameters" : [ + { + "label" : "_", + "name" : "stringClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModule10HttpStatusO_Si", + "mangleName" : "10TestModuleSqSS_SqSS", "moduleName" : "TestModule", "parameters" : [ { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" } } ], "returnType" : { - "int" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "null" } } }, "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_makeAPIResultHandler", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeAPIResultHandler", - "parameters" : [ + "isThrows" : false, + "mangleName" : "10TestModuleSqSS_SqSS", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "string" : { - ], - "returnType" : { + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalInt", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalInt", + "parameters" : [ + { + "label" : "_", + "name" : "intClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModule9APIResultO_SS", + "mangleName" : "10TestModuleSqSi_SqSi", "moduleName" : "TestModule", "parameters" : [ { - "associatedValueEnum" : { - "_0" : "APIResult" + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" } } ], "returnType" : { - "string" : { + "nullable" : { + "_0" : { + "int" : { + } + }, + "_1" : "null" } } }, "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalDirection", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalDirection", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { + "isThrows" : false, + "mangleName" : "10TestModuleSqSi_SqSi", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq9DirectionO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "nullable" : { - "_0" : { - "caseEnum" : { - "_0" : "Direction" - } - }, - "_1" : "null" - } - } - ], - "returnType" : { - "string" : { + "int" : { - } } }, - "useJSTypedClosure" : false + "_1" : "null" } } - } - ], - "returnType" : { - "string" : { + ], + "returnType" : { + "nullable" : { + "_0" : { + "int" : { + } + }, + "_1" : "null" + } } - } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalTheme", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false }, - "name" : "processOptionalTheme", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { - "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq5ThemeO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "Theme", - "_1" : "String" - } - }, - "_1" : "null" + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalBool", + "parameters" : [ + { + "label" : "_", + "name" : "boolClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSqSb_SqSb", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "bool" : { + } - } - ], - "returnType" : { - "string" : { + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "bool" : { } - } - }, - "useJSTypedClosure" : false + }, + "_1" : "null" + } } - } - } - ], - "returnType" : { - "string" : { - + }, + "useJSTypedClosure" : false } } - }, - { - "abiName" : "bjs_TestProcessor_processOptionalAPIResult", - "effects" : { + } + ], + "returnType" : { + "closure" : { + "_0" : { "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "processOptionalAPIResult", - "parameters" : [ - { - "label" : "_", - "name" : "callback", - "type" : { - "closure" : { + "isThrows" : false, + "mangleName" : "10TestModuleSqSb_SqSb", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { "_0" : { - "isAsync" : false, - "isThrows" : false, - "mangleName" : "10TestModuleSq9APIResultO_SS", - "moduleName" : "TestModule", - "parameters" : [ - { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" - } - } - ], - "returnType" : { - "string" : { + "bool" : { - } } }, - "useJSTypedClosure" : false + "_1" : "null" } } - } - ], - "returnType" : { - "string" : { + ], + "returnType" : { + "nullable" : { + "_0" : { + "bool" : { + } + }, + "_1" : "null" + } } - } - }, - { - "abiName" : "bjs_TestProcessor_makeOptionalDirectionFormatter", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false }, - "name" : "makeOptionalDirectionFormatter", - "parameters" : [ - - ], - "returnType" : { + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalFloat", + "parameters" : [ + { + "label" : "_", + "name" : "floatClosure", + "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "10TestModuleSq9DirectionO_SS", + "mangleName" : "10TestModuleSqSf_SqSf", "moduleName" : "TestModule", "parameters" : [ { "nullable" : { "_0" : { - "caseEnum" : { - "_0" : "Direction" + "float" : { + } }, "_1" : "null" @@ -876,8 +860,13 @@ } ], "returnType" : { - "string" : { + "nullable" : { + "_0" : { + "float" : { + } + }, + "_1" : "null" } } }, @@ -886,215 +875,928 @@ } } ], - "name" : "TestProcessor", - "properties" : [ - - ], - "swiftCallName" : "TestProcessor" - } - ], - "enums" : [ - { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "north" - }, - { - "associatedValues" : [ - - ], - "name" : "south" - }, - { - "associatedValues" : [ + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSqSf_SqSf", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "float" : { - ], - "name" : "east" - }, - { - "associatedValues" : [ + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "float" : { - ], - "name" : "west" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false } - ], - "emitStyle" : "const", - "name" : "Direction", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "Direction", - "tsFullPath" : "Direction" + } }, { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "light", - "rawValue" : "light" - }, + "abiName" : "bjs_roundtripOptionalDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalDouble", + "parameters" : [ { - "associatedValues" : [ + "label" : "_", + "name" : "doubleClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSqSd_SqSd", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "double" : { - ], - "name" : "dark", - "rawValue" : "dark" - }, - { - "associatedValues" : [ + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "double" : { - ], - "name" : "auto", - "rawValue" : "auto" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } } ], - "emitStyle" : "const", - "name" : "Theme", - "rawType" : "String", - "staticMethods" : [ + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSqSd_SqSd", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "double" : { - ], - "staticProperties" : [ + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "double" : { - ], - "swiftCallName" : "Theme", - "tsFullPath" : "Theme" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } }, { - "cases" : [ - { - "associatedValues" : [ - - ], - "name" : "ok", - "rawValue" : "200" - }, - { - "associatedValues" : [ - - ], - "name" : "notFound", - "rawValue" : "404" - }, - { - "associatedValues" : [ - - ], - "name" : "serverError", - "rawValue" : "500" - }, + "abiName" : "bjs_roundtripPerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripPerson", + "parameters" : [ { - "associatedValues" : [ - - ], - "name" : "unknown", - "rawValue" : "-1" + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule6PersonC_6PersonC", + "moduleName" : "TestModule", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + }, + "useJSTypedClosure" : false + } + } } ], - "emitStyle" : "const", - "name" : "HttpStatus", - "rawType" : "Int", - "staticMethods" : [ - - ], - "staticProperties" : [ - - ], - "swiftCallName" : "HttpStatus", - "tsFullPath" : "HttpStatus" + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule6PersonC_6PersonC", + "moduleName" : "TestModule", + "parameters" : [ + { + "swiftHeapObject" : { + "_0" : "Person" + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Person" + } + } + }, + "useJSTypedClosure" : false + } + } }, { - "cases" : [ + "abiName" : "bjs_roundtripOptionalPerson", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalPerson", + "parameters" : [ { - "associatedValues" : [ - { - "type" : { - "string" : { - + "label" : "_", + "name" : "personClosure", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq6PersonC_Sq6PersonC", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + }, + "_1" : "null" + } } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq6PersonC_Sq6PersonC", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Person" + } + }, + "_1" : "null" } } - ], - "name" : "success" - }, + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripDirection", + "parameters" : [ { - "associatedValues" : [ - { - "type" : { - "int" : { - + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9DirectionO_9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" + } } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9DirectionO_9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "caseEnum" : { + "_0" : "Direction" + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "Direction" } } - ], - "name" : "failure" - }, + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripTheme", + "parameters" : [ { - "associatedValues" : [ - { - "type" : { - "bool" : { - + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule5ThemeO_5ThemeO", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule5ThemeO_5ThemeO", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" } } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } } - ], - "name" : "flag" - }, + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripHttpStatus", + "parameters" : [ { - "associatedValues" : [ - { - "type" : { - "float" : { - + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule10HttpStatusO_10HttpStatusO", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule10HttpStatusO_10HttpStatusO", + "moduleName" : "TestModule", + "parameters" : [ + { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" } } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } } - ], - "name" : "rate" - }, + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripAPIResult", + "parameters" : [ { - "associatedValues" : [ - { - "type" : { - "double" : { - + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9APIResultO_9APIResultO", + "moduleName" : "TestModule", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModule9APIResultO_9APIResultO", + "moduleName" : "TestModule", + "parameters" : [ + { + "associatedValueEnum" : { + "_0" : "APIResult" + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "APIResult" } } - ], - "name" : "precise" - }, + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalDirection", + "parameters" : [ { - "associatedValues" : [ - - ], - "name" : "info" + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_Sq9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } } ], - "emitStyle" : "const", - "name" : "APIResult", - "staticMethods" : [ - + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_Sq9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalTheme", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalTheme", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq5ThemeO_Sq5ThemeO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + } ], - "staticProperties" : [ - + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq5ThemeO_Sq5ThemeO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "Theme", + "_1" : "String" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalHttpStatus", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalHttpStatus", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq10HttpStatusO_Sq10HttpStatusO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + } ], - "swiftCallName" : "APIResult", - "tsFullPath" : "APIResult" + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq10HttpStatusO_Sq10HttpStatusO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalAPIResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalAPIResult", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9APIResultO_Sq9APIResultO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9APIResultO_Sq9APIResultO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + }, + { + "abiName" : "bjs_roundtripOptionalDirection", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundtripOptionalDirection", + "parameters" : [ + { + "label" : "_", + "name" : "callback", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_Sq9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuleSq9DirectionO_Sq9DirectionO", + "moduleName" : "TestModule", + "parameters" : [ + { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "caseEnum" : { + "_0" : "Direction" + } + }, + "_1" : "null" + } + } + }, + "useJSTypedClosure" : false + } + } } - ], - "exposeToGlobal" : false, - "functions" : [ - ], "protocols" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index e659988d1..8aa9efd65 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -1,30 +1,30 @@ #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si") -fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO") +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule10HttpStatusO_Si") -fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO") +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule10HttpStatusO_Si { - static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { +private enum _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO { + static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> HttpStatus { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si(callbackValue, param0Value) - return Int.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(callbackValue, param0Value) + return HttpStatus.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -32,10 +32,10 @@ private enum _BJS_Closure_10TestModule10HttpStatusO_Si { } } -extension JSTypedClosure where Signature == (HttpStatus) -> Int { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (HttpStatus) -> Int) { +extension JSTypedClosure where Signature == (HttpStatus) -> HttpStatus { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (HttpStatus) -> HttpStatus) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule10HttpStatusO_Si, + makeClosure: make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO, body: body, fileID: fileID, line: line @@ -43,11 +43,11 @@ extension JSTypedClosure where Signature == (HttpStatus) -> Int { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") -@_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si") -public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO") +@_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO") +public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> HttpStatus>>.fromOpaque(boxPtr).takeUnretainedValue().closure let result = closure(HttpStatus.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else @@ -56,32 +56,32 @@ public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(_ boxP } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO") +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_SS") -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO") +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule5ThemeO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { +private enum _BJS_Closure_10TestModule5ThemeO_5ThemeO { + static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Theme { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_SS(callbackValue, param0Value) - return String.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(callbackValue, param0Value) + return Theme.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -89,10 +89,10 @@ private enum _BJS_Closure_10TestModule5ThemeO_SS { } } -extension JSTypedClosure where Signature == (Theme) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> String) { +extension JSTypedClosure where Signature == (Theme) -> Theme { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> Theme) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule5ThemeO_SS, + makeClosure: make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO, body: body, fileID: fileID, line: line @@ -100,11 +100,11 @@ extension JSTypedClosure where Signature == (Theme) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_SS") -public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO") +@_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO") +public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Theme>>.fromOpaque(boxPtr).takeUnretainedValue().closure let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else @@ -113,32 +113,32 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(_ boxPtr: Un } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC") +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_Sb") -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule6PersonC_6PersonC") +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule5ThemeO_Sb { - static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { +private enum _BJS_Closure_10TestModule6PersonC_6PersonC { + static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> Person { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() - let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_Sb(callbackValue, param0Value) - return Bool.bridgeJSLiftReturn(ret) + let param0Pointer = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(callbackValue, param0Pointer) + return Person.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -146,10 +146,10 @@ private enum _BJS_Closure_10TestModule5ThemeO_Sb { } } -extension JSTypedClosure where Signature == (Theme) -> Bool { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Theme) -> Bool) { +extension JSTypedClosure where Signature == (Person) -> Person { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Person) -> Person) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule5ThemeO_Sb, + makeClosure: make_swift_closure_TestModule_10TestModule6PersonC_6PersonC, body: body, fileID: fileID, line: line @@ -157,12 +157,12 @@ extension JSTypedClosure where Signature == (Theme) -> Bool { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") -@_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb") -public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC") +@_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC") +public func _invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Person) -> Person>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Person.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -170,32 +170,32 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(_ boxPtr: Un } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO") +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule6PersonC_SS") -fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO") +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule6PersonC_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> String { +private enum _BJS_Closure_10TestModule9APIResultO_9APIResultO { + static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> APIResult { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() - let param0Pointer = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule6PersonC_SS(callbackValue, param0Pointer) - return String.bridgeJSLiftReturn(ret) + let param0CaseId = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(callbackValue, param0CaseId) + return APIResult.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -203,10 +203,10 @@ private enum _BJS_Closure_10TestModule6PersonC_SS { } } -extension JSTypedClosure where Signature == (Person) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Person) -> String) { +extension JSTypedClosure where Signature == (APIResult) -> APIResult { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (APIResult) -> APIResult) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule6PersonC_SS, + makeClosure: make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO, body: body, fileID: fileID, line: line @@ -214,12 +214,12 @@ extension JSTypedClosure where Signature == (Person) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule6PersonC_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_SS") -public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO") +@_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO") +public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Person) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Person.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> APIResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(APIResult.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -227,32 +227,32 @@ public func _invoke_swift_closure_TestModule_10TestModule6PersonC_SS(_ boxPtr: U } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO") +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9APIResultO_SS") -fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO") +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule9APIResultO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { +private enum _BJS_Closure_10TestModule9DirectionO_9DirectionO { + static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Direction { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() - let param0CaseId = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule9APIResultO_SS(callbackValue, param0CaseId) - return String.bridgeJSLiftReturn(ret) + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(callbackValue, param0Value) + return Direction.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -260,10 +260,10 @@ private enum _BJS_Closure_10TestModule9APIResultO_SS { } } -extension JSTypedClosure where Signature == (APIResult) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (APIResult) -> String) { +extension JSTypedClosure where Signature == (Direction) -> Direction { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> Direction) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule9APIResultO_SS, + makeClosure: make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO, body: body, fileID: fileID, line: line @@ -271,12 +271,12 @@ extension JSTypedClosure where Signature == (APIResult) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_SS") -public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO") +@_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO") +public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(APIResult.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Direction>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Direction.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -284,31 +284,31 @@ public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(_ boxPtr } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_SS") -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSS_SS") +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule9DirectionO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { +private enum _BJS_Closure_10TestModuleSS_SS { + static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_SS(callbackValue, param0Value) + let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Value) return String.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") @@ -317,10 +317,10 @@ private enum _BJS_Closure_10TestModule9DirectionO_SS { } } -extension JSTypedClosure where Signature == (Direction) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> String) { +extension JSTypedClosure where Signature == (String) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) -> String) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule9DirectionO_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSS_SS, body: body, fileID: fileID, line: line @@ -328,12 +328,12 @@ extension JSTypedClosure where Signature == (Direction) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_SS") -public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSS_SS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") +public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -341,31 +341,31 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(_ boxPtr } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSb_Sb") +fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_Sb") -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSb_Sb") +fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModule9DirectionO_Sb { - static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { +private enum _BJS_Closure_10TestModuleSb_Sb { + static func bridgeJSLift(_ callbackId: Int32) -> (Bool) -> Bool { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule9DirectionO_Sb(callbackValue, param0Value) + let ret = invoke_js_callback_TestModule_10TestModuleSb_Sb(callbackValue, param0Value) return Bool.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") @@ -374,10 +374,10 @@ private enum _BJS_Closure_10TestModule9DirectionO_Sb { } } -extension JSTypedClosure where Signature == (Direction) -> Bool { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Direction) -> Bool) { +extension JSTypedClosure where Signature == (Bool) -> Bool { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Bool) -> Bool) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModule9DirectionO_Sb, + makeClosure: make_swift_closure_TestModule_10TestModuleSb_Sb, body: body, fileID: fileID, line: line @@ -385,12 +385,12 @@ extension JSTypedClosure where Signature == (Direction) -> Bool { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") -@_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb") -public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSb_Sb") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSb_Sb") +public func _invoke_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Direction.bridgeJSLiftParameter(param0)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Bool.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -398,32 +398,32 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(_ boxPtr } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSd_Sd") +fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSS_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSd_Sd") +fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSS_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { +private enum _BJS_Closure_10TestModuleSd_Sd { + static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Value) - return String.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModuleSd_Sd(callbackValue, param0Value) + return Double.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -431,10 +431,10 @@ private enum _BJS_Closure_10TestModuleSS_SS { } } -extension JSTypedClosure where Signature == (String) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (String) -> String) { +extension JSTypedClosure where Signature == (Double) -> Double { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Double) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSS_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSd_Sd, body: body, fileID: fileID, line: line @@ -442,12 +442,126 @@ extension JSTypedClosure where Signature == (String) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSS_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSd_Sd") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSd_Sd") +public func _invoke_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Float64 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Double>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Double.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSf_Sf") +fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf(_ callback: Int32, _ param0: Float32) -> Float32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf(_ callback: Int32, _ param0: Float32) -> Float32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSf_Sf") +fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSf_Sf { + static func bridgeJSLift(_ callbackId: Int32) -> (Float) -> Float { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSf_Sf(callbackValue, param0Value) + return Float.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Float) -> Float { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Float) -> Float) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSf_Sf, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSf_Sf") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSf_Sf") +public func _invoke_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float32) -> Float32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Float) -> Float>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Float.bridgeJSLiftParameter(param0)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSi_Si") +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSi_Si") +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSi_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Int) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSi_Si") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSi_Si") +public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Int.bridgeJSLiftParameter(param0)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -455,32 +569,32 @@ public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeM } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") +fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { +private enum _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS(callbackValue, param0IsSome, param0Value) - return String.bridgeJSLiftReturn(ret) + invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() #else fatalError("Only available on WebAssembly") #endif @@ -488,10 +602,10 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_SS { } } -extension JSTypedClosure where Signature == (Optional) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO, body: body, fileID: fileID, line: line @@ -499,12 +613,12 @@ extension JSTypedClosure where Signature == (Optional) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") +public func _invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -512,34 +626,32 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(_ boxPtr: } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Value: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Value: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Optional, Optional, Optional) -> String { +private enum _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1, param2 in + return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() - let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() - let (param1IsSome, param1Value) = param1.bridgeJSLowerParameter() - let (param2IsSome, param2Value) = param2.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(callbackValue, param0IsSome, param0Pointer, param1IsSome, param1Value, param2IsSome, param2Value) - return String.bridgeJSLiftReturn(ret) + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() #else fatalError("Only available on WebAssembly") #endif @@ -547,10 +659,10 @@ private enum _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS { } } -extension JSTypedClosure where Signature == (Optional, Optional, Optional) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional, Optional, Optional) -> String) { +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO, body: body, fileID: fileID, line: line @@ -558,12 +670,12 @@ extension JSTypedClosure where Signature == (Optional, Optional, } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer, _ param1IsSome: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2IsSome: Int32, _ param2Value: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") +public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional, Optional, Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value), Optional.bridgeJSLiftParameter(param1IsSome, param1Bytes, param1Length), Optional.bridgeJSLiftParameter(param2IsSome, param2Value)) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) return result.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -571,32 +683,32 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(_ } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonC_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC") +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSq6PersonC_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { +private enum _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let (param0IsSome, param0Pointer) = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS(callbackValue, param0IsSome, param0Pointer) - return String.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(callbackValue, param0IsSome, param0Pointer) + return Optional.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -604,10 +716,10 @@ private enum _BJS_Closure_10TestModuleSq6PersonC_SS { } } -extension JSTypedClosure where Signature == (Optional) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSq6PersonC_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC, body: body, fileID: fileID, line: line @@ -615,11 +727,11 @@ extension JSTypedClosure where Signature == (Optional) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC") +public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else @@ -628,32 +740,32 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(_ boxPtr: } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { +private enum _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let (param0IsSome, param0CaseId) = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS(callbackValue, param0IsSome, param0CaseId) - return String.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(callbackValue, param0IsSome, param0CaseId) + return Optional.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -661,10 +773,10 @@ private enum _BJS_Closure_10TestModuleSq9APIResultO_SS { } } -extension JSTypedClosure where Signature == (Optional) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO, body: body, fileID: fileID, line: line @@ -672,11 +784,11 @@ extension JSTypedClosure where Signature == (Optional) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") +public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) return result.bridgeJSLowerReturn() #else @@ -685,32 +797,32 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(_ boxP } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { +private enum _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS(callbackValue, param0IsSome, param0Value) - return String.bridgeJSLiftReturn(ret) + let ret = invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -718,10 +830,10 @@ private enum _BJS_Closure_10TestModuleSq9DirectionO_SS { } } -extension JSTypedClosure where Signature == (Optional) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> String) { +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { self.init( - makeClosure: make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS, + makeClosure: make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO, body: body, fileID: fileID, line: line @@ -729,11 +841,11 @@ extension JSTypedClosure where Signature == (Optional) -> String { } } -@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") -@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS") -public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") +public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) return result.bridgeJSLowerReturn() #else @@ -741,6 +853,291 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(_ boxP #endif } +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSS_SqSS") +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSS_SqSS") +fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSqSS_SqSS { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSqSS_SqSS, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS") +public func _invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSb_SqSb") +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSb_SqSb") +fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSqSb_SqSb { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + let ret = invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSqSb_SqSb, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb") +public func _invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSd_SqSd") +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSd_SqSd") +fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSqSd_SqSd { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSqSd_SqSd, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd") +public func _invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSf_SqSf") +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSf_SqSf") +fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSqSf_SqSf { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSqSf_SqSf, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf") +public func _invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSi_SqSi") +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSi_SqSi") +fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +private enum _BJS_Closure_10TestModuleSqSi_SqSi { + static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + let (param0IsSome, param0Value) = param0.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(callbackValue, param0IsSome, param0Value) + return Optional.bridgeJSLiftReturnFromSideChannel() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Optional) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Optional) -> Optional) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuleSqSi_SqSi, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi") +@_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi") +public func _invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + return result.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -867,235 +1264,279 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } -@_expose(wasm, "bjs_Person_init") -@_cdecl("bjs_Person_init") -public func _bjs_Person_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundtripString") +@_cdecl("bjs_roundtripString") +public func _bjs_roundtripString(_ stringClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = Person(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) - return ret.bridgeJSLowerReturn() + let ret = roundtripString(_: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(stringClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_Person_deinit") -@_cdecl("bjs_Person_deinit") -public func _bjs_Person_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_roundtripInt") +@_cdecl("bjs_roundtripInt") +public func _bjs_roundtripInt(_ intClosure: Int32) -> Int32 { #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() + let ret = roundtripInt(_: _BJS_Closure_10TestModuleSi_Si.bridgeJSLift(intClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { - public var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_Person_wrap(Unmanaged.passRetained(self).toOpaque())))) - } +@_expose(wasm, "bjs_roundtripBool") +@_cdecl("bjs_roundtripBool") +public func _bjs_roundtripBool(_ boolClosure: Int32) -> Int32 { + #if arch(wasm32) + let ret = roundtripBool(_: _BJS_Closure_10TestModuleSb_Sb.bridgeJSLift(boolClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif } -#if arch(wasm32) -@_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") -fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripFloat") +@_cdecl("bjs_roundtripFloat") +public func _bjs_roundtripFloat(_ floatClosure: Int32) -> Int32 { + #if arch(wasm32) + let ret = roundtripFloat(_: _BJS_Closure_10TestModuleSf_Sf.bridgeJSLift(floatClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else fatalError("Only available on WebAssembly") + #endif } -#endif -@_expose(wasm, "bjs_TestProcessor_init") -@_cdecl("bjs_TestProcessor_init") -public func _bjs_TestProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_roundtripDouble") +@_cdecl("bjs_roundtripDouble") +public func _bjs_roundtripDouble(_ doubleClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor(transform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform)) - return ret.bridgeJSLowerReturn() + let ret = roundtripDouble(_: _BJS_Closure_10TestModuleSd_Sd.bridgeJSLift(doubleClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_getTransform") -@_cdecl("bjs_TestProcessor_getTransform") -public func _bjs_TestProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripOptionalString") +@_cdecl("bjs_roundtripOptionalString") +public func _bjs_roundtripOptionalString(_ stringClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).getTransform() + let ret = roundtripOptionalString(_: _BJS_Closure_10TestModuleSqSS_SqSS.bridgeJSLift(stringClosure)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processWithCustom") -@_cdecl("bjs_TestProcessor_processWithCustom") -public func _bjs_TestProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalInt") +@_cdecl("bjs_roundtripOptionalInt") +public func _bjs_roundtripOptionalInt(_ intClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(customTransform)) - return ret.bridgeJSLowerReturn() + let ret = roundtripOptionalInt(_: _BJS_Closure_10TestModuleSqSi_SqSi.bridgeJSLift(intClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_printTogether") -@_cdecl("bjs_TestProcessor_printTogether") -public func _bjs_TestProcessor_printTogether(_ _self: UnsafeMutableRawPointer, _ person: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32, _ ratio: Float64, _ customTransform: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalBool") +@_cdecl("bjs_roundtripOptionalBool") +public func _bjs_roundtripOptionalBool(_ boolClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).printTogether(person: Person.bridgeJSLiftParameter(person), name: String.bridgeJSLiftParameter(nameBytes, nameLength), ratio: Double.bridgeJSLiftParameter(ratio), customTransform: _BJS_Closure_10TestModuleSq6PersonCSqSSSqSd_SS.bridgeJSLift(customTransform)) - return ret.bridgeJSLowerReturn() + let ret = roundtripOptionalBool(_: _BJS_Closure_10TestModuleSqSb_SqSb.bridgeJSLift(boolClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_roundtrip") -@_cdecl("bjs_TestProcessor_roundtrip") -public func _bjs_TestProcessor_roundtrip(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> Int32 { +@_expose(wasm, "bjs_roundtripOptionalFloat") +@_cdecl("bjs_roundtripOptionalFloat") +public func _bjs_roundtripOptionalFloat(_ floatClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtrip(_: _BJS_Closure_10TestModule6PersonC_SS.bridgeJSLift(personClosure)) + let ret = roundtripOptionalFloat(_: _BJS_Closure_10TestModuleSqSf_SqSf.bridgeJSLift(floatClosure)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_roundtripOptional") -@_cdecl("bjs_TestProcessor_roundtripOptional") -public func _bjs_TestProcessor_roundtripOptional(_ _self: UnsafeMutableRawPointer, _ personClosure: Int32) -> Int32 { +@_expose(wasm, "bjs_roundtripOptionalDouble") +@_cdecl("bjs_roundtripOptionalDouble") +public func _bjs_roundtripOptionalDouble(_ doubleClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).roundtripOptional(_: _BJS_Closure_10TestModuleSq6PersonC_SS.bridgeJSLift(personClosure)) + let ret = roundtripOptionalDouble(_: _BJS_Closure_10TestModuleSqSd_SqSd.bridgeJSLift(doubleClosure)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processDirection") -@_cdecl("bjs_TestProcessor_processDirection") -public func _bjs_TestProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripPerson") +@_cdecl("bjs_roundtripPerson") +public func _bjs_roundtripPerson(_ personClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_10TestModule9DirectionO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripPerson(_: _BJS_Closure_10TestModule6PersonC_6PersonC.bridgeJSLift(personClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processTheme") -@_cdecl("bjs_TestProcessor_processTheme") -public func _bjs_TestProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalPerson") +@_cdecl("bjs_roundtripOptionalPerson") +public func _bjs_roundtripOptionalPerson(_ personClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_10TestModule5ThemeO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripOptionalPerson(_: _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC.bridgeJSLift(personClosure)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processHttpStatus") -@_cdecl("bjs_TestProcessor_processHttpStatus") -public func _bjs_TestProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { +@_expose(wasm, "bjs_roundtripDirection") +@_cdecl("bjs_roundtripDirection") +public func _bjs_roundtripDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_10TestModule10HttpStatusO_Si.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripDirection(_: _BJS_Closure_10TestModule9DirectionO_9DirectionO.bridgeJSLift(callback)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processAPIResult") -@_cdecl("bjs_TestProcessor_processAPIResult") -public func _bjs_TestProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripTheme") +@_cdecl("bjs_roundtripTheme") +public func _bjs_roundtripTheme(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_10TestModule9APIResultO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripTheme(_: _BJS_Closure_10TestModule5ThemeO_5ThemeO.bridgeJSLift(callback)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_makeDirectionChecker") -@_cdecl("bjs_TestProcessor_makeDirectionChecker") -public func _bjs_TestProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripHttpStatus") +@_cdecl("bjs_roundtripHttpStatus") +public func _bjs_roundtripHttpStatus(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() + let ret = roundtripHttpStatus(_: _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO.bridgeJSLift(callback)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_makeThemeValidator") -@_cdecl("bjs_TestProcessor_makeThemeValidator") -public func _bjs_TestProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripAPIResult") +@_cdecl("bjs_roundtripAPIResult") +public func _bjs_roundtripAPIResult(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() + let ret = roundtripAPIResult(_: _BJS_Closure_10TestModule9APIResultO_9APIResultO.bridgeJSLift(callback)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_makeStatusCodeExtractor") -@_cdecl("bjs_TestProcessor_makeStatusCodeExtractor") -public func _bjs_TestProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripOptionalDirection") +@_cdecl("bjs_roundtripOptionalDirection") +public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() + let ret = roundtripOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_makeAPIResultHandler") -@_cdecl("bjs_TestProcessor_makeAPIResultHandler") -public func _bjs_TestProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_roundtripOptionalTheme") +@_cdecl("bjs_roundtripOptionalTheme") +public func _bjs_roundtripOptionalTheme(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() + let ret = roundtripOptionalTheme(_: _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO.bridgeJSLift(callback)) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processOptionalDirection") -@_cdecl("bjs_TestProcessor_processOptionalDirection") -public func _bjs_TestProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalHttpStatus") +@_cdecl("bjs_roundtripOptionalHttpStatus") +public func _bjs_roundtripOptionalHttpStatus(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripOptionalHttpStatus(_: _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO.bridgeJSLift(callback)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processOptionalTheme") -@_cdecl("bjs_TestProcessor_processOptionalTheme") -public func _bjs_TestProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalAPIResult") +@_cdecl("bjs_roundtripOptionalAPIResult") +public func _bjs_roundtripOptionalAPIResult(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_10TestModuleSq5ThemeO_SS.bridgeJSLift(callback)) - return ret.bridgeJSLowerReturn() + let ret = roundtripOptionalAPIResult(_: _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO.bridgeJSLift(callback)) + return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_processOptionalAPIResult") -@_cdecl("bjs_TestProcessor_processOptionalAPIResult") -public func _bjs_TestProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { +@_expose(wasm, "bjs_roundtripOptionalDirection") +@_cdecl("bjs_roundtripOptionalDirection") +public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_10TestModuleSq9APIResultO_SS.bridgeJSLift(callback)) + let ret = roundtripOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback)) + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Person_init") +@_cdecl("bjs_Person_init") +public func _bjs_Person_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = Person(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_TestProcessor_makeOptionalDirectionFormatter") -@_cdecl("bjs_TestProcessor_makeOptionalDirectionFormatter") -public func _bjs_TestProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { +@_expose(wasm, "bjs_Person_deinit") +@_cdecl("bjs_Person_deinit") +public func _bjs_Person_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TestProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() - return JSTypedClosure(ret).bridgeJSLowerReturn() + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { + public var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_Person_wrap(Unmanaged.passRetained(self).toOpaque())))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") +fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_TestProcessor_init") +@_cdecl("bjs_TestProcessor_init") +public func _bjs_TestProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = TestProcessor(transform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform)) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts index 942b18269..ccc95eb3b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.d.ts @@ -59,23 +59,6 @@ export interface SwiftHeapObject { export interface Person extends SwiftHeapObject { } export interface TestProcessor extends SwiftHeapObject { - getTransform(): (arg0: string) => string; - processWithCustom(text: string, customTransform: (arg0: string) => string): string; - printTogether(person: Person, name: string, ratio: number, customTransform: (arg0: Person | null, arg1: string | null, arg2: number | null) => string): string; - roundtrip(personClosure: (arg0: Person) => string): (arg0: Person) => string; - roundtripOptional(personClosure: (arg0: Person | null) => string): (arg0: Person | null) => string; - processDirection(callback: (arg0: DirectionTag) => string): string; - processTheme(callback: (arg0: ThemeTag) => string): string; - processHttpStatus(callback: (arg0: HttpStatusTag) => number): number; - processAPIResult(callback: (arg0: APIResultTag) => string): string; - makeDirectionChecker(): (arg0: DirectionTag) => boolean; - makeThemeValidator(): (arg0: ThemeTag) => boolean; - makeStatusCodeExtractor(): (arg0: HttpStatusTag) => number; - makeAPIResultHandler(): (arg0: APIResultTag) => string; - processOptionalDirection(callback: (arg0: DirectionTag | null) => string): string; - processOptionalTheme(callback: (arg0: ThemeTag | null) => string): string; - processOptionalAPIResult(callback: (arg0: APIResultTag | null) => string): string; - makeOptionalDirectionFormatter(): (arg0: DirectionTag | null) => string; } export type Exports = { Person: { @@ -84,6 +67,27 @@ export type Exports = { TestProcessor: { new(transform: (arg0: string) => string): TestProcessor; } + roundtripString(stringClosure: (arg0: string) => string): (arg0: string) => string; + roundtripInt(intClosure: (arg0: number) => number): (arg0: number) => number; + roundtripBool(boolClosure: (arg0: boolean) => boolean): (arg0: boolean) => boolean; + roundtripFloat(floatClosure: (arg0: number) => number): (arg0: number) => number; + roundtripDouble(doubleClosure: (arg0: number) => number): (arg0: number) => number; + roundtripOptionalString(stringClosure: (arg0: string | null) => string | null): (arg0: string | null) => string | null; + roundtripOptionalInt(intClosure: (arg0: number | null) => number | null): (arg0: number | null) => number | null; + roundtripOptionalBool(boolClosure: (arg0: boolean | null) => boolean | null): (arg0: boolean | null) => boolean | null; + roundtripOptionalFloat(floatClosure: (arg0: number | null) => number | null): (arg0: number | null) => number | null; + roundtripOptionalDouble(doubleClosure: (arg0: number | null) => number | null): (arg0: number | null) => number | null; + roundtripPerson(personClosure: (arg0: Person) => Person): (arg0: Person) => Person; + roundtripOptionalPerson(personClosure: (arg0: Person | null) => Person | null): (arg0: Person | null) => Person | null; + roundtripDirection(callback: (arg0: DirectionTag) => DirectionTag): (arg0: DirectionTag) => DirectionTag; + roundtripTheme(callback: (arg0: ThemeTag) => ThemeTag): (arg0: ThemeTag) => ThemeTag; + roundtripHttpStatus(callback: (arg0: HttpStatusTag) => HttpStatusTag): (arg0: HttpStatusTag) => HttpStatusTag; + roundtripAPIResult(callback: (arg0: APIResultTag) => APIResultTag): (arg0: APIResultTag) => APIResultTag; + roundtripOptionalDirection(callback: (arg0: DirectionTag | null) => DirectionTag | null): (arg0: DirectionTag | null) => DirectionTag | null; + roundtripOptionalTheme(callback: (arg0: ThemeTag | null) => ThemeTag | null): (arg0: ThemeTag | null) => ThemeTag | null; + roundtripOptionalHttpStatus(callback: (arg0: HttpStatusTag | null) => HttpStatusTag | null): (arg0: HttpStatusTag | null) => HttpStatusTag | null; + roundtripOptionalAPIResult(callback: (arg0: APIResultTag | null) => APIResultTag | null): (arg0: APIResultTag | null) => APIResultTag | null; + roundtripOptionalDirection(callback: (arg0: DirectionTag | null) => DirectionTag | null): (arg0: DirectionTag | null) => DirectionTag | null; Direction: DirectionObject Theme: ThemeObject HttpStatus: HttpStatusObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 38c248cae..09f9aee59 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -329,7 +329,7 @@ export async function createInstantiator(options, swift) { func.__unregister(); } - bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_Si"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); let param0 = param0Id; @@ -340,9 +340,9 @@ export async function createInstantiator(options, swift) { return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule10HttpStatusO_Si"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule10HttpStatusO_Si = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_Si(boxPtr, param0); + bjs["make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -351,19 +351,16 @@ export async function createInstantiator(options, swift) { } return invokeResult | 0; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10HttpStatusO_Si); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO); } - bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); const param0IdObject = swift.memory.getObject(param0Id); swift.memory.release(param0Id); let param0 = String(param0IdObject); const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } tmpRetBytes = textEncoder.encode(result); return tmpRetBytes.length; } catch (error) { @@ -372,11 +369,11 @@ export async function createInstantiator(options, swift) { return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule5ThemeO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule5ThemeO_SS = function(param0) { + bjs["make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule5ThemeO_5ThemeO = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_SS(boxPtr, param0Id, param0Bytes.length); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -388,109 +385,95 @@ export async function createInstantiator(options, swift) { tmpRetString = undefined; return ret; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_5ThemeO); } - bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_Sb"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); + let param0 = _exports['Person'].__construct(param0Id); const result = callback(param0); - return result ? 1 : 0; + return result.pointer; } catch (error) { setException?.(error); return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule5ThemeO_Sb"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule5ThemeO_Sb = function(param0) { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_Sb(boxPtr, param0Id, param0Bytes.length); + bjs["make_swift_closure_TestModule_10TestModule6PersonC_6PersonC"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule6PersonC_6PersonC = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(boxPtr, param0.pointer); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult !== 0; + const resultPtr = invokeResult; + return _exports['Person'].__construct(resultPtr); }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_Sb); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6PersonC_6PersonC); } - bjs["invoke_js_callback_TestModule_10TestModule6PersonC_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = _exports['Person'].__construct(param0Id); + let param0 = enumHelpers.APIResult.lift(param0Id); const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(result); + return caseId; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModule6PersonC_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule6PersonC_SS = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_SS(boxPtr, param0.pointer); + bjs["make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { + const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + invokeResult; + const result = enumHelpers.APIResult.lift(tagStack.pop()); + return result; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6PersonC_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_9APIResultO); } - bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.lift(param0Id); + let param0 = param0Id; const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + return result | 0; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule9APIResultO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule9APIResultO_SS = function(param0) { - const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_SS(boxPtr, param0CaseId); + bjs["make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModule9DirectionO_9DirectionO = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + return invokeResult | 0; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_9DirectionO); } - bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; + const param0IdObject = swift.memory.getObject(param0Id); + swift.memory.release(param0Id); + let param0 = String(param0IdObject); const result = callback(param0); if (typeof result !== "string") { throw new TypeError("Callback must return a string"); @@ -503,9 +486,11 @@ export async function createInstantiator(options, swift) { return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule9DirectionO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule9DirectionO_SS = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_SS(boxPtr, param0); + bjs["make_swift_closure_TestModule_10TestModuleSS_SS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSS_SS = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -517,13 +502,13 @@ export async function createInstantiator(options, swift) { tmpRetString = undefined; return ret; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); } - bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_Sb"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSb_Sb"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; + let param0 = param0Id !== 0; const result = callback(param0); return result ? 1 : 0; } catch (error) { @@ -531,9 +516,9 @@ export async function createInstantiator(options, swift) { return 0; } }; - bjs["make_swift_closure_TestModule_10TestModule9DirectionO_Sb"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModule9DirectionO_Sb = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_Sb(boxPtr, param0); + bjs["make_swift_closure_TestModule_10TestModuleSb_Sb"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSb_Sb = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSb_Sb(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -542,47 +527,120 @@ export async function createInstantiator(options, swift) { } return invokeResult !== 0; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_Sb); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSb_Sb); } - bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSd_Sd"] = function(callbackId, param0Id) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); + let param0 = param0Id; const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); + return result; + } catch (error) { + setException?.(error); + return 0.0; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSd_Sd"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSd_Sd = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSd_Sd(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + return invokeResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSd_Sd); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSf_Sf"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + return Math.fround(result); + } catch (error) { + setException?.(error); + return 0.0; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSf_Sf"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSf_Sf = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSf_Sf(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return invokeResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSf_Sf); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { + try { + const callback = swift.memory.getObject(callbackId); + let param0 = param0Id; + const result = callback(param0); + return result | 0; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); return 0; } }; - bjs["make_swift_closure_TestModule_10TestModuleSS_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSS_SS = function(param0) { - const param0Bytes = textEncoder.encode(param0); - const param0Id = swift.memory.retain(param0Bytes); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); + bjs["make_swift_closure_TestModule_10TestModuleSi_Si"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSi_Si = function(param0) { + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + return invokeResult | 0; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = param0Value; + } else { + param0 = null; + } + const result = callback(param0); + tmpRetOptionalInt = result; + return; + } catch (error) { + setException?.(error); + return; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(boxPtr, +isSome, isSome ? param0 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + invokeResult; + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return optResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_SS"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; @@ -594,41 +652,37 @@ export async function createInstantiator(options, swift) { param0 = null; } const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + tmpRetString = result; + return; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModuleSq5ThemeO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSq5ThemeO_SS = function(param0) { + bjs["make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO = function(param0) { const isSome = param0 != null; let param0Id, param0Bytes; if (isSome) { param0Bytes = textEncoder.encode(param0); param0Id = swift.memory.retain(param0Bytes); } - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_SS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; + invokeResult; + const optResult = tmpRetString; tmpRetString = undefined; - return ret; + return optResult; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(callbackId, param0IsSome, param0Value, param1IsSome, param1Value, param2IsSome, param2Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; @@ -637,142 +691,197 @@ export async function createInstantiator(options, swift) { } else { param0 = null; } - let param1; - if (param1IsSome) { - const param1Object = swift.memory.getObject(param1Value); - swift.memory.release(param1Value); - param1 = String(param1Object); - } else { - param1 = null; + const result = callback(param0); + return result ? result.pointer : 0; + } catch (error) { + setException?.(error); + return 0; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, isSome ? param0.pointer : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; } - let param2; - if (param2IsSome) { - param2 = param2Value; + invokeResult; + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); + return optResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = enumHelpers.APIResult.lift(param0Value); } else { - param2 = null; + param0 = null; } - const result = callback(param0, param1, param2); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); + const result = callback(param0); + if (result) { + const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(result); + tmpRetOptionalInt = caseId; + } else { + tmpRetOptionalInt = null; } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + return; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS = function(param0, param1, param2) { + bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO = function(param0) { const isSome = param0 != null; - const isSome1 = param1 != null; - let param1Id, param1Bytes; - if (isSome1) { - param1Bytes = textEncoder.encode(param1); - param1Id = swift.memory.retain(param1Bytes); - } - const isSome2 = param2 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS(boxPtr, +isSome, isSome ? param0.pointer : 0, +isSome1, isSome1 ? param1Id : 0, isSome1 ? param1Bytes.length : 0, +isSome2, isSome2 ? param2 : 0); + let param0CaseId, param0Cleanup; + if (isSome) { + const enumResult = enumHelpers.APIResult.lower(param0); + param0CaseId = enumResult.caseId; + param0Cleanup = enumResult.cleanup; + } + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + invokeResult; + const tag = tagStack.pop(); + const isNull = (tag === -1); + let optResult; + if (isNull) { + optResult = null; + } else { + optResult = enumHelpers.APIResult.lift(tag); + } + return optResult; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonCSqSSSqSd_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_SS"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; if (param0IsSome) { - param0 = _exports['Person'].__construct(param0Value); + param0 = param0Value; } else { param0 = null; } const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + tmpRetOptionalInt = result; + return; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModuleSq6PersonC_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSq6PersonC_SS = function(param0) { + bjs["make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_SS(boxPtr, +isSome, isSome ? param0.pointer : 0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(boxPtr, +isSome, isSome ? param0 : 0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + invokeResult; + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return optResult; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_SS"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; if (param0IsSome) { - param0 = enumHelpers.APIResult.lift(param0Value); + const param0Object = swift.memory.getObject(param0Value); + swift.memory.release(param0Value); + param0 = String(param0Object); } else { param0 = null; } const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + tmpRetString = result; + return; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSq9APIResultO_SS = function(param0) { + bjs["make_swift_closure_TestModule_10TestModuleSqSS_SqSS"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSqSS_SqSS = function(param0) { const isSome = param0 != null; - let param0CaseId, param0Cleanup; + let param0Id, param0Bytes; if (isSome) { - const enumResult = enumHelpers.APIResult.lower(param0); - param0CaseId = enumResult.caseId; - param0Cleanup = enumResult.cleanup; + param0Bytes = textEncoder.encode(param0); + param0Id = swift.memory.retain(param0Bytes); } - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_SS(boxPtr, +isSome, isSome ? param0CaseId : 0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; + invokeResult; + const optResult = tmpRetString; tmpRetString = undefined; - return ret; + return optResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSS_SqSS); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSqSb_SqSb"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = param0Value !== 0; + } else { + param0 = null; + } + const result = callback(param0); + tmpRetOptionalBool = result; + return; + } catch (error) { + setException?.(error); + return; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSqSb_SqSb"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSqSb_SqSb = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + invokeResult; + const optResult = tmpRetOptionalBool; + tmpRetOptionalBool = undefined; + return optResult; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSb_SqSb); } - bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_SS"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSd_SqSd"] = function(callbackId, param0IsSome, param0Value) { try { const callback = swift.memory.getObject(callbackId); let param0; @@ -782,33 +891,99 @@ export async function createInstantiator(options, swift) { param0 = null; } const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); + tmpRetOptionalDouble = result; + return; + } catch (error) { + setException?.(error); + return; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSqSd_SqSd"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSqSd_SqSd = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; } - tmpRetBytes = textEncoder.encode(result); - return tmpRetBytes.length; + invokeResult; + const optResult = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return optResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSd_SqSd); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSqSf_SqSf"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = Math.fround(param0Value); + } else { + param0 = null; + } + const result = callback(param0); + tmpRetOptionalFloat = result; + return; } catch (error) { setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + return; } }; - bjs["make_swift_closure_TestModule_10TestModuleSq9DirectionO_SS"] = function(boxPtr, file, line) { - const lower_closure_TestModule_10TestModuleSq9DirectionO_SS = function(param0) { + bjs["make_swift_closure_TestModule_10TestModuleSqSf_SqSf"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSqSf_SqSf = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_SS(boxPtr, +isSome, isSome ? param0 : 0); + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; - return ret; + invokeResult; + const optResult = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return optResult; }; - return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_SS); + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSf_SqSf); + } + + bjs["invoke_js_callback_TestModule_10TestModuleSqSi_SqSi"] = function(callbackId, param0IsSome, param0Value) { + try { + const callback = swift.memory.getObject(callbackId); + let param0; + if (param0IsSome) { + param0 = param0Value | 0; + } else { + param0 = null; + } + const result = callback(param0); + tmpRetOptionalInt = result; + return; + } catch (error) { + setException?.(error); + return; + } + }; + bjs["make_swift_closure_TestModule_10TestModuleSqSi_SqSi"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuleSqSi_SqSi = function(param0) { + const isSome = param0 != null; + const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(boxPtr, +isSome, isSome ? param0 : 0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + invokeResult; + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return optResult; + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSi_SqSi); } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { @@ -876,114 +1051,118 @@ export async function createInstantiator(options, swift) { const ret = instance.exports.bjs_TestProcessor_init(callbackId); return TestProcessor.__construct(ret); } - getTransform() { - const ret = instance.exports.bjs_TestProcessor_getTransform(this.pointer); + } + const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); + enumHelpers.APIResult = APIResultHelpers; + + const exports = { + Person, + TestProcessor, + roundtripString: function bjs_roundtripString(stringClosure) { + const callbackId = swift.memory.retain(stringClosure); + const ret = instance.exports.bjs_roundtripString(callbackId); return swift.memory.getObject(ret); - } - processWithCustom(text, customTransform) { - const textBytes = textEncoder.encode(text); - const textId = swift.memory.retain(textBytes); - const callbackId = swift.memory.retain(customTransform); - instance.exports.bjs_TestProcessor_processWithCustom(this.pointer, textId, textBytes.length, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - swift.memory.release(textId); - return ret; - } - printTogether(person, name, ratio, customTransform) { - const nameBytes = textEncoder.encode(name); - const nameId = swift.memory.retain(nameBytes); - const callbackId = swift.memory.retain(customTransform); - instance.exports.bjs_TestProcessor_printTogether(this.pointer, person.pointer, nameId, nameBytes.length, ratio, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - swift.memory.release(nameId); - return ret; - } - roundtrip(personClosure) { + }, + roundtripInt: function bjs_roundtripInt(intClosure) { + const callbackId = swift.memory.retain(intClosure); + const ret = instance.exports.bjs_roundtripInt(callbackId); + return swift.memory.getObject(ret); + }, + roundtripBool: function bjs_roundtripBool(boolClosure) { + const callbackId = swift.memory.retain(boolClosure); + const ret = instance.exports.bjs_roundtripBool(callbackId); + return swift.memory.getObject(ret); + }, + roundtripFloat: function bjs_roundtripFloat(floatClosure) { + const callbackId = swift.memory.retain(floatClosure); + const ret = instance.exports.bjs_roundtripFloat(callbackId); + return swift.memory.getObject(ret); + }, + roundtripDouble: function bjs_roundtripDouble(doubleClosure) { + const callbackId = swift.memory.retain(doubleClosure); + const ret = instance.exports.bjs_roundtripDouble(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalString: function bjs_roundtripOptionalString(stringClosure) { + const callbackId = swift.memory.retain(stringClosure); + const ret = instance.exports.bjs_roundtripOptionalString(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalInt: function bjs_roundtripOptionalInt(intClosure) { + const callbackId = swift.memory.retain(intClosure); + const ret = instance.exports.bjs_roundtripOptionalInt(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalBool: function bjs_roundtripOptionalBool(boolClosure) { + const callbackId = swift.memory.retain(boolClosure); + const ret = instance.exports.bjs_roundtripOptionalBool(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalFloat: function bjs_roundtripOptionalFloat(floatClosure) { + const callbackId = swift.memory.retain(floatClosure); + const ret = instance.exports.bjs_roundtripOptionalFloat(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalDouble: function bjs_roundtripOptionalDouble(doubleClosure) { + const callbackId = swift.memory.retain(doubleClosure); + const ret = instance.exports.bjs_roundtripOptionalDouble(callbackId); + return swift.memory.getObject(ret); + }, + roundtripPerson: function bjs_roundtripPerson(personClosure) { const callbackId = swift.memory.retain(personClosure); - const ret = instance.exports.bjs_TestProcessor_roundtrip(this.pointer, callbackId); + const ret = instance.exports.bjs_roundtripPerson(callbackId); return swift.memory.getObject(ret); - } - roundtripOptional(personClosure) { + }, + roundtripOptionalPerson: function bjs_roundtripOptionalPerson(personClosure) { const callbackId = swift.memory.retain(personClosure); - const ret = instance.exports.bjs_TestProcessor_roundtripOptional(this.pointer, callbackId); + const ret = instance.exports.bjs_roundtripOptionalPerson(callbackId); return swift.memory.getObject(ret); - } - processDirection(callback) { + }, + roundtripDirection: function bjs_roundtripDirection(callback) { const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processDirection(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - processTheme(callback) { - const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processTheme(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - processHttpStatus(callback) { + const ret = instance.exports.bjs_roundtripDirection(callbackId); + return swift.memory.getObject(ret); + }, + roundtripTheme: function bjs_roundtripTheme(callback) { const callbackId = swift.memory.retain(callback); - const ret = instance.exports.bjs_TestProcessor_processHttpStatus(this.pointer, callbackId); - return ret; - } - processAPIResult(callback) { + const ret = instance.exports.bjs_roundtripTheme(callbackId); + return swift.memory.getObject(ret); + }, + roundtripHttpStatus: function bjs_roundtripHttpStatus(callback) { const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processAPIResult(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - makeDirectionChecker() { - const ret = instance.exports.bjs_TestProcessor_makeDirectionChecker(this.pointer); + const ret = instance.exports.bjs_roundtripHttpStatus(callbackId); return swift.memory.getObject(ret); - } - makeThemeValidator() { - const ret = instance.exports.bjs_TestProcessor_makeThemeValidator(this.pointer); + }, + roundtripAPIResult: function bjs_roundtripAPIResult(callback) { + const callbackId = swift.memory.retain(callback); + const ret = instance.exports.bjs_roundtripAPIResult(callbackId); return swift.memory.getObject(ret); - } - makeStatusCodeExtractor() { - const ret = instance.exports.bjs_TestProcessor_makeStatusCodeExtractor(this.pointer); + }, + roundtripOptionalDirection: function bjs_roundtripOptionalDirection(callback) { + const callbackId = swift.memory.retain(callback); + const ret = instance.exports.bjs_roundtripOptionalDirection(callbackId); return swift.memory.getObject(ret); - } - makeAPIResultHandler() { - const ret = instance.exports.bjs_TestProcessor_makeAPIResultHandler(this.pointer); + }, + roundtripOptionalTheme: function bjs_roundtripOptionalTheme(callback) { + const callbackId = swift.memory.retain(callback); + const ret = instance.exports.bjs_roundtripOptionalTheme(callbackId); return swift.memory.getObject(ret); - } - processOptionalDirection(callback) { + }, + roundtripOptionalHttpStatus: function bjs_roundtripOptionalHttpStatus(callback) { const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processOptionalDirection(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - processOptionalTheme(callback) { + const ret = instance.exports.bjs_roundtripOptionalHttpStatus(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalAPIResult: function bjs_roundtripOptionalAPIResult(callback) { const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processOptionalTheme(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - processOptionalAPIResult(callback) { + const ret = instance.exports.bjs_roundtripOptionalAPIResult(callbackId); + return swift.memory.getObject(ret); + }, + roundtripOptionalDirection: function bjs_roundtripOptionalDirection(callback) { const callbackId = swift.memory.retain(callback); - instance.exports.bjs_TestProcessor_processOptionalAPIResult(this.pointer, callbackId); - const ret = tmpRetString; - tmpRetString = undefined; - return ret; - } - makeOptionalDirectionFormatter() { - const ret = instance.exports.bjs_TestProcessor_makeOptionalDirectionFormatter(this.pointer); + const ret = instance.exports.bjs_roundtripOptionalDirection(callbackId); return swift.memory.getObject(ret); - } - } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); - enumHelpers.APIResult = APIResultHelpers; - - const exports = { - Person, - TestProcessor, + }, Direction: DirectionValues, Theme: ThemeValues, HttpStatus: HttpStatusValues, From d9adac0230dd96dfbb07d07bc14b0433e13718b5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 10:28:46 +0900 Subject: [PATCH 175/252] [NFC] Fix warnings (#603) * [NFC] BridgeJS: Fix unused variable warning in BridgeJSCommandPlugin.swift * [NFC] JavaScriptEventLoop: Fix warnings for undeclared SPI usage --- .../Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift | 1 - .../JavaScriptEventLoop+ExecutorFactory.swift | 4 ++++ Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift index 3dce62578..a45a06188 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCommandPlugin/BridgeJSCommandPlugin.swift @@ -98,7 +98,6 @@ extension BridgeJSCommandPlugin.Context { printStderr("Generating bridge code for \(target.name)...") let generatedDirectory = target.directoryURL.appending(path: "Generated") - let generatedJavaScriptDirectory = generatedDirectory.appending(path: "JavaScript") let bridgeDtsPath = target.directoryURL.appending(path: "bridge-js.d.ts") let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json") diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift index d31e03597..7de4cb74a 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift @@ -4,7 +4,11 @@ // See: https://github.com/swiftlang/swift/pull/80266 // See: https://forums.swift.org/t/pitch-2-custom-main-and-global-executors/78437 +#if compiler(>=6.3) @_spi(ExperimentalCustomExecutors) import _Concurrency +#else +import _Concurrency +#endif import _CJavaScriptKit #if compiler(>=6.3) diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift index 4b4115602..aebc90d65 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift @@ -1,5 +1,9 @@ import JavaScriptKit +#if compiler(>=6.3) @_spi(ExperimentalCustomExecutors) import _Concurrency +#else +import _Concurrency +#endif import _CJavaScriptEventLoop import _CJavaScriptKit From f2bf525e0f5ce52f706c016aba815ac0f1857bfe Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 10:36:49 +0900 Subject: [PATCH 176/252] BridgeJS: Support `@JS class` in imported function signatures (#601) --- .../Sources/BridgeJSCore/ImportTS.swift | 28 ++----------- .../Sources/BridgeJSLink/JSGlueGen.swift | 22 ++--------- .../Inputs/MacroSwift/SwiftClass.swift | 2 + .../BridgeJSCodegenTests/SwiftClass.json | 29 ++++++++++++++ .../BridgeJSCodegenTests/SwiftClass.swift | 20 +++++++++- .../BridgeJSLinkTests/Protocol.js | 2 +- .../BridgeJSLinkTests/SwiftClass.d.ts | 1 + .../BridgeJSLinkTests/SwiftClass.js | 11 ++++++ .../Generated/BridgeJS.swift | 18 +++++++++ .../Generated/JavaScript/BridgeJS.json | 39 +++++++++++++++++++ .../JavaScript/SwiftClassSupportTests.mjs | 10 +++++ .../SwiftClassSupportTests.swift | 13 +++++++ Tests/prelude.mjs | 2 + 13 files changed, 153 insertions(+), 44 deletions(-) create mode 100644 Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs create mode 100644 Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 0424d8ca0..08366abf3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -957,18 +957,8 @@ extension BridgeType { return LoweringParameterInfo(loweredParameters: [("funcRef", .i32)]) case .unsafePointer: return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) - case .swiftHeapObject(let className): - switch context { - case .importTS: - throw BridgeJSCoreError( - """ - swiftHeapObject '\(className)' is not supported in TypeScript imports. - Swift classes can only be used in @JS protocols where Swift owns the instance. - """ - ) - case .exportSwift: - return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) - } + case .swiftHeapObject: + return LoweringParameterInfo(loweredParameters: [("pointer", .pointer)]) case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum: @@ -1038,18 +1028,8 @@ extension BridgeType { return LiftingReturnInfo(valueToLift: .i32) case .unsafePointer: return LiftingReturnInfo(valueToLift: .pointer) - case .swiftHeapObject(let className): - switch context { - case .importTS: - throw BridgeJSCoreError( - """ - swiftHeapObject '\(className)' cannot be returned from imported TypeScript functions. - JavaScript cannot create Swift heap objects. - """ - ) - case .exportSwift: - return LiftingReturnInfo(valueToLift: .pointer) - } + case .swiftHeapObject: + return LiftingReturnInfo(valueToLift: .pointer) case .swiftProtocol: throw BridgeJSCoreError("swiftProtocol is not supported in imported signatures") case .caseEnum: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index dec77b3cb..68230e8d1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -581,7 +581,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["pointer"], printCode: { arguments, scope, printer, cleanupCode in - return ["\(name).__construct(\(arguments[0]))"] + return ["_exports['\(name)'].__construct(\(arguments[0]))"] } ) } @@ -1985,14 +1985,7 @@ struct IntrinsicJSFragment: Sendable { case .jsValue: return .jsValueLiftParameter case .unsafePointer: return .identity case .swiftHeapObject(let name): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" - ) - case .exportSwift: - return .swiftHeapObjectLiftParameter(name) - } + return .swiftHeapObjectLiftParameter(name) case .swiftProtocol: return .jsObjectLiftParameter case .void: throw BridgeJSLinkError( @@ -2074,15 +2067,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return .jsObjectLowerReturn case .jsValue: return .jsValueLowerReturn(context: context) case .unsafePointer: return .identity - case .swiftHeapObject(let name): - switch context { - case .importTS: - throw BridgeJSLinkError( - message: "swiftHeapObject '\(name)' can only be used in protocol exports, not in \(context)" - ) - case .exportSwift: - return .swiftHeapObjectLowerReturn - } + case .swiftHeapObject: + return .swiftHeapObjectLowerReturn case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .nullable(let wrappedType, let kind): diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift index 116b00878..aa520783a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift @@ -18,3 +18,5 @@ @JS public class PublicGreeter {} @JS package class PackageGreeter {} + +@JSFunction func jsRoundTripGreeter(greeter: Greeter) throws(JSException) -> Greeter diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json index 9fe717651..d1bf42cff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json @@ -141,5 +141,34 @@ ] }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "name" : "jsRoundTripGreeter", + "parameters" : [ + { + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "types" : [ + + ] + } + ] + }, "moduleName" : "TestModule" } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift index 216dfc684..581d6f1c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift @@ -134,4 +134,22 @@ fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_jsRoundTripGreeter") +fileprivate func bjs_jsRoundTripGreeter(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_jsRoundTripGreeter(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { + let greeterPointer = greeter.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripGreeter(greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Greeter.bridgeJSLiftReturn(ret) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 57587d84a..00b9626e3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -513,7 +513,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_onHelperUpdated"] = function bjs_MyViewControllerDelegate_onHelperUpdated(self, helper) { try { - swift.memory.getObject(self).onHelperUpdated(Helper.__construct(helper)); + swift.memory.getObject(self).onHelperUpdated(_exports['Helper'].__construct(helper)); } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts index 8718463a9..d3461f8c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts @@ -31,6 +31,7 @@ export type Exports = { takeGreeter(greeter: Greeter): void; } export type Imports = { + jsRoundTripGreeter(greeter: Greeter): Greeter; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 6002d190f..eaa5d7720 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -38,6 +38,7 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); bjs["swift_js_return_string"] = function(ptr, len) { const bytes = new Uint8Array(memory.buffer, ptr, len); tmpRetString = textDecoder.decode(bytes); @@ -214,6 +215,16 @@ export async function createInstantiator(options, swift) { const obj = PublicGreeter.__construct(pointer); return swift.memory.retain(obj); }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_jsRoundTripGreeter"] = function bjs_jsRoundTripGreeter(greeter) { + try { + let ret = imports.jsRoundTripGreeter(_exports['Greeter'].__construct(greeter)); + return ret.pointer; + } catch (error) { + setException(error); + return 0 + } + } }, setInstance: (i) => { instance = i; diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 163c9e479..1feb3eed6 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -10666,4 +10666,22 @@ func _$jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws( throw error } return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripGreeter_static") +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif + +func _$SwiftClassSupportImports_jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { + let greeterPointer = greeter.bridgeJSLowerParameter() + let ret = bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Greeter.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 23f47b03d..de7ab4a5d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -15310,6 +15310,45 @@ "types" : [ ] + }, + { + "functions" : [ + + ], + "types" : [ + { + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "SwiftClassSupportImports", + "setters" : [ + + ], + "staticMethods" : [ + { + "name" : "jsRoundTripGreeter", + "parameters" : [ + { + "name" : "greeter", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + } + ] + } + ] } ] }, diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs new file mode 100644 index 000000000..fdb5d498d --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs @@ -0,0 +1,10 @@ +/** + * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["SwiftClassSupportImports"]} + */ +export function getImports(importsContext) { + return { + jsRoundTripGreeter: (greeter) => { + return greeter; + }, + }; +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift new file mode 100644 index 000000000..3cee17554 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift @@ -0,0 +1,13 @@ +import XCTest +@_spi(Experimental) import JavaScriptKit + +@JSClass struct SwiftClassSupportImports { + @JSFunction static func jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter +} + +final class SwiftClassSupportTests: XCTestCase { + func testRoundTripGreeter() throws { + let greeter = try SwiftClassSupportImports.jsRoundTripGreeter(Greeter(name: "Hello")) + XCTAssertEqual(greeter.name, "Hello") + } +} diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 95573b34e..efb168a6d 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -6,6 +6,7 @@ import { import { ImportedFoo } from './BridgeJSRuntimeTests/JavaScript/Types.mjs'; import { runJsOptionalSupportTests } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; import { getImports as getClosureSupportImports } from './BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs'; +import { getImports as getSwiftClassSupportImports } from './BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ export async function setupOptions(options, context) { @@ -213,6 +214,7 @@ export async function setupOptions(options, context) { runJsOptionalSupportTests(exports); }, ClosureSupportImports: getClosureSupportImports(importsContext), + SwiftClassSupportImports: getSwiftClassSupportImports(importsContext), }; }, addToCoreImports(importObject, importsContext) { From 3a22f4d4d443e4f520c61c2a0460a699720df561 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 10:57:19 +0900 Subject: [PATCH 177/252] BridgeJS: Add profiling instrumentation (#604) --- .../Sources/BridgeJSCore/ClosureCodegen.swift | 6 +- .../Sources/BridgeJSCore/ExportSwift.swift | 64 +++++----- .../Sources/BridgeJSCore/ImportTS.swift | 30 +++-- .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 115 ++++++++++++++++++ .../Sources/BridgeJSTool/BridgeJSTool.swift | 102 ++++++++++------ 5 files changed, 236 insertions(+), 81 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 12e4a413c..3ec0418b3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -328,7 +328,9 @@ public struct ClosureCodegen { decls.append(try renderClosureInvokeHandler(signature)) } - let format = BasicFormat() - return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + return withSpan("Format Closure Glue") { + let format = BasicFormat() + return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index acff21847..70ed8f8a8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -47,45 +47,53 @@ public class ExportSwift { func renderSwiftGlue() throws -> String? { var decls: [DeclSyntax] = [] - let protocolCodegen = ProtocolCodegen() - for proto in skeleton.protocols { - decls.append(contentsOf: try protocolCodegen.renderProtocolWrapper(proto, moduleName: moduleName)) + try withSpan("Render Protocols") { [self] in + let protocolCodegen = ProtocolCodegen() + for proto in skeleton.protocols { + decls.append(contentsOf: try protocolCodegen.renderProtocolWrapper(proto, moduleName: moduleName)) + } } - let enumCodegen = EnumCodegen() - for enumDef in skeleton.enums { - if let enumHelpers = enumCodegen.renderEnumHelpers(enumDef) { - decls.append(enumHelpers) - } + try withSpan("Render Enums") { [self] in + let enumCodegen = EnumCodegen() + for enumDef in skeleton.enums { + if let enumHelpers = enumCodegen.renderEnumHelpers(enumDef) { + decls.append(enumHelpers) + } - for staticMethod in enumDef.staticMethods { - decls.append(try renderSingleExportedFunction(function: staticMethod)) - } + for staticMethod in enumDef.staticMethods { + decls.append(try renderSingleExportedFunction(function: staticMethod)) + } - for staticProperty in enumDef.staticProperties { - decls.append( - contentsOf: try renderSingleExportedProperty( - property: staticProperty, - context: .enumStatic(enumDef: enumDef) + for staticProperty in enumDef.staticProperties { + decls.append( + contentsOf: try renderSingleExportedProperty( + property: staticProperty, + context: .enumStatic(enumDef: enumDef) + ) ) - ) + } } } - let structCodegen = StructCodegen() - for structDef in skeleton.structs { - decls.append(contentsOf: structCodegen.renderStructHelpers(structDef)) - decls.append(contentsOf: try renderSingleExportedStruct(struct: structDef)) - } + try withSpan("Render Structs") { [self] in + let structCodegen = StructCodegen() + for structDef in skeleton.structs { + decls.append(contentsOf: structCodegen.renderStructHelpers(structDef)) + decls.append(contentsOf: try renderSingleExportedStruct(struct: structDef)) + } - for function in skeleton.functions { - decls.append(try renderSingleExportedFunction(function: function)) + for function in skeleton.functions { + decls.append(try renderSingleExportedFunction(function: function)) + } + for klass in skeleton.classes { + decls.append(contentsOf: try renderSingleExportedClass(klass: klass)) + } } - for klass in skeleton.classes { - decls.append(contentsOf: try renderSingleExportedClass(klass: klass)) + return withSpan("Format Export Glue") { + let format = BasicFormat() + return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") } - let format = BasicFormat() - return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") } class ExportedThunkBuilder { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 08366abf3..d5cc945ee 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -32,17 +32,23 @@ public struct ImportTS { var decls: [DeclSyntax] = [] for skeleton in self.skeleton.children { - for getter in skeleton.globalGetters { - let getterDecls = try renderSwiftGlobalGetter(getter, topLevelDecls: &decls) - decls.append(contentsOf: getterDecls) + try withSpan("Render Global Getters") { + for getter in skeleton.globalGetters { + let getterDecls = try renderSwiftGlobalGetter(getter, topLevelDecls: &decls) + decls.append(contentsOf: getterDecls) + } } - for function in skeleton.functions { - let thunkDecls = try renderSwiftThunk(function, topLevelDecls: &decls) - decls.append(contentsOf: thunkDecls) + try withSpan("Render Functions") { + for function in skeleton.functions { + let thunkDecls = try renderSwiftThunk(function, topLevelDecls: &decls) + decls.append(contentsOf: thunkDecls) + } } - for type in skeleton.types { - let typeDecls = try renderSwiftType(type, topLevelDecls: &decls) - decls.append(contentsOf: typeDecls) + try withSpan("Render Types") { + for type in skeleton.types { + let typeDecls = try renderSwiftType(type, topLevelDecls: &decls) + decls.append(contentsOf: typeDecls) + } } } if decls.isEmpty { @@ -50,8 +56,10 @@ public struct ImportTS { return nil } - let format = BasicFormat() - return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + return withSpan("Format Import Glue") { + let format = BasicFormat() + return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + } } func renderSwiftGlobalGetter( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index e11bd4058..70dae3a82 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -1,3 +1,12 @@ +import class Foundation.FileHandle +import class Foundation.ProcessInfo +import func Foundation.open +import func Foundation.strerror +import var Foundation.errno +import var Foundation.O_WRONLY +import var Foundation.O_CREAT +import var Foundation.O_TRUNC + // MARK: - ProgressReporting public struct ProgressReporting { @@ -20,6 +29,112 @@ public struct ProgressReporting { } } +// MARK: - Profiling + +/// A simple time-profiler to emit `chrome://tracing` format +public final class Profiling { + nonisolated(unsafe) static var current: Profiling? + + let startTime: ContinuousClock.Instant + let clock = ContinuousClock() + let output: @Sendable (String) -> Void + var firstEntry = true + + init(output: @Sendable @escaping (String) -> Void) { + self.startTime = ContinuousClock.now + self.output = output + } + + public static func with(body: @escaping () throws -> Void) rethrows -> Void { + guard let outputPath = ProcessInfo.processInfo.environment["BRIDGE_JS_PROFILING"] else { + return try body() + } + let fd = open(outputPath, O_WRONLY | O_CREAT | O_TRUNC, 0o644) + guard fd >= 0 else { + let error = String(cString: strerror(errno)) + fatalError("Failed to open profiling output file \(outputPath): \(error)") + } + let output = FileHandle(fileDescriptor: fd, closeOnDealloc: true) + let profiling = Profiling(output: { output.write($0.data(using: .utf8) ?? Data()) }) + defer { + profiling.output("]\n") + } + Profiling.current = profiling + defer { + Profiling.current = nil + } + return try body() + } + + private func formatTimestamp(instant: ContinuousClock.Instant) -> Int { + let duration = self.startTime.duration(to: instant) + let (seconds, attoseconds) = duration.components + // Convert to microseconds + return Int(seconds * 1_000_000 + attoseconds / 1_000_000_000_000) + } + + func begin(_ label: String, _ instant: ContinuousClock.Instant) { + let entry = #"{"ph":"B","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp(instant: instant))}"# + if firstEntry { + firstEntry = false + output("[\n\(entry)") + } else { + output(",\n\(entry)") + } + } + + func end(_ label: String, _ instant: ContinuousClock.Instant) { + let entry = #"{"ph":"E","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp(instant: instant))}"# + output(",\n\(entry)") + } +} + +/// Mark a span of code with a label and measure the duration. +public func withSpan(_ label: String, body: @escaping () throws -> T) rethrows -> T { + guard let profiling = Profiling.current else { + return try body() + } + profiling.begin(label, profiling.clock.now) + defer { + profiling.end(label, profiling.clock.now) + } + return try body() +} + +/// Foundation-less JSON serialization +private enum JSON { + static func serialize(_ value: String) -> String { + // https://www.ietf.org/rfc/rfc4627.txt + var output = "\"" + for scalar in value.unicodeScalars { + switch scalar { + case "\"": + output += "\\\"" + case "\\": + output += "\\\\" + case "\u{08}": + output += "\\b" + case "\u{0C}": + output += "\\f" + case "\n": + output += "\\n" + case "\r": + output += "\\r" + case "\t": + output += "\\t" + case "\u{20}"..."\u{21}", "\u{23}"..."\u{5B}", "\u{5D}"..."\u{10FFFF}": + output.unicodeScalars.append(scalar) + default: + var hex = String(scalar.value, radix: 16, uppercase: true) + hex = String(repeating: "0", count: 4 - hex.count) + hex + output += "\\u" + hex + } + } + output += "\"" + return output + } +} + // MARK: - DiagnosticError import SwiftSyntax diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 92e74e621..f9fa56c42 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -50,7 +50,9 @@ import BridgeJSUtilities static func main() throws { do { - try run() + try Profiling.with { + try run() + } } catch { printStderr("error: \(error)") exit(1) @@ -121,18 +123,22 @@ import BridgeJSUtilities let bridgeJSMacrosPath = outputDirectory.appending(path: "BridgeJS.Macros.swift") let primaryDtsPath = hasDts ? bridgeJsDtsPath.path : bridgeJsGlobalDtsPath.path let globalDtsFiles = (hasDts && hasGlobalDts) ? [bridgeJsGlobalDtsPath.path] : [] - _ = try invokeTS2Swift( - dtsFile: primaryDtsPath, - globalDtsFiles: globalDtsFiles, - tsconfigPath: tsconfigPath, - nodePath: nodePath, - progress: progress, - outputPath: bridgeJSMacrosPath.path - ) + try withSpan("invokeTS2Swift") { + _ = try invokeTS2Swift( + dtsFile: primaryDtsPath, + globalDtsFiles: globalDtsFiles, + tsconfigPath: tsconfigPath, + nodePath: nodePath, + progress: progress, + outputPath: bridgeJSMacrosPath.path + ) + } generatedMacrosPath = bridgeJSMacrosPath.path } - var inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) + var inputFiles = withSpan("Collecting Swift files") { + return inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) + } // BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need // to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin // filters out Generated/ files, so we explicitly add it here after generation. @@ -148,22 +154,28 @@ import BridgeJSUtilities exposeToGlobal: config.exposeToGlobal ) for inputFile in inputFiles.sorted() { - let inputURL = URL(fileURLWithPath: inputFile) - // Skip directories (e.g. .docc catalogs included in target.sourceFiles) - var isDirectory: ObjCBool = false - if FileManager.default.fileExists(atPath: inputFile, isDirectory: &isDirectory), isDirectory.boolValue { - continue + try withSpan("Parsing \(inputFile)") { + let inputURL = URL(fileURLWithPath: inputFile) + // Skip directories (e.g. .docc catalogs included in target.sourceFiles) + var isDirectory: ObjCBool = false + if FileManager.default.fileExists(atPath: inputFile, isDirectory: &isDirectory), + isDirectory.boolValue + { + return + } + let content = try String(contentsOf: inputURL, encoding: .utf8) + if hasBridgeJSSkipComment(content) { + return + } + + let sourceFile = Parser.parse(source: content) + swiftToSkeleton.addSourceFile(sourceFile, inputFilePath: inputFile) } - let content = try String(contentsOf: inputURL, encoding: .utf8) - if hasBridgeJSSkipComment(content) { - continue - } - - let sourceFile = Parser.parse(source: content) - swiftToSkeleton.addSourceFile(sourceFile, inputFilePath: inputFile) } - let skeleton = try swiftToSkeleton.finalize() + let skeleton = try withSpan("SwiftToSkeleton.finalize") { + return try swiftToSkeleton.finalize() + } var exporter: ExportSwift? if let skeleton = skeleton.exported { @@ -183,10 +195,16 @@ import BridgeJSUtilities } // Generate unified closure support for both import/export to avoid duplicate symbols when concatenating. - let closureSupport = try ClosureCodegen().renderSupport(for: skeleton) + let closureSupport = try withSpan("ClosureCodegen.renderSupport") { + return try ClosureCodegen().renderSupport(for: skeleton) + } - let importResult = try importer?.finalize() - let exportResult = try exporter?.finalize() + let importResult = try withSpan("ImportTS.finalize") { + return try importer?.finalize() + } + let exportResult = try withSpan("ExportSwift.finalize") { + return try exporter?.finalize() + } // Combine and write unified Swift output let outputSwiftURL = outputDirectory.appending(path: "BridgeJS.swift") @@ -194,26 +212,30 @@ import BridgeJSUtilities let outputSwift = combineGeneratedSwift(combinedSwift) let shouldWrite = doubleDashOptions["always-write"] == "true" || !outputSwift.isEmpty if shouldWrite { + try withSpan("Writing output Swift") { + try FileManager.default.createDirectory( + at: outputSwiftURL.deletingLastPathComponent(), + withIntermediateDirectories: true, + attributes: nil + ) + try outputSwift.write(to: outputSwiftURL, atomically: true, encoding: .utf8) + } + } + + // Write unified skeleton + let outputSkeletonURL = outputDirectory.appending(path: "JavaScript/BridgeJS.json") + try withSpan("Writing output skeleton") { try FileManager.default.createDirectory( - at: outputSwiftURL.deletingLastPathComponent(), + at: outputSkeletonURL.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: nil ) - try outputSwift.write(to: outputSwiftURL, atomically: true, encoding: .utf8) + let encoder = JSONEncoder() + encoder.outputFormatting = [.prettyPrinted, .sortedKeys] + let skeletonData = try encoder.encode(skeleton) + try skeletonData.write(to: outputSkeletonURL) } - // Write unified skeleton - let outputSkeletonURL = outputDirectory.appending(path: "JavaScript/BridgeJS.json") - try FileManager.default.createDirectory( - at: outputSkeletonURL.deletingLastPathComponent(), - withIntermediateDirectories: true, - attributes: nil - ) - let encoder = JSONEncoder() - encoder.outputFormatting = [.prettyPrinted, .sortedKeys] - let skeletonData = try encoder.encode(skeleton) - try skeletonData.write(to: outputSkeletonURL) - if skeleton.exported != nil || skeleton.imported != nil { progress.print("Generated BridgeJS code") } From 788ad44af6b3e327122f379a445fda7c4d10cc16 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 11:00:49 +0900 Subject: [PATCH 178/252] [NFC] BridgeJS: Make JSGlueGen and IntrinsicJSFragment methods throwable Instead of crashing on errors in JS code generation for BridgeJSLink, we should prefer propagating errors. --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 77 +++--- .../BridgeJSLink/CodeFragmentPrinter.swift | 4 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 257 +++++++++--------- 3 files changed, 173 insertions(+), 165 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 13ea4e910..d1f8363d2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -261,11 +261,11 @@ public struct BridgeJSLink { ] } - private func generateAddImports(needsImportsObject: Bool) -> CodeFragmentPrinter { + private func generateAddImports(needsImportsObject: Bool) throws -> CodeFragmentPrinter { let printer = CodeFragmentPrinter() let allStructs = skeletons.compactMap { $0.exported?.structs }.flatMap { $0 } printer.write("return {") - printer.indent { + try printer.indent { printer.write(lines: [ "/**", " * @param {WebAssembly.Imports} importObject", @@ -273,7 +273,7 @@ public struct BridgeJSLink { "addImports: (importObject, importsContext) => {", ]) - printer.indent { + try printer.indent { printer.write(lines: [ "bjs = {};", "importObject[\"bjs\"] = bjs;", @@ -687,20 +687,21 @@ public struct BridgeJSLink { for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) { let invokeFuncName = "invoke_js_callback_\(moduleName)_\(signature.mangleName)" - printer.write( - lines: generateInvokeFunction( - signature: signature, - functionName: invokeFuncName - ) + let invokeLines = try generateInvokeFunction( + signature: signature, + functionName: invokeFuncName ) + printer.write(lines: invokeLines) let lowerFuncName = "lower_closure_\(moduleName)_\(signature.mangleName)" let makeFuncName = "make_swift_closure_\(moduleName)_\(signature.mangleName)" printer.write("bjs[\"\(makeFuncName)\"] = function(boxPtr, file, line) {") - printer.indent { - printer.write( - lines: generateLowerClosureFunction(signature: signature, functionName: lowerFuncName) + try printer.indent { + let lowerLines = try generateLowerClosureFunction( + signature: signature, + functionName: lowerFuncName ) + printer.write(lines: lowerLines) printer.write( "return \(JSGlueVariableScope.reservedMakeSwiftClosure)(boxPtr, file, line, \(lowerFuncName));" ) @@ -788,7 +789,7 @@ public struct BridgeJSLink { private func generateInvokeFunction( signature: ClosureSignature, functionName: String - ) -> [String] { + ) throws -> [String] { let printer = CodeFragmentPrinter() let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanupCode = CodeFragmentPrinter() @@ -806,20 +807,20 @@ public struct BridgeJSLink { printer.nextLine() printer.write("bjs[\"\(functionName)\"] = function(\(invokeParams.joined(separator: ", "))) {") - printer.indent { + try printer.indent { printer.write("try {") - printer.indent { + try printer.indent { printer.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);") for (index, paramType) in signature.parameters.enumerated() { - let fragment = try! IntrinsicJSFragment.closureLiftParameter(type: paramType) + let fragment = try IntrinsicJSFragment.closureLiftParameter(type: paramType) let args: [String] if case .nullable = paramType { args = ["param\(index)IsSome", "param\(index)Value", "param\(index)"] } else { args = ["param\(index)Id", "param\(index)"] } - _ = fragment.printCode(args, scope, printer, cleanupCode) + _ = try fragment.printCode(args, scope, printer, cleanupCode) } let callbackParams = signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ") @@ -837,14 +838,14 @@ public struct BridgeJSLink { break } - let returnFragment = try! IntrinsicJSFragment.closureLowerReturn(type: signature.returnType) - _ = returnFragment.printCode(["result"], scope, printer, cleanupCode) + let returnFragment = try IntrinsicJSFragment.closureLowerReturn(type: signature.returnType) + _ = try returnFragment.printCode(["result"], scope, printer, cleanupCode) } printer.write("} catch (error) {") - printer.indent { + try printer.indent { printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") let errorFragment = IntrinsicJSFragment.closureErrorReturn(type: signature.returnType) - _ = errorFragment.printCode([], scope, printer, cleanupCode) + _ = try errorFragment.printCode([], scope, printer, cleanupCode) } printer.write("}") } @@ -857,7 +858,7 @@ public struct BridgeJSLink { private func generateLowerClosureFunction( signature: ClosureSignature, functionName: String - ) -> [String] { + ) throws -> [String] { let printer = CodeFragmentPrinter() let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let cleanupCode = CodeFragmentPrinter() @@ -865,13 +866,13 @@ public struct BridgeJSLink { printer.write( "const \(functionName) = function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" ) - printer.indent { + try printer.indent { var invokeArgs: [String] = ["boxPtr"] for (index, paramType) in signature.parameters.enumerated() { let paramName = "param\(index)" - let fragment = try! IntrinsicJSFragment.lowerParameter(type: paramType) - let lowered = fragment.printCode([paramName], scope, printer, cleanupCode) + let fragment = try IntrinsicJSFragment.lowerParameter(type: paramType) + let lowered = try fragment.printCode([paramName], scope, printer, cleanupCode) invokeArgs.append(contentsOf: lowered) } @@ -894,8 +895,8 @@ public struct BridgeJSLink { } printer.write("}") - let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) - _ = returnFragment.printCode([invokeResultName], scope, printer, cleanupCode) + let returnFragment = try IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) + _ = try returnFragment.printCode([invokeResultName], scope, printer, cleanupCode) } printer.write("};") @@ -1073,7 +1074,7 @@ public struct BridgeJSLink { // Main function declaration printer.write("export async function createInstantiator(options, \(JSGlueVariableScope.reservedSwift)) {") - printer.indent { + try printer.indent { printer.write(lines: generateVariableDeclarations()) let bodyPrinter = CodeFragmentPrinter() @@ -1083,7 +1084,7 @@ public struct BridgeJSLink { let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let structCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs) - _ = fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) + _ = try fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) bodyPrinter.write(lines: structPrinter.lines) } @@ -1095,11 +1096,11 @@ public struct BridgeJSLink { let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let enumCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef) - _ = fragment.printCode([enumDef.valuesName], enumScope, enumPrinter, enumCleanup) + _ = try fragment.printCode([enumDef.valuesName], enumScope, enumPrinter, enumCleanup) bodyPrinter.write(lines: enumPrinter.lines) } bodyPrinter.nextLine() - bodyPrinter.write(contentsOf: generateAddImports(needsImportsObject: data.needsImportsObject)) + bodyPrinter.write(contentsOf: try generateAddImports(needsImportsObject: data.needsImportsObject)) if !intrinsicRegistry.isEmpty { printer.write(lines: intrinsicRegistry.emitLines()) @@ -1356,7 +1357,7 @@ public struct BridgeJSLink { loweringFragment.parameters.count == 1, "Lowering fragment should have exactly one parameter to lower" ) - let loweredValues = loweringFragment.printCode([param.name], scope, body, cleanupCode) + let loweredValues = try loweringFragment.printCode([param.name], scope, body, cleanupCode) parameterForwardings.append(contentsOf: loweredValues) } @@ -1388,7 +1389,7 @@ public struct BridgeJSLink { body.write("const \(returnVariable) = \(call);") fragmentArguments = [returnVariable] } - let liftedValues = liftingFragment.printCode(fragmentArguments, scope, body, cleanupCode) + let liftedValues = try liftingFragment.printCode(fragmentArguments, scope, body, cleanupCode) assert(liftedValues.count <= 1, "Lifting fragment should produce at most one value") return liftedValues.first } @@ -1646,7 +1647,7 @@ public struct BridgeJSLink { switch enumDefinition.enumType { case .simple: let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition) - _ = fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) jsTopLevelLines.append(contentsOf: printer.lines) case .rawValue: guard enumDefinition.rawType != nil else { @@ -1654,11 +1655,11 @@ public struct BridgeJSLink { } let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition) - _ = fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) jsTopLevelLines.append(contentsOf: printer.lines) case .associatedValue: let fragment = IntrinsicJSFragment.associatedValueEnumValues(enumDefinition: enumDefinition) - _ = fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) jsTopLevelLines.append(contentsOf: printer.lines) case .namespace: break @@ -2252,7 +2253,7 @@ extension BridgeJSLink { valuesToLift = liftingFragment.parameters.map { scope.variable(param.name + $0.capitalizedFirstLetter) } parameterNames.append(contentsOf: valuesToLift) } - let liftedValues = liftingFragment.printCode(valuesToLift, scope, body, cleanupCode) + let liftedValues = try liftingFragment.printCode(valuesToLift, scope, body, cleanupCode) assert(liftedValues.count == 1, "Lifting fragment should produce exactly one value") parameterForwardings.append(contentsOf: liftedValues) } @@ -2362,7 +2363,7 @@ extension BridgeJSLink { ) let fragment = try IntrinsicJSFragment.protocolPropertyOptionalToSideChannel(wrappedType: wrappedType) - _ = fragment.printCode([resultVar], scope, body, cleanupCode) + _ = try fragment.printCode([resultVar], scope, body, cleanupCode) return nil // Side-channel types return nil (no direct return value) } @@ -2415,7 +2416,7 @@ extension BridgeJSLink { loweringFragment: IntrinsicJSFragment ) throws -> String? { assert(loweringFragment.parameters.count <= 1, "Lowering fragment should have at most one parameter") - let loweredValues = loweringFragment.printCode(returnExpr.map { [$0] } ?? [], scope, body, cleanupCode) + let loweredValues = try loweringFragment.printCode(returnExpr.map { [$0] } ?? [], scope, body, cleanupCode) assert(loweredValues.count <= 1, "Lowering fragment should produce at most one value") return loweredValues.first } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift index 8c5a47b23..4bad3dd34 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift @@ -6,10 +6,10 @@ final class JSIntrinsicRegistry { entries.isEmpty } - func register(name: String, build: (CodeFragmentPrinter) -> Void) { + func register(name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows { guard entries[name] == nil else { return } let printer = CodeFragmentPrinter() - build(printer) + try build(printer) entries[name] = printer.lines } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 68230e8d1..9402cdd9d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -83,8 +83,8 @@ final class JSGlueVariableScope { return suffixedName } - func registerIntrinsic(_ name: String, build: (CodeFragmentPrinter) -> Void) { - intrinsicRegistry.register(name: name, build: build) + func registerIntrinsic(_ name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows { + try intrinsicRegistry.register(name: name, build: build) } func makeChildScope() -> JSGlueVariableScope { @@ -162,7 +162,7 @@ struct IntrinsicJSFragment: Sendable { _ scope: JSGlueVariableScope, _ printer: CodeFragmentPrinter, _ cleanupCode: CodeFragmentPrinter - ) -> [String] + ) throws -> [String] /// A fragment that does nothing static let void = IntrinsicJSFragment( @@ -505,7 +505,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanupCode in - let lowered = jsValueLower.printCode(arguments, scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode(arguments, scope, printer, cleanupCode) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -521,7 +521,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, scope, printer, cleanupCode in - let lowered = jsValueLower.printCode(arguments, scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode(arguments, scope, printer, cleanupCode) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -627,7 +627,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["isSome", "kind", "payload1", "payload2"], printCode: { arguments, scope, printer, cleanupCode in let isSome = arguments[0] - let lifted = jsValueLiftParameter.printCode( + let lifted = try jsValueLiftParameter.printCode( [arguments[1], arguments[2], arguments[3]], scope, printer, @@ -723,9 +723,9 @@ struct IntrinsicJSFragment: Sendable { let arrayVar = scope.variable("arrayValue") printer.write("let \(arrayVar);") printer.write("if (\(isSome)) {") - printer.indent { - let arrayLiftFragment = try! arrayLift(elementType: elementType) - let liftResults = arrayLiftFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let arrayLiftFragment = try arrayLift(elementType: elementType) + let liftResults = try arrayLiftFragment.printCode([], scope, printer, cleanupCode) if let liftResult = liftResults.first { printer.write("\(arrayVar) = \(liftResult);") } @@ -740,9 +740,9 @@ struct IntrinsicJSFragment: Sendable { let dictVar = scope.variable("dictValue") printer.write("let \(dictVar);") printer.write("if (\(isSome)) {") - printer.indent { - let dictLiftFragment = try! dictionaryLift(valueType: valueType) - let liftResults = dictLiftFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let dictLiftFragment = try dictionaryLift(valueType: valueType) + let liftResults = try dictLiftFragment.printCode([], scope, printer, cleanupCode) if let liftResult = liftResults.first { printer.write("\(dictVar) = \(liftResult);") } @@ -805,7 +805,7 @@ struct IntrinsicJSFragment: Sendable { return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0", "\(isSomeVar) ? \(bytesVar).length : 0"] case .jsValue: - let lowered = jsValueLower.printCode([value], scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode([value], scope, printer, cleanupCode) return ["+\(isSomeVar)"] + lowered case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName @@ -833,10 +833,10 @@ struct IntrinsicJSFragment: Sendable { let cleanupArrayVar = scope.variable("\(value)Cleanups") printer.write("const \(cleanupArrayVar) = [];") printer.write("if (\(isSomeVar)) {") - printer.indent { - let arrayLowerFragment = try! arrayLower(elementType: elementType) + try printer.indent { + let arrayLowerFragment = try arrayLower(elementType: elementType) let arrayCleanup = CodeFragmentPrinter() - let _ = arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + let _ = try arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) if !arrayCleanup.lines.isEmpty { for line in arrayCleanup.lines { printer.write("\(cleanupArrayVar).push(() => { \(line) });") @@ -850,10 +850,10 @@ struct IntrinsicJSFragment: Sendable { let cleanupArrayVar = scope.variable("\(value)Cleanups") printer.write("const \(cleanupArrayVar) = [];") printer.write("if (\(isSomeVar)) {") - printer.indent { - let dictLowerFragment = try! dictionaryLower(valueType: valueType) + try printer.indent { + let dictLowerFragment = try dictionaryLower(valueType: valueType) let dictCleanup = CodeFragmentPrinter() - let _ = dictLowerFragment.printCode([value], scope, printer, dictCleanup) + let _ = try dictLowerFragment.printCode([value], scope, printer, dictCleanup) if !dictCleanup.lines.isEmpty { for line in dictCleanup.lines { printer.write("\(cleanupArrayVar).push(() => { \(line) });") @@ -1002,9 +1002,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { - let arrayLiftFragment = try! arrayLift(elementType: elementType) - let liftResults = arrayLiftFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let arrayLiftFragment = try arrayLift(elementType: elementType) + let liftResults = try arrayLiftFragment.printCode([], scope, printer, cleanupCode) if let liftResult = liftResults.first { printer.write("\(resultVar) = \(liftResult);") } @@ -1019,9 +1019,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { - let dictLiftFragment = try! dictionaryLift(valueType: valueType) - let liftResults = dictLiftFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let dictLiftFragment = try dictionaryLift(valueType: valueType) + let liftResults = try dictLiftFragment.printCode([], scope, printer, cleanupCode) if let liftResult = liftResults.first { printer.write("\(resultVar) = \(liftResult);") } @@ -1036,8 +1036,8 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { - let lifted = jsValueLift.printCode([], scope, printer, cleanupCode) + try printer.indent { + let lifted = try jsValueLift.printCode([], scope, printer, cleanupCode) if let liftedValue = lifted.first { printer.write("\(resultVar) = \(liftedValue);") } @@ -1111,7 +1111,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") case .jsValue: if value != "undefined" { - let lowered = jsValueLower.printCode([value], scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode([value], scope, printer, cleanupCode) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -1122,10 +1122,10 @@ struct IntrinsicJSFragment: Sendable { scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) case .array(let elementType): printer.write("if (\(isSomeVar)) {") - printer.indent { - let arrayLowerFragment = try! arrayLower(elementType: elementType) + try printer.indent { + let arrayLowerFragment = try arrayLower(elementType: elementType) let arrayCleanup = CodeFragmentPrinter() - let _ = arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + let _ = try arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) if !arrayCleanup.lines.isEmpty { for line in arrayCleanup.lines { printer.write(line) @@ -1185,21 +1185,21 @@ struct IntrinsicJSFragment: Sendable { cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") case .dictionary(let valueType): printer.write("if (\(isSomeVar)) {") - printer.indent { + try printer.indent { let cleanupArrayVar = scope.variable("arrayCleanups") let entriesVar = scope.variable("entries") let entryVar = scope.variable("entry") printer.write("const \(cleanupArrayVar) = [];") printer.write("const \(entriesVar) = Object.entries(\(value));") printer.write("for (const \(entryVar) of \(entriesVar)) {") - printer.indent { + try printer.indent { let keyVar = scope.variable("key") let valueVar = scope.variable("value") printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") - let keyFragment = try! stackLowerFragment(elementType: .string) + let keyFragment = try stackLowerFragment(elementType: .string) let keyCleanup = CodeFragmentPrinter() - let _ = keyFragment.printCode([keyVar], scope, printer, keyCleanup) + let _ = try keyFragment.printCode([keyVar], scope, printer, keyCleanup) if !keyCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -1210,9 +1210,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("});") } - let valueFragment = try! stackLowerFragment(elementType: valueType) + let valueFragment = try stackLowerFragment(elementType: valueType) let valueCleanup = CodeFragmentPrinter() - let _ = valueFragment.printCode([valueVar], scope, printer, valueCleanup) + let _ = try valueFragment.printCode([valueVar], scope, printer, valueCleanup) if !valueCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -1302,7 +1302,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["value", "targetVar"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLiftParameter - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("let \(arguments[1]) = \(lifted[0]);") return [] } @@ -1312,7 +1312,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["objectId", "targetVar"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = stringLiftParameter - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("let \(arguments[1]) = String(\(lifted[0]));") return [] } @@ -1324,7 +1324,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["objectId", "targetVar"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = stringLiftParameter - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("let \(arguments[1]) = String(\(lifted[0]));") return [] } @@ -1334,7 +1334,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["value", "targetVar"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLiftParameter - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("let \(arguments[1]) = \(lifted[0]);") return [] } @@ -1494,7 +1494,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1520,7 +1520,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = stringLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1530,7 +1530,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = jsObjectLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1540,7 +1540,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = swiftHeapObjectLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1552,7 +1552,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = stringLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1562,7 +1562,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["result"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLowerReturn - let lowered = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lowered[0]);") return [] } @@ -1697,7 +1697,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["invokeCall"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLiftReturn - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lifted[0]);") return [] } @@ -1716,7 +1716,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in printer.write("const resultLen = \(arguments[0]);") let baseFragment = stringLiftReturn - let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) printer.write("return \(lifted[0]);") return [] } @@ -1727,7 +1727,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in printer.write("const resultId = \(arguments[0]);") let baseFragment = jsObjectLiftReturn - let lifted = baseFragment.printCode(["resultId"], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode(["resultId"], scope, printer, cleanupCode) printer.write("return \(lifted[0]);") return [] } @@ -1763,7 +1763,7 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, scope, printer, cleanupCode in printer.write("const resultLen = \(arguments[0]);") let baseFragment = stringLiftReturn - let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) printer.write("return \(lifted[0]);") return [] } @@ -1773,7 +1773,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["invokeCall"], printCode: { arguments, scope, printer, cleanupCode in let baseFragment = boolLiftReturn - let lifted = baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) printer.write("return \(lifted[0]);") return [] } @@ -1823,7 +1823,7 @@ struct IntrinsicJSFragment: Sendable { context: .importTS, kind: kind ) - let lifted = baseFragment.printCode([], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) if !lifted.isEmpty { printer.write("return \(lifted[0]);") } @@ -2186,10 +2186,10 @@ struct IntrinsicJSFragment: Sendable { // Generate lower function printer.write("lower: (value) => {") - printer.indent { + try printer.indent { printer.write("const enumTag = value.tag;") printer.write("switch (enumTag) {") - printer.indent { + try printer.indent { let lowerPrinter = CodeFragmentPrinter() for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter @@ -2197,7 +2197,12 @@ struct IntrinsicJSFragment: Sendable { let caseCleanup = CodeFragmentPrinter() caseCleanup.indent() let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) - _ = fragment.printCode(["value", enumName, caseName], caseScope, lowerPrinter, caseCleanup) + _ = try fragment.printCode( + ["value", enumName, caseName], + caseScope, + lowerPrinter, + caseCleanup + ) } for line in lowerPrinter.lines { @@ -2214,10 +2219,10 @@ struct IntrinsicJSFragment: Sendable { printer.write( "lift: (tag) => {" ) - printer.indent { + try printer.indent { printer.write("tag = tag | 0;") printer.write("switch (tag) {") - printer.indent { + try printer.indent { let liftPrinter = CodeFragmentPrinter() for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter @@ -2225,7 +2230,7 @@ struct IntrinsicJSFragment: Sendable { let caseCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) - _ = fragment.printCode([enumName, caseName], caseScope, liftPrinter, caseCleanup) + _ = try fragment.printCode([enumName, caseName], caseScope, liftPrinter, caseCleanup) } for line in liftPrinter.lines { @@ -2306,7 +2311,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("case \(enumName).Tag.\(caseName): {") - printer.indent { + try printer.indent { if enumCase.associatedValues.isEmpty { printer.write("const cleanup = undefined;") printer.write("return { caseId: \(enumName).Tag.\(caseName), cleanup };") @@ -2316,9 +2321,11 @@ struct IntrinsicJSFragment: Sendable { for (associatedValueIndex, associatedValue) in reversedValues { let prop = associatedValue.label ?? "param\(associatedValueIndex)" - let fragment = IntrinsicJSFragment.associatedValuePushPayload(type: associatedValue.type) + let fragment = try IntrinsicJSFragment.associatedValuePushPayload( + type: associatedValue.type + ) - _ = fragment.printCode(["value.\(prop)"], scope, printer, cleanup) + _ = try fragment.printCode(["value.\(prop)"], scope, printer, cleanup) } if cleanup.lines.isEmpty { @@ -2355,9 +2362,9 @@ struct IntrinsicJSFragment: Sendable { // Process associated values in reverse order (to match the order they'll be popped) for (associatedValueIndex, associatedValue) in enumCase.associatedValues.enumerated().reversed() { let prop = associatedValue.label ?? "param\(associatedValueIndex)" - let fragment = IntrinsicJSFragment.associatedValuePopPayload(type: associatedValue.type) + let fragment = try IntrinsicJSFragment.associatedValuePopPayload(type: associatedValue.type) - let result = fragment.printCode([], scope, casePrinter, cleanup) + let result = try fragment.printCode([], scope, casePrinter, cleanup) let varName = result.first ?? "value_\(associatedValueIndex)" fieldPairs.append("\(prop): \(varName)") @@ -2380,12 +2387,12 @@ struct IntrinsicJSFragment: Sendable { ) } - private static func associatedValuePushPayload(type: BridgeType) -> IntrinsicJSFragment { + private static func associatedValuePushPayload(type: BridgeType) throws -> IntrinsicJSFragment { switch type { case .nullable(let wrappedType, let kind): return associatedValueOptionalPushPayload(wrappedType: wrappedType, kind: kind) default: - return try! stackLowerFragment(elementType: type) + return try stackLowerFragment(elementType: type) } } @@ -2551,10 +2558,10 @@ struct IntrinsicJSFragment: Sendable { let arrCleanupVar = scope.variable("arrCleanup") printer.write("let \(arrCleanupVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { + try printer.indent { let localCleanup = CodeFragmentPrinter() - let arrFragment = try! arrayLower(elementType: elementType) - _ = arrFragment.printCode([value], scope, printer, localCleanup) + let arrFragment = try arrayLower(elementType: elementType) + _ = try arrFragment.printCode([value], scope, printer, localCleanup) let cleanupLines = localCleanup.lines.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty } @@ -2580,12 +2587,12 @@ struct IntrinsicJSFragment: Sendable { ) } - private static func associatedValuePopPayload(type: BridgeType) -> IntrinsicJSFragment { + private static func associatedValuePopPayload(type: BridgeType) throws -> IntrinsicJSFragment { switch type { case .nullable(let wrappedType, let kind): return associatedValueOptionalPopPayload(wrappedType: wrappedType, kind: kind) default: - return try! stackLiftFragment(elementType: type) + return try stackLiftFragment(elementType: type) } } @@ -2602,7 +2609,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { + try printer.indent { // For optional associated value enums, Swift uses bridgeJSLowerParameter() // which pushes caseId to i32Stack (not tagStack like bridgeJSLowerReturn()). if case .associatedValueEnum(let fullName) = wrappedType { @@ -2613,8 +2620,8 @@ struct IntrinsicJSFragment: Sendable { "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar));" ) } else { - let wrappedFragment = associatedValuePopPayload(type: wrappedType) - let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) + let wrappedFragment = try associatedValuePopPayload(type: wrappedType) + let wrappedResults = try wrappedFragment.printCode([], scope, printer, cleanup) if let wrappedResult = wrappedResults.first { printer.write("\(optVar) = \(wrappedResult);") } else { @@ -2690,10 +2697,10 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(cleanupArrayVar) = [];") let elemVar = scope.variable("elem") printer.write("for (const \(elemVar) of \(arr)) {") - printer.indent { - let elementFragment = try! stackLowerFragment(elementType: elementType) + try printer.indent { + let elementFragment = try stackLowerFragment(elementType: elementType) let elementCleanup = CodeFragmentPrinter() - let _ = elementFragment.printCode([elemVar], scope, printer, elementCleanup) + let _ = try elementFragment.printCode([elemVar], scope, printer, elementCleanup) if !elementCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2725,14 +2732,14 @@ struct IntrinsicJSFragment: Sendable { let entryVar = scope.variable("entry") printer.write("const \(entriesVar) = Object.entries(\(dict));") printer.write("for (const \(entryVar) of \(entriesVar)) {") - printer.indent { + try printer.indent { let keyVar = scope.variable("key") let valueVar = scope.variable("value") printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") - let keyFragment = try! stackLowerFragment(elementType: .string) + let keyFragment = try stackLowerFragment(elementType: .string) let keyCleanup = CodeFragmentPrinter() - let _ = keyFragment.printCode([keyVar], scope, printer, keyCleanup) + let _ = try keyFragment.printCode([keyVar], scope, printer, keyCleanup) if !keyCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2743,9 +2750,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("});") } - let valueFragment = try! stackLowerFragment(elementType: valueType) + let valueFragment = try stackLowerFragment(elementType: valueType) let valueCleanup = CodeFragmentPrinter() - let _ = valueFragment.printCode([valueVar], scope, printer, valueCleanup) + let _ = try valueFragment.printCode([valueVar], scope, printer, valueCleanup) if !valueCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2776,9 +2783,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(lenVar) = \(scope.popI32());") printer.write("const \(resultVar) = [];") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") - printer.indent { - let elementFragment = try! stackLiftFragment(elementType: elementType) - let elementResults = elementFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let elementFragment = try stackLiftFragment(elementType: elementType) + let elementResults = try elementFragment.printCode([], scope, printer, cleanupCode) if let elementExpr = elementResults.first { printer.write("\(resultVar).push(\(elementExpr));") } @@ -2802,11 +2809,11 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(lenVar) = \(scope.popI32());") printer.write("const \(resultVar) = {};") printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") - printer.indent { - let valueFragment = try! stackLiftFragment(elementType: valueType) - let valueResults = valueFragment.printCode([], scope, printer, cleanupCode) - let keyFragment = try! stackLiftFragment(elementType: .string) - let keyResults = keyFragment.printCode([], scope, printer, cleanupCode) + try printer.indent { + let valueFragment = try stackLiftFragment(elementType: valueType) + let valueResults = try valueFragment.printCode([], scope, printer, cleanupCode) + let keyFragment = try stackLiftFragment(elementType: .string) + let keyResults = try keyFragment.printCode([], scope, printer, cleanupCode) if let keyExpr = keyResults.first, let valueExpr = valueResults.first { printer.write("\(resultVar)[\(keyExpr)] = \(valueExpr);") } @@ -2978,9 +2985,9 @@ struct IntrinsicJSFragment: Sendable { } ) case .array(let innerElementType): - return try! arrayLift(elementType: innerElementType) + return try arrayLift(elementType: innerElementType) case .dictionary(let valueType): - return try! dictionaryLift(valueType: valueType) + return try dictionaryLift(valueType: valueType) case .nullable(let wrappedType, let kind): return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind) case .unsafePointer: @@ -3004,7 +3011,7 @@ struct IntrinsicJSFragment: Sendable { parameters: ["value"], printCode: { arguments, scope, printer, cleanup in registerJSValueHelpers(scope: scope) - let lowered = jsValueLower.printCode([arguments[0]], scope, printer, cleanup) + let lowered = try jsValueLower.printCode([arguments[0]], scope, printer, cleanup) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -3165,9 +3172,9 @@ struct IntrinsicJSFragment: Sendable { } ) case .array(let innerElementType): - return try! arrayLower(elementType: innerElementType) + return try arrayLower(elementType: innerElementType) case .dictionary(let valueType): - return try! dictionaryLower(valueType: valueType) + return try dictionaryLower(valueType: valueType) case .nullable(let wrappedType, let kind): return try optionalElementLowerFragment( wrappedType: wrappedType, @@ -3216,9 +3223,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("} else {") - printer.indent { - let innerFragment = try! stackLiftFragment(elementType: wrappedType) - let innerResults = innerFragment.printCode([], scope, printer, cleanup) + try printer.indent { + let innerFragment = try stackLiftFragment(elementType: wrappedType) + let innerResults = try innerFragment.printCode([], scope, printer, cleanup) if let innerResult = innerResults.first { printer.write("\(resultVar) = \(innerResult);") } else { @@ -3247,9 +3254,9 @@ struct IntrinsicJSFragment: Sendable { // Cleanup is written inside the if block so retained id is in scope let localCleanupWriter = CodeFragmentPrinter() printer.write("if (\(isSomeVar)) {") - printer.indent { - let innerFragment = try! stackLowerFragment(elementType: wrappedType) - let _ = innerFragment.printCode([value], scope, printer, localCleanupWriter) + try printer.indent { + let innerFragment = try stackLowerFragment(elementType: wrappedType) + let _ = try innerFragment.printCode([value], scope, printer, localCleanupWriter) let localCleanupLines = localCleanupWriter.lines.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty } @@ -3302,8 +3309,8 @@ struct IntrinsicJSFragment: Sendable { printer.indent() printer.write("lower: (value) => {") - printer.indent { - generateStructLowerCode( + try printer.indent { + try generateStructLowerCode( structDef: capturedStructDef, allStructs: capturedAllStructs, scope: scope, @@ -3315,8 +3322,8 @@ struct IntrinsicJSFragment: Sendable { printer.write( "lift: () => {" ) - printer.indent { - generateStructLiftCode( + try printer.indent { + try generateStructLiftCode( structDef: capturedStructDef, allStructs: capturedAllStructs, scope: scope, @@ -3344,7 +3351,7 @@ struct IntrinsicJSFragment: Sendable { allStructs: [ExportedStruct], scope: JSGlueVariableScope, printer: CodeFragmentPrinter - ) { + ) throws { let lowerPrinter = CodeFragmentPrinter() let lowerScope = scope.makeChildScope() let lowerCleanup = CodeFragmentPrinter() @@ -3352,9 +3359,9 @@ struct IntrinsicJSFragment: Sendable { let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps { - let fragment = structFieldLowerFragment(field: property, allStructs: allStructs) + let fragment = try structFieldLowerFragment(field: property, allStructs: allStructs) let fieldValue = "value.\(property.name)" - _ = fragment.printCode([fieldValue], lowerScope, lowerPrinter, lowerCleanup) + _ = try fragment.printCode([fieldValue], lowerScope, lowerPrinter, lowerCleanup) } for line in lowerPrinter.lines { @@ -3377,7 +3384,7 @@ struct IntrinsicJSFragment: Sendable { scope: JSGlueVariableScope, printer: CodeFragmentPrinter, attachMethods: Bool = false - ) { + ) throws { let liftScope = scope.makeChildScope() let liftCleanup = CodeFragmentPrinter() @@ -3385,8 +3392,8 @@ struct IntrinsicJSFragment: Sendable { let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps.reversed() { - let fragment = structFieldLiftFragment(field: property, allStructs: allStructs) - let results = fragment.printCode([], liftScope, printer, liftCleanup) + let fragment = try structFieldLiftFragment(field: property, allStructs: allStructs) + let results = try fragment.printCode([], liftScope, printer, liftCleanup) if let resultExpr = results.first { fieldExpressions.append((property.name, resultExpr)) @@ -3411,7 +3418,7 @@ struct IntrinsicJSFragment: Sendable { printer.write( "\(instanceVar).\(method.name) = function(\(paramList)) {" ) - printer.indent { + try printer.indent { let methodScope = scope.makeChildScope() let methodCleanup = CodeFragmentPrinter() @@ -3422,8 +3429,8 @@ struct IntrinsicJSFragment: Sendable { var paramForwardings: [String] = [] for param in method.parameters { - let fragment = try! IntrinsicJSFragment.lowerParameter(type: param.type) - let loweredValues = fragment.printCode([param.name], methodScope, printer, methodCleanup) + let fragment = try IntrinsicJSFragment.lowerParameter(type: param.type) + let loweredValues = try fragment.printCode([param.name], methodScope, printer, methodCleanup) paramForwardings.append(contentsOf: loweredValues) } @@ -3440,9 +3447,9 @@ struct IntrinsicJSFragment: Sendable { // Lift return value if needed if method.returnType != .void { - let liftFragment = try! IntrinsicJSFragment.liftReturn(type: method.returnType) + let liftFragment = try IntrinsicJSFragment.liftReturn(type: method.returnType) let liftArgs = liftFragment.parameters.isEmpty ? [] : ["ret"] - let lifted = liftFragment.printCode(liftArgs, methodScope, printer, methodCleanup) + let lifted = try liftFragment.printCode(liftArgs, methodScope, printer, methodCleanup) if let liftedValue = lifted.first { printer.write("return \(liftedValue);") } @@ -3460,7 +3467,7 @@ struct IntrinsicJSFragment: Sendable { private static func structFieldLowerFragment( field: ExportedProperty, allStructs: [ExportedStruct] - ) -> IntrinsicJSFragment { + ) throws -> IntrinsicJSFragment { switch field.type { case .jsValue: preconditionFailure("Struct field of JSValue is not supported yet") @@ -3724,7 +3731,7 @@ struct IntrinsicJSFragment: Sendable { scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") default: - let wrappedFragment = structFieldLowerFragment( + let wrappedFragment = try structFieldLowerFragment( field: ExportedProperty( name: field.name, type: wrappedType, @@ -3735,7 +3742,7 @@ struct IntrinsicJSFragment: Sendable { ) let guardedPrinter = CodeFragmentPrinter() let guardedCleanup = CodeFragmentPrinter() - _ = wrappedFragment.printCode([value], scope, guardedPrinter, guardedCleanup) + _ = try wrappedFragment.printCode([value], scope, guardedPrinter, guardedCleanup) var loweredLines = guardedPrinter.lines var hoistedCleanupVar: String? if let first = loweredLines.first { @@ -3794,7 +3801,7 @@ struct IntrinsicJSFragment: Sendable { } ) default: - return try! stackLowerFragment(elementType: field.type) + return try stackLowerFragment(elementType: field.type) } } @@ -3846,7 +3853,7 @@ struct IntrinsicJSFragment: Sendable { private static func structFieldLiftFragment( field: ExportedProperty, allStructs: [ExportedStruct] - ) -> IntrinsicJSFragment { + ) throws -> IntrinsicJSFragment { switch field.type { case .jsValue: preconditionFailure("Struct field of JSValue is not supported yet") @@ -3859,7 +3866,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(isSomeVar) = \(scope.popI32());") printer.write("let \(optVar);") printer.write("if (\(isSomeVar)) {") - printer.indent { + try printer.indent { // Special handling for associated value enum - in struct fields, case ID is pushed to i32Stack if case .associatedValueEnum(let enumName) = wrappedType { let base = enumName.components(separatedBy: ".").last ?? enumName @@ -3869,7 +3876,7 @@ struct IntrinsicJSFragment: Sendable { "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), );" ) } else { - let wrappedFragment = structFieldLiftFragment( + let wrappedFragment = try structFieldLiftFragment( field: ExportedProperty( name: field.name, type: wrappedType, @@ -3878,7 +3885,7 @@ struct IntrinsicJSFragment: Sendable { ), allStructs: allStructs ) - let wrappedResults = wrappedFragment.printCode([], scope, printer, cleanup) + let wrappedResults = try wrappedFragment.printCode([], scope, printer, cleanup) if let wrappedResult = wrappedResults.first { printer.write("\(optVar) = \(wrappedResult);") } else { @@ -3938,7 +3945,7 @@ struct IntrinsicJSFragment: Sendable { } ) default: - return try! stackLiftFragment(elementType: field.type) + return try stackLiftFragment(elementType: field.type) } } } From 3d9678a2331967ebb937b66d4a8324d06af9451b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 11:50:40 +0900 Subject: [PATCH 179/252] BridgeJS: Build fixes for profiling API --- .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 110 +++++++++--------- .../Sources/BridgeJSTool/BridgeJSTool.swift | 24 +++- 2 files changed, 76 insertions(+), 58 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 70dae3a82..df6d0c755 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -1,12 +1,3 @@ -import class Foundation.FileHandle -import class Foundation.ProcessInfo -import func Foundation.open -import func Foundation.strerror -import var Foundation.errno -import var Foundation.O_WRONLY -import var Foundation.O_CREAT -import var Foundation.O_TRUNC - // MARK: - ProgressReporting public struct ProgressReporting { @@ -31,61 +22,66 @@ public struct ProgressReporting { // MARK: - Profiling -/// A simple time-profiler to emit `chrome://tracing` format +/// A simple time-profiler API public final class Profiling { nonisolated(unsafe) static var current: Profiling? - let startTime: ContinuousClock.Instant - let clock = ContinuousClock() - let output: @Sendable (String) -> Void - var firstEntry = true - - init(output: @Sendable @escaping (String) -> Void) { - self.startTime = ContinuousClock.now - self.output = output - } - - public static func with(body: @escaping () throws -> Void) rethrows -> Void { - guard let outputPath = ProcessInfo.processInfo.environment["BRIDGE_JS_PROFILING"] else { - return try body() + let beginEntry: (_ label: String) -> Void + let endEntry: (_ label: String) -> Void + let finalize: () -> Void + + /// Create a profiling instance that outputs Trace Event Format, which + /// can be viewed in chrome://tracing or other compatible viewers. + /// https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit?usp=sharing + public static func traceEvent(output: @escaping (String) -> Void) -> Profiling { + let clock = ContinuousClock() + let startTime = clock.now + var firstEntry = true + + func formatTimestamp() -> Int { + let duration = startTime.duration(to: .now) + let (seconds, attoseconds) = duration.components + // Convert to microseconds + return Int(seconds * 1_000_000 + attoseconds / 1_000_000_000_000) } - let fd = open(outputPath, O_WRONLY | O_CREAT | O_TRUNC, 0o644) - guard fd >= 0 else { - let error = String(cString: strerror(errno)) - fatalError("Failed to open profiling output file \(outputPath): \(error)") - } - let output = FileHandle(fileDescriptor: fd, closeOnDealloc: true) - let profiling = Profiling(output: { output.write($0.data(using: .utf8) ?? Data()) }) - defer { - profiling.output("]\n") - } - Profiling.current = profiling - defer { - Profiling.current = nil - } - return try body() - } - private func formatTimestamp(instant: ContinuousClock.Instant) -> Int { - let duration = self.startTime.duration(to: instant) - let (seconds, attoseconds) = duration.components - // Convert to microseconds - return Int(seconds * 1_000_000 + attoseconds / 1_000_000_000_000) + return Profiling( + beginEntry: { label in + let entry = #"{"ph":"B","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp())}"# + if firstEntry { + firstEntry = false + output("[\n\(entry)") + } else { + output(",\n\(entry)") + } + }, + endEntry: { label in + output(#",\n{"ph":"E","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp())}"#) + }, + finalize: { + output("]\n") + } + ) } - func begin(_ label: String, _ instant: ContinuousClock.Instant) { - let entry = #"{"ph":"B","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp(instant: instant))}"# - if firstEntry { - firstEntry = false - output("[\n\(entry)") - } else { - output(",\n\(entry)") - } + public init( + beginEntry: @escaping (_ label: String) -> Void, + endEntry: @escaping (_ label: String) -> Void, + finalize: @escaping () -> Void + ) { + self.beginEntry = beginEntry + self.endEntry = endEntry + self.finalize = finalize } - func end(_ label: String, _ instant: ContinuousClock.Instant) { - let entry = #"{"ph":"E","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp(instant: instant))}"# - output(",\n\(entry)") + public static func with(_ makeCurrent: () -> Profiling?, body: @escaping () throws -> Void) rethrows -> Void { + guard let current = makeCurrent() else { + return try body() + } + defer { current.finalize() } + Profiling.current = current + defer { Profiling.current = nil } + return try body() } } @@ -94,9 +90,9 @@ public func withSpan(_ label: String, body: @escaping () throws -> T) rethrow guard let profiling = Profiling.current else { return try body() } - profiling.begin(label, profiling.clock.now) + profiling.beginEntry(label) defer { - profiling.end(label, profiling.clock.now) + profiling.endEntry(label) } return try body() } diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index f9fa56c42..b36b3ec8c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -1,10 +1,17 @@ @preconcurrency import func Foundation.exit @preconcurrency import func Foundation.fputs +@preconcurrency import func Foundation.open +@preconcurrency import func Foundation.strerror @preconcurrency import var Foundation.stderr +@preconcurrency import var Foundation.errno +@preconcurrency import var Foundation.O_WRONLY +@preconcurrency import var Foundation.O_CREAT +@preconcurrency import var Foundation.O_TRUNC @preconcurrency import struct Foundation.URL @preconcurrency import struct Foundation.Data @preconcurrency import struct Foundation.ObjCBool @preconcurrency import class Foundation.JSONEncoder +@preconcurrency import class Foundation.FileHandle @preconcurrency import class Foundation.FileManager @preconcurrency import class Foundation.JSONDecoder @preconcurrency import class Foundation.ProcessInfo @@ -50,7 +57,7 @@ import BridgeJSUtilities static func main() throws { do { - try Profiling.with { + try Profiling.with(Profiling.make) { try run() } } catch { @@ -318,6 +325,21 @@ private func inputSwiftFiles(targetDirectory: URL, positionalArguments: [String] return positionalArguments } +extension Profiling { + static func make() -> Profiling? { + guard let outputPath = ProcessInfo.processInfo.environment["BRIDGE_JS_PROFILING"] else { + return nil + } + let fd = open(outputPath, O_WRONLY | O_CREAT | O_TRUNC, 0o644) + guard fd >= 0 else { + let error = String(cString: strerror(errno)) + fatalError("Failed to open profiling output file \(outputPath): \(error)") + } + let output = FileHandle(fileDescriptor: fd, closeOnDealloc: true) + return Profiling.traceEvent(output: { output.write($0.data(using: .utf8) ?? Data()) }) + } +} + // MARK: - Minimal Argument Parsing struct OptionRule { From 235a9bd99243d21612aefc398680a7d44a719fd0 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 11:57:01 +0900 Subject: [PATCH 180/252] BridgeJS: Deduplicate closure signature collection logic (#605) Centralize the `BridgeType` traversal logic and use it to collect closure signatures in both `BridgeJSCore` and `BridgeJSLink`, removing redundant code. This is mostly NFC but added new closure signature collection paths for `.array` and `.dictionary` element types and for enums with associated values. --- .../Sources/BridgeJSCore/ClosureCodegen.swift | 102 +----------- .../Sources/BridgeJSLink/BridgeJSLink.swift | 82 +--------- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 146 ++++++++++++++++++ 3 files changed, 154 insertions(+), 176 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 3ec0418b3..49f2b99bf 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -8,27 +8,6 @@ import BridgeJSSkeleton public struct ClosureCodegen { public init() {} - func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { - for param in parameters { - collectClosureSignatures(from: param.type, into: &signatures) - } - } - - func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { - switch type { - case .closure(let signature, _): - signatures.insert(signature) - for paramType in signature.parameters { - collectClosureSignatures(from: paramType, into: &signatures) - } - collectClosureSignatures(from: signature.returnType, into: &signatures) - case .nullable(let wrapped, _): - collectClosureSignatures(from: wrapped, into: &signatures) - default: - break - } - } - func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { let mangledName = signature.mangleName let helperName = "_BJS_Closure_\(mangledName)" @@ -242,83 +221,10 @@ public struct ClosureCodegen { } public func renderSupport(for skeleton: BridgeJSSkeleton) throws -> String? { - var closureSignatures: Set = [] - - if let exported = skeleton.exported { - for function in exported.functions { - collectClosureSignatures(from: function.parameters, into: &closureSignatures) - collectClosureSignatures(from: function.returnType, into: &closureSignatures) - } - for klass in exported.classes { - if let constructor = klass.constructor { - collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) - } - for method in klass.methods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - for property in klass.properties { - collectClosureSignatures(from: property.type, into: &closureSignatures) - } - } - for proto in exported.protocols { - for method in proto.methods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - for property in proto.properties { - collectClosureSignatures(from: property.type, into: &closureSignatures) - } - } - for structDecl in exported.structs { - for property in structDecl.properties { - collectClosureSignatures(from: property.type, into: &closureSignatures) - } - if let constructor = structDecl.constructor { - collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) - } - for method in structDecl.methods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - } - for enumDecl in exported.enums { - for method in enumDecl.staticMethods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - for property in enumDecl.staticProperties { - collectClosureSignatures(from: property.type, into: &closureSignatures) - } - } - } - - if let imported = skeleton.imported { - for fileSkeleton in imported.children { - for getter in fileSkeleton.globalGetters { - collectClosureSignatures(from: getter.type, into: &closureSignatures) - } - for function in fileSkeleton.functions { - collectClosureSignatures(from: function.parameters, into: &closureSignatures) - collectClosureSignatures(from: function.returnType, into: &closureSignatures) - } - for type in fileSkeleton.types { - if let constructor = type.constructor { - collectClosureSignatures(from: constructor.parameters, into: &closureSignatures) - } - for getter in type.getters { - collectClosureSignatures(from: getter.type, into: &closureSignatures) - } - for setter in type.setters { - collectClosureSignatures(from: setter.type, into: &closureSignatures) - } - for method in type.methods + type.staticMethods { - collectClosureSignatures(from: method.parameters, into: &closureSignatures) - collectClosureSignatures(from: method.returnType, into: &closureSignatures) - } - } - } - } + let collector = ClosureSignatureCollectorVisitor() + var walker = BridgeTypeWalker(visitor: collector) + walker.walk(skeleton) + let closureSignatures = walker.visitor.signatures guard !closureSignatures.isEmpty else { return nil } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 13ea4e910..621e9c98b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -610,13 +610,10 @@ public struct BridgeJSLink { for unified in skeletons { let moduleName = unified.moduleName - var closureSignatures: Set = [] - if let exported = unified.exported { - collectClosureSignatures(from: exported, into: &closureSignatures) - } - if let imported = unified.imported { - collectClosureSignatures(from: imported, into: &closureSignatures) - } + let collector = ClosureSignatureCollectorVisitor() + var walker = BridgeTypeWalker(visitor: collector) + walker.walk(unified) + let closureSignatures = walker.visitor.signatures guard !closureSignatures.isEmpty else { continue } @@ -714,77 +711,6 @@ public struct BridgeJSLink { return printer } - private func collectClosureSignatures(from skeleton: ExportedSkeleton, into signatures: inout Set) - { - for function in skeleton.functions { - collectClosureSignatures(from: function.parameters, into: &signatures) - collectClosureSignatures(from: function.returnType, into: &signatures) - } - for klass in skeleton.classes { - if let constructor = klass.constructor { - collectClosureSignatures(from: constructor.parameters, into: &signatures) - } - for method in klass.methods { - collectClosureSignatures(from: method.parameters, into: &signatures) - collectClosureSignatures(from: method.returnType, into: &signatures) - } - for property in klass.properties { - collectClosureSignatures(from: property.type, into: &signatures) - } - } - } - - private func collectClosureSignatures( - from skeleton: ImportedModuleSkeleton, - into signatures: inout Set - ) { - for fileSkeleton in skeleton.children { - for getter in fileSkeleton.globalGetters { - collectClosureSignatures(from: getter.type, into: &signatures) - } - for function in fileSkeleton.functions { - collectClosureSignatures(from: function.parameters, into: &signatures) - collectClosureSignatures(from: function.returnType, into: &signatures) - } - for type in fileSkeleton.types { - if let constructor = type.constructor { - collectClosureSignatures(from: constructor.parameters, into: &signatures) - } - for getter in type.getters { - collectClosureSignatures(from: getter.type, into: &signatures) - } - for setter in type.setters { - collectClosureSignatures(from: setter.type, into: &signatures) - } - for method in type.methods + type.staticMethods { - collectClosureSignatures(from: method.parameters, into: &signatures) - collectClosureSignatures(from: method.returnType, into: &signatures) - } - } - } - } - - private func collectClosureSignatures(from parameters: [Parameter], into signatures: inout Set) { - for param in parameters { - collectClosureSignatures(from: param.type, into: &signatures) - } - } - - private func collectClosureSignatures(from type: BridgeType, into signatures: inout Set) { - switch type { - case .closure(let signature, _): - signatures.insert(signature) - for paramType in signature.parameters { - collectClosureSignatures(from: paramType, into: &signatures) - } - collectClosureSignatures(from: signature.returnType, into: &signatures) - case .nullable(let wrapped, _): - collectClosureSignatures(from: wrapped, into: &signatures) - default: - break - } - } - private func generateInvokeFunction( signature: ClosureSignature, functionName: String diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 3ebc91306..ba25b6ff9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -247,6 +247,138 @@ public struct Parameter: Codable, Equatable, Sendable { } } +// MARK: - BridgeType Visitor + +public protocol BridgeTypeVisitor { + mutating func visitClosure(_ signature: ClosureSignature, useJSTypedClosure: Bool) +} + +public struct BridgeTypeWalker { + public var visitor: Visitor + + public init(visitor: Visitor) { + self.visitor = visitor + } + + public mutating func walk(_ type: BridgeType) { + switch type { + case .closure(let signature, let useJSTypedClosure): + visitor.visitClosure(signature, useJSTypedClosure: useJSTypedClosure) + for paramType in signature.parameters { + walk(paramType) + } + walk(signature.returnType) + case .nullable(let wrapped, _): + walk(wrapped) + case .array(let element): + walk(element) + case .dictionary(let value): + walk(value) + default: + break + } + } + public mutating func walk(_ parameters: [Parameter]) { + for param in parameters { + walk(param.type) + } + } + public mutating func walk(_ function: ExportedFunction) { + walk(function.parameters) + walk(function.returnType) + } + public mutating func walk(_ constructor: ExportedConstructor) { + walk(constructor.parameters) + } + public mutating func walk(_ skeleton: ExportedSkeleton) { + for function in skeleton.functions { + walk(function) + } + for klass in skeleton.classes { + if let constructor = klass.constructor { + walk(constructor.parameters) + } + for method in klass.methods { + walk(method) + } + for property in klass.properties { + walk(property.type) + } + } + for proto in skeleton.protocols { + for method in proto.methods { + walk(method) + } + for property in proto.properties { + walk(property.type) + } + } + for structDecl in skeleton.structs { + for property in structDecl.properties { + walk(property.type) + } + if let constructor = structDecl.constructor { + walk(constructor.parameters) + } + for method in structDecl.methods { + walk(method) + } + } + for enumDecl in skeleton.enums { + for enumCase in enumDecl.cases { + for associatedValue in enumCase.associatedValues { + walk(associatedValue.type) + } + } + for method in enumDecl.staticMethods { + walk(method) + } + for property in enumDecl.staticProperties { + walk(property.type) + } + } + } + public mutating func walk(_ function: ImportedFunctionSkeleton) { + walk(function.parameters) + walk(function.returnType) + } + public mutating func walk(_ skeleton: ImportedModuleSkeleton) { + for fileSkeleton in skeleton.children { + for getter in fileSkeleton.globalGetters { + walk(getter.type) + } + for setter in fileSkeleton.globalSetters { + walk(setter.type) + } + for function in fileSkeleton.functions { + walk(function) + } + for type in fileSkeleton.types { + if let constructor = type.constructor { + walk(constructor.parameters) + } + for getter in type.getters { + walk(getter.type) + } + for setter in type.setters { + walk(setter.type) + } + for method in type.methods + type.staticMethods { + walk(method) + } + } + } + } + public mutating func walk(_ skeleton: BridgeJSSkeleton) { + if let exported = skeleton.exported { + walk(exported) + } + if let imported = skeleton.imported { + walk(imported) + } + } +} + public struct Effects: Codable, Equatable, Sendable { public var isAsync: Bool public var isThrows: Bool @@ -873,6 +1005,20 @@ public struct ImportedModuleSkeleton: Codable { } } +// MARK: - Closure signature collection visitor + +public struct ClosureSignatureCollectorVisitor: BridgeTypeVisitor { + public var signatures: Set = [] + + public init(signatures: Set = []) { + self.signatures = signatures + } + + public mutating func visitClosure(_ signature: ClosureSignature, useJSTypedClosure: Bool) { + signatures.insert(signature) + } +} + // MARK: - Unified Skeleton /// Unified skeleton containing both exported and imported API definitions From 3bc0400b3627ca9bc3e2e3fca7d604eef2b9985a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 11:19:50 +0900 Subject: [PATCH 181/252] [NFC] BridgeJS: Move CodeFragmentPrintetr to BridgeJSCore So that we can use it for Swift code generation --- .../BridgeJSLink/CodeFragmentPrinter.swift | 80 ------------------- .../Sources/BridgeJSLink/JSGlueGen.swift | 3 + .../BridgeJSLink/JSIntrinsicRegistry.swift | 37 +++++++++ .../Sources/BridgeJSUtilities/Utilities.swift | 47 +++++++++++ 4 files changed, 87 insertions(+), 80 deletions(-) delete mode 100644 Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift create mode 100644 Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift deleted file mode 100644 index 4bad3dd34..000000000 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/CodeFragmentPrinter.swift +++ /dev/null @@ -1,80 +0,0 @@ -/// Registry for JS helper intrinsics used during code generation. -final class JSIntrinsicRegistry { - private var entries: [String: [String]] = [:] - - var isEmpty: Bool { - entries.isEmpty - } - - func register(name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows { - guard entries[name] == nil else { return } - let printer = CodeFragmentPrinter() - try build(printer) - entries[name] = printer.lines - } - - func reset() { - entries.removeAll() - } - - func emitLines() -> [String] { - var emitted: [String] = [] - for key in entries.keys.sorted() { - if let lines = entries[key] { - emitted.append(contentsOf: lines) - emitted.append("") - } - } - if emitted.last == "" { - emitted.removeLast() - } - return emitted - } -} - -/// A printer for code fragments. -final class CodeFragmentPrinter { - private(set) var lines: [String] = [] - private var indentLevel: Int = 0 - - init(header: String = "") { - self.lines.append(contentsOf: header.split(separator: "\n").map { String($0) }) - } - - func nextLine() { - lines.append("") - } - - func write(_ line: S) { - if line.isEmpty { - // Empty lines should not have trailing spaces - lines.append("") - return - } - lines.append(String(repeating: " ", count: indentLevel * 4) + String(line)) - } - - func write(lines: [String]) { - for line in lines { - write(line) - } - } - - func write(contentsOf printer: CodeFragmentPrinter) { - self.write(lines: printer.lines) - } - - func indent() { - indentLevel += 1 - } - - func unindent() { - indentLevel -= 1 - } - - func indent(_ body: () throws -> Void) rethrows { - indentLevel += 1 - try body() - indentLevel -= 1 - } -} diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9402cdd9d..7928f480d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1,6 +1,9 @@ #if canImport(BridgeJSSkeleton) import BridgeJSSkeleton #endif +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif /// A scope for variables for JS glue code final class JSGlueVariableScope { diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift new file mode 100644 index 000000000..c3e77d83f --- /dev/null +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift @@ -0,0 +1,37 @@ +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif + +/// Registry for JS helper intrinsics used during code generation. +final class JSIntrinsicRegistry { + private var entries: [String: [String]] = [:] + + var isEmpty: Bool { + entries.isEmpty + } + + func register(name: String, build: (CodeFragmentPrinter) throws -> Void) rethrows { + guard entries[name] == nil else { return } + let printer = CodeFragmentPrinter() + try build(printer) + entries[name] = printer.lines + } + + func reset() { + entries.removeAll() + } + + func emitLines() -> [String] { + var emitted: [String] = [] + for key in entries.keys.sorted() { + if let lines = entries[key] { + emitted.append(contentsOf: lines) + emitted.append("") + } + } + if emitted.last == "" { + emitted.removeLast() + } + return emitted + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift index 2791aa5be..ed6fa04f0 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift @@ -27,3 +27,50 @@ public enum BridgeJSGeneratedFile { """ } } + +/// A printer for code fragments. +public final class CodeFragmentPrinter { + public private(set) var lines: [String] = [] + private var indentLevel: Int = 0 + + public init(header: String = "") { + self.lines.append(contentsOf: header.split(separator: "\n").map { String($0) }) + } + + public func nextLine() { + lines.append("") + } + + public func write(_ line: S) { + if line.isEmpty { + // Empty lines should not have trailing spaces + lines.append("") + return + } + lines.append(String(repeating: " ", count: indentLevel * 4) + String(line)) + } + + public func write(lines: [String]) { + for line in lines { + write(line) + } + } + + public func write(contentsOf printer: CodeFragmentPrinter) { + self.write(lines: printer.lines) + } + + public func indent() { + indentLevel += 1 + } + + public func unindent() { + indentLevel -= 1 + } + + public func indent(_ body: () throws -> Void) rethrows { + indentLevel += 1 + try body() + indentLevel -= 1 + } +} From 2e4de4fe08d5be9a1b7617de6c9287f3c6f76255 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 12:48:00 +0900 Subject: [PATCH 182/252] BridgeJS: Explicitly reject unsupported optional wrapped types --- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9402cdd9d..3205388e4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1230,7 +1230,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) default: - () + throw BridgeJSLinkError(message: "Unsupported wrapped type for returning from JS function: \(wrappedType)") } return [] From 8f77619d802c83abc0a0531ddaab705c39ebdd71 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 12:56:35 +0900 Subject: [PATCH 183/252] BridgeJS: Fix handling of optional Swift heap objects in JS glue generation --- .../Sources/BridgeJSLink/JSGlueGen.swift | 2 ++ .../Inputs/MacroSwift/SwiftClass.swift | 1 + .../BridgeJSCodegenTests/SwiftClass.json | 28 +++++++++++++++++++ .../BridgeJSCodegenTests/SwiftClass.swift | 18 ++++++++++++ .../BridgeJSLinkTests/Protocol.js | 1 + .../BridgeJSLinkTests/SwiftClass.d.ts | 1 + .../BridgeJSLinkTests/SwiftClass.js | 9 ++++++ .../Generated/BridgeJS.swift | 18 ++++++++++++ .../Generated/JavaScript/BridgeJS.json | 28 +++++++++++++++++++ .../JavaScript/SwiftClassSupportTests.mjs | 3 ++ .../SwiftClassSupportTests.swift | 9 ++++++ 11 files changed, 118 insertions(+) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 3205388e4..c502513d4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -1120,6 +1120,8 @@ struct IntrinsicJSFragment: Sendable { scope.emitPushF64Parameter(payload2Var, printer: printer) } scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) + case .swiftHeapObject: + printer.write("return \(isSomeVar) ? \(value).pointer : 0;") case .array(let elementType): printer.write("if (\(isSomeVar)) {") try printer.indent { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift index aa520783a..2b41d91d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift @@ -20,3 +20,4 @@ @JS package class PackageGreeter {} @JSFunction func jsRoundTripGreeter(greeter: Greeter) throws(JSException) -> Greeter +@JSFunction func jsRoundTripOptionalGreeter(greeter: Greeter?) throws(JSException) -> Greeter? \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json index d1bf42cff..7cebdd5e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.json @@ -162,6 +162,34 @@ "_0" : "Greeter" } } + }, + { + "name" : "jsRoundTripOptionalGreeter", + "parameters" : [ + { + "name" : "greeter", + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } } ], "types" : [ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift index 581d6f1c0..ca82b87c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift @@ -152,4 +152,22 @@ func _$jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { throw error } return Greeter.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_jsRoundTripOptionalGreeter") +fileprivate func bjs_jsRoundTripOptionalGreeter(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_jsRoundTripOptionalGreeter(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsRoundTripOptionalGreeter(_ greeter: Optional) throws(JSException) -> Optional { + let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() + let ret = bjs_jsRoundTripOptionalGreeter(greeterIsSome, greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 00b9626e3..4d9f3e0bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -538,6 +538,7 @@ export async function createInstantiator(options, swift) { try { let ret = swift.memory.getObject(self).createOptionalHelper(); const isSome = ret != null; + return isSome ? ret.pointer : 0; } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts index d3461f8c1..05fc97fee 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.d.ts @@ -32,6 +32,7 @@ export type Exports = { } export type Imports = { jsRoundTripGreeter(greeter: Greeter): Greeter; + jsRoundTripOptionalGreeter(greeter: Greeter | null): Greeter | null; } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index eaa5d7720..85d423f8a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -225,6 +225,15 @@ export async function createInstantiator(options, swift) { return 0 } } + TestModule["bjs_jsRoundTripOptionalGreeter"] = function bjs_jsRoundTripOptionalGreeter(greeterIsSome, greeterWrappedValue) { + try { + let ret = imports.jsRoundTripOptionalGreeter(greeterIsSome ? Greeter.__construct(greeterWrappedValue) : null); + const isSome = ret != null; + return isSome ? ret.pointer : 0; + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { instance = i; diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 1feb3eed6..b10a82fdf 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -10677,6 +10677,15 @@ fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greete } #endif +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static") +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif + func _$SwiftClassSupportImports_jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { let greeterPointer = greeter.bridgeJSLowerParameter() let ret = bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(greeterPointer) @@ -10684,4 +10693,13 @@ func _$SwiftClassSupportImports_jsRoundTripGreeter(_ greeter: Greeter) throws(JS throw error } return Greeter.bridgeJSLiftReturn(ret) +} + +func _$SwiftClassSupportImports_jsRoundTripOptionalGreeter(_ greeter: Optional) throws(JSException) -> Optional { + let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() + let ret = bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(greeterIsSome, greeterPointer) + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturn(ret) } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index de7ab4a5d..7e2d4d855 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -15345,6 +15345,34 @@ "_0" : "Greeter" } } + }, + { + "name" : "jsRoundTripOptionalGreeter", + "parameters" : [ + { + "name" : "greeter", + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } } ] } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs index fdb5d498d..0368cb74a 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs @@ -6,5 +6,8 @@ export function getImports(importsContext) { jsRoundTripGreeter: (greeter) => { return greeter; }, + jsRoundTripOptionalGreeter: (greeter) => { + return greeter; + }, }; } \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift index 3cee17554..1a3dd0a4f 100644 --- a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift @@ -3,6 +3,7 @@ import XCTest @JSClass struct SwiftClassSupportImports { @JSFunction static func jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter + @JSFunction static func jsRoundTripOptionalGreeter(_ greeter: Greeter?) throws(JSException) -> Greeter? } final class SwiftClassSupportTests: XCTestCase { @@ -10,4 +11,12 @@ final class SwiftClassSupportTests: XCTestCase { let greeter = try SwiftClassSupportImports.jsRoundTripGreeter(Greeter(name: "Hello")) XCTAssertEqual(greeter.name, "Hello") } + + func testRoundTripOptionalGreeter() throws { + let greeter1 = try SwiftClassSupportImports.jsRoundTripOptionalGreeter(nil) + XCTAssertNil(greeter1) + + let greeter2 = try SwiftClassSupportImports.jsRoundTripOptionalGreeter(Greeter(name: "Hello")) + XCTAssertEqual(greeter2?.name, "Hello") + } } From 4c0a345b09923faa97ae280a2140830a01cbd1ad Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 12:58:39 +0900 Subject: [PATCH 184/252] BridgeJS: Fix optional Swift heap object for parameter lifting in JS glue --- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 6 ++++-- .../BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift | 2 +- .../__Snapshots__/BridgeJSLinkTests/Protocol.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/SwiftClass.js | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index c502513d4..db900cf99 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -668,7 +668,7 @@ struct IntrinsicJSFragment: Sendable { resultExpr = "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" case .swiftHeapObject(let name): - resultExpr = "\(isSome) ? \(name).__construct(\(wrappedValue)) : \(absenceLiteral)" + resultExpr = "\(isSome) ? _exports['\(name)'].__construct(\(wrappedValue)) : \(absenceLiteral)" case .jsObject: resultExpr = "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" @@ -1232,7 +1232,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) default: - throw BridgeJSLinkError(message: "Unsupported wrapped type for returning from JS function: \(wrappedType)") + throw BridgeJSLinkError( + message: "Unsupported wrapped type for returning from JS function: \(wrappedType)" + ) } return [] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift index 2b41d91d6..d7b5a5b8e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftClass.swift @@ -20,4 +20,4 @@ @JS package class PackageGreeter {} @JSFunction func jsRoundTripGreeter(greeter: Greeter) throws(JSException) -> Greeter -@JSFunction func jsRoundTripOptionalGreeter(greeter: Greeter?) throws(JSException) -> Greeter? \ No newline at end of file +@JSFunction func jsRoundTripOptionalGreeter(greeter: Greeter?) throws(JSException) -> Greeter? diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 4d9f3e0bb..fd37c7178 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -529,7 +529,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_MyViewControllerDelegate_onOptionalHelperUpdated"] = function bjs_MyViewControllerDelegate_onOptionalHelperUpdated(self, helperIsSome, helperWrappedValue) { try { - swift.memory.getObject(self).onOptionalHelperUpdated(helperIsSome ? Helper.__construct(helperWrappedValue) : null); + swift.memory.getObject(self).onOptionalHelperUpdated(helperIsSome ? _exports['Helper'].__construct(helperWrappedValue) : null); } catch (error) { setException(error); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 85d423f8a..13ea6ba75 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -227,7 +227,7 @@ export async function createInstantiator(options, swift) { } TestModule["bjs_jsRoundTripOptionalGreeter"] = function bjs_jsRoundTripOptionalGreeter(greeterIsSome, greeterWrappedValue) { try { - let ret = imports.jsRoundTripOptionalGreeter(greeterIsSome ? Greeter.__construct(greeterWrappedValue) : null); + let ret = imports.jsRoundTripOptionalGreeter(greeterIsSome ? _exports['Greeter'].__construct(greeterWrappedValue) : null); const isSome = ret != null; return isSome ? ret.pointer : 0; } catch (error) { From c74f65991b4dfdc2e8f8b07d4284a50730abe543 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 18:16:19 +0900 Subject: [PATCH 185/252] BridgeJS: Fix missing escape in profiling output --- Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index df6d0c755..67f5170c4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -56,7 +56,7 @@ public final class Profiling { } }, endEntry: { label in - output(#",\n{"ph":"E","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp())}"#) + output(#",\#n{"ph":"E","pid":1,"name":\#(JSON.serialize(label)),"ts":\#(formatTimestamp())}"#) }, finalize: { output("]\n") From a0b8448a1ffadaaa75e78d0092dc7307783ff2b5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 19:40:36 +0900 Subject: [PATCH 186/252] BridgeJS: Add `IntrinsicJSFragment.PrintCodeContext` Prepare to extend the context more --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 79 ++- .../Sources/BridgeJSLink/JSGlueGen.swift | 645 +++++++++++------- 2 files changed, 468 insertions(+), 256 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 2695d9861..7e6ce9b55 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -717,8 +717,11 @@ public struct BridgeJSLink { functionName: String ) throws -> [String] { let printer = CodeFragmentPrinter() - let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - let cleanupCode = CodeFragmentPrinter() + let context = IntrinsicJSFragment.PrintCodeContext( + scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry), + printer: printer, + cleanupCode: CodeFragmentPrinter() + ) // Build parameter list for invoke function var invokeParams: [String] = ["callbackId"] @@ -746,7 +749,7 @@ public struct BridgeJSLink { } else { args = ["param\(index)Id", "param\(index)"] } - _ = try fragment.printCode(args, scope, printer, cleanupCode) + _ = try fragment.printCode(args, context) } let callbackParams = signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ") @@ -765,13 +768,13 @@ public struct BridgeJSLink { } let returnFragment = try IntrinsicJSFragment.closureLowerReturn(type: signature.returnType) - _ = try returnFragment.printCode(["result"], scope, printer, cleanupCode) + _ = try returnFragment.printCode(["result"], context) } printer.write("} catch (error) {") try printer.indent { printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") let errorFragment = IntrinsicJSFragment.closureErrorReturn(type: signature.returnType) - _ = try errorFragment.printCode([], scope, printer, cleanupCode) + _ = try errorFragment.printCode([], context) } printer.write("}") } @@ -786,8 +789,11 @@ public struct BridgeJSLink { functionName: String ) throws -> [String] { let printer = CodeFragmentPrinter() - let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - let cleanupCode = CodeFragmentPrinter() + let context = IntrinsicJSFragment.PrintCodeContext( + scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry), + printer: printer, + cleanupCode: CodeFragmentPrinter() + ) printer.write( "const \(functionName) = function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" @@ -798,7 +804,7 @@ public struct BridgeJSLink { for (index, paramType) in signature.parameters.enumerated() { let paramName = "param\(index)" let fragment = try IntrinsicJSFragment.lowerParameter(type: paramType) - let lowered = try fragment.printCode([paramName], scope, printer, cleanupCode) + let lowered = try fragment.printCode([paramName], context) invokeArgs.append(contentsOf: lowered) } @@ -822,7 +828,7 @@ public struct BridgeJSLink { printer.write("}") let returnFragment = try IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) - _ = try returnFragment.printCode([invokeResultName], scope, printer, cleanupCode) + _ = try returnFragment.printCode([invokeResultName], context) } printer.write("};") @@ -1010,7 +1016,14 @@ public struct BridgeJSLink { let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let structCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs) - _ = try fragment.printCode([structDef.name], structScope, structPrinter, structCleanup) + _ = try fragment.printCode( + [structDef.name], + IntrinsicJSFragment.PrintCodeContext( + scope: structScope, + printer: structPrinter, + cleanupCode: structCleanup + ) + ) bodyPrinter.write(lines: structPrinter.lines) } @@ -1022,7 +1035,14 @@ public struct BridgeJSLink { let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) let enumCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef) - _ = try fragment.printCode([enumDef.valuesName], enumScope, enumPrinter, enumCleanup) + _ = try fragment.printCode( + [enumDef.valuesName], + IntrinsicJSFragment.PrintCodeContext( + scope: enumScope, + printer: enumPrinter, + cleanupCode: enumCleanup + ) + ) bodyPrinter.write(lines: enumPrinter.lines) } bodyPrinter.nextLine() @@ -1269,12 +1289,18 @@ public struct BridgeJSLink { var parameterForwardings: [String] = [] let effects: Effects let scope: JSGlueVariableScope + let context: IntrinsicJSFragment.PrintCodeContext init(effects: Effects, intrinsicRegistry: JSIntrinsicRegistry) { self.effects = effects self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.body = CodeFragmentPrinter() self.cleanupCode = CodeFragmentPrinter() + self.context = IntrinsicJSFragment.PrintCodeContext( + scope: scope, + printer: body, + cleanupCode: cleanupCode + ) } func lowerParameter(param: Parameter) throws { @@ -1283,7 +1309,7 @@ public struct BridgeJSLink { loweringFragment.parameters.count == 1, "Lowering fragment should have exactly one parameter to lower" ) - let loweredValues = try loweringFragment.printCode([param.name], scope, body, cleanupCode) + let loweredValues = try loweringFragment.printCode([param.name], context) parameterForwardings.append(contentsOf: loweredValues) } @@ -1315,7 +1341,7 @@ public struct BridgeJSLink { body.write("const \(returnVariable) = \(call);") fragmentArguments = [returnVariable] } - let liftedValues = try liftingFragment.printCode(fragmentArguments, scope, body, cleanupCode) + let liftedValues = try liftingFragment.printCode(fragmentArguments, context) assert(liftedValues.count <= 1, "Lifting fragment should produce at most one value") return liftedValues.first } @@ -1566,14 +1592,18 @@ public struct BridgeJSLink { var jsTopLevelLines: [String] = [] var dtsTypeLines: [String] = [] let scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - let cleanup = CodeFragmentPrinter() let printer = CodeFragmentPrinter() + let context = IntrinsicJSFragment.PrintCodeContext( + scope: scope, + printer: printer, + cleanupCode: CodeFragmentPrinter() + ) let enumValuesName = enumDefinition.valuesName switch enumDefinition.enumType { case .simple: let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition) - _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], context) jsTopLevelLines.append(contentsOf: printer.lines) case .rawValue: guard enumDefinition.rawType != nil else { @@ -1581,11 +1611,11 @@ public struct BridgeJSLink { } let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition) - _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], context) jsTopLevelLines.append(contentsOf: printer.lines) case .associatedValue: let fragment = IntrinsicJSFragment.associatedValueEnumValues(enumDefinition: enumDefinition) - _ = try fragment.printCode([enumValuesName], scope, printer, cleanup) + _ = try fragment.printCode([enumValuesName], context) jsTopLevelLines.append(contentsOf: printer.lines) case .namespace: break @@ -2155,12 +2185,18 @@ extension BridgeJSLink { let context: BridgeContext var parameterNames: [String] = [] var parameterForwardings: [String] = [] + let printContext: IntrinsicJSFragment.PrintCodeContext init(context: BridgeContext = .importTS, intrinsicRegistry: JSIntrinsicRegistry) { self.body = CodeFragmentPrinter() self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.cleanupCode = CodeFragmentPrinter() self.context = context + self.printContext = IntrinsicJSFragment.PrintCodeContext( + scope: scope, + printer: body, + cleanupCode: cleanupCode + ) } func liftSelf() { @@ -2179,7 +2215,7 @@ extension BridgeJSLink { valuesToLift = liftingFragment.parameters.map { scope.variable(param.name + $0.capitalizedFirstLetter) } parameterNames.append(contentsOf: valuesToLift) } - let liftedValues = try liftingFragment.printCode(valuesToLift, scope, body, cleanupCode) + let liftedValues = try liftingFragment.printCode(valuesToLift, printContext) assert(liftedValues.count == 1, "Lifting fragment should produce exactly one value") parameterForwardings.append(contentsOf: liftedValues) } @@ -2289,7 +2325,7 @@ extension BridgeJSLink { ) let fragment = try IntrinsicJSFragment.protocolPropertyOptionalToSideChannel(wrappedType: wrappedType) - _ = try fragment.printCode([resultVar], scope, body, cleanupCode) + _ = try fragment.printCode([resultVar], printContext) return nil // Side-channel types return nil (no direct return value) } @@ -2342,7 +2378,10 @@ extension BridgeJSLink { loweringFragment: IntrinsicJSFragment ) throws -> String? { assert(loweringFragment.parameters.count <= 1, "Lowering fragment should have at most one parameter") - let loweredValues = try loweringFragment.printCode(returnExpr.map { [$0] } ?? [], scope, body, cleanupCode) + let loweredValues = try loweringFragment.printCode( + returnExpr.map { [$0] } ?? [], + printContext + ) assert(loweredValues.count <= 1, "Lowering fragment should produce at most one value") return loweredValues.first } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 6e1ead728..c60cc2dbf 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -146,31 +146,54 @@ extension JSGlueVariableScope { /// /// See `BridgeJSIntrinsics.swift` in the main JavaScriptKit module for Swift side lowering/lifting implementation. struct IntrinsicJSFragment: Sendable { - /// The names of the parameters that the fragment expects. - let parameters: [String] - /// Prints the fragment code. + struct PrintCodeContext { + /// The scope of the variables. + var scope: JSGlueVariableScope + /// The printer to print the main fragment code. + var printer: CodeFragmentPrinter + /// The printer to print the code that is expected to be executed at the end of the caller of the fragment. + var cleanupCode: CodeFragmentPrinter + + func with(_ keyPath: WritableKeyPath, _ value: T) -> PrintCodeContext { + var new = self + new[keyPath: keyPath] = value + return new + } + } + + /// A function that prints the fragment code. /// /// - Parameters: /// - arguments: The arguments that the fragment expects. An argument may be an expression with side effects, /// so the callee is responsible for evaluating the arguments only once. - /// - scope: The scope of the variables. - /// - printer: The printer to print the main fragment code. - /// - cleanupCode: The printer to print the code that is expected to be executed at the end of the caller of the - /// fragment. + /// - context: The context of the printing. /// - Returns: List of result expressions. - let printCode: + typealias PrintCode = @Sendable ( _ arguments: [String], - _ scope: JSGlueVariableScope, - _ printer: CodeFragmentPrinter, - _ cleanupCode: CodeFragmentPrinter + _ context: PrintCodeContext ) throws -> [String] + /// The names of the parameters that the fragment expects. + let parameters: [String] + + /// Prints the fragment code. + let printCode: PrintCode + + init(parameters: [String], printCode: @escaping PrintCode) { + self.parameters = parameters + self.printCode = printCode + } + + func printCode(_ arguments: [String], _ context: PrintCodeContext) throws -> [String] { + return try printCode(arguments, context) + } + /// A fragment that does nothing static let void = IntrinsicJSFragment( parameters: [], - printCode: { _, _, _, _ in + printCode: { _, _ in return [] } ) @@ -178,7 +201,7 @@ struct IntrinsicJSFragment: Sendable { /// A fragment that returns the argument as is. static let identity = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return [arguments[0]] } ) @@ -188,19 +211,19 @@ struct IntrinsicJSFragment: Sendable { static let boolLowerParameter = identity static let boolLiftReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(arguments[0]) !== 0"] } ) static let boolLiftParameter = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(arguments[0]) !== 0"] } ) static let boolLowerReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(arguments[0]) ? 1 : 0"] } ) @@ -208,7 +231,7 @@ struct IntrinsicJSFragment: Sendable { /// Convert signed Int32 to unsigned for UInt values static let uintLiftReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(arguments[0]) >>> 0"] } ) @@ -216,7 +239,8 @@ struct IntrinsicJSFragment: Sendable { static let stringLowerParameter = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let argument = arguments[0] let bytesLabel = scope.variable("\(argument)Bytes") let bytesIdLabel = scope.variable("\(argument)Id") @@ -228,7 +252,8 @@ struct IntrinsicJSFragment: Sendable { ) static let stringLiftReturn = IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let resultLabel = scope.variable("ret") printer.write("const \(resultLabel) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") @@ -237,7 +262,8 @@ struct IntrinsicJSFragment: Sendable { ) static let stringLiftParameter = IntrinsicJSFragment( parameters: ["objectId"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let objectId = arguments[0] let objectLabel = scope.variable("\(objectId)Object") // TODO: Implement "take" operation @@ -248,7 +274,8 @@ struct IntrinsicJSFragment: Sendable { ) static let stringLowerReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) printer.write( "\(JSGlueVariableScope.reservedStorageToReturnBytes) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(arguments[0]));" ) @@ -258,13 +285,14 @@ struct IntrinsicJSFragment: Sendable { static let jsObjectLowerParameter = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["swift.memory.retain(\(arguments[0]))"] } ) static let jsObjectLiftReturn = IntrinsicJSFragment( parameters: ["retId"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) // TODO: Implement "take" operation let resultLabel = scope.variable("ret") let retId = arguments[0] @@ -275,7 +303,8 @@ struct IntrinsicJSFragment: Sendable { ) static let jsObjectLiftRetainedObjectId = IntrinsicJSFragment( parameters: ["objectId"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let resultLabel = scope.variable("value") let objectId = arguments[0] printer.write( @@ -287,13 +316,13 @@ struct IntrinsicJSFragment: Sendable { ) static let jsObjectLiftParameter = IntrinsicJSFragment( parameters: ["objectId"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(JSGlueVariableScope.reservedSwift).memory.getObject(\(arguments[0]))"] } ) static let jsObjectLowerReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, _ in return ["\(JSGlueVariableScope.reservedSwift).memory.retain(\(arguments[0]))"] } ) @@ -419,7 +448,8 @@ struct IntrinsicJSFragment: Sendable { static let jsValueLower = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let kindVar = scope.variable("\(value)Kind") let payload1Var = scope.variable("\(value)Payload1") @@ -507,8 +537,9 @@ struct IntrinsicJSFragment: Sendable { // via the parameter stacks that `_swift_js_pop_*` read from. return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in - let lowered = try jsValueLower.printCode(arguments, scope, printer, cleanupCode) + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let lowered = try jsValueLower.printCode(arguments, context) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -523,8 +554,12 @@ struct IntrinsicJSFragment: Sendable { // to tmpRet stacks directly. return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in - let lowered = try jsValueLower.printCode(arguments, scope, printer, cleanupCode) + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let lowered = try jsValueLower.printCode( + arguments, + context + ) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -539,7 +574,8 @@ struct IntrinsicJSFragment: Sendable { static let jsValueLift = IntrinsicJSFragment( parameters: [], - printCode: { _, scope, printer, cleanupCode in + printCode: { _, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let payload2 = scope.variable("jsValuePayload2") let payload1 = scope.variable("jsValuePayload1") let kind = scope.variable("jsValueKind") @@ -556,7 +592,8 @@ struct IntrinsicJSFragment: Sendable { ) static let jsValueLiftParameter = IntrinsicJSFragment( parameters: ["kind", "payload1", "payload2"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( @@ -568,14 +605,14 @@ struct IntrinsicJSFragment: Sendable { static let swiftHeapObjectLowerParameter = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in return ["\(arguments[0]).pointer"] } ) static func swiftHeapObjectLiftReturn(_ name: String) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in return ["\(name).__construct(\(arguments[0]))"] } ) @@ -583,14 +620,14 @@ struct IntrinsicJSFragment: Sendable { static func swiftHeapObjectLiftParameter(_ name: String) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["pointer"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in return ["_exports['\(name)'].__construct(\(arguments[0]))"] } ) } static let swiftHeapObjectLowerReturn = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in return ["\(arguments[0]).pointer"] } ) @@ -598,7 +635,8 @@ struct IntrinsicJSFragment: Sendable { static func associatedEnumLowerParameter(enumBase: String) -> IntrinsicJSFragment { IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (printer, cleanup) = (context.printer, context.cleanupCode) let value = arguments[0] let caseIdName = "\(value)CaseId" let cleanupName = "\(value)Cleanup" @@ -614,7 +652,8 @@ struct IntrinsicJSFragment: Sendable { static func associatedEnumLiftReturn(enumBase: String) -> IntrinsicJSFragment { IntrinsicJSFragment( parameters: [], - printCode: { _, scope, printer, _ in + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) let retName = scope.variable("ret") printer.write( "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTag()));" @@ -628,13 +667,11 @@ struct IntrinsicJSFragment: Sendable { if case .jsValue = wrappedType { return IntrinsicJSFragment( parameters: ["isSome", "kind", "payload1", "payload2"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let isSome = arguments[0] let lifted = try jsValueLiftParameter.printCode( [arguments[1], arguments[2], arguments[3]], - scope, - printer, - cleanupCode + context ) let valueExpr = lifted.first ?? "undefined" return ["\(isSome) ? \(valueExpr) : null"] @@ -644,7 +681,8 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["isSome", "wrappedValue"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let isSome = arguments[0] let wrappedValue = arguments[1] let resultExpr: String @@ -728,7 +766,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") try printer.indent { let arrayLiftFragment = try arrayLift(elementType: elementType) - let liftResults = try arrayLiftFragment.printCode([], scope, printer, cleanupCode) + let liftResults = try arrayLiftFragment.printCode([], context) if let liftResult = liftResults.first { printer.write("\(arrayVar) = \(liftResult);") } @@ -745,7 +783,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSome)) {") try printer.indent { let dictLiftFragment = try dictionaryLift(valueType: valueType) - let liftResults = try dictLiftFragment.printCode([], scope, printer, cleanupCode) + let liftResults = try dictLiftFragment.printCode([], context) if let liftResult = liftResults.first { printer.write("\(dictVar) = \(liftResult);") } @@ -768,7 +806,8 @@ struct IntrinsicJSFragment: Sendable { static func optionalLowerParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(value) != null;") @@ -808,7 +847,7 @@ struct IntrinsicJSFragment: Sendable { return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0", "\(isSomeVar) ? \(bytesVar).length : 0"] case .jsValue: - let lowered = try jsValueLower.printCode([value], scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode([value], context) return ["+\(isSomeVar)"] + lowered case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName @@ -839,7 +878,10 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { let arrayLowerFragment = try arrayLower(elementType: elementType) let arrayCleanup = CodeFragmentPrinter() - let _ = try arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + let _ = try arrayLowerFragment.printCode( + [value], + context.with(\.cleanupCode, arrayCleanup) + ) if !arrayCleanup.lines.isEmpty { for line in arrayCleanup.lines { printer.write("\(cleanupArrayVar).push(() => { \(line) });") @@ -856,7 +898,10 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { let dictLowerFragment = try dictionaryLower(valueType: valueType) let dictCleanup = CodeFragmentPrinter() - let _ = try dictLowerFragment.printCode([value], scope, printer, dictCleanup) + let _ = try dictLowerFragment.printCode( + [value], + context.with(\.cleanupCode, dictCleanup) + ) if !dictCleanup.lines.isEmpty { for line in dictCleanup.lines { printer.write("\(cleanupArrayVar).push(() => { \(line) });") @@ -903,9 +948,11 @@ struct IntrinsicJSFragment: Sendable { kind: JSOptionalKind ) -> IntrinsicJSFragment { let absenceLiteral = kind.absenceLiteral + let bridgeContext = context return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("optResult") switch wrappedType { case .bool: @@ -933,7 +980,7 @@ struct IntrinsicJSFragment: Sendable { ) printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;") let constructExpr = - context == .exportSwift + bridgeContext == .exportSwift ? "\(className).__construct(\(pointerVar))" : "_exports['\(className)'].__construct(\(pointerVar))" printer.write( @@ -1007,7 +1054,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") try printer.indent { let arrayLiftFragment = try arrayLift(elementType: elementType) - let liftResults = try arrayLiftFragment.printCode([], scope, printer, cleanupCode) + let liftResults = try arrayLiftFragment.printCode([], context) if let liftResult = liftResults.first { printer.write("\(resultVar) = \(liftResult);") } @@ -1024,7 +1071,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") try printer.indent { let dictLiftFragment = try dictionaryLift(valueType: valueType) - let liftResults = try dictLiftFragment.printCode([], scope, printer, cleanupCode) + let liftResults = try dictLiftFragment.printCode([], context) if let liftResult = liftResults.first { printer.write("\(resultVar) = \(liftResult);") } @@ -1040,7 +1087,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(resultVar);") printer.write("if (\(isSomeVar)) {") try printer.indent { - let lifted = try jsValueLift.printCode([], scope, printer, cleanupCode) + let lifted = try jsValueLift.printCode([], context) if let liftedValue = lifted.first { printer.write("\(resultVar) = \(liftedValue);") } @@ -1068,7 +1115,8 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let isSomeVar = scope.variable("isSome") let presenceExpr = kind.presenceCheck(value: value) @@ -1114,7 +1162,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") case .jsValue: if value != "undefined" { - let lowered = try jsValueLower.printCode([value], scope, printer, cleanupCode) + let lowered = try jsValueLower.printCode([value], context) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -1130,7 +1178,10 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { let arrayLowerFragment = try arrayLower(elementType: elementType) let arrayCleanup = CodeFragmentPrinter() - let _ = try arrayLowerFragment.printCode([value], scope, printer, arrayCleanup) + let _ = try arrayLowerFragment.printCode( + [value], + context.with(\.cleanupCode, arrayCleanup) + ) if !arrayCleanup.lines.isEmpty { for line in arrayCleanup.lines { printer.write(line) @@ -1204,7 +1255,10 @@ struct IntrinsicJSFragment: Sendable { let keyFragment = try stackLowerFragment(elementType: .string) let keyCleanup = CodeFragmentPrinter() - let _ = try keyFragment.printCode([keyVar], scope, printer, keyCleanup) + let _ = try keyFragment.printCode( + [keyVar], + context.with(\.cleanupCode, keyCleanup) + ) if !keyCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -1217,7 +1271,10 @@ struct IntrinsicJSFragment: Sendable { let valueFragment = try stackLowerFragment(elementType: valueType) let valueCleanup = CodeFragmentPrinter() - let _ = try valueFragment.printCode([valueVar], scope, printer, valueCleanup) + let _ = try valueFragment.printCode( + [valueVar], + context.with(\.cleanupCode, valueCleanup) + ) if !valueCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -1268,7 +1325,8 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let value = arguments[0] switch wrappedType { @@ -1299,7 +1357,8 @@ struct IntrinsicJSFragment: Sendable { case .int, .float, .double, .caseEnum: return IntrinsicJSFragment( parameters: ["value", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer printer.write("let \(arguments[1]) = \(arguments[0]);") return [] } @@ -1307,9 +1366,10 @@ struct IntrinsicJSFragment: Sendable { case .bool: return IntrinsicJSFragment( parameters: ["value", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let baseFragment = boolLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], context) printer.write("let \(arguments[1]) = \(lifted[0]);") return [] } @@ -1317,9 +1377,10 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["objectId", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let baseFragment = stringLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], context) printer.write("let \(arguments[1]) = String(\(lifted[0]));") return [] } @@ -1329,9 +1390,10 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["objectId", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let baseFragment = stringLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], context) printer.write("let \(arguments[1]) = String(\(lifted[0]));") return [] } @@ -1339,9 +1401,10 @@ struct IntrinsicJSFragment: Sendable { case .bool: return IntrinsicJSFragment( parameters: ["value", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let baseFragment = boolLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], context) printer.write("let \(arguments[1]) = \(lifted[0]);") return [] } @@ -1349,7 +1412,8 @@ struct IntrinsicJSFragment: Sendable { default: return IntrinsicJSFragment( parameters: ["value", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer printer.write("let \(arguments[1]) = \(arguments[0]);") return [] } @@ -1358,7 +1422,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return IntrinsicJSFragment( parameters: ["objectId", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let objectId = arguments[0] let targetVar = arguments[1] printer.write( @@ -1371,7 +1436,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftHeapObject(let name): return IntrinsicJSFragment( parameters: ["pointer", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let pointer = arguments[0] let targetVar = arguments[1] printer.write("let \(targetVar) = _exports['\(name)'].__construct(\(pointer));") @@ -1381,7 +1447,8 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): return IntrinsicJSFragment( parameters: ["caseId", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let caseId = arguments[0] let targetVar = arguments[1] let base = fullName.components(separatedBy: ".").last ?? fullName @@ -1416,7 +1483,8 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["isSome", "value", "targetVar"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let isSome = arguments[0] let value = arguments[1] let targetVar = arguments[2] @@ -1483,72 +1551,72 @@ struct IntrinsicJSFragment: Sendable { case .void: return IntrinsicJSFragment( parameters: ["result"], - printCode: { _, _, printer, _ in - printer.write("return;") + printCode: { _, context in + context.printer.write("return;") return [] } ) case .int, .caseEnum: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]) | 0;") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]) | 0;") return [] } ) case .bool: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = boolLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) case .float: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return Math.fround(\(arguments[0]));") + printCode: { arguments, context in + context.printer.write("return Math.fround(\(arguments[0]));") return [] } ) case .double: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]);") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]);") return [] } ) case .string: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = stringLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) case .jsObject: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = jsObjectLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) case .swiftHeapObject: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = swiftHeapObjectLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) @@ -1557,28 +1625,28 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = stringLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) case .bool: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = boolLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lowered[0]);") + let lowered = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lowered[0]);") return [] } ) default: return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]) | 0;") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]) | 0;") return [] } ) @@ -1586,7 +1654,8 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let result = arguments[0] let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("caseId") @@ -1610,7 +1679,8 @@ struct IntrinsicJSFragment: Sendable { private static func closureOptionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["result"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let result = arguments[0] switch wrappedType { @@ -1685,7 +1755,8 @@ struct IntrinsicJSFragment: Sendable { case .void: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer printer.write("\(arguments[0]);") printer.write("return;") return [] @@ -1694,55 +1765,56 @@ struct IntrinsicJSFragment: Sendable { case .int, .caseEnum: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]) | 0;") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]) | 0;") return [] } ) case .bool: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let baseFragment = boolLiftReturn - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) - printer.write("return \(lifted[0]);") + let lifted = try baseFragment.printCode([arguments[0]], context) + context.printer.write("return \(lifted[0]);") return [] } ) case .float, .double: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]);") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]);") return [] } ) case .string: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("const resultLen = \(arguments[0]);") + printCode: { arguments, context in + context.printer.write("const resultLen = \(arguments[0]);") let baseFragment = stringLiftReturn - let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) - printer.write("return \(lifted[0]);") + let lifted = try baseFragment.printCode([], context) + context.printer.write("return \(lifted[0]);") return [] } ) case .jsObject: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("const resultId = \(arguments[0]);") + printCode: { arguments, context in + context.printer.write("const resultId = \(arguments[0]);") let baseFragment = jsObjectLiftReturn - let lifted = try baseFragment.printCode(["resultId"], scope, printer, cleanupCode) - printer.write("return \(lifted[0]);") + let lifted = try baseFragment.printCode(["resultId"], context) + context.printer.write("return \(lifted[0]);") return [] } ) case .swiftHeapObject(let className): return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer printer.write("const resultPtr = \(arguments[0]);") printer.write("return _exports['\(className)'].__construct(resultPtr);") return [] @@ -1751,7 +1823,8 @@ struct IntrinsicJSFragment: Sendable { case .closure: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let funcRefVar = scope.variable("swiftClosureFuncRef") printer.write("const \(funcRefVar) = \(arguments[0]);") printer.write( @@ -1767,20 +1840,22 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer printer.write("const resultLen = \(arguments[0]);") let baseFragment = stringLiftReturn - let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) - printer.write("return \(lifted[0]);") + let lifted = try baseFragment.printCode([], context) + context.printer.write("return \(lifted[0]);") return [] } ) case .bool: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let baseFragment = boolLiftReturn - let lifted = try baseFragment.printCode([arguments[0]], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([arguments[0]], context) printer.write("return \(lifted[0]);") return [] } @@ -1788,8 +1863,8 @@ struct IntrinsicJSFragment: Sendable { default: return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in - printer.write("return \(arguments[0]) | 0;") + printCode: { arguments, context in + context.printer.write("return \(arguments[0]) | 0;") return [] } ) @@ -1797,7 +1872,8 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) printer.write("\(arguments[0]);") let base = fullName.components(separatedBy: ".").last ?? fullName let resultVar = scope.variable("result") @@ -1822,7 +1898,8 @@ struct IntrinsicJSFragment: Sendable { ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["invokeCall"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let invokeCall = arguments[0] printer.write("\(invokeCall);") let baseFragment = optionalLiftReturn( @@ -1830,7 +1907,7 @@ struct IntrinsicJSFragment: Sendable { context: .importTS, kind: kind ) - let lifted = try baseFragment.printCode([], scope, printer, cleanupCode) + let lifted = try baseFragment.printCode([], context) if !lifted.isEmpty { printer.write("return \(lifted[0]);") } @@ -1843,7 +1920,8 @@ struct IntrinsicJSFragment: Sendable { static func closureErrorReturn(type: BridgeType) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer switch type { case .void: printer.write("return;") @@ -1914,7 +1992,8 @@ struct IntrinsicJSFragment: Sendable { case .closure: return IntrinsicJSFragment( parameters: ["closure"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let closure = arguments[0] let callbackIdVar = scope.variable("callbackId") printer.write( @@ -1963,7 +2042,7 @@ struct IntrinsicJSFragment: Sendable { case .closure: return IntrinsicJSFragment( parameters: ["funcRef"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let funcRef = arguments[0] return ["\(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRef))"] } @@ -2018,7 +2097,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["caseId"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let caseId = arguments[0] let resultVar = scope.variable("enumValue") printer.write( @@ -2036,7 +2116,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("structValue") printer.write( "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" @@ -2048,7 +2129,7 @@ struct IntrinsicJSFragment: Sendable { case .closure: return IntrinsicJSFragment( parameters: ["funcRef"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in let funcRef = arguments[0] return ["\(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRef))"] } @@ -2108,7 +2189,8 @@ struct IntrinsicJSFragment: Sendable { case .closure: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let printer = context.printer let value = arguments[0] printer.write("if (typeof \(value) !== \"function\") {") printer.indent { @@ -2135,7 +2217,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("cleanup") @@ -2154,7 +2237,8 @@ struct IntrinsicJSFragment: Sendable { static func associatedValueEnumValues(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let printer = context.printer let enumName = arguments[0] printer.write("const \(enumName) = {") @@ -2181,7 +2265,8 @@ struct IntrinsicJSFragment: Sendable { static func associatedValueEnumHelperFactory(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let enumName = arguments[0] printer.write("const __bjs_create\(enumName)Helpers = () => {") @@ -2206,9 +2291,11 @@ struct IntrinsicJSFragment: Sendable { let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) _ = try fragment.printCode( ["value", enumName, caseName], - caseScope, - lowerPrinter, - caseCleanup + IntrinsicJSFragment.PrintCodeContext( + scope: caseScope, + printer: lowerPrinter, + cleanupCode: caseCleanup + ) ) } @@ -2237,7 +2324,14 @@ struct IntrinsicJSFragment: Sendable { let caseCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) - _ = try fragment.printCode([enumName, caseName], caseScope, liftPrinter, caseCleanup) + _ = try fragment.printCode( + [enumName, caseName], + IntrinsicJSFragment.PrintCodeContext( + scope: caseScope, + printer: liftPrinter, + cleanupCode: caseCleanup + ) + ) } for line in liftPrinter.lines { @@ -2264,7 +2358,8 @@ struct IntrinsicJSFragment: Sendable { static func simpleEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let printer = context.printer let enumName = arguments[0] printer.write("const \(enumName) = {") printer.indent { @@ -2288,7 +2383,8 @@ struct IntrinsicJSFragment: Sendable { static func rawValueEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let printer = context.printer let enumName = arguments[0] printer.write("const \(enumName) = {") printer.indent { @@ -2312,7 +2408,8 @@ struct IntrinsicJSFragment: Sendable { private static func associatedValuePushPayload(enumCase: EnumCase) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value", "enumName", "caseName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let enumName = arguments[1] let caseName = arguments[2] @@ -2332,7 +2429,7 @@ struct IntrinsicJSFragment: Sendable { type: associatedValue.type ) - _ = try fragment.printCode(["value.\(prop)"], scope, printer, cleanup) + _ = try fragment.printCode(["value.\(prop)"], context) } if cleanup.lines.isEmpty { @@ -2356,7 +2453,8 @@ struct IntrinsicJSFragment: Sendable { private static func associatedValuePopPayload(enumCase: EnumCase) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName", "caseName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let enumName = arguments[0] let caseName = arguments[1] @@ -2371,7 +2469,7 @@ struct IntrinsicJSFragment: Sendable { let prop = associatedValue.label ?? "param\(associatedValueIndex)" let fragment = try IntrinsicJSFragment.associatedValuePopPayload(type: associatedValue.type) - let result = try fragment.printCode([], scope, casePrinter, cleanup) + let result = try fragment.printCode([], context.with(\.printer, casePrinter)) let varName = result.first ?? "value_\(associatedValueIndex)" fieldPairs.append("\(prop): \(varName)") @@ -2409,7 +2507,8 @@ struct IntrinsicJSFragment: Sendable { ) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") @@ -2568,7 +2667,10 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { let localCleanup = CodeFragmentPrinter() let arrFragment = try arrayLower(elementType: elementType) - _ = try arrFragment.printCode([value], scope, printer, localCleanup) + _ = try arrFragment.printCode( + [value], + context.with(\.cleanupCode, localCleanup) + ) let cleanupLines = localCleanup.lines.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty } @@ -2609,7 +2711,8 @@ struct IntrinsicJSFragment: Sendable { ) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let optVar = scope.variable("optional") let isSomeVar = scope.variable("isSome") @@ -2628,7 +2731,7 @@ struct IntrinsicJSFragment: Sendable { ) } else { let wrappedFragment = try associatedValuePopPayload(type: wrappedType) - let wrappedResults = try wrappedFragment.printCode([], scope, printer, cleanup) + let wrappedResults = try wrappedFragment.printCode([], context) if let wrappedResult = wrappedResults.first { printer.write("\(optVar) = \(wrappedResult);") } else { @@ -2651,7 +2754,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let cleanupVar = scope.variable("cleanup") printer.write( @@ -2666,7 +2770,8 @@ struct IntrinsicJSFragment: Sendable { static func swiftStructLowerParameter(structBase: String) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let cleanupVar = scope.variable("cleanup") printer.write( @@ -2681,7 +2786,8 @@ struct IntrinsicJSFragment: Sendable { static func swiftStructLiftReturn(structBase: String) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("structValue") printer.write( "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();" @@ -2697,7 +2803,8 @@ struct IntrinsicJSFragment: Sendable { static func arrayLower(elementType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["arr"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let arr = arguments[0] let cleanupArrayVar = scope.variable("arrayCleanups") @@ -2707,7 +2814,10 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { let elementFragment = try stackLowerFragment(elementType: elementType) let elementCleanup = CodeFragmentPrinter() - let _ = try elementFragment.printCode([elemVar], scope, printer, elementCleanup) + let _ = try elementFragment.printCode( + [elemVar], + context.with(\.cleanupCode, elementCleanup) + ) if !elementCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2730,7 +2840,8 @@ struct IntrinsicJSFragment: Sendable { static func dictionaryLower(valueType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["dict"], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) let dict = arguments[0] let cleanupArrayVar = scope.variable("arrayCleanups") @@ -2746,7 +2857,10 @@ struct IntrinsicJSFragment: Sendable { let keyFragment = try stackLowerFragment(elementType: .string) let keyCleanup = CodeFragmentPrinter() - let _ = try keyFragment.printCode([keyVar], scope, printer, keyCleanup) + let _ = try keyFragment.printCode( + [keyVar], + context.with(\.cleanupCode, keyCleanup) + ) if !keyCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2759,7 +2873,10 @@ struct IntrinsicJSFragment: Sendable { let valueFragment = try stackLowerFragment(elementType: valueType) let valueCleanup = CodeFragmentPrinter() - let _ = try valueFragment.printCode([valueVar], scope, printer, valueCleanup) + let _ = try valueFragment.printCode( + [valueVar], + context.with(\.cleanupCode, valueCleanup) + ) if !valueCleanup.lines.isEmpty { printer.write("\(cleanupArrayVar).push(() => {") printer.indent { @@ -2782,7 +2899,8 @@ struct IntrinsicJSFragment: Sendable { static func arrayLift(elementType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("arrayResult") let lenVar = scope.variable("arrayLen") let iVar = scope.variable("i") @@ -2792,7 +2910,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") try printer.indent { let elementFragment = try stackLiftFragment(elementType: elementType) - let elementResults = try elementFragment.printCode([], scope, printer, cleanupCode) + let elementResults = try elementFragment.printCode([], context) if let elementExpr = elementResults.first { printer.write("\(resultVar).push(\(elementExpr));") } @@ -2808,7 +2926,8 @@ struct IntrinsicJSFragment: Sendable { static func dictionaryLift(valueType: BridgeType) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanupCode in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("dictResult") let lenVar = scope.variable("dictLen") let iVar = scope.variable("i") @@ -2818,9 +2937,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("for (let \(iVar) = 0; \(iVar) < \(lenVar); \(iVar)++) {") try printer.indent { let valueFragment = try stackLiftFragment(elementType: valueType) - let valueResults = try valueFragment.printCode([], scope, printer, cleanupCode) + let valueResults = try valueFragment.printCode([], context) let keyFragment = try stackLiftFragment(elementType: .string) - let keyResults = try keyFragment.printCode([], scope, printer, cleanupCode) + let keyResults = try keyFragment.printCode([], context) if let keyExpr = keyResults.first, let valueExpr = valueResults.first { printer.write("\(resultVar)[\(keyExpr)] = \(valueExpr);") } @@ -2836,7 +2955,8 @@ struct IntrinsicJSFragment: Sendable { case .jsValue: return IntrinsicJSFragment( parameters: [], - printCode: { _, scope, printer, cleanup in + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) let payload2Var = scope.variable("jsValuePayload2") let payload1Var = scope.variable("jsValuePayload1") let kindVar = scope.variable("jsValueKind") @@ -2854,7 +2974,8 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let strVar = scope.variable("string") printer.write("const \(strVar) = \(scope.popString());") return [strVar] @@ -2863,7 +2984,8 @@ struct IntrinsicJSFragment: Sendable { case .bool: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let bVar = scope.variable("bool") printer.write("const \(bVar) = \(scope.popI32()) !== 0;") return [bVar] @@ -2872,7 +2994,8 @@ struct IntrinsicJSFragment: Sendable { case .int, .uint: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let iVar = scope.variable("int") printer.write("const \(iVar) = \(scope.popI32());") return [iVar] @@ -2881,7 +3004,8 @@ struct IntrinsicJSFragment: Sendable { case .float: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let fVar = scope.variable("f32") printer.write("const \(fVar) = \(scope.popF32());") return [fVar] @@ -2890,7 +3014,8 @@ struct IntrinsicJSFragment: Sendable { case .double: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let dVar = scope.variable("f64") printer.write("const \(dVar) = \(scope.popF64());") return [dVar] @@ -2900,7 +3025,8 @@ struct IntrinsicJSFragment: Sendable { let structBase = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("struct") printer.write( "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lift();" @@ -2911,7 +3037,8 @@ struct IntrinsicJSFragment: Sendable { case .caseEnum: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let varName = scope.variable("caseId") printer.write("const \(varName) = \(scope.popI32());") return [varName] @@ -2922,7 +3049,8 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let varName = scope.variable("rawValue") printer.write("const \(varName) = \(scope.popString());") return [varName] @@ -2931,7 +3059,8 @@ struct IntrinsicJSFragment: Sendable { case .float: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let varName = scope.variable("rawValue") printer.write("const \(varName) = \(scope.popF32());") return [varName] @@ -2940,7 +3069,8 @@ struct IntrinsicJSFragment: Sendable { case .double: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let varName = scope.variable("rawValue") printer.write("const \(varName) = \(scope.popF64());") return [varName] @@ -2949,7 +3079,8 @@ struct IntrinsicJSFragment: Sendable { default: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let varName = scope.variable("rawValue") printer.write("const \(varName) = \(scope.popI32());") return [varName] @@ -2960,7 +3091,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("enumValue") printer.write( "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()), );" @@ -2971,7 +3103,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftHeapObject(let className): return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let ptrVar = scope.variable("ptr") let objVar = scope.variable("obj") printer.write("const \(ptrVar) = \(scope.popPointer());") @@ -2982,7 +3115,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject, .swiftProtocol: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let idVar = scope.variable("objId") let objVar = scope.variable("obj") printer.write("const \(idVar) = \(scope.popI32());") @@ -3000,7 +3134,8 @@ struct IntrinsicJSFragment: Sendable { case .unsafePointer: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let pVar = scope.variable("pointer") printer.write("const \(pVar) = \(scope.popPointer());") return [pVar] @@ -3016,9 +3151,10 @@ struct IntrinsicJSFragment: Sendable { case .jsValue: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) registerJSValueHelpers(scope: scope) - let lowered = try jsValueLower.printCode([arguments[0]], scope, printer, cleanup) + let lowered = try jsValueLower.printCode([arguments[0]], context) let kindVar = lowered[0] let payload1Var = lowered[1] let payload2Var = lowered[2] @@ -3031,7 +3167,8 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") @@ -3046,7 +3183,8 @@ struct IntrinsicJSFragment: Sendable { case .bool: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushI32Parameter("\(arguments[0]) ? 1 : 0", printer: printer) return [] } @@ -3054,7 +3192,8 @@ struct IntrinsicJSFragment: Sendable { case .int, .uint: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } @@ -3062,7 +3201,8 @@ struct IntrinsicJSFragment: Sendable { case .float: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) return [] } @@ -3070,7 +3210,8 @@ struct IntrinsicJSFragment: Sendable { case .double: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushF64Parameter("\(arguments[0])", printer: printer) return [] } @@ -3079,7 +3220,8 @@ struct IntrinsicJSFragment: Sendable { let structBase = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let cleanupVar = scope.variable("structCleanup") printer.write( @@ -3092,7 +3234,8 @@ struct IntrinsicJSFragment: Sendable { case .caseEnum: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } @@ -3102,7 +3245,8 @@ struct IntrinsicJSFragment: Sendable { case .string: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") @@ -3121,7 +3265,8 @@ struct IntrinsicJSFragment: Sendable { case .float: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) return [] } @@ -3129,7 +3274,8 @@ struct IntrinsicJSFragment: Sendable { case .double: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushF64Parameter("\(arguments[0])", printer: printer) return [] } @@ -3137,7 +3283,8 @@ struct IntrinsicJSFragment: Sendable { default: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) return [] } @@ -3147,7 +3294,8 @@ struct IntrinsicJSFragment: Sendable { let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let caseIdVar = scope.variable("caseId") let cleanupVar = scope.variable("enumCleanup") @@ -3162,7 +3310,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftHeapObject: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushPointerParameter("\(arguments[0]).pointer", printer: printer) return [] } @@ -3170,7 +3319,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let idVar = scope.variable("objId") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") @@ -3191,7 +3341,8 @@ struct IntrinsicJSFragment: Sendable { // Same as jsObject but no cleanup — Swift's AnyProtocol wrapper releases via deinit return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let idVar = scope.variable("objId") printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") @@ -3202,7 +3353,8 @@ struct IntrinsicJSFragment: Sendable { case .unsafePointer: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) scope.emitPushPointerParameter("(\(arguments[0]) | 0)", printer: printer) return [] } @@ -3219,7 +3371,8 @@ struct IntrinsicJSFragment: Sendable { let absenceLiteral = kind.absenceLiteral return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let isSomeVar = scope.variable("isSome") let resultVar = scope.variable("optValue") @@ -3232,7 +3385,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("} else {") try printer.indent { let innerFragment = try stackLiftFragment(elementType: wrappedType) - let innerResults = try innerFragment.printCode([], scope, printer, cleanup) + let innerResults = try innerFragment.printCode([], context) if let innerResult = innerResults.first { printer.write("\(resultVar) = \(innerResult);") } else { @@ -3252,7 +3405,8 @@ struct IntrinsicJSFragment: Sendable { ) throws -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let isSomeVar = scope.variable("isSome") @@ -3263,7 +3417,10 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") try printer.indent { let innerFragment = try stackLowerFragment(elementType: wrappedType) - let _ = try innerFragment.printCode([value], scope, printer, localCleanupWriter) + let _ = try innerFragment.printCode( + [value], + context.with(\.cleanupCode, localCleanupWriter) + ) let localCleanupLines = localCleanupWriter.lines.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty } @@ -3303,7 +3460,8 @@ struct IntrinsicJSFragment: Sendable { static func structHelper(structDefinition: ExportedStruct, allStructs: [ExportedStruct]) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["structName"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let printer = context.printer let structName = arguments[0] let capturedStructDef = structDefinition let capturedAllStructs = allStructs @@ -3320,8 +3478,7 @@ struct IntrinsicJSFragment: Sendable { try generateStructLowerCode( structDef: capturedStructDef, allStructs: capturedAllStructs, - scope: scope, - printer: printer + context: context ) } printer.write("},") @@ -3333,8 +3490,7 @@ struct IntrinsicJSFragment: Sendable { try generateStructLiftCode( structDef: capturedStructDef, allStructs: capturedAllStructs, - scope: scope, - printer: printer, + context: context, attachMethods: true ) } @@ -3356,9 +3512,9 @@ struct IntrinsicJSFragment: Sendable { private static func generateStructLowerCode( structDef: ExportedStruct, allStructs: [ExportedStruct], - scope: JSGlueVariableScope, - printer: CodeFragmentPrinter + context: IntrinsicJSFragment.PrintCodeContext ) throws { + let (scope, printer) = (context.scope, context.printer) let lowerPrinter = CodeFragmentPrinter() let lowerScope = scope.makeChildScope() let lowerCleanup = CodeFragmentPrinter() @@ -3368,7 +3524,14 @@ struct IntrinsicJSFragment: Sendable { for property in instanceProps { let fragment = try structFieldLowerFragment(field: property, allStructs: allStructs) let fieldValue = "value.\(property.name)" - _ = try fragment.printCode([fieldValue], lowerScope, lowerPrinter, lowerCleanup) + _ = try fragment.printCode( + [fieldValue], + IntrinsicJSFragment.PrintCodeContext( + scope: lowerScope, + printer: lowerPrinter, + cleanupCode: lowerCleanup, + ) + ) } for line in lowerPrinter.lines { @@ -3388,19 +3551,18 @@ struct IntrinsicJSFragment: Sendable { private static func generateStructLiftCode( structDef: ExportedStruct, allStructs: [ExportedStruct], - scope: JSGlueVariableScope, - printer: CodeFragmentPrinter, + context: IntrinsicJSFragment.PrintCodeContext, attachMethods: Bool = false ) throws { - let liftScope = scope.makeChildScope() - let liftCleanup = CodeFragmentPrinter() + let (scope, printer) = (context.scope, context.printer) + let liftScope = context.scope.makeChildScope() var fieldExpressions: [(name: String, expression: String)] = [] let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps.reversed() { let fragment = try structFieldLiftFragment(field: property, allStructs: allStructs) - let results = try fragment.printCode([], liftScope, printer, liftCleanup) + let results = try fragment.printCode([], context) if let resultExpr = results.first { fieldExpressions.append((property.name, resultExpr)) @@ -3437,7 +3599,7 @@ struct IntrinsicJSFragment: Sendable { var paramForwardings: [String] = [] for param in method.parameters { let fragment = try IntrinsicJSFragment.lowerParameter(type: param.type) - let loweredValues = try fragment.printCode([param.name], methodScope, printer, methodCleanup) + let loweredValues = try fragment.printCode([param.name], context) paramForwardings.append(contentsOf: loweredValues) } @@ -3456,7 +3618,7 @@ struct IntrinsicJSFragment: Sendable { if method.returnType != .void { let liftFragment = try IntrinsicJSFragment.liftReturn(type: method.returnType) let liftArgs = liftFragment.parameters.isEmpty ? [] : ["ret"] - let lifted = try liftFragment.printCode(liftArgs, methodScope, printer, methodCleanup) + let lifted = try liftFragment.printCode(liftArgs, context) if let liftedValue = lifted.first { printer.write("return \(liftedValue);") } @@ -3481,7 +3643,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let idVar = scope.variable("id") printer.write("let \(idVar);") @@ -3511,7 +3674,8 @@ struct IntrinsicJSFragment: Sendable { case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") @@ -3749,7 +3913,10 @@ struct IntrinsicJSFragment: Sendable { ) let guardedPrinter = CodeFragmentPrinter() let guardedCleanup = CodeFragmentPrinter() - _ = try wrappedFragment.printCode([value], scope, guardedPrinter, guardedCleanup) + _ = try wrappedFragment.printCode( + [value], + context.with(\.printer, guardedPrinter).with(\.cleanupCode, guardedCleanup) + ) var loweredLines = guardedPrinter.lines var hoistedCleanupVar: String? if let first = loweredLines.first { @@ -3788,13 +3955,14 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let nestedName): return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let structResultVar = scope.variable("structResult") printer.write( "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lower(\(value));" ) - cleanup.write("if (\(structResultVar).cleanup) { \(structResultVar).cleanup(); }") + context.cleanupCode.write("if (\(structResultVar).cleanup) { \(structResultVar).cleanup(); }") return [] } ) @@ -3802,8 +3970,10 @@ struct IntrinsicJSFragment: Sendable { // These types should not appear as struct fields - return error fragment return IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, scope, printer, cleanup in - printer.write("throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");") + printCode: { arguments, context in + context.printer.write( + "throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");" + ) return [] } ) @@ -3867,7 +4037,8 @@ struct IntrinsicJSFragment: Sendable { case .nullable(let wrappedType, let kind): return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let isSomeVar = scope.variable("isSome") let optVar = scope.variable("optional") printer.write("const \(isSomeVar) = \(scope.popI32());") @@ -3892,7 +4063,7 @@ struct IntrinsicJSFragment: Sendable { ), allStructs: allStructs ) - let wrappedResults = try wrappedFragment.printCode([], scope, printer, cleanup) + let wrappedResults = try wrappedFragment.printCode([], context) if let wrappedResult = wrappedResults.first { printer.write("\(optVar) = \(wrappedResult);") } else { @@ -3911,7 +4082,8 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let nestedName): return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let structVar = scope.variable("struct") printer.write( "const \(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lift();" @@ -3922,7 +4094,8 @@ struct IntrinsicJSFragment: Sendable { case .jsObject: return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) let objectIdVar = scope.variable("objectId") let varName = scope.variable("value") printer.write("const \(objectIdVar) = \(scope.popI32());") @@ -3946,8 +4119,8 @@ struct IntrinsicJSFragment: Sendable { // These types should not appear as struct fields return IntrinsicJSFragment( parameters: [], - printCode: { arguments, scope, printer, cleanup in - printer.write("throw new Error(\"Unsupported struct field type: \(field.type)\");") + printCode: { arguments, context in + context.printer.write("throw new Error(\"Unsupported struct field type: \(field.type)\");") return [] } ) From 00d196786e464adf83ff0140bef1e7625e6d0348 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 21:33:10 +0900 Subject: [PATCH 187/252] BridgeJS: Fix unused variable warnings in JSGlueGen.swift --- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index c60cc2dbf..915ca2ea5 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2409,7 +2409,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value", "enumName", "caseName"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (printer, cleanup) = (context.printer, context.cleanupCode) let enumName = arguments[1] let caseName = arguments[2] @@ -2454,7 +2454,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["enumName", "caseName"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let printer = context.printer let enumName = arguments[0] let caseName = arguments[1] @@ -2712,7 +2712,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: [], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let optVar = scope.variable("optional") let isSomeVar = scope.variable("isSome") @@ -3152,7 +3152,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) registerJSValueHelpers(scope: scope) let lowered = try jsValueLower.printCode([arguments[0]], context) let kindVar = lowered[0] @@ -3372,7 +3372,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: [], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let isSomeVar = scope.variable("isSome") let resultVar = scope.variable("optValue") From f6959e04e88304826a6c4033b6122a81113dc5dd Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 21:52:42 +0900 Subject: [PATCH 188/252] BridgeJS: Reduce `PrintCodeContext` construction usage --- .../Sources/BridgeJSLink/JSGlueGen.swift | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 915ca2ea5..4ec7f3f55 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2291,11 +2291,7 @@ struct IntrinsicJSFragment: Sendable { let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) _ = try fragment.printCode( ["value", enumName, caseName], - IntrinsicJSFragment.PrintCodeContext( - scope: caseScope, - printer: lowerPrinter, - cleanupCode: caseCleanup - ) + context.with(\.scope, caseScope).with(\.printer, lowerPrinter).with(\.cleanupCode, caseCleanup) ) } @@ -2326,11 +2322,7 @@ struct IntrinsicJSFragment: Sendable { let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) _ = try fragment.printCode( [enumName, caseName], - IntrinsicJSFragment.PrintCodeContext( - scope: caseScope, - printer: liftPrinter, - cleanupCode: caseCleanup - ) + context.with(\.scope, caseScope).with(\.printer, liftPrinter).with(\.cleanupCode, caseCleanup) ) } @@ -3526,11 +3518,7 @@ struct IntrinsicJSFragment: Sendable { let fieldValue = "value.\(property.name)" _ = try fragment.printCode( [fieldValue], - IntrinsicJSFragment.PrintCodeContext( - scope: lowerScope, - printer: lowerPrinter, - cleanupCode: lowerCleanup, - ) + context.with(\.scope, lowerScope).with(\.printer, lowerPrinter).with(\.cleanupCode, lowerCleanup) ) } From cb45962b14993cc0963cf090c11e191c22fbdd86 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 9 Feb 2026 21:53:31 +0900 Subject: [PATCH 189/252] ./Utilities/format.swift --- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 4ec7f3f55..510a361ff 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -2291,7 +2291,10 @@ struct IntrinsicJSFragment: Sendable { let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) _ = try fragment.printCode( ["value", enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, lowerPrinter).with(\.cleanupCode, caseCleanup) + context.with(\.scope, caseScope).with(\.printer, lowerPrinter).with( + \.cleanupCode, + caseCleanup + ) ) } @@ -2322,7 +2325,10 @@ struct IntrinsicJSFragment: Sendable { let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) _ = try fragment.printCode( [enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, liftPrinter).with(\.cleanupCode, caseCleanup) + context.with(\.scope, caseScope).with(\.printer, liftPrinter).with( + \.cleanupCode, + caseCleanup + ) ) } From f90d9183f24189fbe5c1bfa5afa87693a5d03f67 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 8 Feb 2026 10:45:07 +0900 Subject: [PATCH 190/252] BridgeJS: Unify closure JS glue lift/lower --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 122 +--- .../Sources/BridgeJSLink/JSGlueGen.swift | 624 +----------------- .../BridgeJSLinkTests/SwiftClosure.js | 506 ++++++-------- .../BridgeJSLinkTests/SwiftClosureImports.js | 18 +- 4 files changed, 251 insertions(+), 1019 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 7e6ce9b55..2c800ef0b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -716,71 +716,25 @@ public struct BridgeJSLink { signature: ClosureSignature, functionName: String ) throws -> [String] { - let printer = CodeFragmentPrinter() - let context = IntrinsicJSFragment.PrintCodeContext( - scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry), - printer: printer, - cleanupCode: CodeFragmentPrinter() - ) + let thunkBuilder = ImportedThunkBuilder(context: .exportSwift, intrinsicRegistry: intrinsicRegistry) + thunkBuilder.parameterNames.append("callbackId") + thunkBuilder.body.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);") - // Build parameter list for invoke function - var invokeParams: [String] = ["callbackId"] for (index, paramType) in signature.parameters.enumerated() { - if case .nullable = paramType { - invokeParams.append("param\(index)IsSome") - invokeParams.append("param\(index)Value") - } else { - invokeParams.append("param\(index)Id") - } + let paramName = "param\(index)" + try thunkBuilder.liftParameter(param: Parameter(label: nil, name: paramName, type: paramType)) } - printer.nextLine() - printer.write("bjs[\"\(functionName)\"] = function(\(invokeParams.joined(separator: ", "))) {") - try printer.indent { - printer.write("try {") - try printer.indent { - printer.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);") + let returnExpr = try thunkBuilder.call(calleeExpr: "callback", returnType: signature.returnType) - for (index, paramType) in signature.parameters.enumerated() { - let fragment = try IntrinsicJSFragment.closureLiftParameter(type: paramType) - let args: [String] - if case .nullable = paramType { - args = ["param\(index)IsSome", "param\(index)Value", "param\(index)"] - } else { - args = ["param\(index)Id", "param\(index)"] - } - _ = try fragment.printCode(args, context) - } - - let callbackParams = signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ") - printer.write("const result = callback(\(callbackParams));") - - // Type check if needed (for example, formatName requires string return) - switch signature.returnType { - case .string: - printer.write("if (typeof result !== \"string\") {") - printer.indent { - printer.write("throw new TypeError(\"Callback must return a string\");") - } - printer.write("}") - default: - break - } - - let returnFragment = try IntrinsicJSFragment.closureLowerReturn(type: signature.returnType) - _ = try returnFragment.printCode(["result"], context) - } - printer.write("} catch (error) {") - try printer.indent { - printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);") - let errorFragment = IntrinsicJSFragment.closureErrorReturn(type: signature.returnType) - _ = try errorFragment.printCode([], context) - } - printer.write("}") - } - printer.write("};") + var functionLines = thunkBuilder.renderFunction( + name: nil, + returnExpr: returnExpr, + returnType: signature.returnType + ) + functionLines[0] = "bjs[\"\(functionName)\"] = " + functionLines[0] - return printer.lines + return functionLines } /// Generates a lower_closure_* function that wraps a Swift closure for JavaScript @@ -789,46 +743,27 @@ public struct BridgeJSLink { functionName: String ) throws -> [String] { let printer = CodeFragmentPrinter() - let context = IntrinsicJSFragment.PrintCodeContext( - scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry), - printer: printer, - cleanupCode: CodeFragmentPrinter() + let builder = ExportedThunkBuilder( + effects: Effects(isAsync: false, isThrows: true), + hasDirectAccessToSwiftClass: false, + intrinsicRegistry: intrinsicRegistry ) + builder.parameterForwardings.append("boxPtr") printer.write( "const \(functionName) = function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {" ) try printer.indent { - var invokeArgs: [String] = ["boxPtr"] - + // Lower parameters using shared thunk builder for (index, paramType) in signature.parameters.enumerated() { let paramName = "param\(index)" - let fragment = try IntrinsicJSFragment.lowerParameter(type: paramType) - let lowered = try fragment.printCode([paramName], context) - invokeArgs.append(contentsOf: lowered) + try builder.lowerParameter(param: Parameter(label: nil, name: paramName, type: paramType)) } - // Call the Swift invoke function let invokeCall = - "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))" - let invokeResultName = "invokeResult" - printer.write("const \(invokeResultName) = \(invokeCall);") - - printer.write("if (\(JSGlueVariableScope.reservedStorageToReturnException)) {") - printer.indent { - printer.write( - "const error = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(JSGlueVariableScope.reservedStorageToReturnException));" - ) - printer.write( - "\(JSGlueVariableScope.reservedSwift).memory.release(\(JSGlueVariableScope.reservedStorageToReturnException));" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnException) = undefined;") - printer.write("throw error;") - } - printer.write("}") - - let returnFragment = try IntrinsicJSFragment.closureLiftReturn(type: signature.returnType) - _ = try returnFragment.printCode([invokeResultName], context) + "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" + let returnExpr = try builder.call(abiName: invokeCall, returnType: signature.returnType) + builder.renderFunctionBody(into: printer, returnExpr: returnExpr) } printer.write("};") @@ -1291,7 +1226,7 @@ public struct BridgeJSLink { let scope: JSGlueVariableScope let context: IntrinsicJSFragment.PrintCodeContext - init(effects: Effects, intrinsicRegistry: JSIntrinsicRegistry) { + init(effects: Effects, hasDirectAccessToSwiftClass: Bool = true, intrinsicRegistry: JSIntrinsicRegistry) { self.effects = effects self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.body = CodeFragmentPrinter() @@ -1299,7 +1234,8 @@ public struct BridgeJSLink { self.context = IntrinsicJSFragment.PrintCodeContext( scope: scope, printer: body, - cleanupCode: cleanupCode + cleanupCode: cleanupCode, + hasDirectAccessToSwiftClass: hasDirectAccessToSwiftClass ) } @@ -2221,13 +2157,13 @@ extension BridgeJSLink { } func renderFunction( - name: String, + name: String?, returnExpr: String?, returnType: BridgeType ) -> [String] { let printer = CodeFragmentPrinter() - printer.write("function \(name)(\(parameterNames.joined(separator: ", "))) {") + printer.write("function\(name.map { " \($0)" } ?? "")(\(parameterNames.joined(separator: ", "))) {") printer.indent { printer.write("try {") printer.indent { @@ -2259,7 +2195,7 @@ extension BridgeJSLink { return try call(name: name, fromObjectExpr: "imports", returnType: returnType) } - private func call(calleeExpr: String, returnType: BridgeType) throws -> String? { + func call(calleeExpr: String, returnType: BridgeType) throws -> String? { let callExpr = "\(calleeExpr)(\(parameterForwardings.joined(separator: ", ")))" return try self.call(callExpr: callExpr, returnType: returnType) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 510a361ff..9f1eddfdd 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -154,6 +154,9 @@ struct IntrinsicJSFragment: Sendable { var printer: CodeFragmentPrinter /// The printer to print the code that is expected to be executed at the end of the caller of the fragment. var cleanupCode: CodeFragmentPrinter + /// Whether the fragment has direct access to the SwiftHeapObject classes. + /// If false, the fragment needs to use `_exports[""]` to access the class. + var hasDirectAccessToSwiftClass: Bool = true func with(_ keyPath: WritableKeyPath, _ value: T) -> PrintCodeContext { var new = self @@ -613,7 +616,9 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - return ["\(name).__construct(\(arguments[0]))"] + return [ + "\(context.hasDirectAccessToSwiftClass ? name : "_exports['\(name)']").__construct(\(arguments[0]))" + ] } ) } @@ -944,11 +949,9 @@ struct IntrinsicJSFragment: Sendable { static func optionalLiftReturn( wrappedType: BridgeType, - context: BridgeContext = .exportSwift, kind: JSOptionalKind ) -> IntrinsicJSFragment { let absenceLiteral = kind.absenceLiteral - let bridgeContext = context return IntrinsicJSFragment( parameters: [], printCode: { arguments, context in @@ -980,7 +983,7 @@ struct IntrinsicJSFragment: Sendable { ) printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;") let constructExpr = - bridgeContext == .exportSwift + context.hasDirectAccessToSwiftClass ? "\(className).__construct(\(pointerVar))" : "_exports['\(className)'].__construct(\(pointerVar))" printer.write( @@ -1349,619 +1352,6 @@ struct IntrinsicJSFragment: Sendable { ) } - // MARK: - Closure Support - - /// Lifts a WASM parameter to JS for passing to a JS callback (invoke_js_callback_*) - static func closureLiftParameter(type: BridgeType) throws -> IntrinsicJSFragment { - switch type { - case .int, .float, .double, .caseEnum: - return IntrinsicJSFragment( - parameters: ["value", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - printer.write("let \(arguments[1]) = \(arguments[0]);") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["value", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let baseFragment = boolLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], context) - printer.write("let \(arguments[1]) = \(lifted[0]);") - return [] - } - ) - case .string: - return IntrinsicJSFragment( - parameters: ["objectId", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let baseFragment = stringLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], context) - printer.write("let \(arguments[1]) = String(\(lifted[0]));") - return [] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: ["objectId", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let baseFragment = stringLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], context) - printer.write("let \(arguments[1]) = String(\(lifted[0]));") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["value", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let baseFragment = boolLiftParameter - let lifted = try baseFragment.printCode([arguments[0]], context) - printer.write("let \(arguments[1]) = \(lifted[0]);") - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: ["value", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - printer.write("let \(arguments[1]) = \(arguments[0]);") - return [] - } - ) - } - case .jsObject: - return IntrinsicJSFragment( - parameters: ["objectId", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let objectId = arguments[0] - let targetVar = arguments[1] - printer.write( - "let \(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") - return [] - } - ) - case .swiftHeapObject(let name): - return IntrinsicJSFragment( - parameters: ["pointer", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let pointer = arguments[0] - let targetVar = arguments[1] - printer.write("let \(targetVar) = _exports['\(name)'].__construct(\(pointer));") - return [] - } - ) - case .associatedValueEnum(let fullName): - return IntrinsicJSFragment( - parameters: ["caseId", "targetVar"], - printCode: { arguments, context in - let printer = context.printer - let caseId = arguments[0] - let targetVar = arguments[1] - let base = fullName.components(separatedBy: ".").last ?? fullName - printer.write( - "let \(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseId));" - ) - return [] - } - ) - case .nullable(let wrappedType, let kind): - return try closureOptionalLiftParameter(wrappedType: wrappedType, kind: kind) - default: - throw BridgeJSLinkError(message: "Unsupported closure parameter type for lifting: \(type)") - } - } - - /// Handles optional parameter lifting for closure invocation. - private static func closureOptionalLiftParameter( - wrappedType: BridgeType, - kind: JSOptionalKind - ) throws -> IntrinsicJSFragment { - let absenceLiteral = kind.absenceLiteral - switch wrappedType { - case .string, .rawValueEnum, .int, .bool, .double, .float, .jsObject, .swiftHeapObject, .caseEnum, - .associatedValueEnum, .closure: - break - default: - throw BridgeJSLinkError( - message: "Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)" - ) - } - - return IntrinsicJSFragment( - parameters: ["isSome", "value", "targetVar"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let isSome = arguments[0] - let value = arguments[1] - let targetVar = arguments[2] - - printer.write("let \(targetVar);") - printer.write("if (\(isSome)) {") - printer.indent() - switch wrappedType { - case .string, .rawValueEnum(_, .string): - let objectLabel = scope.variable("\(targetVar)Object") - printer.write( - "const \(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") - printer.write("\(targetVar) = String(\(objectLabel));") - case .int, .uint: - printer.write("\(targetVar) = \(value) | 0;") - case .bool: - printer.write("\(targetVar) = \(value) !== 0;") - case .double: - printer.write("\(targetVar) = \(value);") - case .float: - printer.write("\(targetVar) = Math.fround(\(value));") - case .jsObject: - printer.write("\(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));") - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") - case .swiftHeapObject(let typeName): - printer.write("\(targetVar) = _exports['\(typeName)'].__construct(\(value));") - case .caseEnum: - printer.write("\(targetVar) = \(value);") - case .rawValueEnum(_, let rawType): - switch rawType { - case .bool: - printer.write("\(targetVar) = \(value) !== 0;") - default: - printer.write("\(targetVar) = \(value);") - } - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - printer.write( - "\(targetVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(value));" - ) - case .closure: - printer.write("\(targetVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(value));") - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(value));") - default: - fatalError("Unsupported optional wrapped type in closure parameter lifting: \(wrappedType)") - } - printer.unindent() - printer.write("} else {") - printer.indent() - printer.write("\(targetVar) = \(absenceLiteral);") - printer.unindent() - printer.write("}") - - return [] - } - ) - } - - /// Lowers a JS return value to WASM for returning from callback (invoke_js_callback_*) - static func closureLowerReturn(type: BridgeType) throws -> IntrinsicJSFragment { - switch type { - case .void: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { _, context in - context.printer.write("return;") - return [] - } - ) - case .int, .caseEnum: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]) | 0;") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = boolLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - context.printer.write("return Math.fround(\(arguments[0]));") - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]);") - return [] - } - ) - case .string: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = stringLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - case .jsObject: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = jsObjectLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - case .swiftHeapObject: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = swiftHeapObjectLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = stringLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let baseFragment = boolLowerReturn - let lowered = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lowered[0]);") - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]) | 0;") - return [] - } - ) - } - case .associatedValueEnum(let fullName): - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) - let result = arguments[0] - let base = fullName.components(separatedBy: ".").last ?? fullName - let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("cleanup") - printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(result));" - ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - printer.write("return \(caseIdVar);") - return [] - } - ) - case .nullable(let wrappedType, _): - return try closureOptionalLowerReturn(wrappedType: wrappedType) - default: - throw BridgeJSLinkError(message: "Unsupported closure return type for lowering: \(type)") - } - } - - /// Handles optional return lowering for closure invocation - private static func closureOptionalLowerReturn(wrappedType: BridgeType) throws -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: ["result"], - printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) - let result = arguments[0] - - switch wrappedType { - case .swiftHeapObject: - printer.write("return \(result) ? \(result).pointer : 0;") - case .string: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(result);") - printer.write("return;") - case .int, .uint: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") - printer.write("return;") - case .bool: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = \(result);") - printer.write("return;") - case .float: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(result);") - printer.write("return;") - case .double: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(result);") - printer.write("return;") - case .caseEnum: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") - printer.write("return;") - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(result);") - printer.write("return;") - case .bool: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = \(result);") - printer.write("return;") - case .float: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(result);") - printer.write("return;") - case .double: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(result);") - printer.write("return;") - default: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(result);") - printer.write("return;") - } - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("cleanup") - printer.write("if (\(result)) {") - printer.indent() - printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(result));" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(caseIdVar);") - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - printer.unindent() - printer.write("} else {") - printer.indent() - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = null;") - printer.unindent() - printer.write("}") - printer.write("return;") - default: - fatalError("Unsupported optional wrapped type in closure return lowering: \(wrappedType)") - } - - return [] - } - ) - } - - /// Lifts a WASM return value to JS from Swift closure (lower_closure_*) - static func closureLiftReturn(type: BridgeType) throws -> IntrinsicJSFragment { - switch type { - case .void: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let printer = context.printer - printer.write("\(arguments[0]);") - printer.write("return;") - return [] - } - ) - case .int, .caseEnum: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]) | 0;") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let baseFragment = boolLiftReturn - let lifted = try baseFragment.printCode([arguments[0]], context) - context.printer.write("return \(lifted[0]);") - return [] - } - ) - case .float, .double: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]);") - return [] - } - ) - case .string: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - context.printer.write("const resultLen = \(arguments[0]);") - let baseFragment = stringLiftReturn - let lifted = try baseFragment.printCode([], context) - context.printer.write("return \(lifted[0]);") - return [] - } - ) - case .jsObject: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - context.printer.write("const resultId = \(arguments[0]);") - let baseFragment = jsObjectLiftReturn - let lifted = try baseFragment.printCode(["resultId"], context) - context.printer.write("return \(lifted[0]);") - return [] - } - ) - case .swiftHeapObject(let className): - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let printer = context.printer - printer.write("const resultPtr = \(arguments[0]);") - printer.write("return _exports['\(className)'].__construct(resultPtr);") - return [] - } - ) - case .closure: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let funcRefVar = scope.variable("swiftClosureFuncRef") - printer.write("const \(funcRefVar) = \(arguments[0]);") - printer.write( - "const funcObj = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(funcRefVar));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(funcRefVar));") - printer.write("return funcObj;") - return [] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let printer = context.printer - printer.write("const resultLen = \(arguments[0]);") - let baseFragment = stringLiftReturn - let lifted = try baseFragment.printCode([], context) - context.printer.write("return \(lifted[0]);") - return [] - } - ) - case .bool: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let printer = context.printer - let baseFragment = boolLiftReturn - let lifted = try baseFragment.printCode([arguments[0]], context) - printer.write("return \(lifted[0]);") - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - context.printer.write("return \(arguments[0]) | 0;") - return [] - } - ) - } - case .associatedValueEnum(let fullName): - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - printer.write("\(arguments[0]);") - let base = fullName.components(separatedBy: ".").last ?? fullName - let resultVar = scope.variable("result") - printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()));" - ) - printer.write("return \(resultVar);") - return [] - } - ) - case .nullable(let wrappedType, let kind): - return try closureOptionalLiftReturn(wrappedType: wrappedType, kind: kind) - default: - throw BridgeJSLinkError(message: "Unsupported closure return type for lifting: \(type)") - } - } - - /// Handles optional return lifting for Swift closure returns - private static func closureOptionalLiftReturn( - wrappedType: BridgeType, - kind: JSOptionalKind - ) throws -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: ["invokeCall"], - printCode: { arguments, context in - let printer = context.printer - let invokeCall = arguments[0] - printer.write("\(invokeCall);") - let baseFragment = optionalLiftReturn( - wrappedType: wrappedType, - context: .importTS, - kind: kind - ) - let lifted = try baseFragment.printCode([], context) - if !lifted.isEmpty { - printer.write("return \(lifted[0]);") - } - return [] - } - ) - } - - /// Provides appropriate default values for error cases in closure invocation - static func closureErrorReturn(type: BridgeType) -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let printer = context.printer - switch type { - case .void: - printer.write("return;") - case .string: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = new Uint8Array(0);") - printer.write("return 0;") - case .int, .bool, .caseEnum: - printer.write("return 0;") - case .float, .double: - printer.write("return 0.0;") - case .jsObject, .swiftHeapObject: - printer.write("return 0;") - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = new Uint8Array(0);") - printer.write("return 0;") - case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: - printer.write("return 0;") - case .float, .double: - printer.write("return 0.0;") - } - case .associatedValueEnum: - printer.write("return;") - case .nullable(let wrappedType, _): - switch wrappedType { - case .swiftHeapObject: - printer.write("return 0;") - default: - printer.write("return;") - } - default: - printer.write("return 0;") - } - - return [] - } - ) - } - // MARK: - ExportSwift /// Returns a fragment that lowers a JS value to Wasm core values for parameters diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 09f9aee59..2ef9aaf5a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -328,337 +328,299 @@ export async function createInstantiator(options, swift) { const func = swift.memory.getObject(funcRef); func.__unregister(); } - - bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return result | 0; + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult | 0; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO); } - - bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); - const result = callback(param0); - tmpRetBytes = textEncoder.encode(result); + const param0Object = swift.memory.getObject(param0); + swift.memory.release(param0); + let ret = callback(param0Object); + tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { - setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule5ThemeO_5ThemeO = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); + instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(param0Id); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_5ThemeO); } - - bjs["invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = _exports['Person'].__construct(param0Id); - const result = callback(param0); - return result.pointer; + let ret = callback(_exports['Person'].__construct(param0)); + return ret.pointer; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModule6PersonC_6PersonC"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule6PersonC_6PersonC = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(boxPtr, param0.pointer); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(boxPtr, param0.pointer); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultPtr = invokeResult; - return _exports['Person'].__construct(resultPtr); + return _exports['Person'].__construct(ret); }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6PersonC_6PersonC); } - - bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = enumHelpers.APIResult.lift(param0Id); - const result = callback(param0); - const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(result); + const enumValue = enumHelpers.APIResult.lift(param0); + let ret = callback(enumValue); + const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(ret); return caseId; } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); + instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); + const ret = enumHelpers.APIResult.lift(tagStack.pop()); + if (param0Cleanup) { param0Cleanup(); } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const result = enumHelpers.APIResult.lift(tagStack.pop()); - return result; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_9APIResultO); } - - bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return result | 0; + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule9DirectionO_9DirectionO = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult | 0; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_9DirectionO); } - - bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - const param0IdObject = swift.memory.getObject(param0Id); - swift.memory.release(param0Id); - let param0 = String(param0IdObject); - const result = callback(param0); - if (typeof result !== "string") { - throw new TypeError("Callback must return a string"); - } - tmpRetBytes = textEncoder.encode(result); + const param0Object = swift.memory.getObject(param0); + swift.memory.release(param0); + let ret = callback(param0Object); + tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; } catch (error) { - setException?.(error); - tmpRetBytes = new Uint8Array(0); - return 0; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSS_SS = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); + const ret = tmpRetString; + tmpRetString = undefined; + swift.memory.release(param0Id); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - const resultLen = invokeResult; - const ret = tmpRetString; - tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); } - - bjs["invoke_js_callback_TestModule_10TestModuleSb_Sb"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSb_Sb"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id !== 0; - const result = callback(param0); - return result ? 1 : 0; + let ret = callback(param0 !== 0); + return ret ? 1 : 0; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSb_Sb"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSb_Sb = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSb_Sb(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleSb_Sb(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult !== 0; + return ret !== 0; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSb_Sb); } - - bjs["invoke_js_callback_TestModule_10TestModuleSd_Sd"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSd_Sd"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return result; + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0.0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSd_Sd"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSd_Sd = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSd_Sd(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleSd_Sd(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSd_Sd); } - - bjs["invoke_js_callback_TestModule_10TestModuleSf_Sf"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSf_Sf"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return Math.fround(result); + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0.0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSf_Sf"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSf_Sf = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSf_Sf(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleSf_Sf(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSf_Sf); } - - bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return result | 0; + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSi_Si"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSi_Si = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult | 0; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si); } - - bjs["invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value; - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalInt = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO); } - - bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; + let obj; if (param0IsSome) { - const param0Object = swift.memory.getObject(param0Value); - swift.memory.release(param0Value); - param0 = String(param0Object); + obj = swift.memory.getObject(param0WrappedValue); + swift.memory.release(param0WrappedValue); + } + let ret = callback(param0IsSome ? obj : null); + const isSome = ret != null; + if (isSome) { + tmpRetString = ret; } else { - param0 = null; + tmpRetString = null; } - const result = callback(param0); - tmpRetString = result; - return; } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO = function(param0) { const isSome = param0 != null; @@ -667,78 +629,68 @@ export async function createInstantiator(options, swift) { param0Bytes = textEncoder.encode(param0); param0Id = swift.memory.retain(param0Bytes); } - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + const optResult = tmpRetString; + tmpRetString = undefined; + if (param0Id != undefined) { + swift.memory.release(param0Id); + } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetString; - tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO); } - - bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = _exports['Person'].__construct(param0Value); - } else { - param0 = null; - } - const result = callback(param0); - return result ? result.pointer : 0; + let ret = callback(param0IsSome ? _exports['Person'].__construct(param0WrappedValue) : null); + const isSome = ret != null; + return isSome ? ret.pointer : 0; } catch (error) { - setException?.(error); - return 0; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, isSome ? param0.pointer : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, isSome ? param0.pointer : 0); + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC); } - - bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; + let enumValue; if (param0IsSome) { - param0 = enumHelpers.APIResult.lift(param0Value); - } else { - param0 = null; + enumValue = enumHelpers.APIResult.lift(param0WrappedValue); } - const result = callback(param0); - if (result) { - const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(result); - tmpRetOptionalInt = caseId; + let ret = callback(param0IsSome ? enumValue : null); + const isSome = ret != null; + if (isSome) { + const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(ret); + return caseId; } else { - tmpRetOptionalInt = null; + return -1; } - return; } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO = function(param0) { const isSome = param0 != null; @@ -748,14 +700,7 @@ export async function createInstantiator(options, swift) { param0CaseId = enumResult.caseId; param0Cleanup = enumResult.cleanup; } - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); - if (tmpRetException) { - const error = swift.memory.getObject(tmpRetException); - swift.memory.release(tmpRetException); - tmpRetException = undefined; - throw error; - } - invokeResult; + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); const tag = tagStack.pop(); const isNull = (tag === -1); let optResult; @@ -764,65 +709,62 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.APIResult.lift(tag); } + if (param0Cleanup) { param0Cleanup(); } + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO); } - - bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value; - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalInt = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue : null); + const isSome = ret != null; + return isSome ? (ret | 0) : -1; } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO); } - - bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; + let obj; if (param0IsSome) { - const param0Object = swift.memory.getObject(param0Value); - swift.memory.release(param0Value); - param0 = String(param0Object); + obj = swift.memory.getObject(param0WrappedValue); + swift.memory.release(param0WrappedValue); + } + let ret = callback(param0IsSome ? obj : null); + const isSome = ret != null; + if (isSome) { + tmpRetString = ret; } else { - param0 = null; + tmpRetString = null; } - const result = callback(param0); - tmpRetString = result; - return; } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSqSS_SqSS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSS_SqSS = function(param0) { const isSome = param0 != null; @@ -831,156 +773,122 @@ export async function createInstantiator(options, swift) { param0Bytes = textEncoder.encode(param0); param0Id = swift.memory.retain(param0Bytes); } - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + const optResult = tmpRetString; + tmpRetString = undefined; + if (param0Id != undefined) { + swift.memory.release(param0Id); + } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetString; - tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSS_SqSS); } - - bjs["invoke_js_callback_TestModule_10TestModuleSqSb_SqSb"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSb_SqSb"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value !== 0; - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalBool = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue !== 0 : null); + const isSome = ret != null; + bjs["swift_js_return_optional_bool"](isSome ? 1 : 0, isSome ? (ret ? 1 : 0) : 0); } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSqSb_SqSb"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSb_SqSb = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalBool; + tmpRetOptionalBool = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalBool; - tmpRetOptionalBool = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSb_SqSb); } - - bjs["invoke_js_callback_TestModule_10TestModuleSqSd_SqSd"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSd_SqSd"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value; - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalDouble = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_double"](isSome ? 1 : 0, isSome ? ret : 0.0); } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSqSd_SqSd"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSd_SqSd = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSd_SqSd); } - - bjs["invoke_js_callback_TestModule_10TestModuleSqSf_SqSf"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSf_SqSf"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = Math.fround(param0Value); - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalFloat = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_float"](isSome ? 1 : 0, isSome ? Math.fround(ret) : 0.0); } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSqSf_SqSf"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSf_SqSf = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSf_SqSf); } - - bjs["invoke_js_callback_TestModule_10TestModuleSqSi_SqSi"] = function(callbackId, param0IsSome, param0Value) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSi_SqSi"] = function(callbackId, param0IsSome, param0WrappedValue) { try { const callback = swift.memory.getObject(callbackId); - let param0; - if (param0IsSome) { - param0 = param0Value | 0; - } else { - param0 = null; - } - const result = callback(param0); - tmpRetOptionalInt = result; - return; + let ret = callback(param0IsSome ? param0WrappedValue : null); + const isSome = ret != null; + bjs["swift_js_return_optional_int"](isSome ? 1 : 0, isSome ? (ret | 0) : 0); } catch (error) { - setException?.(error); - return; + setException(error); } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSqSi_SqSi"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSi_SqSi = function(param0) { const isSome = param0 != null; - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(boxPtr, +isSome, isSome ? param0 : 0); + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - invokeResult; - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSi_SqSi); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 57b34d426..98899d4df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -228,28 +228,26 @@ export async function createInstantiator(options, swift) { const func = swift.memory.getObject(funcRef); func.__unregister(); } - - bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0Id) { + bjs["invoke_js_callback_TestModule_10TestModuleSi_Si"] = function(callbackId, param0) { try { const callback = swift.memory.getObject(callbackId); - let param0 = param0Id; - const result = callback(param0); - return result | 0; + let ret = callback(param0); + return ret; } catch (error) { - setException?.(error); - return 0; + setException(error); + return 0 } - }; + } bjs["make_swift_closure_TestModule_10TestModuleSi_Si"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSi_Si = function(param0) { - const invokeResult = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); + const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleSi_Si(boxPtr, param0); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } - return invokeResult | 0; + return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si); } From bceaf282812d4d341ec21f22a525d6c7301c90f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Feb 2026 17:50:31 +0000 Subject: [PATCH 191/252] Bump actions/setup-node from 4 to 6 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 6. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b5a808bc..68d6dac21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -85,7 +85,7 @@ jobs: steps: - uses: actions/checkout@v6 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: '20' - name: Install TypeScript From c6f2642275b2777da95c03c0e98845d48b12e5da Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Mon, 9 Feb 2026 18:51:58 +0100 Subject: [PATCH 192/252] BridgeJS: Fix incorrect TypeScript type names for `tsEnum`-style enums and struct associated values --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 13 +++++++++++-- .../BridgeJSLinkTests/EnumAssociatedValue.d.ts | 4 ++-- .../__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts | 6 +++--- .../BridgeJSLinkTests/EnumRawType.d.ts | 12 ++++++------ 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 13ea4e910..59ab9428b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1470,6 +1470,9 @@ public struct BridgeJSLink { case .namespaceEnum: return enumDef.tsFullPath default: + if enumDef.emitStyle == .tsEnum { + return enumDef.tsFullPath + } return "\(enumDef.tsFullPath)Tag" } } @@ -1786,7 +1789,7 @@ public struct BridgeJSLink { ] for (associatedValueIndex, associatedValue) in enumCase.associatedValues.enumerated() { let prop = associatedValue.label ?? "param\(associatedValueIndex)" - fields.append("\(prop): \(associatedValue.type.tsType)") + fields.append("\(prop): \(resolveTypeScriptType(associatedValue.type))") } unionParts.append("{ \(fields.joined(separator: "; ")) }") } @@ -2917,6 +2920,7 @@ extension BridgeJSLink { depth: 1, printer: printer, exposeToGlobal: true, + exportedSkeletons: exportedSkeletons, renderTSSignatureCallback: renderTSSignatureCallback ) printer.unindent() @@ -2935,6 +2939,7 @@ extension BridgeJSLink { depth: 1, printer: printer, exposeToGlobal: false, + exportedSkeletons: exportedSkeletons, renderTSSignatureCallback: renderTSSignatureCallback ) } @@ -2948,6 +2953,7 @@ extension BridgeJSLink { depth: Int, printer: CodeFragmentPrinter, exposeToGlobal: Bool, + exportedSkeletons: [ExportedSkeleton], renderTSSignatureCallback: @escaping ([Parameter], BridgeType, Effects) -> String ) { func hasContent(node: NamespaceNode) -> Bool { @@ -3102,7 +3108,9 @@ extension BridgeJSLink { .enumerated() { let prop = associatedValue.label ?? "param\(associatedValueIndex)" - fields.append("\(prop): \(associatedValue.type.tsType)") + fields.append( + "\(prop): \(BridgeJSLink.resolveTypeScriptType(associatedValue.type, exportedSkeletons: exportedSkeletons))" + ) } unionParts.append("{ \(fields.joined(separator: "; ")) }") } @@ -3136,6 +3144,7 @@ extension BridgeJSLink { depth: depth + 1, printer: printer, exposeToGlobal: exposeToGlobal, + exportedSkeletons: exportedSkeletons, renderTSSignatureCallback: renderTSSignatureCallback ) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts index 9ab117011..13f77ae08 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.d.ts @@ -82,7 +82,7 @@ export const AllTypesResultValues: { }; export type AllTypesResultTag = - { tag: typeof AllTypesResultValues.Tag.StructPayload; param0: PointTag } | { tag: typeof AllTypesResultValues.Tag.ClassPayload; param0: User } | { tag: typeof AllTypesResultValues.Tag.JsObjectPayload; param0: any } | { tag: typeof AllTypesResultValues.Tag.NestedEnum; param0: APIResultTag } | { tag: typeof AllTypesResultValues.Tag.ArrayPayload; param0: number[] } | { tag: typeof AllTypesResultValues.Tag.Empty } + { tag: typeof AllTypesResultValues.Tag.StructPayload; param0: Point } | { tag: typeof AllTypesResultValues.Tag.ClassPayload; param0: User } | { tag: typeof AllTypesResultValues.Tag.JsObjectPayload; param0: any } | { tag: typeof AllTypesResultValues.Tag.NestedEnum; param0: APIResultTag } | { tag: typeof AllTypesResultValues.Tag.ArrayPayload; param0: number[] } | { tag: typeof AllTypesResultValues.Tag.Empty } export const OptionalAllTypesResultValues: { readonly Tag: { @@ -96,7 +96,7 @@ export const OptionalAllTypesResultValues: { }; export type OptionalAllTypesResultTag = - { tag: typeof OptionalAllTypesResultValues.Tag.OptStruct; param0: PointTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptClass; param0: User | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptJSObject; param0: any | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptNestedEnum; param0: APIResultTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptArray; param0: number[] | null } | { tag: typeof OptionalAllTypesResultValues.Tag.Empty } + { tag: typeof OptionalAllTypesResultValues.Tag.OptStruct; param0: Point | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptClass; param0: User | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptJSObject; param0: any | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptNestedEnum; param0: APIResultTag | null } | { tag: typeof OptionalAllTypesResultValues.Tag.OptArray; param0: number[] | null } | { tag: typeof OptionalAllTypesResultValues.Tag.Empty } export interface Point { x: number; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts index 47fb52d94..5581df31e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.d.ts @@ -42,9 +42,9 @@ export type Exports = { getDirection(): DirectionTag; processDirection(input: DirectionTag): StatusTag; roundTripOptionalDirection(input: DirectionTag | null): DirectionTag | null; - setTSDirection(direction: TSDirectionTag): void; - getTSDirection(): TSDirectionTag; - roundTripOptionalTSDirection(input: TSDirectionTag | null): TSDirectionTag | null; + setTSDirection(direction: TSDirection): void; + getTSDirection(): TSDirection; + roundTripOptionalTSDirection(input: TSDirection | null): TSDirection | null; Direction: DirectionObject Status: StatusObject PublicStatus: PublicStatusObject diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts index 170d7f07d..50a45a58d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.d.ts @@ -113,18 +113,18 @@ export type Exports = { setTheme(theme: ThemeTag): void; getTheme(): ThemeTag; roundTripOptionalTheme(input: ThemeTag | null): ThemeTag | null; - setTSTheme(theme: TSThemeTag): void; - getTSTheme(): TSThemeTag; - roundTripOptionalTSTheme(input: TSThemeTag | null): TSThemeTag | null; + setTSTheme(theme: TSTheme): void; + getTSTheme(): TSTheme; + roundTripOptionalTSTheme(input: TSTheme | null): TSTheme | null; setFeatureFlag(flag: FeatureFlagTag): void; getFeatureFlag(): FeatureFlagTag; roundTripOptionalFeatureFlag(input: FeatureFlagTag | null): FeatureFlagTag | null; setHttpStatus(status: HttpStatusTag): void; getHttpStatus(): HttpStatusTag; roundTripOptionalHttpStatus(input: HttpStatusTag | null): HttpStatusTag | null; - setTSHttpStatus(status: TSHttpStatusTag): void; - getTSHttpStatus(): TSHttpStatusTag; - roundTripOptionalHttpStatus(input: TSHttpStatusTag | null): TSHttpStatusTag | null; + setTSHttpStatus(status: TSHttpStatus): void; + getTSHttpStatus(): TSHttpStatus; + roundTripOptionalHttpStatus(input: TSHttpStatus | null): TSHttpStatus | null; setPriority(priority: PriorityTag): void; getPriority(): PriorityTag; roundTripOptionalPriority(input: PriorityTag | null): PriorityTag | null; From 935130c27b45feb253dc6531d1b9f7ab7854087e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 10 Feb 2026 11:12:54 +0900 Subject: [PATCH 193/252] BridgeJS: Update `JSUndefinedOr` APIs - Rename `optionalRepresentation` to `asOptional`. - Remove `undefinedValue` static property and use `.undefined` case directly. --- .../Sources/BridgeJSCore/ExportSwift.swift | 6 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 70 +++++++++---------- Sources/JavaScriptKit/JSUndefinedOr.swift | 19 +++-- .../DictionaryTests.swift | 2 +- .../OptionalSupportTests.swift | 2 +- 5 files changed, 55 insertions(+), 44 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 70ed8f8a8..913bc076b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -156,7 +156,7 @@ public class ExportSwift { let absentExpr = kind == .null ? "\(optionalSwiftType)<[\(swiftTypeName)]>.none" - : "\(optionalSwiftType)<[\(swiftTypeName)]>.undefinedValue" + : "\(optionalSwiftType)<[\(swiftTypeName)]>.undefined" liftingExpr = ExprSyntax( """ { @@ -934,7 +934,7 @@ struct StackCodegen { let swiftTypeName = elementType.swiftType let absentExpr = kind == .null - ? "\(typeName)<[\(swiftTypeName)]>.none" : "\(typeName)<[\(swiftTypeName)]>.undefinedValue" + ? "\(typeName)<[\(swiftTypeName)]>.none" : "\(typeName)<[\(swiftTypeName)]>.undefined" return """ { let __isSome = _swift_js_pop_i32() @@ -951,7 +951,7 @@ struct StackCodegen { let absentExpr = kind == .null ? "\(typeName)<[String: \(swiftTypeName)]>.none" - : "\(typeName)<[String: \(swiftTypeName)]>.undefinedValue" + : "\(typeName)<[String: \(swiftTypeName)]>.undefined" return """ { let __isSome = _swift_js_pop_i32() diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 4c8fdf3db..496b515c9 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -143,7 +143,7 @@ public protocol _BridgedSwiftStackType { /// Used by JSUndefinedOr so all bridge methods delegate to Optional. public protocol _BridgedAsOptional { associatedtype Wrapped - var optionalRepresentation: Wrapped? { get } + var asOptional: Wrapped? { get } init(optional: Wrapped?) } @@ -2019,7 +2019,7 @@ extension Optional where Wrapped: _BridgedSwiftStruct { extension _BridgedAsOptional where Wrapped == Bool { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { @@ -2035,13 +2035,13 @@ extension _BridgedAsOptional where Wrapped == Bool { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == Int { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { @@ -2057,13 +2057,13 @@ extension _BridgedAsOptional where Wrapped == Int { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == UInt { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { @@ -2079,13 +2079,13 @@ extension _BridgedAsOptional where Wrapped == UInt { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == String { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter( @@ -2105,13 +2105,13 @@ extension _BridgedAsOptional where Wrapped == String { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == JSObject { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Self { @@ -2123,7 +2123,7 @@ extension _BridgedAsOptional where Wrapped == JSObject { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } @@ -2133,20 +2133,20 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftProtocolWrapper { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftHeapObject { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, pointer: UnsafeMutableRawPointer) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public consuming func bridgeJSLowerParameterWithRetain() -> ( isSome: Int32, pointer: UnsafeMutableRawPointer ) { - optionalRepresentation.bridgeJSLowerParameterWithRetain() + asOptional.bridgeJSLowerParameterWithRetain() } @_spi(BridgeJS) public static func bridgeJSLiftParameter( @@ -2165,13 +2165,13 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftHeapObject { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == Float { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { @@ -2187,13 +2187,13 @@ extension _BridgedAsOptional where Wrapped == Float { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped == Double { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { @@ -2209,13 +2209,13 @@ extension _BridgedAsOptional where Wrapped == Double { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { @@ -2231,20 +2231,20 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter( @@ -2264,14 +2264,14 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { @@ -2287,7 +2287,7 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } @@ -2302,14 +2302,14 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Float { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { @@ -2325,14 +2325,14 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Double { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { @@ -2348,13 +2348,13 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } extension _BridgedAsOptional where Wrapped: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { - optionalRepresentation.bridgeJSLowerParameter() + asOptional.bridgeJSLowerParameter() } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ caseId: Int32) -> Self { @@ -2370,7 +2370,7 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftAssociatedValueEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } @@ -2384,7 +2384,7 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - optionalRepresentation.bridgeJSLowerReturn() + asOptional.bridgeJSLowerReturn() } } @@ -2526,7 +2526,7 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftDictionaryStackType { typealias DictionaryValue = Wrapped.DictionaryValue @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { - let opt = optionalRepresentation + let opt = asOptional if let dict = opt { dict.bridgeJSLowerReturn() return 1 diff --git a/Sources/JavaScriptKit/JSUndefinedOr.swift b/Sources/JavaScriptKit/JSUndefinedOr.swift index 82e218105..de7be09b4 100644 --- a/Sources/JavaScriptKit/JSUndefinedOr.swift +++ b/Sources/JavaScriptKit/JSUndefinedOr.swift @@ -1,17 +1,28 @@ +/// A wrapper that represents a JavaScript value of `Wrapped | undefined`. +/// +/// In BridgeJS, `Optional` is bridged as `Wrapped | null`. +/// Use `JSUndefinedOr` when the JavaScript API expects +/// `Wrapped | undefined` instead. @frozen public enum JSUndefinedOr { + /// The JavaScript value is `undefined`. case undefined + /// The JavaScript value is present and wrapped. case value(Wrapped) - /// Convenience accessor for the undefined case. - public static var undefinedValue: Self { .undefined } - + /// Creates a wrapper from a Swift optional. + /// + /// - Parameter optional: The optional value to wrap. + /// `nil` becomes ``undefined`` and a non-`nil` value becomes ``value(_:)``. @inlinable public init(optional: Wrapped?) { self = optional.map(Self.value) ?? .undefined } + /// Returns the wrapped value as a Swift optional. + /// + /// Returns `nil` when this value is ``undefined``. @inlinable - public var optionalRepresentation: Wrapped? { + public var asOptional: Wrapped? { switch self { case .undefined: return nil diff --git a/Tests/BridgeJSRuntimeTests/DictionaryTests.swift b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift index 83ca72d04..ba702205d 100644 --- a/Tests/BridgeJSRuntimeTests/DictionaryTests.swift +++ b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift @@ -57,7 +57,7 @@ final class DictionaryTests: XCTestCase { func testRoundTripOptionalDictionaryUndefined() throws { let some: JSUndefinedOr<[String: Int]> = .value(["n": 42]) - let undefined: JSUndefinedOr<[String: Int]> = .undefinedValue + let undefined: JSUndefinedOr<[String: Int]> = .undefined let returnedSome = try jsRoundTripUndefinedDictionary(some) switch returnedSome { diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift index adfd51dea..454f5011d 100644 --- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -23,7 +23,7 @@ final class OptionalSupportTests: XCTestCase { XCTFail("Expected defined value") } - let undefined = try jsRoundTripOptionalStringUndefined(.undefinedValue) + let undefined = try jsRoundTripOptionalStringUndefined(.undefined) if case .value = undefined { XCTFail("Expected undefined") } From 9eaefa6dd0210ad3e7f5e52bc23e5e2cc9a0acc5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 10 Feb 2026 16:19:34 +0900 Subject: [PATCH 194/252] BridgeJS: Rename `BRIDGE_JS_PROFILING` to `BRIDGEJS_PROFILING` to be consistent with other environment variables used by BridgeJS. --- Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index b36b3ec8c..3b784b732 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -327,7 +327,7 @@ private func inputSwiftFiles(targetDirectory: URL, positionalArguments: [String] extension Profiling { static func make() -> Profiling? { - guard let outputPath = ProcessInfo.processInfo.environment["BRIDGE_JS_PROFILING"] else { + guard let outputPath = ProcessInfo.processInfo.environment["BRIDGEJS_PROFILING"] else { return nil } let fd = open(outputPath, O_WRONLY | O_CREAT | O_TRUNC, 0o644) From 929af06dd07205def449f2063646f86466c15e28 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 10 Feb 2026 16:21:25 +0900 Subject: [PATCH 195/252] Merge pull request #616 from swiftwasm/katei/0736-bridgejs-diagnos BridgeJS: Include source-context in diagnostic messages --- Plugins/BridgeJS/Package.swift | 2 + .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 150 ++++++++++++++- .../BridgeJSToolTests/DiagnosticsTests.swift | 182 ++++++++++++++++++ 3 files changed, 328 insertions(+), 6 deletions(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift diff --git a/Plugins/BridgeJS/Package.swift b/Plugins/BridgeJS/Package.swift index 49aa161c9..2074a8a66 100644 --- a/Plugins/BridgeJS/Package.swift +++ b/Plugins/BridgeJS/Package.swift @@ -58,6 +58,8 @@ let package = Package( "BridgeJSCore", "BridgeJSLink", "TS2Swift", + .product(name: "SwiftParser", package: "swift-syntax"), + .product(name: "SwiftSyntax", package: "swift-syntax"), ], exclude: ["__Snapshots__", "Inputs"] ), diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 67f5170c4..9db11b14d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -134,6 +134,7 @@ private enum JSON { // MARK: - DiagnosticError import SwiftSyntax +import class Foundation.ProcessInfo struct DiagnosticError: Error { let node: Syntax @@ -146,17 +147,154 @@ struct DiagnosticError: Error { self.hint = hint } - func formattedDescription(fileName: String) -> String { - let locationConverter = SourceLocationConverter(fileName: fileName, tree: node.root) - let location = locationConverter.location(for: node.position) - var description = "\(fileName):\(location.line):\(location.column): error: \(message)" + /// Formats the diagnostic error as a string. + /// + /// - Parameters: + /// - fileName: The name of the file to display in the output. + /// - colorize: Whether to colorize the output with ANSI escape sequences. + /// - Returns: The formatted diagnostic error string. + func formattedDescription(fileName: String, colorize: Bool = Self.shouldColorize) -> String { + let displayFileName = fileName == "-" ? "" : fileName + let converter = SourceLocationConverter(fileName: displayFileName, tree: node.root) + let startLocation = converter.location(for: node.positionAfterSkippingLeadingTrivia) + let endLocation = converter.location(for: node.endPositionBeforeTrailingTrivia) + + let sourceText = node.root.description + let lines = sourceText.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline) + let startLineIndex = max(0, min(lines.count - 1, startLocation.line - 1)) + let mainLine = String(lines[startLineIndex]) + + let lineNumberWidth = max(3, String(lines.count).count) + + let header: String = { + guard colorize else { + return "\(displayFileName):\(startLocation.line):\(startLocation.column): error: \(message)" + } + return + "\(displayFileName):\(startLocation.line):\(startLocation.column): \(ANSI.boldRed)error: \(ANSI.boldDefault)\(message)\(ANSI.reset)" + }() + + let highlightStartColumn = min(max(1, startLocation.column), mainLine.utf8.count + 1) + let availableColumns = max(0, mainLine.utf8.count - (highlightStartColumn - 1)) + let rawHighlightLength: Int = { + guard availableColumns > 0 else { return 0 } + if startLocation.line == endLocation.line { + return max(1, min(endLocation.column - startLocation.column, availableColumns)) + } else { + return min(1, availableColumns) + } + }() + let highlightLength = min(rawHighlightLength, availableColumns) + + let formattedMainLine: String = { + guard colorize, highlightLength > 0 else { return mainLine } + + let startIndex = Self.index(atUTF8Offset: highlightStartColumn - 1, in: mainLine) + let endIndex = Self.index(atUTF8Offset: highlightStartColumn - 1 + highlightLength, in: mainLine) + + let prefix = String(mainLine[..= 0, lineIndex < lines.count else { continue } + descriptionParts.append( + Self.formatSourceLine( + number: lineIndex + 1, + text: String(lines[lineIndex]), + width: lineNumberWidth, + colorize: colorize + ) + ) + } + + descriptionParts.append( + Self.formatSourceLine( + number: startLocation.line, + text: formattedMainLine, + width: lineNumberWidth, + colorize: colorize + ) + ) + + let pointerSpacing = max(0, highlightStartColumn - 1) + let pointerMessage: String = { + let pointer = String(repeating: " ", count: pointerSpacing) + "`- " + guard colorize else { return pointer + "error: \(message)" } + return pointer + "\(ANSI.boldRed)error: \(ANSI.boldDefault)\(message)\(ANSI.reset)" + }() + descriptionParts.append( + Self.formatSourceLine( + number: nil, + text: pointerMessage, + width: lineNumberWidth, + colorize: colorize + ) + ) + + if startLineIndex + 1 < lines.count { + descriptionParts.append( + Self.formatSourceLine( + number: startLocation.line + 1, + text: String(lines[startLineIndex + 1]), + width: lineNumberWidth, + colorize: colorize + ) + ) + } + if let hint { - description += "\nHint: \(hint)" + descriptionParts.append("Hint: \(hint)") } - return description + + return descriptionParts.joined(separator: "\n") + } + + private static func formatSourceLine( + number: Int?, + text: String, + width: Int, + colorize: Bool + ) -> String { + let gutter: String + if let number { + let paddedNumber = String(repeating: " ", count: max(0, width - String(number).count)) + String(number) + gutter = colorize ? ANSI.cyan + paddedNumber + ANSI.reset : paddedNumber + } else { + gutter = String(repeating: " ", count: width) + } + return "\(gutter) | \(text)" + } + + private static var shouldColorize: Bool { + let env = ProcessInfo.processInfo.environment + let termIsDumb = env["TERM"] == "dumb" + return env["NO_COLOR"] == nil && !termIsDumb + } + + private static func index(atUTF8Offset offset: Int, in line: String) -> String.Index { + let clamped = max(0, min(offset, line.utf8.count)) + let utf8Index = line.utf8.index(line.utf8.startIndex, offsetBy: clamped) + // String.Index initializer is guaranteed to succeed because the UTF8 index comes from the same string. + return String.Index(utf8Index, within: line)! } } +private enum ANSI { + static let reset = "\u{001B}[0;0m" + static let boldRed = "\u{001B}[1;31m" + static let boldDefault = "\u{001B}[1;39m" + static let cyan = "\u{001B}[0;36m" + static let underline = "\u{001B}[4;39m" +} + // MARK: - BridgeJSCoreError public struct BridgeJSCoreError: Swift.Error, CustomStringConvertible { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift new file mode 100644 index 000000000..500a5db95 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift @@ -0,0 +1,182 @@ +import SwiftParser +import SwiftSyntax +import Testing + +@testable import BridgeJSCore + +@Suite struct DiagnosticsTests { + /// Returns the first parameter's type node from a function in the source (the first `@JS func`-like decl), for pinpointing diagnostics. + private func firstParameterTypeNode(source: String) -> TypeSyntax? { + let tree = Parser.parse(source: source) + for stmt in tree.statements { + if let funcDecl = stmt.item.as(FunctionDeclSyntax.self), + let firstParam = funcDecl.signature.parameterClause.parameters.first + { + return firstParam.type + } + } + return nil + } + + @Test + func diagnosticIncludesLocationSourceAndHint() throws { + let source = "@JS func foo(_ bar: A) {}\n" + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError( + node: typeNode, + message: "Unsupported type 'A'.", + hint: "Only primitive types and types defined in the same module are allowed" + ) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + let expectedPrefix = """ + :1:21: error: Unsupported type 'A'. + 1 | @JS func foo(_ bar: A) {} + | `- error: Unsupported type 'A'. + 2 | + """.trimmingCharacters(in: .whitespacesAndNewlines) + #expect(description.hasPrefix(expectedPrefix)) + #expect(description.contains("Hint: Only primitive types and types defined in the same module are allowed")) + } + + @Test + func diagnosticOmitsHintWhenNotProvided() throws { + let source = "@JS static func foo() {}\n" + let tree = Parser.parse(source: source) + let diagnostic = DiagnosticError( + node: tree, + message: "Top-level functions cannot be static", + hint: nil + ) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + let expectedPrefix = """ + :1:1: error: Top-level functions cannot be static + 1 | @JS static func foo() {} + | `- error: Top-level functions cannot be static + 2 | + """.trimmingCharacters(in: .whitespacesAndNewlines) + #expect(description.hasPrefix(expectedPrefix)) + #expect(!description.contains("Hint:")) + } + + @Test + func diagnosticUsesGivenFileNameNotStdin() throws { + let source = "@JS func foo(_ bar: A) {}\n" + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError( + node: typeNode, + message: "Unsupported type 'A'.", + hint: nil + ) + let description = diagnostic.formattedDescription(fileName: "Sources/Foo.swift", colorize: false) + #expect(description.hasPrefix("Sources/Foo.swift:1:21: error: Unsupported type 'A'.")) + } + + @Test + func diagnosticWithColorizeTrueIncludesANSISequences() throws { + let source = "@JS func foo(_ bar: A) {}\n" + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError( + node: typeNode, + message: "Unsupported type 'A'.", + hint: nil + ) + let description = diagnostic.formattedDescription(fileName: "-", colorize: true) + let esc = "\u{001B}" + let boldRed = "\(esc)[1;31m" + let boldDefault = "\(esc)[1;39m" + let reset = "\(esc)[0;0m" + let cyan = "\(esc)[0;36m" + let underline = "\(esc)[4;39m" + let expected = + ":1:21: \(boldRed)error: \(boldDefault)Unsupported type 'A'.\(reset)\n" + + "\(cyan) 1\(reset) | @JS func foo(_ bar: \(underline)A\(reset)) {}\n" + + " | `- \(boldRed)error: \(boldDefault)Unsupported type 'A'.\(reset)\n" + + "\(cyan) 2\(reset) | " + #expect(description == expected) + } + + // MARK: - Context source lines + + @Test + func showsOnePreviousLineWhenErrorNotOnFirstLine() throws { + let source = """ + preamble + @JS func foo(_ bar: A) {} + """ + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError(node: typeNode, message: "Unsupported type 'A'.", hint: nil) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + #expect(description.contains(" 1 | preamble")) + #expect(description.contains(" 2 | @JS func foo(_ bar: A) {}")) + #expect(description.contains(":2:")) + } + + @Test + func showsThreePreviousLinesWhenAvailable() throws { + let source = """ + first + second + third + @JS func foo(_ bar: A) {} + """ + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError(node: typeNode, message: "Unsupported type 'A'.", hint: nil) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + #expect(description.contains(" 1 | first")) + #expect(description.contains(" 2 | second")) + #expect(description.contains(" 3 | third")) + #expect(description.contains(" 4 | @JS func foo(_ bar: A) {}")) + #expect(description.contains(":4:")) + } + + @Test + func capsContextAtThreePreviousLines() throws { + let source = """ + line0 + line1 + line2 + line3 + @JS func foo(_ bar: A) {} + """ + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError(node: typeNode, message: "Unsupported type 'A'.", hint: nil) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + #expect(!description.contains(" 1 | line0")) + #expect(description.contains(" 2 | line1")) + #expect(description.contains(" 3 | line2")) + #expect(description.contains(" 4 | line3")) + #expect(description.contains(" 5 | @JS func foo(_ bar: A) {}")) + #expect(description.contains(":5:")) + } + + @Test + func includesNextLineAfterErrorLine() throws { + let source = """ + @JS func foo( + _ bar: A + ) {} + """ + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError(node: typeNode, message: "Unsupported type 'A'.", hint: nil) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + #expect(description.contains(" 1 | @JS func foo(")) + #expect(description.contains(" 2 | _ bar: A")) + #expect(description.contains(" 3 | ) {}")) + #expect(description.contains(":2:")) + } + + @Test + func omitsNextLineWhenErrorIsOnLastLine() throws { + let source = """ + preamble + @JS func foo(_ bar: A) + """ + let typeNode = try #require(firstParameterTypeNode(source: source)) + let diagnostic = DiagnosticError(node: typeNode, message: "Unsupported type 'A'.", hint: nil) + let description = diagnostic.formattedDescription(fileName: "-", colorize: false) + #expect(description.contains(" 2 | @JS func foo(_ bar: A)")) + #expect(description.contains(":2:")) + // No line 3 in source, so output must not show a " 3 |" context line after the pointer + #expect(!description.contains(" 3 |")) + } +} From 63cb9af45a7b6b387cd8af50c83b3ad79e07fe29 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 10 Feb 2026 14:38:00 +0700 Subject: [PATCH 196/252] BridgeJS: Check generated TypeScript validity in test suites (#611) --- .github/workflows/test.yml | 4 ++++ .../__Snapshots__/BridgeJSLinkTests/tsconfig.json | 12 ++++++++++++ package.json | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68d6dac21..1e9060f19 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,6 +69,8 @@ jobs: git diff --exit-code Sources/JavaScriptKit/Runtime - run: swift test --package-path ./Plugins/PackageToJS - run: swift test --package-path ./Plugins/BridgeJS + - name: Validate BridgeJS TypeScript declarations + run: npm run check:bridgejs-dts test-bridgejs-against-swift-versions: name: Test BridgeJS against Swift versions @@ -90,6 +92,8 @@ jobs: node-version: '20' - name: Install TypeScript run: npm install + - name: Validate BridgeJS TypeScript declarations + run: npm run check:bridgejs-dts - name: Run BridgeJS tests # NOTE: Seems like the prebuilt SwiftSyntax binaries are not compatible with # non-macro dependents, so disable experimental prebuilts for now. diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json new file mode 100644 index 000000000..277b2c578 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "strict": true, + "noEmit": true, + "skipLibCheck": false, + "target": "ES2020", + "module": "ES2020", + "moduleResolution": "node", + "lib": ["ES2020", "DOM"] + }, + "include": ["*.d.ts"] +} diff --git a/package.json b/package.json index 1f3f1871b..509cddde2 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "build:clean": "rm -rf Runtime/lib", "build:ts": "cd Runtime; rollup -c", "prepublishOnly": "npm run build", - "format": "prettier --write Runtime/src" + "format": "prettier --write Runtime/src", + "check:bridgejs-dts": "tsc --project Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/tsconfig.json" }, "keywords": [ "Swift", From b06a79bf9b10dbe868c1e8d2807fd6385f74929c Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 10 Feb 2026 17:27:30 +0900 Subject: [PATCH 197/252] BridgeJS: Allow executing TS2SwiftVitestTests on Xcode --- Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift | 15 ++++++++------- .../BridgeJSToolTests/TS2SwiftVitestTests.swift | 13 +++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift index 795b7b390..6337dcf27 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift +++ b/Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift @@ -20,6 +20,12 @@ import BridgeJSCore import BridgeJSSkeleton #endif +#if os(Windows) +let PATH_SEPARATOR: Character = ";" +#else +let PATH_SEPARATOR: Character = ":" +#endif + internal func which( _ executable: String, environment: [String: String] = ProcessInfo.processInfo.environment @@ -39,13 +45,8 @@ internal func which( } } } - let pathSeparator: Character - #if os(Windows) - pathSeparator = ";" - #else - pathSeparator = ":" - #endif - let paths = environment["PATH"]?.split(separator: pathSeparator) ?? [] + + let paths = environment["PATH"]?.split(separator: PATH_SEPARATOR) ?? [] for path in paths { let url = URL(fileURLWithPath: String(path)).appendingPathComponent(executable) if checkCandidate(url) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift index bb3d2e0a4..f658b001f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift @@ -1,5 +1,6 @@ import Foundation import Testing +@testable import TS2Swift /// Runs the TS2Swift JavaScript test suite (Vitest) so that `swift test --package-path ./Plugins/BridgeJS` /// validates both the TypeScript ts2swift output and the Swift codegen. For fast iteration on ts2swift, @@ -17,8 +18,16 @@ import Testing .appendingPathComponent("TS2Swift") .appendingPathComponent("JavaScript") let process = Process() - process.executableURL = URL(fileURLWithPath: "/usr/bin/env") - var arguments = ["npm", "run", "test"] + guard let npmExecutable = which("npm"), let nodeExecutable = which("node") else { + Issue.record("No \"npm\" command found in your system") + return + } + process.executableURL = npmExecutable + var environment = ProcessInfo.processInfo.environment + environment["PATH"] = + "\(nodeExecutable.deletingLastPathComponent().path)\(PATH_SEPARATOR) \(environment["PATH"] ?? "")" + process.environment = environment + var arguments = ["run", "test"] if ProcessInfo.processInfo.environment["UPDATE_SNAPSHOTS"] != nil { arguments.append(contentsOf: ["--", "--update"]) } From cb7b6a92d9127c98b326214ed7f7ac3ced50ad10 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 11 Feb 2026 18:15:32 +0900 Subject: [PATCH 198/252] BridgeJS: Remove parsing API usage from JSSetterMacro --- Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift index ba171e8eb..4d32db449 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSSetterMacro.swift @@ -54,7 +54,7 @@ extension JSSetterMacro: BodyMacro { firstName: .wildcardToken(trailingTrivia: .space), secondName: .identifier("value"), colon: .colonToken(trailingTrivia: .space), - type: TypeSyntax(stringLiteral: "<#Type#>") + type: IdentifierTypeSyntax(name: TokenSyntax(.identifier("<#Type#>"), presence: .present)) ) let newClause = FunctionParameterClauseSyntax( leftParen: .leftParenToken(), From 9162fa0cebca2c7e35a135e0819f8977b92dbf97 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 11 Feb 2026 18:32:46 +0900 Subject: [PATCH 199/252] BridgeJS: Remove BasicFormat usage in ExportSwift --- Benchmarks/Sources/Generated/BridgeJS.swift | 83 ++- .../Sources/BridgeJSCore/ClosureCodegen.swift | 133 ++-- .../Sources/BridgeJSCore/ExportSwift.swift | 612 ++++++++++-------- .../Sources/BridgeJSCore/ImportTS.swift | 584 +++++------------ .../Sources/BridgeJSUtilities/Utilities.swift | 6 + .../BridgeJSCodegenTests/ArrayTypes.swift | 100 +-- .../BridgeJSCodegenTests/Async.swift | 14 +- .../EnumAssociatedValue.swift | 66 +- .../ImportedTypeInExportedInterface.swift | 28 +- .../BridgeJSCodegenTests/JSValue.swift | 5 +- .../BridgeJSCodegenTests/Protocol.swift | 12 +- .../BridgeJSCodegenTests/SwiftStruct.swift | 13 +- .../Generated/BridgeJS.swift | 305 ++++----- 13 files changed, 880 insertions(+), 1081 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 5a480694c..515d3a531 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -312,7 +312,7 @@ extension Person: _BridgedSwiftStruct { self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -1569,12 +1569,12 @@ public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPoin let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) #else fatalError("Only available on WebAssembly") #endif @@ -1586,7 +1586,8 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1601,14 +1602,15 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1623,12 +1625,12 @@ public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPo let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) #else fatalError("Only available on WebAssembly") #endif @@ -1640,7 +1642,8 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1655,14 +1658,15 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1677,12 +1681,12 @@ public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPo let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) #else fatalError("Only available on WebAssembly") #endif @@ -1696,8 +1700,10 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1712,17 +1718,19 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1737,12 +1745,12 @@ public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRaw let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) #else fatalError("Only available on WebAssembly") #endif @@ -1756,8 +1764,10 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1772,17 +1782,19 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -1799,7 +1811,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint } else { return [Int].bridgeJSLiftParameter() } - }()) + }()) #else fatalError("Only available on WebAssembly") #endif @@ -1812,7 +1824,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -1826,7 +1839,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -1843,10 +1857,11 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRaw } else { return [Int].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 49f2b99bf..eefc63a7e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -4,6 +4,9 @@ import SwiftSyntaxBuilder #if canImport(BridgeJSSkeleton) import BridgeJSSkeleton #endif +#if canImport(BridgeJSUtilities) +import BridgeJSUtilities +#endif public struct ClosureCodegen { public init() {} @@ -41,9 +44,6 @@ public struct ClosureCodegen { try builder.call(returnType: signature.returnType) try builder.liftReturnValue(returnType: signature.returnType) - // Get the body code - let bodyCode = builder.getBody() - // Generate extern declaration using CallJSEmission let externDecl = builder.renderImportDecl() @@ -58,79 +58,42 @@ public struct ClosureCodegen { #endif """ - let helperEnumDecl = EnumDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.private)) - }, - name: .identifier(helperName), - memberBlockBuilder: { - DeclSyntax( - FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.static)) - }, - name: .identifier("bridgeJSLift"), - signature: FunctionSignatureSyntax( - parameterClause: FunctionParameterClauseSyntax { - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier("callbackId"), - colon: .colonToken(), - type: IdentifierTypeSyntax(name: .identifier("Int32")) - ) - }, - returnClause: ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(swiftClosureType)) - ) - ), - body: CodeBlockSyntax { - "let callback = JSObject.bridgeJSLiftParameter(callbackId)" - ReturnStmtSyntax( - expression: ClosureExprSyntax( - leftBrace: .leftBraceToken(), - signature: ClosureSignatureSyntax( - capture: ClosureCaptureClauseSyntax( - leftSquare: .leftSquareToken(), - items: ClosureCaptureListSyntax { - #if canImport(SwiftSyntax602) - ClosureCaptureSyntax( - name: .identifier("", presence: .missing), - initializer: InitializerClauseSyntax( - equal: .equalToken(presence: .missing), - nil, - value: ExprSyntax("callback") - ), - trailingTrivia: nil - ) - #else - ClosureCaptureSyntax( - expression: ExprSyntax("callback") - ) - #endif - }, - rightSquare: .rightSquareToken() - ), - parameterClause: .simpleInput( - ClosureShorthandParameterListSyntax { - for (index, _) in signature.parameters.enumerated() { - ClosureShorthandParameterSyntax(name: .identifier("param\(index)")) - } - } - ), - inKeyword: .keyword(.in) - ), - statements: CodeBlockItemListSyntax { - SwiftCodePattern.buildWasmConditionalCompilation(wasmBody: bodyCode.statements) - }, - rightBrace: .rightBraceToken() - ) - ) + let helperEnumDeclPrinter = CodeFragmentPrinter() + helperEnumDeclPrinter.write("private enum \(helperName) {") + helperEnumDeclPrinter.indent { + helperEnumDeclPrinter.write("static func bridgeJSLift(_ callbackId: Int32) -> \(swiftClosureType) {") + helperEnumDeclPrinter.indent { + helperEnumDeclPrinter.write("let callback = JSObject.bridgeJSLiftParameter(callbackId)") + let parameters: String + if signature.parameters.isEmpty { + parameters = "" + } else if signature.parameters.count == 1 { + parameters = " param0" + } else { + parameters = + " (" + + signature.parameters.enumerated().map { index, param in + "param\(index)" + }.joined(separator: ", ") + ")" + } + helperEnumDeclPrinter.write("return { [callback]\(parameters) in") + helperEnumDeclPrinter.indent { + SwiftCodePattern.buildWasmConditionalCompilation( + printer: helperEnumDeclPrinter, + wasmBody: { printer in + printer.write(lines: builder.body.lines) } ) - ) + } + helperEnumDeclPrinter.write("}") + } - ) + helperEnumDeclPrinter.write("}") + } + helperEnumDeclPrinter.write("}") + + let helperEnumDecl: DeclSyntax = "\(raw: helperEnumDeclPrinter.lines.joined(separator: "\n"))" + let typedClosureExtension: DeclSyntax = """ extension JSTypedClosure where Signature == \(raw: swiftClosureType) { init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping \(raw: swiftClosureType)) { @@ -145,7 +108,7 @@ public struct ClosureCodegen { """ return [ - externDecl, makeClosureExternDecl, DeclSyntax(helperEnumDecl), typedClosureExtension, + externDecl, makeClosureExternDecl, helperEnumDecl, typedClosureExtension, ] } @@ -199,24 +162,20 @@ public struct ClosureCodegen { returnType: abiReturnWasmType ) - // Build body - let body = CodeBlockItemListSyntax { - "let closure = Unmanaged<\(raw: boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure" + // Build function declaration using helper + let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( + abiName: abiName, + signature: funcSignature + ) { printer in + printer.write("let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure") if signature.returnType == .void { - closureCallExpr + printer.write(closureCallExpr.description) } else { - "let result = \(closureCallExpr)" - "return result.bridgeJSLowerReturn()" + printer.write("let result = \(closureCallExpr)") + printer.write("return result.bridgeJSLowerReturn()") } } - // Build function declaration using helper - let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( - abiName: abiName, - signature: funcSignature, - body: body - ) - return DeclSyntax(funcDecl) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 913bc076b..2d31cd212 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -91,8 +91,7 @@ public class ExportSwift { } } return withSpan("Format Export Glue") { - let format = BasicFormat() - return decls.map { $0.formatted(using: format).description }.joined(separator: "\n\n") + return decls.map { $0.description }.joined(separator: "\n\n") } } @@ -423,9 +422,10 @@ public class ExportSwift { // Build function declaration using helper function let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( abiName: abiName, - signature: signature, - body: body - ) + signature: signature + ) { printer in + printer.write(multilineString: body.description) + } return DeclSyntax(funcDecl) } @@ -715,11 +715,10 @@ public class ExportSwift { signature: SwiftSignatureBuilder.buildABIFunctionSignature( abiParameters: [("pointer", .pointer)], returnType: nil - ), - body: CodeBlockItemListSyntax { - "Unmanaged<\(raw: klass.swiftCallName)>.fromOpaque(pointer).release()" - } - ) + ) + ) { printer in + printer.write("Unmanaged<\(klass.swiftCallName)>.fromOpaque(pointer).release()") + } decls.append(DeclSyntax(funcDecl)) } @@ -763,34 +762,29 @@ public class ExportSwift { returnType: .i32 ) - // Build extern function declaration (no body) - let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( - moduleName: moduleName, - abiName: externFunctionName, - functionName: wrapFunctionName, - signature: funcSignature - ) - - // Build stub function declaration (with fatalError body) - let stubFuncDecl = FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.fileprivate)) + let externDeclPrinter = CodeFragmentPrinter() + SwiftCodePattern.buildWasmConditionalCompilationDecls( + printer: externDeclPrinter, + wasmDecl: { printer in + SwiftCodePattern.buildExternFunctionDecl( + printer: printer, + moduleName: moduleName, + abiName: externFunctionName, + functionName: wrapFunctionName, + signature: funcSignature + ) }, - funcKeyword: .keyword(.func), - name: .identifier(wrapFunctionName), - signature: funcSignature, - body: CodeBlockSyntax { - "fatalError(\"Only available on WebAssembly\")" + elseDecl: { printer in + printer.write( + multilineString: """ + fileprivate func \(wrapFunctionName)\(funcSignature) { + fatalError("Only available on WebAssembly") + } + """ + ) } ) - - // Use helper function for conditional compilation - let externDecl = DeclSyntax( - SwiftCodePattern.buildWasmConditionalCompilationDecls( - wasmDecl: DeclSyntax(externFuncDecl), - elseDecl: DeclSyntax(stubFuncDecl) - ) - ) + let externDecl: DeclSyntax = "\(raw: externDeclPrinter.lines.joined(separator: "\n"))" return [extensionDecl, externDecl] } } @@ -1035,9 +1029,9 @@ struct StackCodegen { accessor: String, varPrefix: String ) -> [CodeBlockItemSyntax] { - var statements: [CodeBlockItemSyntax] = [] + var statements: [String] = [] let elementVarName = "__bjs_elem_\(varPrefix)" - statements.append("for \(raw: elementVarName) in \(raw: accessor) {") + statements.append("for \(elementVarName) in \(accessor) {") let elementStatements = lowerStatements( for: elementType, @@ -1045,12 +1039,13 @@ struct StackCodegen { varPrefix: "\(varPrefix)_elem" ) for stmt in elementStatements { - statements.append(stmt) + statements.append(stmt.description) } statements.append("}") - statements.append("_swift_js_push_i32(Int32(\(raw: accessor).count))") - return statements + statements.append("_swift_js_push_i32(Int32(\(accessor).count))") + let parsed: CodeBlockItemListSyntax = "\(raw: statements.joined(separator: "\n"))" + return Array(parsed) } private func lowerDictionaryStatements( @@ -1117,9 +1112,9 @@ struct StackCodegen { accessor: String, varPrefix: String ) -> [CodeBlockItemSyntax] { - var statements: [CodeBlockItemSyntax] = [] - statements.append("let __bjs_isSome_\(raw: varPrefix) = \(raw: accessor) != nil") - statements.append("if let __bjs_unwrapped_\(raw: varPrefix) = \(raw: accessor) {") + var statements: [String] = [] + statements.append("let __bjs_isSome_\(varPrefix) = \(accessor) != nil") + statements.append("if let __bjs_unwrapped_\(varPrefix) = \(accessor) {") let innerStatements = lowerUnwrappedOptionalStatements( wrappedType: wrappedType, @@ -1127,12 +1122,13 @@ struct StackCodegen { varPrefix: varPrefix ) for stmt in innerStatements { - statements.append(stmt) + statements.append(stmt.description) } statements.append("}") - statements.append("_swift_js_push_i32(__bjs_isSome_\(raw: varPrefix) ? 1 : 0)") - return statements + statements.append("_swift_js_push_i32(__bjs_isSome_\(varPrefix) ? 1 : 0)") + let parsed: CodeBlockItemListSyntax = "\(raw: statements.joined(separator: "\n"))" + return Array(parsed) } private func lowerUnwrappedOptionalStatements( @@ -1186,104 +1182,151 @@ struct EnumCodegen { } private func renderCaseEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { - let typeName = enumDef.swiftCallName - var initCases: [String] = [] - var valueCases: [String] = [] - for (index, enumCase) in enumDef.cases.enumerated() { - initCases.append("case \(index): self = .\(enumCase.name)") - valueCases.append("case .\(enumCase.name): return \(index)") - } - let initSwitch = (["switch bridgeJSRawValue {"] + initCases + ["default: return nil", "}"]).joined( - separator: "\n" - ) - let valueSwitch = (["switch self {"] + valueCases + ["}"]).joined(separator: "\n") + let printer = CodeFragmentPrinter() + printer.write("extension \(enumDef.swiftCallName): _BridgedSwiftCaseEnum {") + printer.indent { + printer.write( + multilineString: """ + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> \(enumDef.swiftCallName) { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> \(enumDef.swiftCallName) { + return \(enumDef.swiftCallName)(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } - return """ - extension \(raw: typeName): _BridgedSwiftCaseEnum { - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - return bridgeJSRawValue - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> \(raw: typeName) { - return bridgeJSLiftParameter(value) - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> \(raw: typeName) { - return \(raw: typeName)(bridgeJSRawValue: value)! - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { - return bridgeJSLowerParameter() + """ + ) + printer.nextLine() + + printer.write("private init?(bridgeJSRawValue: Int32) {") + printer.indent { + printer.write("switch bridgeJSRawValue {") + for (index, enumCase) in enumDef.cases.enumerated() { + printer.write("case \(index):") + printer.indent { + printer.write("self = .\(enumCase.name)") + } } - - private init?(bridgeJSRawValue: Int32) { - \(raw: initSwitch) + printer.write("default:") + printer.indent { + printer.write("return nil") } - - private var bridgeJSRawValue: Int32 { - \(raw: valueSwitch) + printer.write("}") + } + printer.write("}") + printer.nextLine() + + printer.write("private var bridgeJSRawValue: Int32 {") + printer.indent { + printer.write("switch self {") + for (index, enumCase) in enumDef.cases.enumerated() { + printer.write("case .\(enumCase.name):") + printer.indent { + printer.write("return \(index)") + } } + printer.write("}") } - """ + printer.write("}") + } + printer.write("}") + return "\(raw: printer.lines.joined(separator: "\n"))" } private func renderRawValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName guard enumDef.rawType != nil else { return """ - extension \(raw: typeName): _BridgedSwiftEnumNoPayload {} + extension \(raw: typeName): _BridgedSwiftEnumNoPayload { + } """ } // When rawType is present, conform to _BridgedSwiftRawValueEnum which provides // default implementations for _BridgedSwiftStackType methods via protocol extension. return """ - extension \(raw: typeName): _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} + extension \(raw: typeName): _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { + } """ } private func renderAssociatedValueEnumHelpers(_ enumDef: ExportedEnum) -> DeclSyntax { let typeName = enumDef.swiftCallName - return """ - extension \(raw: typeName): _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(raw: typeName) { - switch caseId { - \(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n")) - default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)") - } + let printer = CodeFragmentPrinter() + printer.write("extension \(typeName): _BridgedSwiftAssociatedValueEnum {") + printer.indent { + printer.write("private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(typeName) {") + printer.indent { + printer.write("switch caseId {") + generateStackLiftSwitchCases(printer: printer, enumDef: enumDef) + printer.write("default:") + printer.indent { + printer.write("fatalError(\"Unknown \(typeName) case ID: \\(caseId)\")") } + printer.write("}") + } + printer.write("}") + printer.nextLine() - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { - switch self { - \(raw: generateLowerParameterSwitchCases(enumDef: enumDef).joined(separator: "\n")) - } - } + printer.write("// MARK: Protocol Export") + printer.nextLine() - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(raw: typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } + printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {") + printer.indent { + printer.write("switch self {") + generateLowerParameterSwitchCases(printer: printer, enumDef: enumDef) + printer.write("}") + } + printer.write("}") + printer.nextLine() - // MARK: ExportSwift + printer.write( + multilineString: """ + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(typeName) { + return _bridgeJSLiftFromCaseId(caseId) + } + """ + ) + printer.nextLine() - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } + printer.write("// MARK: ExportSwift") + printer.nextLine() - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - \(raw: generateReturnSwitchCases(enumDef: enumDef).joined(separator: "\n")) + printer.write( + multilineString: """ + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(typeName) { + return _bridgeJSLiftFromCaseId(caseId) } - } + """ + ) + printer.nextLine() + + printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() {") + printer.indent { + printer.write("switch self {") + generateReturnSwitchCases(printer: printer, enumDef: enumDef) + printer.write("}") } - """ + printer.write("}") + } + printer.write("}") + return "\(raw: printer.lines.joined(separator: "\n"))" } - private func generateStackLiftSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] + private func generateStackLiftSwitchCases(printer: CodeFragmentPrinter, enumDef: ExportedEnum) { for (caseIndex, enumCase) in enumDef.cases.enumerated() { if enumCase.associatedValues.isEmpty { - cases.append("case \(caseIndex): return .\(enumCase.name)") + printer.write("case \(caseIndex):") + printer.indent { + printer.write("return .\(enumCase.name)") + } } else { - var lines: [String] = [] - lines.append("case \(caseIndex):") + printer.write("case \(caseIndex):") let argList = enumCase.associatedValues.map { associatedValue in let labelPrefix: String if let label = associatedValue.label { @@ -1294,17 +1337,17 @@ struct EnumCodegen { let liftExpr = stackCodegen.liftExpression(for: associatedValue.type) return "\(labelPrefix)\(liftExpr)" } - lines.append("return .\(enumCase.name)(\(argList.joined(separator: ", ")))") - cases.append(lines.joined(separator: "\n")) + printer.indent { + printer.write("return .\(enumCase.name)(\(argList.joined(separator: ", ")))") + } } } - return cases } private func generatePayloadPushingCode( + printer: CodeFragmentPrinter, associatedValues: [AssociatedValue] - ) -> [String] { - var bodyLines: [String] = [] + ) { for (index, associatedValue) in associatedValues.enumerated() { let paramName = associatedValue.label ?? "param\(index)" let statements = stackCodegen.lowerStatements( @@ -1312,51 +1355,50 @@ struct EnumCodegen { accessor: paramName, varPrefix: paramName ) - for stmt in statements { - bodyLines.append(stmt.description) - } + printer.write(multilineString: CodeBlockItemListSyntax(statements).description) } - return bodyLines } - private func generateLowerParameterSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] + private func generateLowerParameterSwitchCases(printer: CodeFragmentPrinter, enumDef: ExportedEnum) { for (caseIndex, enumCase) in enumDef.cases.enumerated() { if enumCase.associatedValues.isEmpty { - cases.append("case .\(enumCase.name):") - cases.append("return Int32(\(caseIndex))") + printer.write("case .\(enumCase.name):") + printer.indent { + printer.write("return Int32(\(caseIndex))") + } } else { - let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) let pattern = enumCase.associatedValues.enumerated() .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } .joined(separator: ", ") - cases.append("case .\(enumCase.name)(\(pattern)):") - cases.append(contentsOf: payloadCode) - cases.append("return Int32(\(caseIndex))") + printer.write("case .\(enumCase.name)(\(pattern)):") + printer.indent { + generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues) + printer.write("return Int32(\(caseIndex))") + } } } - return cases } - private func generateReturnSwitchCases(enumDef: ExportedEnum) -> [String] { - var cases: [String] = [] + private func generateReturnSwitchCases(printer: CodeFragmentPrinter, enumDef: ExportedEnum) { for (caseIndex, enumCase) in enumDef.cases.enumerated() { if enumCase.associatedValues.isEmpty { - cases.append("case .\(enumCase.name):") - cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") + printer.write("case .\(enumCase.name):") + printer.indent { + printer.write("_swift_js_push_tag(Int32(\(caseIndex)))") + } } else { let pattern = enumCase.associatedValues.enumerated() .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } .joined(separator: ", ") - cases.append("case .\(enumCase.name)(\(pattern)):") - let payloadCode = generatePayloadPushingCode(associatedValues: enumCase.associatedValues) - cases.append(contentsOf: payloadCode) - // Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function. - // This ensures nested enum tags don't overwrite the outer tag. - cases.append("_swift_js_push_tag(Int32(\(caseIndex)))") + printer.write("case .\(enumCase.name)(\(pattern)):") + printer.indent { + generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues) + // Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function. + // This ensures nested enum tags don't overwrite the outer tag. + printer.write("_swift_js_push_tag(Int32(\(caseIndex)))") + } } } - return cases } } @@ -1367,40 +1409,60 @@ struct StructCodegen { func renderStructHelpers(_ structDef: ExportedStruct) -> [DeclSyntax] { let typeName = structDef.swiftCallName - let liftCode = generateStructLiftCode(structDef: structDef) - let lowerCode = generateStructLowerCode(structDef: structDef) - let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? "" let lowerExternName = "swift_js_struct_lower_\(structDef.name)" let liftExternName = "swift_js_struct_lift_\(structDef.name)" let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)" let liftFunctionName = "_bjs_struct_lift_\(structDef.name)" - let bridgedStructExtension: DeclSyntax = """ - extension \(raw: typeName): _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(raw: typeName) { - \(raw: liftCode.joined(separator: "\n")) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - \(raw: lowerCode.joined(separator: "\n")) - } - - \(raw: accessControl)init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter()) - defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() - } + let printer = CodeFragmentPrinter() + printer.write("extension \(typeName): _BridgedSwiftStruct {") + printer.indent { + printer.write("@_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(typeName) {") + printer.indent { + printer.write(lines: generateStructLiftCode(structDef: structDef)) + } + printer.write("}") + printer.nextLine() - \(raw: accessControl)func toJSObject() -> JSObject { - let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() - return JSObject(id: UInt32(bitPattern: \(raw: liftFunctionName)())) - } + printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() {") + printer.indent { + printer.write(lines: generateStructLowerCode(structDef: structDef)) } - """ + printer.write("}") + printer.nextLine() + + let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? "" + printer.write( + multilineString: """ + \(accessControl)init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = \(lowerFunctionName)(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + """ + ) + printer.nextLine() + + printer.write( + multilineString: """ + \(accessControl)func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: \(liftFunctionName)())) + } + """ + ) + } + printer.write("}") - let lowerExternDecl = Self.renderStructExtern( + let bridgedStructExtension: DeclSyntax = "\(raw: printer.lines.joined(separator: "\n"))" + + let lowerExternDeclPrinter = CodeFragmentPrinter() + Self.renderStructExtern( + printer: lowerExternDeclPrinter, externName: lowerExternName, functionName: lowerFunctionName, signature: SwiftSignatureBuilder.buildABIFunctionSignature( @@ -1408,7 +1470,9 @@ struct StructCodegen { returnType: .i32 ) ) - let liftExternDecl = Self.renderStructExtern( + let liftExternDeclPrinter = CodeFragmentPrinter() + Self.renderStructExtern( + printer: liftExternDeclPrinter, externName: liftExternName, functionName: liftFunctionName, signature: SwiftSignatureBuilder.buildABIFunctionSignature( @@ -1417,39 +1481,39 @@ struct StructCodegen { ) ) - return [bridgedStructExtension, lowerExternDecl, liftExternDecl] + return [ + bridgedStructExtension, "\(raw: lowerExternDeclPrinter.lines.joined(separator: "\n"))", + "\(raw: liftExternDeclPrinter.lines.joined(separator: "\n"))", + ] } private static func renderStructExtern( + printer: CodeFragmentPrinter, externName: String, functionName: String, - signature: FunctionSignatureSyntax - ) -> DeclSyntax { - let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( - moduleName: "bjs", - abiName: externName, - functionName: functionName, - signature: signature - ) - - let stubFuncDecl = FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.fileprivate)) + signature: String + ) { + SwiftCodePattern.buildWasmConditionalCompilationDecls( + printer: printer, + wasmDecl: { printer in + SwiftCodePattern.buildExternFunctionDecl( + printer: printer, + moduleName: "bjs", + abiName: externName, + functionName: functionName, + signature: signature + ) }, - funcKeyword: .keyword(.func), - name: .identifier(functionName), - signature: signature, - body: CodeBlockSyntax { - "fatalError(\"Only available on WebAssembly\")" + elseDecl: { printer in + printer.write( + multilineString: """ + fileprivate func \(functionName)\(signature) { + fatalError("Only available on WebAssembly") + } + """ + ) } ) - - return DeclSyntax( - SwiftCodePattern.buildWasmConditionalCompilationDecls( - wasmDecl: DeclSyntax(externFuncDecl), - elseDecl: DeclSyntax(stubFuncDecl) - ) - ) } private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { @@ -1469,7 +1533,7 @@ struct StructCodegen { } private func generateStructLowerCode(structDef: ExportedStruct) -> [String] { - var lines: [String] = [] + let printer = CodeFragmentPrinter() let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps { @@ -1479,12 +1543,10 @@ struct StructCodegen { accessor: accessor, varPrefix: property.name ) - for stmt in statements { - lines.append(stmt.description) - } + printer.write(multilineString: CodeBlockItemListSyntax(statements).description) } - return lines + return printer.lines } } @@ -1495,7 +1557,7 @@ struct ProtocolCodegen { let wrapperName = "Any\(proto.name)" let protocolName = proto.name - var methodDecls: [DeclSyntax] = [] + var methodDecls: [CodeFragmentPrinter] = [] var externDecls: [DeclSyntax] = [] for method in proto.methods { @@ -1523,72 +1585,72 @@ struct ProtocolCodegen { abiParameters: builder.abiParameterSignatures, returnType: builder.abiReturnType ) - let externFuncDecl = SwiftCodePattern.buildExternFunctionDecl( + let externDeclPrinter = CodeFragmentPrinter() + SwiftCodePattern.buildExternFunctionDecl( + printer: externDeclPrinter, moduleName: moduleName, abiName: method.abiName, functionName: "_extern_\(method.name)", signature: externSignature ) - externDecls.append(DeclSyntax(externFuncDecl)) - let methodImplementation = DeclSyntax( - FunctionDeclSyntax( - name: .identifier(method.name), - signature: signature, - body: builder.getBody() - ) - ) - - methodDecls.append(methodImplementation) + externDecls.append(DeclSyntax("\(raw: externDeclPrinter.lines.joined(separator: "\n"))")) + let methodImplPrinter = CodeFragmentPrinter() + methodImplPrinter.write("func \(method.name)\(signature) {") + methodImplPrinter.indent { + methodImplPrinter.write(lines: builder.body.lines) + } + methodImplPrinter.write("}") + methodDecls.append(methodImplPrinter) } - var propertyDecls: [DeclSyntax] = [] + var propertyDecls: [CodeFragmentPrinter] = [] for property in proto.properties { - let (propertyImpl, propertyExternDecls) = try renderProtocolProperty( + let propertyDeclPrinter = CodeFragmentPrinter() + let propertyExternDecls = try renderProtocolProperty( + printer: propertyDeclPrinter, property: property, protocolName: protocolName, moduleName: moduleName ) - propertyDecls.append(propertyImpl) + propertyDecls.append(propertyDeclPrinter) externDecls.append(contentsOf: propertyExternDecls) } - let structDecl = StructDeclSyntax( - name: .identifier(wrapperName), - inheritanceClause: InheritanceClauseSyntax( - inheritedTypesBuilder: { - InheritedTypeSyntax(type: IdentifierTypeSyntax(name: .identifier(protocolName))) - InheritedTypeSyntax(type: IdentifierTypeSyntax(name: .identifier("_BridgedSwiftProtocolWrapper"))) - } - ), - memberBlockBuilder: { - DeclSyntax( - """ - let jsObject: JSObject - """ - ).with(\.trailingTrivia, .newlines(2)) + let structDeclPrinter = CodeFragmentPrinter() + structDeclPrinter.write("struct \(wrapperName): \(protocolName), _BridgedSwiftProtocolWrapper {") + structDeclPrinter.indent { + structDeclPrinter.write("let jsObject: JSObject") + structDeclPrinter.nextLine() - for decl in methodDecls + propertyDecls { - decl.with(\.trailingTrivia, .newlines(2)) - } + for methodDecl in methodDecls { + structDeclPrinter.write(lines: methodDecl.lines) + structDeclPrinter.nextLine() + } - DeclSyntax( - """ + for decl in propertyDecls { + structDeclPrinter.write(lines: decl.lines) + structDeclPrinter.nextLine() + } + structDeclPrinter.write( + multilineString: """ static func bridgeJSLiftParameter(_ value: Int32) -> Self { - return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) + return \(wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) } """ - ) - } - ) - return [DeclSyntax(structDecl)] + externDecls + ) + } + structDeclPrinter.write("}") + + return ["\(raw: structDeclPrinter.lines.joined(separator: "\n"))"] + externDecls } private func renderProtocolProperty( + printer: CodeFragmentPrinter, property: ExportedProtocolProperty, protocolName: String, moduleName: String - ) throws -> (propertyDecl: DeclSyntax, externDecls: [DeclSyntax]) { + ) throws -> [DeclSyntax] { let getterAbiName = ABINameGenerator.generateABIName( baseName: property.name, operation: "get", @@ -1614,37 +1676,27 @@ struct ProtocolCodegen { abiParameters: getterBuilder.abiParameterSignatures, returnType: getterBuilder.abiReturnType ) - let getterExternDecl = SwiftCodePattern.buildExternFunctionDecl( + let getterExternDeclPrinter = CodeFragmentPrinter() + SwiftCodePattern.buildExternFunctionDecl( + printer: getterExternDeclPrinter, moduleName: moduleName, abiName: getterAbiName, functionName: getterAbiName, signature: getterExternSignature ) + let getterExternDecl = DeclSyntax("\(raw: getterExternDeclPrinter.lines.joined(separator: "\n"))") + var externDecls: [DeclSyntax] = [getterExternDecl] + + printer.write("var \(property.name): \(property.type.swiftType) {") + try printer.indent { + printer.write("get {") + printer.indent { + printer.write(lines: getterBuilder.body.lines) + } + printer.write("}") + + if property.isReadonly { return } - if property.isReadonly { - let propertyDecl = VariableDeclSyntax( - bindingSpecifier: .keyword(.var), - bindings: PatternBindingListSyntax { - PatternBindingSyntax( - pattern: IdentifierPatternSyntax(identifier: .identifier(property.name)), - typeAnnotation: TypeAnnotationSyntax( - type: IdentifierTypeSyntax(name: .identifier(property.type.swiftType)) - ), - accessorBlock: AccessorBlockSyntax( - accessors: .accessors( - AccessorDeclListSyntax { - AccessorDeclSyntax( - accessorSpecifier: .keyword(.get), - body: getterBuilder.getBody() - ) - } - ) - ) - ) - } - ) - return (DeclSyntax(propertyDecl), [DeclSyntax(getterExternDecl)]) - } else { let setterBuilder = ImportTS.CallJSEmission( moduleName: moduleName, abiName: setterAbiName, @@ -1659,40 +1711,26 @@ struct ProtocolCodegen { abiParameters: setterBuilder.abiParameterSignatures, returnType: setterBuilder.abiReturnType ) - let setterExternDecl = SwiftCodePattern.buildExternFunctionDecl( + let setterExternDeclPrinter = CodeFragmentPrinter() + SwiftCodePattern.buildExternFunctionDecl( + printer: setterExternDeclPrinter, moduleName: moduleName, abiName: setterAbiName, functionName: setterAbiName, signature: setterExternSignature ) + let setterExternDecl = DeclSyntax("\(raw: setterExternDeclPrinter.lines.joined(separator: "\n"))") + externDecls.append(setterExternDecl) - let propertyDecl = VariableDeclSyntax( - bindingSpecifier: .keyword(.var), - bindings: PatternBindingListSyntax { - PatternBindingSyntax( - pattern: IdentifierPatternSyntax(identifier: .identifier(property.name)), - typeAnnotation: TypeAnnotationSyntax( - type: IdentifierTypeSyntax(name: .identifier(property.type.swiftType)) - ), - accessorBlock: AccessorBlockSyntax( - accessors: .accessors( - AccessorDeclListSyntax { - AccessorDeclSyntax( - accessorSpecifier: .keyword(.get), - body: getterBuilder.getBody() - ) - AccessorDeclSyntax( - accessorSpecifier: .keyword(.set), - body: setterBuilder.getBody() - ) - } - ) - ) - ) - } - ) - return (DeclSyntax(propertyDecl), [DeclSyntax(getterExternDecl), DeclSyntax(setterExternDecl)]) + printer.write("set {") + printer.indent { + printer.write(lines: setterBuilder.body.lines) + } + printer.write("}") } + printer.write("}") + + return externDecls } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index d5cc945ee..8eead20b7 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -85,16 +85,16 @@ public struct ImportTS { let moduleName: String let context: BridgeContext - var body: [CodeBlockItemSyntax] = [] - var abiParameterForwardings: [LabeledExprSyntax] = [] + var body = CodeFragmentPrinter() + var abiParameterForwardings: [String] = [] var abiParameterSignatures: [(name: String, type: WasmCoreType)] = [] var abiReturnType: WasmCoreType? // Track destructured variable names for multiple lowered parameters var destructuredVarNames: [String] = [] // Stack-lowered parameters should be evaluated in reverse order to match LIFO stacks - var stackLoweringStmts: [CodeBlockItemSyntax] = [] + var stackLoweringStmts: [String] = [] // Values to extend lifetime during call - var valuesToExtendLifetimeDuringCall: [ExprSyntax] = [] + var valuesToExtendLifetimeDuringCall: [String] = [] init(moduleName: String, abiName: String, context: BridgeContext = .importTS) { self.moduleName = moduleName @@ -108,34 +108,17 @@ public struct ImportTS { switch param.type { case .closure(let signature, useJSTypedClosure: false): let jsTypedClosureType = BridgeType.closure(signature, useJSTypedClosure: true).swiftType - body.append("let \(raw: param.name) = \(raw: jsTypedClosureType)(\(raw: param.name))") + body.write("let \(param.name) = \(jsTypedClosureType)(\(param.name))") // The just created JSObject is not owned by the caller unlike those passed in parameters, // so we need to extend its lifetime during the call to ensure the JSObject.id is valid. - valuesToExtendLifetimeDuringCall.append("\(raw: param.name)") + valuesToExtendLifetimeDuringCall.append(param.name) default: break } let initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") if loweringInfo.loweredParameters.isEmpty { - let stmt = CodeBlockItemSyntax( - item: .decl( - DeclSyntax( - VariableDeclSyntax( - bindingSpecifier: .keyword(.let), - bindings: PatternBindingListSyntax { - PatternBindingSyntax( - pattern: PatternSyntax( - IdentifierPatternSyntax(identifier: .wildcardToken()) - ), - initializer: InitializerClauseSyntax(value: initializerExpr) - ) - } - ) - ) - ) - ) - stackLoweringStmts.insert(stmt, at: 0) + stackLoweringStmts.insert("let _ = \(initializerExpr)", at: 0) return } @@ -145,40 +128,14 @@ public struct ImportTS { } // Always add destructuring statement to body (unified for single and multiple) - let pattern: PatternSyntax + let pattern: String if destructuredNames.count == 1 { - pattern = PatternSyntax(IdentifierPatternSyntax(identifier: .identifier(destructuredNames[0]))) + pattern = destructuredNames[0] } else { - pattern = PatternSyntax( - TuplePatternSyntax { - for name in destructuredNames { - TuplePatternElementSyntax( - pattern: IdentifierPatternSyntax(identifier: .identifier(name)) - ) - } - } - ) + pattern = "(" + destructuredNames.joined(separator: ", ") + ")" } - body.append( - CodeBlockItemSyntax( - item: .decl( - DeclSyntax( - VariableDeclSyntax( - bindingSpecifier: .keyword(.let), - bindings: PatternBindingListSyntax { - PatternBindingSyntax( - pattern: pattern, - initializer: InitializerClauseSyntax( - value: initializerExpr - ) - ) - } - ) - ) - ) - ) - ) + body.write("let \(pattern) = \(initializerExpr)") destructuredVarNames.append(contentsOf: destructuredNames) // Add to signatures and forwardings (unified for both single and multiple) @@ -194,63 +151,36 @@ public struct ImportTS { // Always use destructured variable in call without labels // Swift allows omitting labels when they match parameter names - let callExpr = ExprSyntax("\(raw: destructuredNames[index])") - abiParameterForwardings.append( - LabeledExprSyntax(expression: callExpr) - ) + abiParameterForwardings.append(destructuredNames[index]) } } func call(returnType: BridgeType) throws { - let liftingInfo = try returnType.liftingReturnInfo(context: context) - body.append(contentsOf: stackLoweringStmts) - - var callExpr = FunctionCallExprSyntax( - calledExpression: ExprSyntax("\(raw: abiName)"), - leftParen: .leftParenToken(), - arguments: LabeledExprListSyntax { - for forwarding in abiParameterForwardings { - forwarding - } - }, - rightParen: .rightParenToken() - ) + let liftingInfo: BridgeType.LiftingReturnInfo = try returnType.liftingReturnInfo(context: context) + for stmt in stackLoweringStmts { + body.write(stmt.description) + } + + let assign = + (returnType == .void || returnType.usesSideChannelForOptionalReturn() || liftingInfo.valueToLift == nil) + ? "" : "let ret = " + let callExpr = "\(abiName)(\(abiParameterForwardings.joined(separator: ", ")))" if !valuesToExtendLifetimeDuringCall.isEmpty { - callExpr = FunctionCallExprSyntax( - calledExpression: ExprSyntax("withExtendedLifetime"), - leftParen: .leftParenToken(), - arguments: LabeledExprListSyntax { - LabeledExprSyntax( - expression: TupleExprSyntax( - elements: LabeledExprListSyntax { - for value in valuesToExtendLifetimeDuringCall { - LabeledExprSyntax(expression: value) - } - } - ) - ) - }, - rightParen: .rightParenToken(), - trailingClosure: ClosureExprSyntax( - leftBrace: .leftBraceToken(), - statements: CodeBlockItemListSyntax { - CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr)))) - }, - rightBrace: .rightBraceToken() - ) + body.write( + "\(assign)withExtendedLifetime((\(valuesToExtendLifetimeDuringCall.joined(separator: ", ")))) {" ) - } - - if returnType == .void || returnType.usesSideChannelForOptionalReturn() || liftingInfo.valueToLift == nil { - body.append(CodeBlockItemSyntax(item: .stmt(StmtSyntax(ExpressionStmtSyntax(expression: callExpr))))) + body.indent { + body.write(callExpr) + } + body.write("}") } else { - body.append("let ret = \(raw: callExpr)") + body.write("\(assign)\(callExpr)") } // Add exception check for ImportTS context if context == .importTS { - body.append("if let error = _swift_js_take_exception() { throw error }") + body.write("if let error = _swift_js_take_exception() { throw error }") } } @@ -265,54 +195,30 @@ public struct ImportTS { if returnType.usesSideChannelForOptionalReturn() { // Side channel returns: extern function returns Void, value is retrieved via side channel abiReturnType = nil - body.append( - CodeBlockItemSyntax( - item: .stmt( - StmtSyntax( - ReturnStmtSyntax( - expression: ExprSyntax( - "\(raw: returnType.swiftType).bridgeJSLiftReturnFromSideChannel()" - ) - ) - ) - ) - ) - ) + body.write("return \(returnType.swiftType).bridgeJSLiftReturnFromSideChannel()") } else { abiReturnType = liftingInfo.valueToLift - let liftExpr: ExprSyntax + let liftExpr: String switch returnType { case .closure(let signature, _): - liftExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(ret)") + liftExpr = "_BJS_Closure_\(signature.mangleName).bridgeJSLift(ret)" default: if liftingInfo.valueToLift != nil { - liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn(ret)" + liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn(ret)" } else { - liftExpr = "\(raw: returnType.swiftType).bridgeJSLiftReturn()" + liftExpr = "\(returnType.swiftType).bridgeJSLiftReturn()" } } - body.append( - CodeBlockItemSyntax( - item: .stmt( - StmtSyntax( - ReturnStmtSyntax(expression: liftExpr) - ) - ) - ) - ) + body.write("return \(liftExpr)") } } - func getBody() -> CodeBlockSyntax { - return CodeBlockSyntax(statements: CodeBlockItemListSyntax(body)) - } - func assignThis(returnType: BridgeType) { guard case .jsObject = returnType else { preconditionFailure("assignThis can only be called with a jsObject return type") } abiReturnType = .i32 - body.append("self.jsObject = JSObject(id: UInt32(bitPattern: ret))") + body.write("self.jsObject = JSObject(id: UInt32(bitPattern: ret))") } func renderImportDecl() -> DeclSyntax { @@ -321,40 +227,33 @@ public struct ImportTS { returnType: abiReturnType ) - // Build extern function declaration (no body) - let externFuncDecl = FunctionDeclSyntax( - attributes: SwiftCodePattern.buildExternAttribute(moduleName: moduleName, abiName: abiName), - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.fileprivate)).with(\.trailingTrivia, .space) - }, - funcKeyword: .keyword(.func).with(\.trailingTrivia, .space), - name: .identifier(abiName), - signature: signature - ) - - // Build stub function declaration (with fatalError body) - let stubFuncDecl = FunctionDeclSyntax( - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.fileprivate)).with(\.trailingTrivia, .space) + let printer = CodeFragmentPrinter() + SwiftCodePattern.buildWasmConditionalCompilationDecls( + printer: printer, + wasmDecl: { printer in + SwiftCodePattern.buildExternFunctionDecl( + printer: printer, + moduleName: moduleName, + abiName: abiName, + functionName: abiName, + signature: signature + ) }, - funcKeyword: .keyword(.func).with(\.trailingTrivia, .space), - name: .identifier(abiName), - signature: signature, - body: CodeBlockSyntax { - "fatalError(\"Only available on WebAssembly\")" + elseDecl: { printer in + printer.write( + multilineString: """ + fileprivate func \(abiName)\(signature) { + fatalError("Only available on WebAssembly") + } + """ + ) } ) - - // Use conditional compilation helper - return DeclSyntax( - SwiftCodePattern.buildWasmConditionalCompilationDecls( - wasmDecl: DeclSyntax(externFuncDecl), - elseDecl: DeclSyntax(stubFuncDecl) - ) - ) + return "\(raw: printer.lines.joined(separator: "\n"))" } func renderThunkDecl(name: String, parameters: [Parameter], returnType: BridgeType) -> DeclSyntax { + let printer = CodeFragmentPrinter() let effects = Effects(isAsync: false, isThrows: true) let signature = SwiftSignatureBuilder.buildFunctionSignature( parameters: parameters, @@ -362,35 +261,28 @@ public struct ImportTS { effects: effects, useWildcardLabels: true ) - return DeclSyntax( - FunctionDeclSyntax( - name: .identifier(name.backtickIfNeeded()), - signature: signature, - body: CodeBlockSyntax { - body - } - ) - ) + printer.write("func \(name.backtickIfNeeded())\(signature) {") + printer.indent { + printer.write(lines: body.lines) + } + printer.write("}") + return "\(raw: printer.lines.joined(separator: "\n"))" } func renderConstructorDecl(parameters: [Parameter]) -> DeclSyntax { + let printer = CodeFragmentPrinter() let effects = Effects(isAsync: false, isThrows: true) - // Constructors don't have return types, so build signature without return clause - let signature = FunctionSignatureSyntax( - parameterClause: SwiftSignatureBuilder.buildParameterClause( - parameters: parameters, - useWildcardLabels: true - ), - effectSpecifiers: SwiftSignatureBuilder.buildEffectSpecifiers(effects: effects) - ) - return DeclSyntax( - InitializerDeclSyntax( - signature: signature, - bodyBuilder: { - body - } - ) + let parameterClause = SwiftSignatureBuilder.buildParameterClause( + parameters: parameters, + useWildcardLabels: true ) + let effectSpecifiers = SwiftSignatureBuilder.buildEffectSpecifiers(effects: effects) + printer.write("init\(parameterClause)\(effectSpecifiers.map { " \($0)" } ?? "") {") + printer.indent { + printer.write(lines: body.lines) + } + printer.write("}") + return "\(raw: printer.lines.joined(separator: "\n"))" } } @@ -600,12 +492,17 @@ struct SwiftSignatureBuilder { returnType: BridgeType, effects: Effects? = nil, useWildcardLabels: Bool = false - ) -> FunctionSignatureSyntax { - return FunctionSignatureSyntax( - parameterClause: buildParameterClause(parameters: parameters, useWildcardLabels: useWildcardLabels), - effectSpecifiers: effects.flatMap { buildEffectSpecifiers(effects: $0) }, - returnClause: buildReturnClause(returnType: returnType) - ) + ) -> String { + let parameterClause = buildParameterClause(parameters: parameters, useWildcardLabels: useWildcardLabels) + let effectSpecifiers = effects.flatMap { buildEffectSpecifiers(effects: $0) } + let returnClause = buildReturnClause(returnType: returnType) + var out = "" + out += parameterClause + if let effectSpecifiers { + out += " \(effectSpecifiers)" + } + out += returnClause + return out } /// Builds a function signature for ABI/extern functions using WasmCoreType parameters @@ -619,12 +516,14 @@ struct SwiftSignatureBuilder { abiParameters: [(name: String, type: WasmCoreType)], returnType: WasmCoreType?, effects: Effects? = nil - ) -> FunctionSignatureSyntax { - return FunctionSignatureSyntax( - parameterClause: buildABIParameterClause(abiParameters: abiParameters), - effectSpecifiers: effects.flatMap { buildEffectSpecifiers(effects: $0) }, - returnClause: buildABIReturnClause(returnType: returnType) - ) + ) -> String { + var out = "" + out += buildABIParameterClause(abiParameters: abiParameters) + if let effects = effects, let effectSpecifiers = buildEffectSpecifiers(effects: effects) { + out += " \(effectSpecifiers)" + } + out += buildABIReturnClause(returnType: returnType) + return out } /// Builds a parameter clause from an array of Parameter structs @@ -639,48 +538,28 @@ struct SwiftSignatureBuilder { static func buildParameterClause( parameters: [Parameter], useWildcardLabels: Bool = false - ) -> FunctionParameterClauseSyntax { - return FunctionParameterClauseSyntax(parametersBuilder: { - for param in parameters { - let paramTypeSyntax = buildParameterTypeSyntax(from: param.type) - if useWildcardLabels { - // Always use wildcard labels: "_ name: Type" - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier(param.name), - colon: .colonToken(), - type: paramTypeSyntax - ) - } else { - let label = param.label ?? param.name - if label == param.name { - // External label same as parameter name: "count: Int" - FunctionParameterSyntax( - firstName: .identifier(label), - secondName: nil, - colon: .colonToken(), - type: paramTypeSyntax - ) - } else if param.label == nil { - // No label specified: use wildcard "_ name: Type" - FunctionParameterSyntax( - firstName: .wildcardToken(), - secondName: .identifier(param.name), - colon: .colonToken(), - type: paramTypeSyntax - ) - } else { - // External label differs: "label count: Int" - FunctionParameterSyntax( - firstName: .identifier(label), - secondName: .identifier(param.name), - colon: .colonToken(), - type: paramTypeSyntax - ) - } - } + ) -> String { + var out = "(" + out += parameters.map { param in + let label = param.label ?? param.name + let paramType = buildParameterTypeSyntax(from: param.type) + + if useWildcardLabels { + // Always use wildcard labels: "_ name: Type" + return "_ \(param.name): \(paramType)" + } else if label == param.name { + // External label same as parameter name: "count: Int" + return "\(param.name): \(paramType)" + } else if param.label == nil { + // No label specified: use wildcard "_ name: Type" + return "_ \(param.name): \(paramType)" + } else { + // External label differs: "label count: Int" + return "\(label) \(param.name): \(paramType)" } - }) + }.joined(separator: ", ") + out += ")" + return out } /// Builds a parameter clause for ABI/extern functions @@ -688,77 +567,56 @@ struct SwiftSignatureBuilder { /// All parameters use wildcard labels: "_ name: Type" static func buildABIParameterClause( abiParameters: [(name: String, type: WasmCoreType)] - ) -> FunctionParameterClauseSyntax { - return FunctionParameterClauseSyntax(parametersBuilder: { - for param in abiParameters { - FunctionParameterSyntax( - firstName: .wildcardToken().with(\.trailingTrivia, .space), - secondName: .identifier(param.name), - type: IdentifierTypeSyntax(name: .identifier(param.type.swiftType)) - ) - } - }) + ) -> String { + "(" + + abiParameters.map { param in + "_ \(param.name): \(param.type.swiftType)" + }.joined(separator: ", ") + ")" } /// Builds a return clause from a BridgeType /// /// Always returns a ReturnClauseSyntax, including for Void types /// (to match original behavior that explicitly includes "-> Void") - static func buildReturnClause(returnType: BridgeType) -> ReturnClauseSyntax? { - return ReturnClauseSyntax( - arrow: .arrowToken(), - type: buildTypeSyntax(from: returnType) - ) + static func buildReturnClause(returnType: BridgeType) -> String { + return " -> \(returnType.swiftType)" } /// Builds a return clause for ABI/extern functions /// /// Returns nil for Void (when returnType is nil), otherwise returns a ReturnClauseSyntax - static func buildABIReturnClause(returnType: WasmCoreType?) -> ReturnClauseSyntax? { + static func buildABIReturnClause(returnType: WasmCoreType?) -> String { guard let returnType = returnType else { - return ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier("Void")) - ) + return " -> Void" } - return ReturnClauseSyntax( - arrow: .arrowToken(), - type: IdentifierTypeSyntax(name: .identifier(returnType.swiftType)) - ) + return " -> \(returnType.swiftType)" } /// Builds effect specifiers (async/throws) from an Effects struct /// /// Uses JSException as the thrown error type for throws clauses - static func buildEffectSpecifiers(effects: Effects) -> FunctionEffectSpecifiersSyntax? { + static func buildEffectSpecifiers(effects: Effects) -> String? { guard effects.isAsync || effects.isThrows else { return nil } - return FunctionEffectSpecifiersSyntax( - asyncSpecifier: effects.isAsync ? .keyword(.async) : nil, - throwsClause: effects.isThrows - ? ThrowsClauseSyntax( - throwsSpecifier: .keyword(.throws), - leftParen: .leftParenToken(), - type: IdentifierTypeSyntax(name: .identifier("JSException")), - rightParen: .rightParenToken() - ) : nil - ) + var items: [String] = [] + if effects.isAsync { items.append("async") } + if effects.isThrows { items.append("throws(JSException)") } + return items.joined(separator: " ") } /// Builds a TypeSyntax node from a BridgeType /// /// Converts BridgeType to its Swift type representation as a TypeSyntax node - static func buildTypeSyntax(from type: BridgeType) -> TypeSyntax { - let identifierType = IdentifierTypeSyntax(name: .identifier(type.swiftType)) - return TypeSyntax(identifierType) + static func buildTypeSyntax(from type: BridgeType) -> String { + return type.swiftType } /// Builds a parameter type syntax from a BridgeType. - static func buildParameterTypeSyntax(from type: BridgeType) -> TypeSyntax { + static func buildParameterTypeSyntax(from type: BridgeType) -> String { switch type { case .closure(_, useJSTypedClosure: false): - return TypeSyntax("@escaping \(raw: type.swiftType)") + return "@escaping \(type.swiftType)" default: return buildTypeSyntax(from: type) } @@ -768,167 +626,69 @@ struct SwiftSignatureBuilder { enum SwiftCodePattern { /// Builds a conditional compilation block with #if arch(wasm32) and #else fatalError static func buildWasmConditionalCompilation( - wasmBody: CodeBlockItemListSyntax - ) -> IfConfigDeclSyntax { - return IfConfigDeclSyntax( - clauses: IfConfigClauseListSyntax { - IfConfigClauseSyntax( - poundKeyword: .poundIfToken(), - condition: ExprSyntax("arch(wasm32)"), - elements: .statements(wasmBody) - ) - IfConfigClauseSyntax( - poundKeyword: .poundElseToken(), - elements: .statements( - CodeBlockItemListSyntax { - "fatalError(\"Only available on WebAssembly\")" - } - ) - ) - } - ) + printer: CodeFragmentPrinter, + wasmBody: (_ printer: CodeFragmentPrinter) -> Void + ) { + printer.write("#if arch(wasm32)") + wasmBody(printer) + printer.write("#else") + printer.write("fatalError(\"Only available on WebAssembly\")") + printer.write("#endif") } /// Builds a conditional compilation block with #if arch(wasm32) and #else for declarations static func buildWasmConditionalCompilationDecls( - wasmDecl: DeclSyntax, - elseDecl: DeclSyntax - ) -> IfConfigDeclSyntax { - return IfConfigDeclSyntax( - clauses: IfConfigClauseListSyntax { - IfConfigClauseSyntax( - poundKeyword: .poundIfToken(), - condition: ExprSyntax("arch(wasm32)"), - elements: .statements( - CodeBlockItemListSyntax { - CodeBlockItemSyntax(item: .decl(wasmDecl)) - } - ) - ) - IfConfigClauseSyntax( - poundKeyword: .poundElseToken(), - elements: .statements( - CodeBlockItemListSyntax { - CodeBlockItemSyntax(item: .decl(elseDecl)) - } - ) - ) - } - ) + printer: CodeFragmentPrinter, + wasmDecl: (_ printer: CodeFragmentPrinter) -> Void, + elseDecl: (_ printer: CodeFragmentPrinter) -> Void + ) { + printer.write("#if arch(wasm32)") + wasmDecl(printer) + printer.write("#else") + elseDecl(printer) + printer.write("#endif") } /// Builds the @_extern attribute for WebAssembly extern function declarations /// Builds an @_extern function declaration (no body, just the declaration) static func buildExternFunctionDecl( + printer: CodeFragmentPrinter, moduleName: String, abiName: String, functionName: String, - signature: FunctionSignatureSyntax - ) -> FunctionDeclSyntax { - return FunctionDeclSyntax( - attributes: buildExternAttribute(moduleName: moduleName, abiName: abiName), - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.fileprivate)) - }, - funcKeyword: .keyword(.func), - name: .identifier(functionName), - signature: signature - ) + signature: String + ) { + printer.write(buildExternAttribute(moduleName: moduleName, abiName: abiName)) + printer.write("fileprivate func \(functionName)\(signature)") } /// Builds the standard @_expose and @_cdecl attributes for WebAssembly-exposed functions - static func buildExposeAttributes(abiName: String) -> AttributeListSyntax { - return AttributeListSyntax { - #if canImport(SwiftSyntax602) - let exposeAttrArgs = AttributeSyntax.Arguments.argumentList( - LabeledExprListSyntax { - LabeledExprSyntax(label: nil, expression: DeclReferenceExprSyntax(baseName: "wasm")) - .with(\.trailingComma, .commaToken()) - LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)) - } - ) - let cdeclAttrArgs = AttributeSyntax.Arguments.argumentList( - [ - LabeledExprSyntax(label: nil, expression: StringLiteralExprSyntax(content: abiName)) - ] - ) - #else - let exposeAttrArgs = AttributeSyntax.Arguments.exposeAttributeArguments( - ExposeAttributeArgumentsSyntax( - language: .identifier("wasm"), - comma: .commaToken(), - cxxName: StringLiteralExprSyntax(content: abiName) - ) - ) - let cdeclAttrArgs = AttributeSyntax.Arguments.string(StringLiteralExprSyntax(content: abiName)) - #endif - AttributeSyntax( - attributeName: IdentifierTypeSyntax(name: .identifier("_expose")), - leftParen: .leftParenToken(), - arguments: exposeAttrArgs, - rightParen: .rightParenToken() - ) - .with(\.trailingTrivia, .newline) - - AttributeSyntax( - attributeName: IdentifierTypeSyntax(name: .identifier("_cdecl")), - leftParen: .leftParenToken(), - arguments: cdeclAttrArgs, - rightParen: .rightParenToken() - ) - .with(\.trailingTrivia, .newline) - } + static func buildExposeAttributes(abiName: String) -> String { + return """ + @_expose(wasm, "\(abiName)") + @_cdecl("\(abiName)") + """ } /// Builds a function declaration with @_expose/@_cdecl attributes and conditional compilation static func buildExposedFunctionDecl( abiName: String, - signature: FunctionSignatureSyntax, - body: CodeBlockItemListSyntax - ) -> FunctionDeclSyntax { - let funcBody = CodeBlockSyntax { - buildWasmConditionalCompilation(wasmBody: body) + signature: String, + body: (CodeFragmentPrinter) -> Void + ) -> DeclSyntax { + let printer = CodeFragmentPrinter() + printer.write(buildExposeAttributes(abiName: abiName)) + printer.write("public func _\(abiName)\(signature) {") + printer.indent { + buildWasmConditionalCompilation(printer: printer, wasmBody: body) } - - return FunctionDeclSyntax( - attributes: buildExposeAttributes(abiName: abiName), - modifiers: DeclModifierListSyntax { - DeclModifierSyntax(name: .keyword(.public)) - }, - funcKeyword: .keyword(.func), - name: .identifier("_\(abiName)"), - signature: signature, - body: funcBody - ) + printer.write("}") + return "\(raw: printer.lines.joined(separator: "\n"))" } /// Builds the @_extern attribute for WebAssembly extern function declarations - static func buildExternAttribute(moduleName: String, abiName: String) -> AttributeListSyntax { - return AttributeListSyntax { - AttributeSyntax( - attributeName: IdentifierTypeSyntax(name: .identifier("_extern")), - leftParen: .leftParenToken(), - arguments: .argumentList( - LabeledExprListSyntax { - LabeledExprSyntax( - expression: ExprSyntax("wasm") - ) - LabeledExprSyntax( - label: .identifier("module"), - colon: .colonToken(), - expression: StringLiteralExprSyntax(content: moduleName) - ) - LabeledExprSyntax( - label: .identifier("name"), - colon: .colonToken(), - expression: StringLiteralExprSyntax(content: abiName) - ) - } - ), - rightParen: .rightParenToken() - ) - .with(\.trailingTrivia, .newline) - } + static func buildExternAttribute(moduleName: String, abiName: String) -> String { + return "@_extern(wasm, module: \"\(moduleName)\", name: \"\(abiName)\")" } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift index ed6fa04f0..68c07f225 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSUtilities/Utilities.swift @@ -60,6 +60,12 @@ public final class CodeFragmentPrinter { self.write(lines: printer.lines) } + public func write(multilineString: String) { + for line in multilineString.split(separator: "\n") { + write(line) + } + } + public func indent() { indentLevel += 1 } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 023caf21f..261c0b066 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -229,17 +229,19 @@ public func _bjs_processOptionalIntArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -254,17 +256,19 @@ public func _bjs_processOptionalStringArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -281,10 +285,11 @@ public func _bjs_processOptionalArray(_ values: Int32) -> Void { } else { return [Int].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -299,17 +304,19 @@ public func _bjs_processOptionalPointArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -324,17 +331,19 @@ public func _bjs_processOptionalDirectionArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -349,17 +358,19 @@ public func _bjs_processOptionalStatusArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -374,14 +385,15 @@ public func _bjs_processNestedIntArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -396,14 +408,15 @@ public func _bjs_processNestedStringArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[String]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([String].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -418,14 +431,15 @@ public func _bjs_processNestedPointArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Point]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Point].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -451,14 +465,15 @@ public func _bjs_processNestedItemArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Item]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Item].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -484,17 +499,19 @@ public func _bjs_processOptionalJSObjectArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -509,14 +526,15 @@ public func _bjs_processNestedJSObjectArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[JSObject]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([JSObject].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift index 4c97553de..f5230f213 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift @@ -4,7 +4,7 @@ public func _bjs_asyncReturnVoid() -> Int32 { #if arch(wasm32) let ret = JSPromise.async { await asyncReturnVoid() - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -17,7 +17,7 @@ public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripInt(_: Int.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -30,7 +30,7 @@ public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int3 #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripString(_: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -43,7 +43,7 @@ public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripBool(_: Bool.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -56,7 +56,7 @@ public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripFloat(_: Float.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -69,7 +69,7 @@ public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripDouble(_: Double.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -82,7 +82,7 @@ public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripJSObject(_: JSObject.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 26454a2a7..f2029749c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -309,36 +309,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -360,36 +360,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) _swift_js_push_tag(Int32(2)) @@ -474,14 +474,14 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) @@ -511,14 +511,14 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(2)) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) @@ -618,13 +618,13 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { return .optNestedEnum(Optional.bridgeJSLiftParameter()) case 4: return .optArray({ - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } +}()) case 5: return .empty default: @@ -639,35 +639,35 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optStruct(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(1) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(4) @@ -691,35 +691,35 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optStruct(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(1)) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(2)) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) case .optArray(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(4)) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index 6d9bee080..cd0f56694 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -1,8 +1,6 @@ extension FooContainer: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { - let optionalFoo = Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - } + let optionalFoo = Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) } let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) return FooContainer(foo: foo, optionalFoo: optionalFoo) } @@ -11,7 +9,7 @@ extension FooContainer: _BridgedSwiftStruct { self.foo.jsObject.bridgeJSLowerStackReturn() let __bjs_isSome_optionalFoo = self.optionalFoo != nil if let __bjs_unwrapped_optionalFoo = self.optionalFoo { - __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) } @@ -82,15 +80,13 @@ public func _bjs_processFooArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Foo] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) } __result.reverse() return __result - }()) - ret.map { - $0.jsObject - } .bridgeJSLowerReturn() + }()) + ret.map { $0.jsObject }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -104,19 +100,19 @@ public func _bjs_processOptionalFooArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - }) + for _ in 0..<__count { + __result.append(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index f3550129c..b4e45bbc9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -41,10 +41,11 @@ public func _bjs_roundTripOptionalJSValueArray(_ values: Int32) -> Void { } else { return [JSValue].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 3536b53cb..55521dbaf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -417,9 +417,7 @@ extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { public func _bjs_processDelegates() -> Void { #if arch(wasm32) let ret = processDelegates(_: [AnyMyViewControllerDelegate].bridgeJSLiftParameter()) - ret.map { - $0 as! AnyMyViewControllerDelegate - } .bridgeJSLowerReturn() + ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -590,9 +588,7 @@ public func _bjs_MyViewController_delegate_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_secondDelegate_get") public func _bjs_MyViewController_secondDelegate_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate.flatMap { - $0 as? AnyMyViewControllerDelegate - } + let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate.flatMap { $0 as? AnyMyViewControllerDelegate } return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -660,9 +656,7 @@ public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates - ret.map { - $0 as! AnyMyViewControllerDelegate - } .bridgeJSLowerReturn() + ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index ca2467249..1ff0a4ce8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -17,12 +17,12 @@ extension DataPoint: _BridgedSwiftStruct { self.label.bridgeJSLowerStackReturn() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() + __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() + __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -84,7 +84,7 @@ extension Address: _BridgedSwiftStruct { self.city.bridgeJSLowerStackReturn() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() + __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -137,7 +137,7 @@ extension Person: _BridgedSwiftStruct { self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -233,7 +233,7 @@ extension Measurement: _BridgedSwiftStruct { self.precision.bridgeJSLowerStackReturn() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) } @@ -277,7 +277,6 @@ extension ConfigStruct: _BridgedSwiftStruct { } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - } init(unsafelyCopying jsObject: JSObject) { @@ -399,7 +398,7 @@ extension Container: _BridgedSwiftStruct { self.object.bridgeJSLowerStackReturn() let __bjs_isSome_optionalObject = self.optionalObject != nil if let __bjs_unwrapped_optionalObject = self.optionalObject { - __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index b10a82fdf..af9f15dbc 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -655,7 +655,7 @@ fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1, param2 in + return { [callback] (param0, param1, param2) in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() @@ -714,7 +714,7 @@ fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int, Int) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1, param2 in + return { [callback] (param0, param1, param2) in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() @@ -773,7 +773,7 @@ fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsS private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] param0, param1 in + return { [callback] (param0, param1) in #if arch(wasm32) let callbackValue = callback.bridgeJSLowerParameter() let param0Value = param0.bridgeJSLowerParameter() @@ -2443,14 +2443,14 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) @@ -2480,14 +2480,14 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(2)) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) @@ -2815,17 +2815,15 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { return .optNestedEnum(Optional.bridgeJSLiftParameter()) case 4: return .optArray({ - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) + let __isSome = _swift_js_pop_i32() + if __isSome == 0 { + return Optional<[Int]>.none + } else { + return [Int].bridgeJSLiftParameter() + } +}()) case 5: - return .optJsClass(Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - }) + return .optJsClass(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) case 6: return .empty default: @@ -2840,42 +2838,42 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optStruct(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(1) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(4) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(5) @@ -2899,42 +2897,42 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optStruct(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(1)) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(2)) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) case .optArray(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() + __bjs_unwrapped_param0.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(4)) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(5)) @@ -2965,36 +2963,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -3016,36 +3014,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(0)) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) _swift_js_push_tag(Int32(1)) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) _swift_js_push_tag(Int32(2)) @@ -3176,12 +3174,12 @@ extension DataPoint: _BridgedSwiftStruct { self.label.bridgeJSLowerStackReturn() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() + __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() + __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -3243,7 +3241,7 @@ extension Address: _BridgedSwiftStruct { self.city.bridgeJSLowerStackReturn() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() + __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -3297,12 +3295,12 @@ extension Contact: _BridgedSwiftStruct { self.address.bridgeJSLowerReturn() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) let __bjs_isSome_secondaryAddress = self.secondaryAddress != nil if let __bjs_unwrapped_secondaryAddress = self.secondaryAddress { - __bjs_unwrapped_secondaryAddress.bridgeJSLowerReturn() + __bjs_unwrapped_secondaryAddress.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_secondaryAddress ? 1 : 0) } @@ -3353,12 +3351,12 @@ extension Config: _BridgedSwiftStruct { self.name.bridgeJSLowerStackReturn() let __bjs_isSome_theme = self.theme != nil if let __bjs_unwrapped_theme = self.theme { - __bjs_unwrapped_theme.bridgeJSLowerStackReturn() + __bjs_unwrapped_theme.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_theme ? 1 : 0) let __bjs_isSome_direction = self.direction != nil if let __bjs_unwrapped_direction = self.direction { - __bjs_unwrapped_direction.bridgeJSLowerStackReturn() + __bjs_unwrapped_direction.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_direction ? 1 : 0) self.status.bridgeJSLowerStackReturn() @@ -3408,7 +3406,7 @@ extension SessionData: _BridgedSwiftStruct { self.id.bridgeJSLowerStackReturn() let __bjs_isSome_owner = self.owner != nil if let __bjs_unwrapped_owner = self.owner { - __bjs_unwrapped_owner.bridgeJSLowerStackReturn() + __bjs_unwrapped_owner.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_owner ? 1 : 0) } @@ -3460,12 +3458,12 @@ extension ValidationReport: _BridgedSwiftStruct { self.result.bridgeJSLowerReturn() let __bjs_isSome_status = self.status != nil if let __bjs_unwrapped_status = self.status { - __bjs_unwrapped_status.bridgeJSLowerStackReturn() + __bjs_unwrapped_status.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_status ? 1 : 0) let __bjs_isSome_outcome = self.outcome != nil if let __bjs_unwrapped_outcome = self.outcome { - _swift_js_push_i32(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_outcome ? 1 : 0) } @@ -3526,23 +3524,23 @@ extension AdvancedConfig: _BridgedSwiftStruct { self.status.bridgeJSLowerStackReturn() let __bjs_isSome_result = self.result != nil if let __bjs_unwrapped_result = self.result { - _swift_js_push_i32(__bjs_unwrapped_result.bridgeJSLowerParameter()) + _swift_js_push_i32(__bjs_unwrapped_result.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_result ? 1 : 0) let __bjs_isSome_metadata = self.metadata != nil if let __bjs_unwrapped_metadata = self.metadata { - __bjs_unwrapped_metadata.bridgeJSLowerStackReturn() + __bjs_unwrapped_metadata.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_metadata ? 1 : 0) let __bjs_isSome_location = self.location != nil if let __bjs_unwrapped_location = self.location { - __bjs_unwrapped_location.bridgeJSLowerReturn() + __bjs_unwrapped_location.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_location ? 1 : 0) self.defaults.bridgeJSLowerReturn() let __bjs_isSome_overrideDefaults = self.overrideDefaults != nil if let __bjs_unwrapped_overrideDefaults = self.overrideDefaults { - __bjs_unwrapped_overrideDefaults.bridgeJSLowerReturn() + __bjs_unwrapped_overrideDefaults.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_overrideDefaults ? 1 : 0) } @@ -3594,12 +3592,12 @@ extension MeasurementConfig: _BridgedSwiftStruct { self.ratio.bridgeJSLowerStackReturn() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) let __bjs_isSome_optionalRatio = self.optionalRatio != nil if let __bjs_unwrapped_optionalRatio = self.optionalRatio { - __bjs_unwrapped_optionalRatio.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalRatio.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalRatio ? 1 : 0) } @@ -3735,7 +3733,7 @@ extension CopyableCart: _BridgedSwiftStruct { self.x.bridgeJSLowerStackReturn() let __bjs_isSome_note = self.note != nil if let __bjs_unwrapped_note = self.note { - __bjs_unwrapped_note.bridgeJSLowerStackReturn() + __bjs_unwrapped_note.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_note ? 1 : 0) } @@ -3842,7 +3840,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { self.item.bridgeJSLowerReturn() let __bjs_isSome_shippingAddress = self.shippingAddress != nil if let __bjs_unwrapped_shippingAddress = self.shippingAddress { - __bjs_unwrapped_shippingAddress.bridgeJSLowerReturn() + __bjs_unwrapped_shippingAddress.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_shippingAddress ? 1 : 0) } @@ -4011,7 +4009,7 @@ extension JSObjectContainer: _BridgedSwiftStruct { self.object.bridgeJSLowerStackReturn() let __bjs_isSome_optionalObject = self.optionalObject != nil if let __bjs_unwrapped_optionalObject = self.optionalObject { - __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) } @@ -4051,9 +4049,7 @@ fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 { extension FooContainer: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { - let optionalFoo = Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - } + let optionalFoo = Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) } let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) return FooContainer(foo: foo, optionalFoo: optionalFoo) } @@ -4062,7 +4058,7 @@ extension FooContainer: _BridgedSwiftStruct { self.foo.jsObject.bridgeJSLowerStackReturn() let __bjs_isSome_optionalFoo = self.optionalFoo != nil if let __bjs_unwrapped_optionalFoo = self.optionalFoo { - __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) } @@ -4109,7 +4105,7 @@ extension ArrayMembers: _BridgedSwiftStruct { } else { return [String].bridgeJSLiftParameter() } - }() +}() let ints = [Int].bridgeJSLiftParameter() return ArrayMembers(ints: ints, optStrings: optStrings) } @@ -4118,7 +4114,7 @@ extension ArrayMembers: _BridgedSwiftStruct { self.ints.bridgeJSLowerReturn() let __bjs_isSome_optStrings = self.optStrings != nil if let __bjs_unwrapped_optStrings = self.optStrings { - __bjs_unwrapped_optStrings.bridgeJSLowerReturn() + __bjs_unwrapped_optStrings.bridgeJSLowerReturn() } _swift_js_push_i32(__bjs_isSome_optStrings ? 1 : 0) } @@ -4396,10 +4392,11 @@ public func _bjs_roundTripOptionalJSValueArray(_ v: Int32) -> Void { } else { return [JSValue].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -4636,7 +4633,7 @@ public func _bjs_asyncRoundTripVoid() -> Int32 { #if arch(wasm32) let ret = JSPromise.async { await asyncRoundTripVoid() - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4649,7 +4646,7 @@ public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripInt(v: Int.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4662,7 +4659,7 @@ public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripFloat(v: Float.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4675,7 +4672,7 @@ public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripDouble(v: Double.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4688,7 +4685,7 @@ public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripBool(v: Bool.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4701,7 +4698,7 @@ public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int3 #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4714,7 +4711,7 @@ public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4727,7 +4724,7 @@ public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) let ret = JSPromise.async { return await asyncRoundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)).jsValue - } .jsObject + }.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5424,7 +5421,7 @@ public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { } else { return [Int].bridgeJSLiftParameter() } - }()) + }()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5593,17 +5590,19 @@ public func _bjs_roundTripOptionalIntArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5618,17 +5617,19 @@ public func _bjs_roundTripOptionalStringArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5643,17 +5644,19 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5668,17 +5671,19 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5693,17 +5698,19 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5720,10 +5727,11 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { } else { return [Int].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5740,10 +5748,11 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { } else { return [String].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5760,10 +5769,11 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { } else { return [Greeter].bridgeJSLiftParameter() } - }()) + }()) let __bjs_isSome_ret = ret != nil if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn()} + __bjs_unwrapped_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) #else fatalError("Only available on WebAssembly") @@ -5778,14 +5788,15 @@ public func _bjs_roundTripNestedIntArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Int]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Int].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5800,14 +5811,15 @@ public func _bjs_roundTripNestedStringArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[String]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([String].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5822,14 +5834,15 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Double]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Double].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5844,14 +5857,15 @@ public func _bjs_roundTripNestedBoolArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Bool]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Bool].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5866,14 +5880,15 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[DataPoint]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([DataPoint].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5888,14 +5903,15 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Direction]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Direction].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5910,14 +5926,15 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [[Greeter]] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append([Greeter].bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn()} + __bjs_elem_ret.bridgeJSLowerReturn() + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -5995,9 +6012,7 @@ public func _bjs_consumeDataProcessorArrayType() -> Int32 { public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) - ret.map { - $0 as! AnyDataProcessor - } .bridgeJSLowerReturn() + ret.map { $0 as! AnyDataProcessor }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6022,17 +6037,19 @@ public func _bjs_roundTripOptionalJSObjectArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Optional.bridgeJSLiftParameter()) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -6047,15 +6064,13 @@ public func _bjs_roundTripFooArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Foo] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { + for _ in 0..<__count { __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) } __result.reverse() return __result - }()) - ret.map { - $0.jsObject - } .bridgeJSLowerReturn() + }()) + ret.map { $0.jsObject }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -6069,19 +6084,19 @@ public func _bjs_roundTripOptionalFooArray() -> Void { let __count = Int(_swift_js_pop_i32()) var __result: [Optional] = [] __result.reserveCapacity(__count) - for _ in 0 ..< __count { - __result.append(Optional.bridgeJSLiftParameter().map { - Foo(unsafelyWrapping: $0) - }) + for _ in 0..<__count { + __result.append(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) } __result.reverse() return __result - }()) + }()) for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn()} - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0)} + __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn() + } + _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + } _swift_js_push_i32(Int32(ret.count)) #else fatalError("Only available on WebAssembly") @@ -8160,9 +8175,7 @@ public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_backupProcessor_get") public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor.flatMap { - $0 as? AnyDataProcessor - } + let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor.flatMap { $0 as? AnyDataProcessor } return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") From bed117819acf36b3068efc3c93d8e63c4c536560 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 11 Feb 2026 19:13:16 +0100 Subject: [PATCH 200/252] NCF: BridgeJS: Generalize Optional stack ABI for Array, Dictionary, and Struct types --- Benchmarks/Sources/Generated/BridgeJS.swift | 50 +----- .../Sources/BridgeJSCore/ExportSwift.swift | 79 ++------- .../Sources/BridgeJSLink/JSGlueGen.swift | 9 +- .../BridgeJSCodegenTests/ArrayTypes.swift | 22 +-- .../DefaultParameters.swift | 8 +- .../DictionaryTypes.swift | 4 +- .../EnumAssociatedValue.swift | 33 +--- .../BridgeJSCodegenTests/JSValue.swift | 16 +- .../BridgeJSLinkTests/ArrayTypes.js | 3 +- .../BridgeJSLinkTests/DefaultParameters.js | 6 +- .../BridgeJSLinkTests/DictionaryTypes.js | 3 +- .../BridgeJSLinkTests/JSValue.js | 3 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 81 ++++----- .../Generated/BridgeJS.swift | 164 ++++-------------- 14 files changed, 127 insertions(+), 354 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 515d3a531..e4e147f5b 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -1762,11 +1762,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalPointArray() for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + __bjs_elem_ret.bridgeJSLowerReturn() } _swift_js_push_i32(Int32(ret.count)) #else @@ -1789,11 +1785,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab return __result }()) for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + __bjs_elem_ret.bridgeJSLowerReturn() } _swift_js_push_i32(Int32(ret.count)) #else @@ -1803,15 +1795,9 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab @_expose(wasm, "bjs_ArrayRoundtrip_takeOptionalArray") @_cdecl("bjs_ArrayRoundtrip_takeOptionalArray") -public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPointer, _ values: Int32) -> Void { +public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalArray(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1822,11 +1808,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1837,11 +1819,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1849,20 +1827,10 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP @_expose(wasm, "bjs_ArrayRoundtrip_roundtripOptionalArray") @_cdecl("bjs_ArrayRoundtrip_roundtripOptionalArray") -public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRawPointer, _ values: Int32) -> Void { +public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalArray(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 2d31cd212..b75f9535d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -147,27 +147,7 @@ public class ExportSwift { } else { optionalSwiftType = "JSUndefinedOr" } - if case .array(let elementType) = wrappedType { - let arrayLift = StackCodegen().liftArrayExpression(elementType: elementType) - let isSomeParam = argumentsToLift[0] - let swiftTypeName = elementType.swiftType - typeNameForIntrinsic = "\(optionalSwiftType)<[\(swiftTypeName)]>" - let absentExpr = - kind == .null - ? "\(optionalSwiftType)<[\(swiftTypeName)]>.none" - : "\(optionalSwiftType)<[\(swiftTypeName)]>.undefined" - liftingExpr = ExprSyntax( - """ - { - if \(raw: isSomeParam) == 0 { - return \(raw: absentExpr) - } else { - return \(arrayLift) - } - }() - """ - ) - } else if case .swiftProtocol(let protocolName) = wrappedType { + if case .swiftProtocol(let protocolName) = wrappedType { let wrapperName = "Any\(protocolName)" typeNameForIntrinsic = "\(optionalSwiftType)<\(wrapperName)>" liftingExpr = ExprSyntax( @@ -919,43 +899,11 @@ struct StackCodegen { let typeName = kind == .null ? "Optional" : "JSUndefinedOr" switch wrappedType { case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue, - .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum: + .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum, + .array, .dictionary: return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" case .jsObject(let className?): return "\(raw: typeName).bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" - case .array(let elementType): - let arrayLift = liftArrayExpression(elementType: elementType) - let swiftTypeName = elementType.swiftType - let absentExpr = - kind == .null - ? "\(typeName)<[\(swiftTypeName)]>.none" : "\(typeName)<[\(swiftTypeName)]>.undefined" - return """ - { - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return \(raw: absentExpr) - } else { - return \(arrayLift) - } - }() - """ - case .dictionary(let valueType): - let dictionaryLift = liftDictionaryExpression(valueType: valueType) - let swiftTypeName = valueType.swiftType - let absentExpr = - kind == .null - ? "\(typeName)<[String: \(swiftTypeName)]>.none" - : "\(typeName)<[String: \(swiftTypeName)]>.undefined" - return """ - { - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return \(raw: absentExpr) - } else { - return \(dictionaryLift) - } - }() - """ case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol: fatalError("Invalid nullable wrapped type: \(wrappedType)") } @@ -1112,6 +1060,13 @@ struct StackCodegen { accessor: String, varPrefix: String ) -> [CodeBlockItemSyntax] { + switch wrappedType { + case .array, .dictionary, .swiftStruct: + return ["\(raw: accessor).bridgeJSLowerReturn()"] + default: + break + } + var statements: [String] = [] statements.append("let __bjs_isSome_\(varPrefix) = \(accessor) != nil") statements.append("if let __bjs_unwrapped_\(varPrefix) = \(accessor) {") @@ -1140,23 +1095,15 @@ struct StackCodegen { case .string, .int, .uint, .bool, .float, .double, .jsValue: return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .caseEnum, .rawValueEnum: - // Enums conform to _BridgedSwiftStackType return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] - case .swiftStruct: - return ["\(raw: unwrappedVar).bridgeJSLowerReturn()"] case .swiftHeapObject: return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .associatedValueEnum: - // Push payloads via bridgeJSLowerParameter(), then push the returned case ID return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] case .jsObject(nil): return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .jsObject(_?): return ["\(raw: unwrappedVar).jsObject.bridgeJSLowerStackReturn()"] - case .array(let elementType): - return lowerArrayStatements(elementType: elementType, accessor: unwrappedVar, varPrefix: varPrefix) - case .dictionary(let valueType): - return lowerDictionaryStatements(valueType: valueType, accessor: unwrappedVar, varPrefix: varPrefix) default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } @@ -1834,8 +1781,12 @@ extension BridgeType { case .swiftProtocol: return .jsObject case .void: return .void case .nullable(let wrappedType, _): + let wrappedInfo = try wrappedType.liftParameterInfo() + if wrappedInfo.parameters.isEmpty { + return LiftingIntrinsicInfo(parameters: []) + } var optionalParams: [(name: String, type: WasmCoreType)] = [("isSome", .i32)] - optionalParams.append(contentsOf: try wrappedType.liftParameterInfo().parameters) + optionalParams.append(contentsOf: wrappedInfo.parameters) return LiftingIntrinsicInfo(parameters: optionalParams) case .caseEnum: return .caseEnum case .rawValueEnum(_, let rawType): diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 9f1eddfdd..1e384d833 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -832,7 +832,8 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") - return ["+\(isSomeVar)"] + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") + return [] case .string, .rawValueEnum(_, .string): let bytesVar = scope.variable("\(value)Bytes") let idVar = scope.variable("\(value)Id") @@ -895,7 +896,8 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") - return ["+\(isSomeVar)"] + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") + return [] case .dictionary(let valueType): let cleanupArrayVar = scope.variable("\(value)Cleanups") printer.write("const \(cleanupArrayVar) = [];") @@ -915,7 +917,8 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") - return ["+\(isSomeVar)"] + printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") + return [] default: switch wrappedType { case .swiftHeapObject: diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 261c0b066..243c99b7c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -277,20 +277,10 @@ public func _bjs_processOptionalStringArray() -> Void { @_expose(wasm, "bjs_processOptionalArray") @_cdecl("bjs_processOptionalArray") -public func _bjs_processOptionalArray(_ values: Int32) -> Void { +public func _bjs_processOptionalArray() -> Void { #if arch(wasm32) - let ret = processOptionalArray(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = processOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -311,11 +301,7 @@ public func _bjs_processOptionalPointArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + __bjs_elem_ret.bridgeJSLowerReturn() } _swift_js_push_i32(Int32(ret.count)) #else diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift index 4c4c69c99..16cae49e8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift @@ -294,9 +294,9 @@ public func _bjs_testEmptyInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMuta @_expose(wasm, "bjs_testOptionalStructDefault") @_cdecl("bjs_testOptionalStructDefault") -public func _bjs_testOptionalStructDefault(_ point: Int32) -> Void { +public func _bjs_testOptionalStructDefault() -> Void { #if arch(wasm32) - let ret = testOptionalStructDefault(point: Optional.bridgeJSLiftParameter(point)) + let ret = testOptionalStructDefault(point: Optional.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -305,9 +305,9 @@ public func _bjs_testOptionalStructDefault(_ point: Int32) -> Void { @_expose(wasm, "bjs_testOptionalStructWithValueDefault") @_cdecl("bjs_testOptionalStructWithValueDefault") -public func _bjs_testOptionalStructWithValueDefault(_ point: Int32) -> Void { +public func _bjs_testOptionalStructWithValueDefault() -> Void { #if arch(wasm32) - let ret = testOptionalStructWithValueDefault(point: Optional.bridgeJSLiftParameter(point)) + let ret = testOptionalStructWithValueDefault(point: Optional.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift index 2a41c35a7..016a5f814 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift @@ -11,9 +11,9 @@ public func _bjs_mirrorDictionary() -> Void { @_expose(wasm, "bjs_optionalDictionary") @_cdecl("bjs_optionalDictionary") -public func _bjs_optionalDictionary(_ values: Int32) -> Void { +public func _bjs_optionalDictionary() -> Void { #if arch(wasm32) - let ret = optionalDictionary(_: Optional<[String: String]>.bridgeJSLiftParameter(values)) + let ret = optionalDictionary(_: Optional<[String: String]>.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index f2029749c..a21c766c0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -617,14 +617,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case 3: return .optNestedEnum(Optional.bridgeJSLiftParameter()) case 4: - return .optArray({ - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } -}()) + return .optArray(Optional<[Int]>.bridgeJSLiftParameter()) case 5: return .empty default: @@ -637,11 +630,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -665,11 +654,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() return Int32(4) case .empty: return Int32(5) @@ -689,11 +674,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() _swift_js_push_tag(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -717,11 +698,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() _swift_js_push_tag(Int32(4)) case .empty: _swift_js_push_tag(Int32(5)) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index b4e45bbc9..931605a50 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -33,20 +33,10 @@ public func _bjs_roundTripJSValueArray() -> Void { @_expose(wasm, "bjs_roundTripOptionalJSValueArray") @_cdecl("bjs_roundTripOptionalJSValueArray") -public func _bjs_roundTripOptionalJSValueArray(_ values: Int32) -> Void { +public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValueArray(_: { - if values == 0 { - return Optional<[JSValue]>.none - } else { - return [JSValue].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalJSValueArray(_: Optional<[JSValue]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index d858d8e38..a381f5569 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -673,7 +673,8 @@ export async function createInstantiator(options, swift) { i32Stack.push(values.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } - instance.exports.bjs_processOptionalArray(+isSome); + i32Stack.push(+isSome); + instance.exports.bjs_processOptionalArray(); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 079618bbf..04335c58c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -521,7 +521,8 @@ export async function createInstantiator(options, swift) { const structResult = structHelpers.Config.lower(point); pointCleanup = structResult.cleanup; } - instance.exports.bjs_testOptionalStructDefault(+isSome); + i32Stack.push(+isSome); + instance.exports.bjs_testOptionalStructDefault(); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { @@ -539,7 +540,8 @@ export async function createInstantiator(options, swift) { const structResult = structHelpers.Config.lower(point); pointCleanup = structResult.cleanup; } - instance.exports.bjs_testOptionalStructWithValueDefault(+isSome); + i32Stack.push(+isSome); + instance.exports.bjs_testOptionalStructWithValueDefault(); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 54f00021d..a77407eca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -327,7 +327,8 @@ export async function createInstantiator(options, swift) { i32Stack.push(entries.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } - instance.exports.bjs_optionalDictionary(+isSome); + i32Stack.push(+isSome); + instance.exports.bjs_optionalDictionary(); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 888a11a4c..f6e4bf8aa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -507,7 +507,8 @@ export async function createInstantiator(options, swift) { i32Stack.push(values.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } - instance.exports.bjs_roundTripOptionalJSValueArray(+isSome); + i32Stack.push(+isSome); + instance.exports.bjs_roundTripOptionalJSValueArray(); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 496b515c9..d1390a610 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -623,7 +623,7 @@ extension _BridgedSwiftAssociatedValueEnum { /// A protocol that Swift struct types conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. -public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftStackType { +public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftGenericOptionalStackType { // MARK: ExportSwift @_spi(BridgeJS) static func bridgeJSLiftParameter() -> Self @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void @@ -1463,11 +1463,6 @@ extension Optional where Wrapped == [JSValue] { return [JSValue].bridgeJSLiftParameter() } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [JSValue]? { - let isSome = _swift_js_pop_i32() - return bridgeJSLiftParameter(isSome) - } - @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [JSValue]? { let isSome = _swift_js_pop_i32() if isSome == 0 { @@ -1741,17 +1736,6 @@ public protocol _BridgedSwiftTypeLoweredIntoVoidType { consuming func bridgeJSLowerReturn() -> Void } -extension Optional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - switch consume self { - case .none: - () - case .some(let value): - value.bridgeJSLowerReturn() - } - } -} - // MARK: Optional Raw Value Enum Support extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { @@ -1989,8 +1973,6 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { // MARK: Optional Struct Support extension Optional where Wrapped: _BridgedSwiftStruct { - // MARK: ExportSwift - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> Wrapped? { if isSome == 0 { return nil @@ -1998,19 +1980,40 @@ extension Optional where Wrapped: _BridgedSwiftStruct { return Wrapped.bridgeJSLiftParameter() } } +} + +// MARK: - Generic Optional Stack Support + +/// Marker protocol for types whose Optional wrapper should use the generic +/// stack-based ABI (`_BridgedSwiftStackType`). Only Array, Dictionary, and +/// `_BridgedSwiftStruct` conform. Primitives and other types keep their +/// own type-specific Optional extensions. +public protocol _BridgedSwiftGenericOptionalStackType: _BridgedSwiftStackType +where StackLiftResult == Self {} + +extension Optional: _BridgedSwiftStackType +where Wrapped: _BridgedSwiftGenericOptionalStackType { + public typealias StackLiftResult = Wrapped? @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { let isSome = _swift_js_pop_i32() - return bridgeJSLiftParameter(isSome) + if isSome == 0 { + return nil + } + return Wrapped.bridgeJSLiftParameter() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + bridgeJSLowerReturn() } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { switch consume self { case .none: - _swift_js_push_i32(0) // Push only isSome=0 (no struct fields) + _swift_js_push_i32(0) case .some(let value): - value.bridgeJSLowerReturn() // Push all struct fields FIRST - _swift_js_push_i32(1) // Then push isSome=1 LAST (so it's popped FIRST by JS) + value.bridgeJSLowerStackReturn() + _swift_js_push_i32(1) } } } @@ -2235,12 +2238,6 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { } } -extension _BridgedAsOptional where Wrapped: _BridgedSwiftTypeLoweredIntoVoidType { - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - asOptional.bridgeJSLowerReturn() - } -} - extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { @@ -2390,6 +2387,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct { // MARK: - Array Support +extension Array: _BridgedSwiftGenericOptionalStackType +where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element {} extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { public typealias StackLiftResult = [Element] @@ -2427,11 +2426,15 @@ extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, E // MARK: - Dictionary Support -public protocol _BridgedSwiftDictionaryStackType: _BridgedSwiftTypeLoweredIntoVoidType { +public protocol _BridgedSwiftDictionaryStackType: _BridgedSwiftTypeLoweredIntoVoidType, + _BridgedSwiftGenericOptionalStackType +{ associatedtype DictionaryValue: _BridgedSwiftStackType where DictionaryValue.StackLiftResult == DictionaryValue } +extension Dictionary: _BridgedSwiftGenericOptionalStackType +where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value {} extension Dictionary: _BridgedSwiftStackType where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value { public typealias StackLiftResult = [String: Value] @@ -2492,16 +2495,6 @@ extension Optional where Wrapped: _BridgedSwiftDictionaryStackType { } } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { - switch consume self { - case .none: - _swift_js_push_i32(0) - case .some(let dict): - dict.bridgeJSLowerReturn() - _swift_js_push_i32(1) - } - } - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? { if isSome == 0 { return nil @@ -2509,10 +2502,6 @@ extension Optional where Wrapped: _BridgedSwiftDictionaryStackType { return Dictionary.bridgeJSLiftParameter() } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Wrapped.DictionaryValue]? { - bridgeJSLiftParameter(_swift_js_pop_i32()) - } - @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [String: Wrapped.DictionaryValue]? { let isSome = _swift_js_pop_i32() if isSome == 0 { @@ -2542,4 +2531,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftDictionaryStackType { let value = Dictionary.bridgeJSLiftParameter() as! Wrapped return Self(optional: value) } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + asOptional.bridgeJSLowerReturn() + } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index af9f15dbc..9465040a9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2814,14 +2814,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case 3: return .optNestedEnum(Optional.bridgeJSLiftParameter()) case 4: - return .optArray({ - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } -}()) + return .optArray(Optional<[Int]>.bridgeJSLiftParameter()) case 5: return .optJsClass(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) case 6: @@ -2836,11 +2829,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { switch self { case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -2864,11 +2853,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() return Int32(4) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -2895,11 +2880,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { switch self { case .optStruct(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() _swift_js_push_tag(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -2923,11 +2904,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) _swift_js_push_tag(Int32(3)) case .optArray(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) + param0.bridgeJSLowerReturn() _swift_js_push_tag(Int32(4)) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil @@ -3298,11 +3275,7 @@ extension Contact: _BridgedSwiftStruct { __bjs_unwrapped_email.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) - let __bjs_isSome_secondaryAddress = self.secondaryAddress != nil - if let __bjs_unwrapped_secondaryAddress = self.secondaryAddress { - __bjs_unwrapped_secondaryAddress.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_secondaryAddress ? 1 : 0) + self.secondaryAddress.bridgeJSLowerReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -3532,17 +3505,9 @@ extension AdvancedConfig: _BridgedSwiftStruct { __bjs_unwrapped_metadata.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_metadata ? 1 : 0) - let __bjs_isSome_location = self.location != nil - if let __bjs_unwrapped_location = self.location { - __bjs_unwrapped_location.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_location ? 1 : 0) + self.location.bridgeJSLowerReturn() self.defaults.bridgeJSLowerReturn() - let __bjs_isSome_overrideDefaults = self.overrideDefaults != nil - if let __bjs_unwrapped_overrideDefaults = self.overrideDefaults { - __bjs_unwrapped_overrideDefaults.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_overrideDefaults ? 1 : 0) + self.overrideDefaults.bridgeJSLowerReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -3838,11 +3803,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { self.id.bridgeJSLowerStackReturn() self.item.bridgeJSLowerReturn() - let __bjs_isSome_shippingAddress = self.shippingAddress != nil - if let __bjs_unwrapped_shippingAddress = self.shippingAddress { - __bjs_unwrapped_shippingAddress.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_shippingAddress ? 1 : 0) + self.shippingAddress.bridgeJSLowerReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -4098,25 +4059,14 @@ fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { extension ArrayMembers: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ArrayMembers { - let optStrings = { - let __isSome = _swift_js_pop_i32() - if __isSome == 0 { - return Optional<[String]>.none - } else { - return [String].bridgeJSLiftParameter() - } -}() + let optStrings = Optional<[String]>.bridgeJSLiftParameter() let ints = [Int].bridgeJSLiftParameter() return ArrayMembers(ints: ints, optStrings: optStrings) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { self.ints.bridgeJSLowerReturn() - let __bjs_isSome_optStrings = self.optStrings != nil - if let __bjs_unwrapped_optStrings = self.optStrings { - __bjs_unwrapped_optStrings.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_optStrings ? 1 : 0) + self.optStrings.bridgeJSLowerReturn() } init(unsafelyCopying jsObject: JSObject) { @@ -4340,9 +4290,9 @@ public func _bjs_roundTripDictionaryExport() -> Void { @_expose(wasm, "bjs_roundTripOptionalDictionaryExport") @_cdecl("bjs_roundTripOptionalDictionaryExport") -public func _bjs_roundTripOptionalDictionaryExport(_ v: Int32) -> Void { +public func _bjs_roundTripOptionalDictionaryExport() -> Void { #if arch(wasm32) - let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter(v)) + let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4384,20 +4334,10 @@ public func _bjs_roundTripJSValueArray() -> Void { @_expose(wasm, "bjs_roundTripOptionalJSValueArray") @_cdecl("bjs_roundTripOptionalJSValueArray") -public func _bjs_roundTripOptionalJSValueArray(_ v: Int32) -> Void { +public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValueArray(v: { - if v == 0 { - return Optional<[JSValue]>.none - } else { - return [JSValue].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalJSValueArray(v: Optional<[JSValue]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5413,15 +5353,9 @@ public func _bjs_arrayWithDefault() -> Int32 { @_expose(wasm, "bjs_arrayWithOptionalDefault") @_cdecl("bjs_arrayWithOptionalDefault") -public func _bjs_arrayWithOptionalDefault(_ values: Int32) -> Int32 { +public func _bjs_arrayWithOptionalDefault() -> Int32 { #if arch(wasm32) - let ret = arrayWithOptionalDefault(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) + let ret = arrayWithOptionalDefault(_: Optional<[Int]>.bridgeJSLiftParameter()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5651,11 +5585,7 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { return __result }()) for __bjs_elem_ret in ret { - let __bjs_isSome_ret_elem = __bjs_elem_ret != nil - if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) + __bjs_elem_ret.bridgeJSLowerReturn() } _swift_js_push_i32(Int32(ret.count)) #else @@ -5719,20 +5649,10 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { @_expose(wasm, "bjs_roundTripOptionalIntArrayType") @_cdecl("bjs_roundTripOptionalIntArrayType") -public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { +public func _bjs_roundTripOptionalIntArrayType() -> Void { #if arch(wasm32) - let ret = roundTripOptionalIntArrayType(_: { - if values == 0 { - return Optional<[Int]>.none - } else { - return [Int].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalIntArrayType(_: Optional<[Int]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5740,20 +5660,10 @@ public func _bjs_roundTripOptionalIntArrayType(_ values: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalStringArrayType") @_cdecl("bjs_roundTripOptionalStringArrayType") -public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { +public func _bjs_roundTripOptionalStringArrayType() -> Void { #if arch(wasm32) - let ret = roundTripOptionalStringArrayType(_: { - if values == 0 { - return Optional<[String]>.none - } else { - return [String].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalStringArrayType(_: Optional<[String]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5761,20 +5671,10 @@ public func _bjs_roundTripOptionalStringArrayType(_ values: Int32) -> Void { @_expose(wasm, "bjs_roundTripOptionalGreeterArrayType") @_cdecl("bjs_roundTripOptionalGreeterArrayType") -public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { +public func _bjs_roundTripOptionalGreeterArrayType() -> Void { #if arch(wasm32) - let ret = roundTripOptionalGreeterArrayType(_: { - if greeters == 0 { - return Optional<[Greeter]>.none - } else { - return [Greeter].bridgeJSLiftParameter() - } - }()) - let __bjs_isSome_ret = ret != nil - if let __bjs_unwrapped_ret = ret { - __bjs_unwrapped_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(__bjs_isSome_ret ? 1 : 0) + let ret = roundTripOptionalGreeterArrayType(_: Optional<[Greeter]>.bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -9006,9 +8906,9 @@ fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPoi @_expose(wasm, "bjs_Container_init") @_cdecl("bjs_Container_init") -public func _bjs_Container_init(_ config: Int32) -> UnsafeMutableRawPointer { +public func _bjs_Container_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let _tmp_config = Optional.bridgeJSLiftParameter(config) + let _tmp_config = Optional.bridgeJSLiftParameter() let _tmp_location = DataPoint.bridgeJSLiftParameter() let ret = Container(location: _tmp_location, config: _tmp_config) return ret.bridgeJSLowerReturn() @@ -9051,9 +8951,9 @@ public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void @_expose(wasm, "bjs_Container_config_set") @_cdecl("bjs_Container_config_set") -public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { +public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter(value) + Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter() #else fatalError("Only available on WebAssembly") #endif From 38af37b56002e9185834905f4494b34da25518f2 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 11 Feb 2026 21:12:39 +0100 Subject: [PATCH 201/252] BridgeJS: Delegate nested container codegen to generic runtime conformances --- Benchmarks/Sources/Generated/BridgeJS.swift | 64 ++-------- .../Sources/BridgeJSCore/ExportSwift.swift | 40 +++---- .../BridgeJSCodegenTests/ArrayTypes.swift | 80 ++----------- .../Generated/BridgeJS.swift | 112 +++--------------- 4 files changed, 48 insertions(+), 248 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 515d3a531..da7d155e1 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -1565,16 +1565,7 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ArrayRoundtrip_takeNestedIntArray") public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Int]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Int].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1585,10 +1576,7 @@ public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPoin public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1598,20 +1586,8 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ArrayRoundtrip_roundtripNestedIntArray") public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Int]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Int].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1621,16 +1597,7 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa @_cdecl("bjs_ArrayRoundtrip_takeNestedPointArray") public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Point]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Point].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) #else fatalError("Only available on WebAssembly") #endif @@ -1641,10 +1608,7 @@ public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1654,20 +1618,8 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_roundtripNestedPointArray") public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Point]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Point].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 2d31cd212..ca9689607 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -838,18 +838,16 @@ struct StackCodegen { func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { switch elementType { - case .int, .uint, .float, .double, .string, .bool, .jsValue, - .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, - .unsafePointer, .rawValueEnum, .associatedValueEnum: - return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" - case .jsObject(_?): + case .jsObject(let className?) where className != "JSObject": return liftArrayExpressionInline(elementType: elementType) case .swiftProtocol(let protocolName): return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" - case .nullable, .array, .closure, .dictionary: + case .nullable, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") + default: + return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" } } @@ -872,11 +870,7 @@ struct StackCodegen { func liftDictionaryExpression(valueType: BridgeType) -> ExprSyntax { switch valueType { - case .int, .uint, .float, .double, .string, .bool, .jsValue, - .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, - .unsafePointer, .rawValueEnum, .associatedValueEnum: - return "[String: \(raw: valueType.swiftType)].bridgeJSLiftParameter()" - case .jsObject(let className?): + case .jsObject(let className?) where className != "JSObject": return """ { let __dict = [String: JSObject].bridgeJSLiftParameter() @@ -890,10 +884,12 @@ struct StackCodegen { return __dict.mapValues { $0 as! Any\(raw: protocolName) } }() """ - case .nullable, .array, .dictionary, .closure: + case .nullable, .closure: return liftDictionaryExpressionInline(valueType: valueType) case .void, .namespaceEnum: fatalError("Invalid dictionary value type: \(valueType)") + default: + return "[String: \(raw: valueType.swiftType)].bridgeJSLiftParameter()" } } @@ -1005,15 +1001,11 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch elementType { - case .int, .uint, .float, .double, .string, .bool, .jsValue, - .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, - .unsafePointer, .rawValueEnum, .associatedValueEnum: - return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .jsObject(_?): + case .jsObject(let className?) where className != "JSObject": return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] - case .nullable, .array, .closure, .dictionary: + case .nullable, .closure: return lowerArrayStatementsInline( elementType: elementType, accessor: accessor, @@ -1021,6 +1013,8 @@ struct StackCodegen { ) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") + default: + return ["\(raw: accessor).bridgeJSLowerReturn()"] } } @@ -1054,15 +1048,11 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch valueType { - case .int, .uint, .float, .double, .string, .bool, .jsValue, - .jsObject(nil), .swiftStruct, .caseEnum, .swiftHeapObject, - .unsafePointer, .rawValueEnum, .associatedValueEnum: - return ["\(raw: accessor).bridgeJSLowerReturn()"] - case .jsObject(_?): + case .jsObject(let className?) where className != "JSObject": return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSLowerReturn()"] case .swiftProtocol(let protocolName): return ["\(raw: accessor).mapValues { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] - case .nullable, .array, .dictionary, .closure: + case .nullable, .closure: return lowerDictionaryStatementsInline( valueType: valueType, accessor: accessor, @@ -1070,6 +1060,8 @@ struct StackCodegen { ) case .void, .namespaceEnum: fatalError("Invalid dictionary value type: \(valueType)") + default: + return ["\(raw: accessor).bridgeJSLowerReturn()"] } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 261c0b066..6b10c0fe7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -381,20 +381,8 @@ public func _bjs_processOptionalStatusArray() -> Void { @_cdecl("bjs_processNestedIntArray") public func _bjs_processNestedIntArray() -> Void { #if arch(wasm32) - let ret = processNestedIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Int]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Int].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = processNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -404,20 +392,8 @@ public func _bjs_processNestedIntArray() -> Void { @_cdecl("bjs_processNestedStringArray") public func _bjs_processNestedStringArray() -> Void { #if arch(wasm32) - let ret = processNestedStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[String]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([String].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = processNestedStringArray(_: [[String]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -427,20 +403,8 @@ public func _bjs_processNestedStringArray() -> Void { @_cdecl("bjs_processNestedPointArray") public func _bjs_processNestedPointArray() -> Void { #if arch(wasm32) - let ret = processNestedPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Point]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Point].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = processNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -461,20 +425,8 @@ public func _bjs_processItemArray() -> Void { @_cdecl("bjs_processNestedItemArray") public func _bjs_processNestedItemArray() -> Void { #if arch(wasm32) - let ret = processNestedItemArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Item]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Item].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = processNestedItemArray(_: [[Item]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -522,20 +474,8 @@ public func _bjs_processOptionalJSObjectArray() -> Void { @_cdecl("bjs_processNestedJSObjectArray") public func _bjs_processNestedJSObjectArray() -> Void { #if arch(wasm32) - let ret = processNestedJSObjectArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[JSObject]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([JSObject].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = processNestedJSObjectArray(_: [[JSObject]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index af9f15dbc..c37bce3c9 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -5784,20 +5784,8 @@ public func _bjs_roundTripOptionalGreeterArrayType(_ greeters: Int32) -> Void { @_cdecl("bjs_roundTripNestedIntArray") public func _bjs_roundTripNestedIntArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedIntArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Int]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Int].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5807,20 +5795,8 @@ public func _bjs_roundTripNestedIntArray() -> Void { @_cdecl("bjs_roundTripNestedStringArray") public func _bjs_roundTripNestedStringArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedStringArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[String]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([String].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedStringArray(_: [[String]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5830,20 +5806,8 @@ public func _bjs_roundTripNestedStringArray() -> Void { @_cdecl("bjs_roundTripNestedDoubleArray") public func _bjs_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDoubleArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Double]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Double].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedDoubleArray(_: [[Double]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5853,20 +5817,8 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { @_cdecl("bjs_roundTripNestedBoolArray") public func _bjs_roundTripNestedBoolArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedBoolArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Bool]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Bool].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedBoolArray(_: [[Bool]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5876,20 +5828,8 @@ public func _bjs_roundTripNestedBoolArray() -> Void { @_cdecl("bjs_roundTripNestedDataPointArray") public func _bjs_roundTripNestedDataPointArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDataPointArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[DataPoint]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([DataPoint].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedDataPointArray(_: [[DataPoint]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5899,20 +5839,8 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { @_cdecl("bjs_roundTripNestedDirectionArray") public func _bjs_roundTripNestedDirectionArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDirectionArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Direction]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Direction].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedDirectionArray(_: [[Direction]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -5922,20 +5850,8 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { @_cdecl("bjs_roundTripNestedGreeterArray") public func _bjs_roundTripNestedGreeterArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedGreeterArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [[Greeter]] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append([Greeter].bridgeJSLiftParameter()) - } - __result.reverse() - return __result - }()) - for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() - } - _swift_js_push_i32(Int32(ret.count)) + let ret = roundTripNestedGreeterArray(_: [[Greeter]].bridgeJSLiftParameter()) + ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif From 6716dfc931fa826fe0c7c8163759157453f2ec59 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 12 Feb 2026 14:10:53 +0900 Subject: [PATCH 202/252] [NFC] BridgeJS: Remove tag stack and use i32 stack for enum case tags --- Benchmarks/Sources/Generated/BridgeJS.swift | 26 +++--- .../Sources/BridgeJSCore/ExportSwift.swift | 4 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 6 -- .../Sources/BridgeJSLink/JSGlueGen.swift | 13 +-- .../EnumAssociatedValue.swift | 74 ++++++++--------- .../BridgeJSCodegenTests/Protocol.swift | 4 +- .../StaticFunctions.Global.swift | 4 +- .../StaticFunctions.swift | 4 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 12 +-- .../BridgeJSLinkTests/ArrayTypes.js | 4 - .../__Snapshots__/BridgeJSLinkTests/Async.js | 4 - .../BridgeJSLinkTests/DefaultParameters.js | 4 - .../BridgeJSLinkTests/DictionaryTypes.js | 4 - .../BridgeJSLinkTests/EnumAssociatedValue.js | 38 ++++----- .../BridgeJSLinkTests/EnumCase.js | 4 - .../BridgeJSLinkTests/EnumNamespace.Global.js | 4 - .../BridgeJSLinkTests/EnumNamespace.js | 4 - .../BridgeJSLinkTests/EnumRawType.js | 4 - .../BridgeJSLinkTests/GlobalGetter.js | 4 - .../BridgeJSLinkTests/GlobalThisImports.js | 4 - .../BridgeJSLinkTests/ImportArray.js | 4 - .../ImportedTypeInExportedInterface.js | 4 - .../BridgeJSLinkTests/InvalidPropertyNames.js | 4 - .../BridgeJSLinkTests/JSClass.js | 4 - .../JSClassStaticFunctions.js | 4 - .../BridgeJSLinkTests/JSValue.js | 4 - .../BridgeJSLinkTests/MixedGlobal.js | 4 - .../BridgeJSLinkTests/MixedModules.js | 4 - .../BridgeJSLinkTests/MixedPrivate.js | 4 - .../BridgeJSLinkTests/Namespaces.Global.js | 4 - .../BridgeJSLinkTests/Namespaces.js | 4 - .../BridgeJSLinkTests/Optionals.js | 4 - .../BridgeJSLinkTests/PrimitiveParameters.js | 4 - .../BridgeJSLinkTests/PrimitiveReturn.js | 4 - .../BridgeJSLinkTests/PropertyTypes.js | 4 - .../BridgeJSLinkTests/Protocol.js | 4 - .../StaticFunctions.Global.js | 6 +- .../BridgeJSLinkTests/StaticFunctions.js | 6 +- .../StaticProperties.Global.js | 4 - .../BridgeJSLinkTests/StaticProperties.js | 4 - .../BridgeJSLinkTests/StringParameter.js | 4 - .../BridgeJSLinkTests/StringReturn.js | 4 - .../BridgeJSLinkTests/SwiftClass.js | 4 - .../BridgeJSLinkTests/SwiftClosure.js | 8 +- .../BridgeJSLinkTests/SwiftClosureImports.js | 4 - .../BridgeJSLinkTests/SwiftStruct.js | 4 - .../BridgeJSLinkTests/SwiftStructImports.js | 4 - .../__Snapshots__/BridgeJSLinkTests/Throws.js | 4 - .../BridgeJSLinkTests/UnsafePointer.js | 4 - .../VoidParameterVoidReturn.js | 4 - Plugins/PackageToJS/Templates/instantiate.js | 1 - .../JavaScriptKit/BridgeJSIntrinsics.swift | 11 +-- .../Generated/BridgeJS.swift | 80 +++++++++---------- 53 files changed, 130 insertions(+), 315 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index fe655a96f..cdd3aa775 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -65,21 +65,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .flag(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .rate(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .precise(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .info: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } @@ -162,26 +162,26 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .error(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .location(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .status(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .coordinates(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() @@ -192,9 +192,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) case .info: - _swift_js_push_tag(Int32(6)) + _swift_js_push_i32(Int32(6)) } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index d44e9afbf..304ded82b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1323,7 +1323,7 @@ struct EnumCodegen { if enumCase.associatedValues.isEmpty { printer.write("case .\(enumCase.name):") printer.indent { - printer.write("_swift_js_push_tag(Int32(\(caseIndex)))") + printer.write("_swift_js_push_i32(Int32(\(caseIndex)))") } } else { let pattern = enumCase.associatedValues.enumerated() @@ -1334,7 +1334,7 @@ struct EnumCodegen { generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues) // Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function. // This ensures nested enum tags don't overwrite the outer tag. - printer.write("_swift_js_push_tag(Int32(\(caseIndex)))") + printer.write("_swift_js_push_i32(Int32(\(caseIndex)))") } } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index af5c94276..44b6f0c38 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -246,7 +246,6 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);", "let \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);", - "let \(JSGlueVariableScope.reservedTagStack) = [];", "let \(JSGlueVariableScope.reservedStringStack) = [];", "let \(JSGlueVariableScope.reservedI32Stack) = [];", "let \(JSGlueVariableScope.reservedF32Stack) = [];", @@ -342,11 +341,6 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(id);") } printer.write("}") - printer.write("bjs[\"swift_js_push_tag\"] = function(tag) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedTagStack).push(tag);") - } - printer.write("}") printer.write("bjs[\"swift_js_push_i32\"] = function(v) {") printer.indent { printer.write("\(JSGlueVariableScope.reservedI32Stack).push(v | 0);") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 1e384d833..36d463ab4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -23,7 +23,6 @@ final class JSGlueVariableScope { static let reservedStorageToReturnOptionalHeapObject = "tmpRetOptionalHeapObject" static let reservedTextEncoder = "textEncoder" static let reservedTextDecoder = "textDecoder" - static let reservedTagStack = "tagStack" static let reservedStringStack = "strStack" static let reservedI32Stack = "i32Stack" static let reservedF32Stack = "f32Stack" @@ -52,7 +51,6 @@ final class JSGlueVariableScope { reservedStorageToReturnOptionalHeapObject, reservedTextEncoder, reservedTextDecoder, - reservedTagStack, reservedStringStack, reservedI32Stack, reservedF32Stack, @@ -122,9 +120,6 @@ extension JSGlueVariableScope { func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) { printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));") } - func popTag() -> String { - return "\(JSGlueVariableScope.reservedTagStack).pop()" - } func popString() -> String { return "\(JSGlueVariableScope.reservedStringStack).pop()" } @@ -661,7 +656,7 @@ struct IntrinsicJSFragment: Sendable { let (scope, printer) = (context.scope, context.printer) let retName = scope.variable("ret") printer.write( - "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popTag()));" + "const \(retName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lift(\(scope.popI32()));" ) return [retName] } @@ -1022,7 +1017,7 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let tagVar = scope.variable("tag") - printer.write("const \(tagVar) = \(scope.popTag());") + printer.write("const \(tagVar) = \(scope.popI32());") let isNullVar = scope.variable("isNull") printer.write("const \(isNullVar) = (\(tagVar) === -1);") printer.write("let \(resultVar);") @@ -2112,7 +2107,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") try printer.indent { // For optional associated value enums, Swift uses bridgeJSLowerParameter() - // which pushes caseId to i32Stack (not tagStack like bridgeJSLowerReturn()). + // which pushes caseId to i32Stack (same as bridgeJSLowerReturn()). if case .associatedValueEnum(let fullName) = wrappedType { let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("caseId") @@ -2486,7 +2481,7 @@ struct IntrinsicJSFragment: Sendable { let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popTag()), );" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popI32()), );" ) return [resultVar] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index a21c766c0..9787865f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -56,21 +56,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .flag(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .rate(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .precise(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .info: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } @@ -146,21 +146,21 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .error(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .status(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .coordinates(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() @@ -171,9 +171,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .info: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } @@ -225,16 +225,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .status(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) } } } @@ -279,11 +279,11 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) } } } @@ -363,7 +363,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { @@ -375,7 +375,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { @@ -392,7 +392,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) } } } @@ -504,26 +504,26 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { switch self { case .precision(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .direction(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .empty: - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) } } } @@ -586,21 +586,21 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { switch self { case .structPayload(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .classPayload(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .jsObjectPayload(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .nestedEnum(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .arrayPayload(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .empty: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } @@ -675,33 +675,33 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { switch self { case .optStruct(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .optArray(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .empty: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 55521dbaf..9b68b96ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -401,10 +401,10 @@ extension Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index 3e5b40def..a7b0578a9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -83,10 +83,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index 3e5b40def..a7b0578a9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -83,10 +83,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index 8aa9efd65..d8b3c9bb8 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -1245,21 +1245,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .flag(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .rate(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .precise(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .info: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index a381f5569..97531d378 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -31,7 +31,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -93,9 +92,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index 0f4dce413..b215b3691 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 04335c58c..fba9f9c6b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -24,7 +24,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -118,9 +117,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index a77407eca..1f7fe91e1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 18c6999c1..3a4818463 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -99,7 +99,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -698,7 +697,7 @@ export async function createInstantiator(options, swift) { return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; } case AllTypesResultValues.Tag.NestedEnum: { - const enumValue = enumHelpers.APIResult.lift(tagStack.pop(), ); + const enumValue = enumHelpers.APIResult.lift(i32Stack.pop(), ); return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; } case AllTypesResultValues.Tag.ArrayPayload: { @@ -911,9 +910,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } @@ -1136,13 +1132,13 @@ export async function createInstantiator(options, swift) { }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); - const ret = enumHelpers.APIResult.lift(tagStack.pop()); + const ret = enumHelpers.APIResult.lift(i32Stack.pop()); return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); - const ret = enumHelpers.APIResult.lift(tagStack.pop()); + const ret = enumHelpers.APIResult.lift(i32Stack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1155,7 +1151,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1173,13 +1169,13 @@ export async function createInstantiator(options, swift) { }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); - const ret = enumHelpers.ComplexResult.lift(tagStack.pop()); + const ret = enumHelpers.ComplexResult.lift(i32Stack.pop()); return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); - const ret = enumHelpers.ComplexResult.lift(tagStack.pop()); + const ret = enumHelpers.ComplexResult.lift(i32Stack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1192,7 +1188,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalComplexResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1212,7 +1208,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1232,7 +1228,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1252,7 +1248,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1279,7 +1275,7 @@ export async function createInstantiator(options, swift) { result2Cleanup = enumResult1.cleanup; } instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1294,7 +1290,7 @@ export async function createInstantiator(options, swift) { roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.TypedPayloadResult.lower(result); instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId); - const ret = enumHelpers.TypedPayloadResult.lift(tagStack.pop()); + const ret = enumHelpers.TypedPayloadResult.lift(i32Stack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1307,7 +1303,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1321,7 +1317,7 @@ export async function createInstantiator(options, swift) { roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.AllTypesResult.lower(result); instance.exports.bjs_roundTripAllTypesResult(resultCaseId); - const ret = enumHelpers.AllTypesResult.lift(tagStack.pop()); + const ret = enumHelpers.AllTypesResult.lift(i32Stack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1334,7 +1330,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { @@ -1348,7 +1344,7 @@ export async function createInstantiator(options, swift) { roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.OptionalAllTypesResult.lower(result); instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId); - const ret = enumHelpers.OptionalAllTypesResult.lift(tagStack.pop()); + const ret = enumHelpers.OptionalAllTypesResult.lift(i32Stack.pop()); if (resultCleanup) { resultCleanup(); } return ret; }, @@ -1361,7 +1357,7 @@ export async function createInstantiator(options, swift) { resultCleanup = enumResult.cleanup; } instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, isSome ? resultCaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 6ed445811..341ffb260 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -42,7 +42,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -89,9 +88,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 55f995024..fa4586a2d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -62,7 +62,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -109,9 +108,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 179712fef..5d85347ee 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -43,7 +43,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -90,9 +89,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 0855f11ec..04d667b8e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -93,7 +93,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -141,9 +140,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index c9ccf98fe..a60d5377f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index 947ee4d11..e0b4f8f94 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index 6c56cce6f..80ff1cead 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index b0674f388..7e2f48981 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -130,9 +129,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 9ac03ee73..3f5d49f35 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 6e9100b11..66abcf418 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index b466d0900..138bef6a1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index f6e4bf8aa..426fd8c1a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -155,9 +154,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 7bb3c14d6..590e84cc3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index ac2270b9f..18fb5af6c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 3205ef5d0..27bad9aea 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index ed8f6db8b..9e6782d12 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index c148f0761..94a4b73fb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index b69033543..f637af601 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index 11a199b71..dd59941f7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index bb1e7ad40..a67637e58 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 4e8e86821..35bc1d028 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index fd37c7178..d783e8968 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -42,7 +42,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -128,9 +127,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index fcf19c54f..892110aca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -115,9 +114,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } @@ -332,7 +328,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tagStack.pop()); + const ret = enumHelpers.APIResult.lift(i32Stack.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 5e82061d9..f2c93adae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -115,9 +114,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } @@ -326,7 +322,7 @@ export async function createInstantiator(options, swift) { roundtrip: function(value) { const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); - const ret = enumHelpers.APIResult.lift(tagStack.pop()); + const ret = enumHelpers.APIResult.lift(i32Stack.pop()); if (valueCleanup) { valueCleanup(); } return ret; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index ad44e80fa..adb809f6f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -70,9 +69,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index fb43d426b..f1273821a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -70,9 +69,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index 1ee9f519e..b81a4990b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 02833d1c6..112f853d4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 13ea6ba75..fc2fc58c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 2ef9aaf5a..4df3d5018 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -48,7 +48,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -191,9 +190,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } @@ -419,7 +415,7 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); - const ret = enumHelpers.APIResult.lift(tagStack.pop()); + const ret = enumHelpers.APIResult.lift(i32Stack.pop()); if (param0Cleanup) { param0Cleanup(); } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); @@ -701,7 +697,7 @@ export async function createInstantiator(options, swift) { param0Cleanup = enumResult.cleanup; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); - const tag = tagStack.pop(); + const tag = i32Stack.pop(); const isNull = (tag === -1); let optResult; if (isNull) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 98899d4df..8744f5e45 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -91,9 +90,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index 3f42f3103..ff8c8f8b0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -323,9 +322,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 751b28959..a33914d89 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -80,9 +79,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 50276543c..e81050bf6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -65,9 +64,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 29474892f..cdcd6db3a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -85,9 +84,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index de17f5edc..05a16a3eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -18,7 +18,6 @@ export async function createInstantiator(options, swift) { let tmpRetOptionalFloat; let tmpRetOptionalDouble; let tmpRetOptionalHeapObject; - let tagStack = []; let strStack = []; let i32Stack = []; let f32Stack = []; @@ -66,9 +65,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_release"] = function(id) { swift.memory.release(id); } - bjs["swift_js_push_tag"] = function(tag) { - tagStack.push(tag); - } bjs["swift_js_push_i32"] = function(v) { i32Stack.push(v | 0); } diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index a0920964b..955c2928c 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -39,7 +39,6 @@ async function createInstantiator(options, swift) { swift_js_throw: unexpectedBjsCall, swift_js_retain: unexpectedBjsCall, swift_js_release: unexpectedBjsCall, - swift_js_push_tag: unexpectedBjsCall, swift_js_push_i32: unexpectedBjsCall, swift_js_push_f32: unexpectedBjsCall, swift_js_push_f64: unexpectedBjsCall, diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index d1390a610..feca05b3b 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -694,15 +694,6 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo } #endif -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_push_tag") -@_spi(BridgeJS) public func _swift_js_push_tag(_ tag: Int32) -#else -@_spi(BridgeJS) public func _swift_js_push_tag(_ tag: Int32) { - _onlyAvailableOnWasm() -} -#endif - #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_string") @_spi(BridgeJS) public func _swift_js_push_string(_ ptr: UnsafePointer?, _ len: Int32) @@ -1963,7 +1954,7 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { switch consume self { case .none: - _swift_js_push_tag(-1) // Use -1 as sentinel for null + _swift_js_push_i32(-1) // Use -1 as sentinel for null case .some(let value): value.bridgeJSLowerReturn() } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 90a0dbddf..745c56472 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2083,21 +2083,21 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .flag(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .rate(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .precise(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .info: - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) } } } @@ -2180,26 +2180,26 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .error(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .location(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .status(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .coordinates(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() @@ -2210,9 +2210,9 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { param6.bridgeJSLowerStackReturn() param7.bridgeJSLowerStackReturn() param8.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) case .info: - _swift_js_push_tag(Int32(6)) + _swift_js_push_i32(Int32(6)) } } } @@ -2264,16 +2264,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .status(let param0, let param1, let param2): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() param2.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) } } } @@ -2318,11 +2318,11 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): param0.bridgeJSLowerStackReturn() param1.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) } } } @@ -2390,24 +2390,24 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { switch self { case .structPayload(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .classPayload(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .jsObjectPayload(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .nestedEnum(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .arrayPayload(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .jsClassPayload(let param0): param0.jsObject.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) case .empty: - _swift_js_push_tag(Int32(6)) + _swift_js_push_i32(Int32(6)) } } } @@ -2473,26 +2473,26 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { switch self { case .precision(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .direction(let param0): param0.bridgeJSLowerStackReturn() - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .empty: - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) } } } @@ -2881,40 +2881,40 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { switch self { case .optStruct(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(3)) + _swift_js_push_i32(Int32(3)) case .optArray(let param0): param0.bridgeJSLowerReturn() - _swift_js_push_tag(Int32(4)) + _swift_js_push_i32(Int32(4)) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(5)) + _swift_js_push_i32(Int32(5)) case .empty: - _swift_js_push_tag(Int32(6)) + _swift_js_push_i32(Int32(6)) } } } @@ -2994,7 +2994,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_tag(Int32(0)) + _swift_js_push_i32(Int32(0)) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { @@ -3006,7 +3006,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param1.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - _swift_js_push_tag(Int32(1)) + _swift_js_push_i32(Int32(1)) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { @@ -3023,7 +3023,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { __bjs_unwrapped_param2.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - _swift_js_push_tag(Int32(2)) + _swift_js_push_i32(Int32(2)) } } } From e129b41a23d407b8b0f77cf1375e13674031b0d9 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 12 Feb 2026 15:28:49 +0900 Subject: [PATCH 203/252] [NFC] BridgeJS: Minimize enum with assoc values code generation --- Benchmarks/Sources/Generated/BridgeJS.swift | 94 +---- .../Sources/BridgeJSCore/ExportSwift.swift | 63 +--- .../EnumAssociatedValue.swift | 338 +---------------- .../BridgeJSCodegenTests/Protocol.swift | 27 +- .../StaticFunctions.Global.swift | 27 +- .../StaticFunctions.swift | 27 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 38 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 33 +- .../Generated/BridgeJS.swift | 353 +----------------- 9 files changed, 76 insertions(+), 924 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index cdd3aa775..9a1b30dc4 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -8,7 +8,7 @@ @_spi(BridgeJS) import JavaScriptKit extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -27,9 +27,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -50,42 +48,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .flag(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .rate(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .precise(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .info: - _swift_js_push_i32(Int32(5)) - } - } } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -106,9 +72,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -147,56 +111,6 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { return Int32(6) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .location(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(5)) - case .info: - _swift_js_push_i32(Int32(6)) - } - } } extension SimpleStruct: _BridgedSwiftStruct { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 304ded82b..5fb6f103f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1199,7 +1199,9 @@ struct EnumCodegen { let printer = CodeFragmentPrinter() printer.write("extension \(typeName): _BridgedSwiftAssociatedValueEnum {") printer.indent { - printer.write("private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> \(typeName) {") + printer.write( + "@_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> \(typeName) {" + ) printer.indent { printer.write("switch caseId {") generateStackLiftSwitchCases(printer: printer, enumDef: enumDef) @@ -1212,40 +1214,7 @@ struct EnumCodegen { printer.write("}") printer.nextLine() - printer.write("// MARK: Protocol Export") - printer.nextLine() - - printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 {") - printer.indent { - printer.write("switch self {") - generateLowerParameterSwitchCases(printer: printer, enumDef: enumDef) - printer.write("}") - } - printer.write("}") - printer.nextLine() - - printer.write( - multilineString: """ - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> \(typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } - """ - ) - printer.nextLine() - - printer.write("// MARK: ExportSwift") - printer.nextLine() - - printer.write( - multilineString: """ - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> \(typeName) { - return _bridgeJSLiftFromCaseId(caseId) - } - """ - ) - printer.nextLine() - - printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() {") + printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 {") printer.indent { printer.write("switch self {") generateReturnSwitchCases(printer: printer, enumDef: enumDef) @@ -1298,32 +1267,12 @@ struct EnumCodegen { } } - private func generateLowerParameterSwitchCases(printer: CodeFragmentPrinter, enumDef: ExportedEnum) { - for (caseIndex, enumCase) in enumDef.cases.enumerated() { - if enumCase.associatedValues.isEmpty { - printer.write("case .\(enumCase.name):") - printer.indent { - printer.write("return Int32(\(caseIndex))") - } - } else { - let pattern = enumCase.associatedValues.enumerated() - .map { index, associatedValue in "let \(associatedValue.label ?? "param\(index)")" } - .joined(separator: ", ") - printer.write("case .\(enumCase.name)(\(pattern)):") - printer.indent { - generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues) - printer.write("return Int32(\(caseIndex))") - } - } - } - } - private func generateReturnSwitchCases(printer: CodeFragmentPrinter, enumDef: ExportedEnum) { for (caseIndex, enumCase) in enumDef.cases.enumerated() { if enumCase.associatedValues.isEmpty { printer.write("case .\(enumCase.name):") printer.indent { - printer.write("_swift_js_push_i32(Int32(\(caseIndex)))") + printer.write("return Int32(\(caseIndex))") } } else { let pattern = enumCase.associatedValues.enumerated() @@ -1334,7 +1283,7 @@ struct EnumCodegen { generatePayloadPushingCode(printer: printer, associatedValues: enumCase.associatedValues) // Push tag AFTER payloads so it's popped first (LIFO) by the JS lift function. // This ensures nested enum tags don't overwrite the outer tag. - printer.write("_swift_js_push_i32(Int32(\(caseIndex)))") + printer.write("return Int32(\(caseIndex))") } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 9787865f2..8705c929e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -1,5 +1,5 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -18,9 +18,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -41,42 +39,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .flag(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .rate(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .precise(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .info: - _swift_js_push_i32(Int32(5)) - } - } } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -95,9 +61,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -131,55 +95,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .info: - _swift_js_push_i32(Int32(5)) - } - } } extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -192,9 +111,7 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -210,37 +127,10 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { return Int32(2) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Utilities.Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - } - } } extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> NetworkingResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -251,9 +141,7 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -264,32 +152,10 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { return Int32(1) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> NetworkingResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> NetworkingResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - } - } } extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: return .success(Optional.bridgeJSLiftParameter()) @@ -302,9 +168,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): let __bjs_isSome_param0 = param0 != nil @@ -344,57 +208,6 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { return Int32(2) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - _swift_js_push_i32(Int32(1)) - case .status(let param0, let param1, let param2): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - let __bjs_isSome_param2 = param2 != nil - if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - } - } } extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { @@ -444,7 +257,7 @@ extension CardinalDirection: _BridgedSwiftCaseEnum { } extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) @@ -461,9 +274,7 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .precision(let param0): param0.bridgeJSLowerStackReturn() @@ -489,47 +300,10 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { return Int32(4) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .precision(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .direction(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .optPrecision(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - case .optDirection(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(3)) - case .empty: - _swift_js_push_i32(Int32(4)) - } - } } extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> AllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AllTypesResult { switch caseId { case 0: return .structPayload(Point.bridgeJSLiftParameter()) @@ -548,9 +322,7 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .structPayload(let param0): param0.bridgeJSLowerReturn() @@ -571,42 +343,10 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> AllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> AllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .structPayload(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(0)) - case .classPayload(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .jsObjectPayload(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .nestedEnum(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(3)) - case .arrayPayload(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(4)) - case .empty: - _swift_js_push_i32(Int32(5)) - } - } } extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult { switch caseId { case 0: return .optStruct(Optional.bridgeJSLiftParameter()) @@ -625,9 +365,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .optStruct(let param0): param0.bridgeJSLowerReturn() @@ -660,50 +398,6 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .optStruct(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(0)) - case .optClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(1)) - case .optJSObject(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - case .optNestedEnum(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(3)) - case .optArray(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(4)) - case .empty: - _swift_js_push_i32(Int32(5)) - } - } } extension Point: _BridgedSwiftStruct { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 9b68b96ed..fcca0aaa3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -363,7 +363,7 @@ extension ExampleEnum: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Result: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Result { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Result { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -374,9 +374,7 @@ extension Result: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -386,27 +384,6 @@ extension Result: _BridgedSwiftAssociatedValueEnum { return Int32(1) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - } - } } extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index a7b0578a9..6622ef3da 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -45,7 +45,7 @@ public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -56,9 +56,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -68,27 +66,6 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(1) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - } - } } @_expose(wasm, "bjs_APIResult_static_roundtrip") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index a7b0578a9..6622ef3da 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -45,7 +45,7 @@ public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -56,9 +56,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -68,27 +66,6 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(1) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - } - } } @_expose(wasm, "bjs_APIResult_static_roundtrip") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index d8b3c9bb8..57a963637 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -1188,7 +1188,7 @@ extension HttpStatus: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -1207,9 +1207,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -1230,38 +1228,6 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .flag(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .rate(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .precise(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .info: - _swift_js_push_i32(Int32(5)) - } - } } @_expose(wasm, "bjs_roundtripString") diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index feca05b3b..90493f773 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -601,23 +601,42 @@ extension _BridgedSwiftCaseEnum { /// /// The conformance is automatically synthesized by the BridgeJS code generator. public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftStackType { - // MARK: ImportTS - @_spi(BridgeJS) consuming func bridgeJSLowerParameter() -> Int32 - @_spi(BridgeJS) static func bridgeJSLiftReturn(_ caseId: Int32) -> Self + /// Pops the payload of the associated value enum from the stack. + /// + /// - Parameter caseId: The enum case ID. + /// - Returns: The associated value enum with its payload popped from the stack. + @_spi(BridgeJS) static func bridgeJSStackPopPayload(_ caseId: Int32) -> Self - // MARK: ExportSwift - @_spi(BridgeJS) static func bridgeJSLiftParameter(_ caseId: Int32) -> Self - @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void + /// Pushes the payload of the associated value enum onto the stack. + /// + /// - Returns: The enum case ID. + @_spi(BridgeJS) consuming func bridgeJSStackPushPayload() -> Int32 } extension _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - bridgeJSLiftParameter(_swift_js_pop_i32()) + bridgeJSStackPopPayload(_swift_js_pop_i32()) } @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { bridgeJSLowerReturn() } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ caseId: Int32) -> Self { + return bridgeJSStackPopPayload(caseId) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + _swift_js_push_i32(bridgeJSStackPushPayload()) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSStackPushPayload() + } + + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { + return bridgeJSStackPopPayload(caseId) + } } /// A protocol that Swift struct types conform to. diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 745c56472..400829a5d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2026,7 +2026,7 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { } extension APIResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -2045,9 +2045,7 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -2068,42 +2066,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { return Int32(5) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .flag(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .rate(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .precise(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .info: - _swift_js_push_i32(Int32(5)) - } - } } extension ComplexResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> ComplexResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -2124,9 +2090,7 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -2165,60 +2129,10 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { return Int32(6) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> ComplexResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .location(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(3)) - case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(4)) - case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(5)) - case .info: - _swift_js_push_i32(Int32(6)) - } - } } extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> Utilities.Result { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -2231,9 +2145,7 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -2249,37 +2161,10 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { return Int32(2) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> Utilities.Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> Utilities.Result { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - } - } } extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> API.NetworkingResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> API.NetworkingResult { switch caseId { case 0: return .success(String.bridgeJSLiftParameter()) @@ -2290,9 +2175,7 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): param0.bridgeJSLowerStackReturn() @@ -2303,32 +2186,10 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { return Int32(1) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> API.NetworkingResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> API.NetworkingResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - } - } } extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> AllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AllTypesResult { switch caseId { case 0: return .structPayload(Address.bridgeJSLiftParameter()) @@ -2349,9 +2210,7 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .structPayload(let param0): param0.bridgeJSLowerReturn() @@ -2375,45 +2234,10 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { return Int32(6) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> AllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> AllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .structPayload(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(0)) - case .classPayload(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .jsObjectPayload(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(2)) - case .nestedEnum(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(3)) - case .arrayPayload(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(4)) - case .jsClassPayload(let param0): - param0.jsObject.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(5)) - case .empty: - _swift_js_push_i32(Int32(6)) - } - } } extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> TypedPayloadResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) @@ -2430,9 +2254,7 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .precision(let param0): param0.bridgeJSLowerStackReturn() @@ -2458,43 +2280,6 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { return Int32(4) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> TypedPayloadResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .precision(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(0)) - case .direction(let param0): - param0.bridgeJSLowerStackReturn() - _swift_js_push_i32(Int32(1)) - case .optPrecision(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - case .optDirection(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(3)) - case .empty: - _swift_js_push_i32(Int32(4)) - } - } } extension StaticCalculator: _BridgedSwiftCaseEnum { @@ -2803,7 +2588,7 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se } extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> OptionalAllTypesResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult { switch caseId { case 0: return .optStruct(Optional
        .bridgeJSLiftParameter()) @@ -2824,9 +2609,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .optStruct(let param0): param0.bridgeJSLowerReturn() @@ -2866,61 +2649,10 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { return Int32(6) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> OptionalAllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> OptionalAllTypesResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .optStruct(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(0)) - case .optClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(1)) - case .optJSObject(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - case .optNestedEnum(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(3)) - case .optArray(let param0): - param0.bridgeJSLowerReturn() - _swift_js_push_i32(Int32(4)) - case .optJsClass(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(5)) - case .empty: - _swift_js_push_i32(Int32(6)) - } - } } extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { - private static func _bridgeJSLiftFromCaseId(_ caseId: Int32) -> APIOptionalResult { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: return .success(Optional.bridgeJSLiftParameter()) @@ -2933,9 +2665,7 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } - // MARK: Protocol Export - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): let __bjs_isSome_param0 = param0 != nil @@ -2975,57 +2705,6 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { return Int32(2) } } - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ caseId: Int32) -> APIOptionalResult { - return _bridgeJSLiftFromCaseId(caseId) - } - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - switch self { - case .success(let param0): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - _swift_js_push_i32(Int32(0)) - case .failure(let param0, let param1): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - _swift_js_push_i32(Int32(1)) - case .status(let param0, let param1, let param2): - let __bjs_isSome_param0 = param0 != nil - if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) - let __bjs_isSome_param1 = param1 != nil - if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) - let __bjs_isSome_param2 = param2 != nil - if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() - } - _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) - _swift_js_push_i32(Int32(2)) - } - } } extension Point: _BridgedSwiftStruct { From 8970445ff4a54536d1fc45f047899dc4886e30dc Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 12 Feb 2026 10:19:49 +0100 Subject: [PATCH 204/252] NFC: BridgeJS: Simplify ExportSwift codegen by using no-arg bridgeJSLiftParameter() intrinsics --- .../Sources/BridgeJSCore/ExportSwift.swift | 55 ++++--------------- .../EnumAssociatedValue.swift | 6 +- .../BridgeJSCodegenTests/SwiftStruct.swift | 2 +- .../Generated/BridgeJS.swift | 18 +++--- 4 files changed, 24 insertions(+), 57 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 5fb6f103f..600a24e2c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -779,30 +779,11 @@ struct StackCodegen { func liftExpression(for type: BridgeType) -> ExprSyntax { switch type { case .string, .int, .uint, .bool, .float, .double, - .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject: + .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer, + .swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum: return "\(raw: type.swiftType).bridgeJSLiftParameter()" case .jsObject(let className?): return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSLiftParameter())" - case .unsafePointer: - return "\(raw: type.swiftType).bridgeJSLiftParameter()" - case .swiftProtocol(let protocolName): - return "Any\(raw: protocolName).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .caseEnum: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return - "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())" - case .float: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_f32())" - case .double: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_f64())" - case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" - } - case .associatedValueEnum: - return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_i32())" case .nullable(let wrappedType, let kind): return liftNullableExpression(wrappedType: wrappedType, kind: kind) case .array(let elementType): @@ -820,8 +801,6 @@ struct StackCodegen { switch elementType { case .jsObject(let className?) where className != "JSObject": return liftArrayExpressionInline(elementType: elementType) - case .swiftProtocol(let protocolName): - return "[Any\(raw: protocolName)].bridgeJSLiftParameter()" case .nullable, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: @@ -857,13 +836,6 @@ struct StackCodegen { return __dict.mapValues { \(raw: className)(unsafelyWrapping: $0) } }() """ - case .swiftProtocol(let protocolName): - return """ - { - let __dict = [String: JSObject].bridgeJSLiftParameter() - return __dict.mapValues { $0 as! Any\(raw: protocolName) } - }() - """ case .nullable, .closure: return liftDictionaryExpressionInline(valueType: valueType) case .void, .namespaceEnum: @@ -917,19 +889,14 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch type { - case .string, .int, .uint, .bool, .float, .double, .jsValue: - return ["\(raw: accessor).bridgeJSLowerStackReturn()"] - case .jsObject(nil): + case .string, .int, .uint, .bool, .float, .double, .jsValue, + .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure, + .caseEnum, .rawValueEnum: return ["\(raw: accessor).bridgeJSLowerStackReturn()"] case .jsObject(_?): return ["\(raw: accessor).jsObject.bridgeJSLowerStackReturn()"] - case .swiftHeapObject, .unsafePointer, .closure: - return ["\(raw: accessor).bridgeJSLowerStackReturn()"] - case .swiftProtocol(let protocolName): - let wrapperName = "Any\(protocolName)" - return ["(\(raw: accessor) as! \(raw: wrapperName)).bridgeJSLowerStackReturn()"] - case .caseEnum, .rawValueEnum: - return ["\(raw: accessor).bridgeJSLowerStackReturn()"] + case .swiftProtocol: + return ["(\(raw: accessor) as! \(raw: type.swiftType)).bridgeJSLowerStackReturn()"] case .associatedValueEnum, .swiftStruct: return ["\(raw: accessor).bridgeJSLowerReturn()"] case .nullable(let wrappedType, _): @@ -951,8 +918,8 @@ struct StackCodegen { switch elementType { case .jsObject(let className?) where className != "JSObject": return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] - case .swiftProtocol(let protocolName): - return ["\(raw: accessor).map { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] + case .swiftProtocol: + return ["\(raw: accessor).map { $0 as! \(raw: elementType.swiftType) }.bridgeJSLowerReturn()"] case .nullable, .closure: return lowerArrayStatementsInline( elementType: elementType, @@ -998,8 +965,8 @@ struct StackCodegen { switch valueType { case .jsObject(let className?) where className != "JSObject": return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSLowerReturn()"] - case .swiftProtocol(let protocolName): - return ["\(raw: accessor).mapValues { $0 as! Any\(raw: protocolName) }.bridgeJSLowerReturn()"] + case .swiftProtocol: + return ["\(raw: accessor).mapValues { $0 as! \(raw: valueType.swiftType) }.bridgeJSLowerReturn()"] case .nullable, .closure: return lowerDictionaryStatementsInline( valueType: valueType, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 8705c929e..39582c9a9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -260,9 +260,9 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: - return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .precision(Precision.bridgeJSLiftParameter()) case 1: - return .direction(CardinalDirection.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .direction(CardinalDirection.bridgeJSLiftParameter()) case 2: return .optPrecision(Optional.bridgeJSLiftParameter()) case 3: @@ -312,7 +312,7 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { case 2: return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) case 3: - return .nestedEnum(APIResult.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .nestedEnum(APIResult.bridgeJSLiftParameter()) case 4: return .arrayPayload([Int].bridgeJSLiftParameter()) case 5: diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index 1ff0a4ce8..2e551452d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -223,7 +223,7 @@ fileprivate func _bjs_struct_lift_Session() -> Int32 { extension Measurement: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Measurement { let optionalPrecision = Optional.bridgeJSLiftParameter() - let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) + let precision = Precision.bridgeJSLiftParameter() let value = Double.bridgeJSLiftParameter() return Measurement(value: value, precision: precision, optionalPrecision: optionalPrecision) } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 400829a5d..07092d4bd 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2198,7 +2198,7 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { case 2: return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) case 3: - return .nestedEnum(APIResult.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .nestedEnum(APIResult.bridgeJSLiftParameter()) case 4: return .arrayPayload([Int].bridgeJSLiftParameter()) case 5: @@ -2240,9 +2240,9 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: - return .precision(Precision.bridgeJSLiftParameter(_swift_js_pop_f32())) + return .precision(Precision.bridgeJSLiftParameter()) case 1: - return .direction(Direction.bridgeJSLiftParameter(_swift_js_pop_i32())) + return .direction(Direction.bridgeJSLiftParameter()) case 2: return .optPrecision(Optional.bridgeJSLiftParameter()) case 3: @@ -2992,7 +2992,7 @@ fileprivate func _bjs_struct_lift_Contact() -> Int32 { extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) + let status = Status.bridgeJSLiftParameter() let direction = Optional.bridgeJSLiftParameter() let theme = Optional.bridgeJSLiftParameter() let name = String.bridgeJSLiftParameter() @@ -3100,7 +3100,7 @@ extension ValidationReport: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { let outcome = Optional.bridgeJSLiftParameter() let status = Optional.bridgeJSLiftParameter() - let result = APIResult.bridgeJSLiftParameter(_swift_js_pop_i32()) + let result = APIResult.bridgeJSLiftParameter() let id = Int.bridgeJSLiftParameter() return ValidationReport(id: id, result: result, status: status, outcome: outcome) } @@ -3160,8 +3160,8 @@ extension AdvancedConfig: _BridgedSwiftStruct { let location = Optional.bridgeJSLiftParameter() let metadata = Optional.bridgeJSLiftParameter() let result = Optional.bridgeJSLiftParameter() - let status = Status.bridgeJSLiftParameter(_swift_js_pop_i32()) - let theme = Theme.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32()) + let status = Status.bridgeJSLiftParameter() + let theme = Theme.bridgeJSLiftParameter() let enabled = Bool.bridgeJSLiftParameter() let title = String.bridgeJSLiftParameter() let id = Int.bridgeJSLiftParameter() @@ -3226,8 +3226,8 @@ extension MeasurementConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { let optionalRatio = Optional.bridgeJSLiftParameter() let optionalPrecision = Optional.bridgeJSLiftParameter() - let ratio = Ratio.bridgeJSLiftParameter(_swift_js_pop_f64()) - let precision = Precision.bridgeJSLiftParameter(_swift_js_pop_f32()) + let ratio = Ratio.bridgeJSLiftParameter() + let precision = Precision.bridgeJSLiftParameter() return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) } From d5ac7fa0c04cb55d125d077d7eb490d129c4ca02 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 12 Feb 2026 11:43:16 +0100 Subject: [PATCH 205/252] NFC: BridgeJS: Simplify ExportSwift codegen by removing redundant branches and extracting helpers --- .../Sources/BridgeJSCore/ExportSwift.swift | 104 +++++------------- .../EnumAssociatedValue.swift | 2 +- .../BridgeJSCodegenTests/Protocol.swift | 2 +- .../Generated/BridgeJS.swift | 8 +- 4 files changed, 36 insertions(+), 80 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 600a24e2c..e324c866f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -147,23 +147,9 @@ public class ExportSwift { } else { optionalSwiftType = "JSUndefinedOr" } - if case .swiftProtocol(let protocolName) = wrappedType { - let wrapperName = "Any\(protocolName)" - typeNameForIntrinsic = "\(optionalSwiftType)<\(wrapperName)>" - liftingExpr = ExprSyntax( - "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" - ) - } else { - typeNameForIntrinsic = "\(optionalSwiftType)<\(wrappedType.swiftType)>" - liftingExpr = ExprSyntax( - "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" - ) - } - case .swiftProtocol(let protocolName): - let wrapperName = "Any\(protocolName)" - typeNameForIntrinsic = wrapperName + typeNameForIntrinsic = "\(optionalSwiftType)<\(wrappedType.swiftType)>" liftingExpr = ExprSyntax( - "\(raw: wrapperName).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" + "\(raw: typeNameForIntrinsic).bridgeJSLiftParameter(\(raw: argumentsToLift.joined(separator: ", ")))" ) default: typeNameForIntrinsic = param.type.swiftType @@ -178,6 +164,20 @@ public class ExportSwift { } } + private func protocolCastSuffix(for returnType: BridgeType) -> (prefix: String, suffix: String) { + switch returnType { + case .swiftProtocol: + return ("", " as! \(returnType.swiftType)") + case .nullable(let wrappedType, _): + if case .swiftProtocol = wrappedType { + return ("(", ").flatMap { $0 as? \(wrappedType.swiftType) }") + } + return ("", "") + default: + return ("", "") + } + } + private func removeFirstLiftedParameter() -> (parameter: Parameter, expr: ExprSyntax) { let parameter = parameters.removeFirst() let expr = liftedParameterExprs.removeFirst() @@ -211,26 +211,10 @@ public class ExportSwift { if returnType == .void { return CodeBlockItemSyntax(item: .init(ExpressionStmtSyntax(expression: callExpr))) } else { - switch returnType { - case .swiftProtocol(let protocolName): - let wrapperName = "Any\(protocolName)" - return CodeBlockItemSyntax( - item: .init(DeclSyntax("let ret = \(raw: callExpr) as! \(raw: wrapperName)")) - ) - case .nullable(let wrappedType, _): - if case .swiftProtocol(let protocolName) = wrappedType { - let wrapperName = "Any\(protocolName)" - return CodeBlockItemSyntax( - item: .init( - DeclSyntax("let ret = (\(raw: callExpr)).flatMap { $0 as? \(raw: wrapperName) }") - ) - ) - } else { - return CodeBlockItemSyntax(item: .init(DeclSyntax("let ret = \(raw: callExpr)"))) - } - default: - return CodeBlockItemSyntax(item: .init(DeclSyntax("let ret = \(raw: callExpr)"))) - } + let (prefix, suffix) = protocolCastSuffix(for: returnType) + return CodeBlockItemSyntax( + item: .init(DeclSyntax("let ret = \(raw: prefix)\(raw: callExpr)\(raw: suffix)")) + ) } } @@ -244,20 +228,8 @@ public class ExportSwift { if returnType == .void { append("\(raw: name)") } else { - switch returnType { - case .swiftProtocol(let protocolName): - let wrapperName = "Any\(protocolName)" - append("let ret = \(raw: name) as! \(raw: wrapperName)") - case .nullable(let wrappedType, _): - if case .swiftProtocol(let protocolName) = wrappedType { - let wrapperName = "Any\(protocolName)" - append("let ret = \(raw: name).flatMap { $0 as? \(raw: wrapperName) }") - } else { - append("let ret = \(raw: name)") - } - default: - append("let ret = \(raw: name)") - } + let (prefix, suffix) = protocolCastSuffix(for: returnType) + append("let ret = \(raw: prefix)\(raw: name)\(raw: suffix)") } } @@ -301,20 +273,8 @@ public class ExportSwift { if returnType == .void { append("\(raw: selfExpr).\(raw: propertyName)") } else { - switch returnType { - case .swiftProtocol(let protocolName): - let wrapperName = "Any\(protocolName)" - append("let ret = \(raw: selfExpr).\(raw: propertyName) as! \(raw: wrapperName)") - case .nullable(let wrappedType, _): - if case .swiftProtocol(let protocolName) = wrappedType { - let wrapperName = "Any\(protocolName)" - append("let ret = \(raw: selfExpr).\(raw: propertyName).flatMap { $0 as? \(raw: wrapperName) }") - } else { - append("let ret = \(raw: selfExpr).\(raw: propertyName)") - } - default: - append("let ret = \(raw: selfExpr).\(raw: propertyName)") - } + let (prefix, suffix) = protocolCastSuffix(for: returnType) + append("let ret = \(raw: prefix)\(raw: selfExpr).\(raw: propertyName)\(raw: suffix)") } } @@ -1051,18 +1011,14 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch wrappedType { - case .string, .int, .uint, .bool, .float, .double, .jsValue: - return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] - case .caseEnum, .rawValueEnum: - return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] - case .swiftHeapObject: - return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] - case .associatedValueEnum: - return ["_swift_js_push_i32(\(raw: unwrappedVar).bridgeJSLowerParameter())"] - case .jsObject(nil): - return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] case .jsObject(_?): return ["\(raw: unwrappedVar).jsObject.bridgeJSLowerStackReturn()"] + case .swiftProtocol: + return ["(\(raw: unwrappedVar) as! \(raw: wrappedType.swiftType)).bridgeJSLowerStackReturn()"] + case .string, .int, .uint, .bool, .float, .double, .jsValue, + .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure, + .caseEnum, .rawValueEnum, .associatedValueEnum: + return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 39582c9a9..fa19b481c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -387,7 +387,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index fcca0aaa3..4051f5c9e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -565,7 +565,7 @@ public func _bjs_MyViewController_delegate_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_secondDelegate_get") public func _bjs_MyViewController_secondDelegate_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate.flatMap { $0 as? AnyMyViewControllerDelegate } + let ret = (MyViewController.bridgeJSLiftParameter(_self).secondDelegate).flatMap { $0 as? AnyMyViewControllerDelegate } return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 07092d4bd..e01c41511 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2631,7 +2631,7 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - _swift_js_push_i32(__bjs_unwrapped_param0.bridgeJSLowerParameter()) + __bjs_unwrapped_param0.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) @@ -3115,7 +3115,7 @@ extension ValidationReport: _BridgedSwiftStruct { _swift_js_push_i32(__bjs_isSome_status ? 1 : 0) let __bjs_isSome_outcome = self.outcome != nil if let __bjs_unwrapped_outcome = self.outcome { - _swift_js_push_i32(__bjs_unwrapped_outcome.bridgeJSLowerParameter()) + __bjs_unwrapped_outcome.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_outcome ? 1 : 0) } @@ -3176,7 +3176,7 @@ extension AdvancedConfig: _BridgedSwiftStruct { self.status.bridgeJSLowerStackReturn() let __bjs_isSome_result = self.result != nil if let __bjs_unwrapped_result = self.result { - _swift_js_push_i32(__bjs_unwrapped_result.bridgeJSLowerParameter()) + __bjs_unwrapped_result.bridgeJSLowerStackReturn() } _swift_js_push_i32(__bjs_isSome_result ? 1 : 0) let __bjs_isSome_metadata = self.metadata != nil @@ -7670,7 +7670,7 @@ public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_backupProcessor_get") public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor.flatMap { $0 as? AnyDataProcessor } + let ret = (DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor).flatMap { $0 as? AnyDataProcessor } return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") From 38a73c86edd302cc5dcebcdc389ec14b5b8a526f Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 12 Feb 2026 13:21:34 +0100 Subject: [PATCH 206/252] NFC: BridgeJS: Further simplify codegen and JSValue intrinsics --- .../Sources/BridgeJSCore/ClosureCodegen.swift | 37 ++-- .../Sources/BridgeJSCore/ExportSwift.swift | 158 +++++++++--------- .../ImportedTypeInExportedInterface.swift | 11 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 42 ++--- .../Generated/BridgeJS.swift | 11 +- 5 files changed, 106 insertions(+), 153 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index eefc63a7e..cbec4ba31 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -11,17 +11,17 @@ import BridgeJSUtilities public struct ClosureCodegen { public init() {} + private func swiftClosureType(for signature: ClosureSignature) -> String { + let closureParams = signature.parameters.map { "\($0.swiftType)" }.joined(separator: ", ") + let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") + let swiftReturnType = signature.returnType.swiftType + return "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + } + func renderClosureHelpers(_ signature: ClosureSignature) throws -> [DeclSyntax] { let mangledName = signature.mangleName let helperName = "_BJS_Closure_\(mangledName)" - - let closureParams = signature.parameters.enumerated().map { _, type in - "\(type.swiftType)" - }.joined(separator: ", ") - - let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") - let swiftReturnType = signature.returnType.swiftType - let swiftClosureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + let swiftClosureType = swiftClosureType(for: signature) let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)" @@ -72,7 +72,7 @@ public struct ClosureCodegen { } else { parameters = " (" - + signature.parameters.enumerated().map { index, param in + + signature.parameters.enumerated().map { index, _ in "param\(index)" }.joined(separator: ", ") + ")" } @@ -113,12 +113,7 @@ public struct ClosureCodegen { } func renderClosureInvokeHandler(_ signature: ClosureSignature) throws -> DeclSyntax { - let closureParams = signature.parameters.enumerated().map { _, type in - "\(type.swiftType)" - }.joined(separator: ", ") - let swiftEffects = (signature.isAsync ? " async" : "") + (signature.isThrows ? " throws" : "") - let swiftReturnType = signature.returnType.swiftType - let swiftClosureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)" + let swiftClosureType = swiftClosureType(for: signature) let boxType = "_BridgeJSTypedClosureBox<\(swiftClosureType)>" let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" @@ -144,17 +139,7 @@ public struct ClosureCodegen { let closureCallExpr = ExprSyntax("closure(\(raw: liftedParams.joined(separator: ", ")))") - // Determine return type - let abiReturnWasmType: WasmCoreType? - if signature.returnType == .void { - abiReturnWasmType = nil - } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType { - abiReturnWasmType = wasmType - } else { - abiReturnWasmType = nil - } - - let throwReturn = abiReturnWasmType?.swiftReturnPlaceholderStmt ?? "return" + let abiReturnWasmType = try signature.returnType.loweringReturnInfo().returnType // Build signature using SwiftSignatureBuilder let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index e324c866f..bb42e9d1e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -482,12 +482,7 @@ public class ExportSwift { } if function.effects.isStatic, let staticContext = function.staticContext { - let callName: String - switch staticContext { - case .className(let baseName), .enumName(let baseName), .structName(let baseName), - .namespaceEnum(let baseName): - callName = "\(baseName).\(function.name)" - } + let callName = "\(staticContextBaseName(staticContext)).\(function.name)" builder.call(name: callName, returnType: function.returnType) } else { builder.call(name: function.name, returnType: function.returnType) @@ -497,17 +492,61 @@ public class ExportSwift { return builder.render(abiName: function.abiName) } + private func staticContextBaseName(_ staticContext: StaticContext) -> String { + switch staticContext { + case .className(let baseName), .enumName(let baseName), .structName(let baseName), + .namespaceEnum(let baseName): + return baseName + } + } + + private func renderSingleExportedConstructor( + constructor: ExportedConstructor, + callName: String, + returnType: BridgeType + ) throws -> DeclSyntax { + let builder = ExportedThunkBuilder(effects: constructor.effects) + for param in constructor.parameters { + try builder.liftParameter(param: param) + } + builder.call(name: callName, returnType: returnType) + try builder.lowerReturnValue(returnType: returnType) + return builder.render(abiName: constructor.abiName) + } + + private func renderSingleExportedMethod( + method: ExportedFunction, + ownerTypeName: String, + instanceSelfType: BridgeType + ) throws -> DeclSyntax { + let builder = ExportedThunkBuilder(effects: method.effects) + if !method.effects.isStatic { + try builder.liftParameter(param: Parameter(label: nil, name: "_self", type: instanceSelfType)) + } + for param in method.parameters { + try builder.liftParameter(param: param) + } + + if method.effects.isStatic { + builder.call(name: "\(ownerTypeName).\(method.name)", returnType: method.returnType) + } else { + builder.callMethod(methodName: method.name, returnType: method.returnType) + } + try builder.lowerReturnValue(returnType: method.returnType) + return builder.render(abiName: method.abiName) + } + func renderSingleExportedStruct(struct structDef: ExportedStruct) throws -> [DeclSyntax] { var decls: [DeclSyntax] = [] if let constructor = structDef.constructor { - let builder = ExportedThunkBuilder(effects: constructor.effects) - for param in constructor.parameters { - try builder.liftParameter(param: param) - } - builder.call(name: structDef.swiftCallName, returnType: .swiftStruct(structDef.swiftCallName)) - try builder.lowerReturnValue(returnType: .swiftStruct(structDef.swiftCallName)) - decls.append(builder.render(abiName: constructor.abiName)) + decls.append( + try renderSingleExportedConstructor( + constructor: constructor, + callName: structDef.swiftCallName, + returnType: .swiftStruct(structDef.swiftCallName) + ) + ) } for property in structDef.properties where property.isStatic { @@ -520,28 +559,13 @@ public class ExportSwift { } for method in structDef.methods { - let builder = ExportedThunkBuilder(effects: method.effects) - - if method.effects.isStatic { - for param in method.parameters { - try builder.liftParameter(param: param) - } - builder.call(name: "\(structDef.swiftCallName).\(method.name)", returnType: method.returnType) - } else { - try builder.liftParameter( - param: Parameter(label: nil, name: "_self", type: .swiftStruct(structDef.swiftCallName)) - ) - for param in method.parameters { - try builder.liftParameter(param: param) - } - builder.callMethod( - methodName: method.name, - returnType: method.returnType + decls.append( + try renderSingleExportedMethod( + method: method, + ownerTypeName: structDef.swiftCallName, + instanceSelfType: .swiftStruct(structDef.swiftCallName) ) - } - - try builder.lowerReturnValue(returnType: method.returnType) - decls.append(builder.render(abiName: method.abiName)) + ) } return decls @@ -598,55 +622,29 @@ public class ExportSwift { var decls: [DeclSyntax] = [] if let constructor = klass.constructor { - let builder = ExportedThunkBuilder(effects: constructor.effects) - for param in constructor.parameters { - try builder.liftParameter(param: param) - } - builder.call(name: klass.swiftCallName, returnType: BridgeType.swiftHeapObject(klass.name)) - try builder.lowerReturnValue(returnType: BridgeType.swiftHeapObject(klass.name)) - decls.append(builder.render(abiName: constructor.abiName)) + decls.append( + try renderSingleExportedConstructor( + constructor: constructor, + callName: klass.swiftCallName, + returnType: .swiftHeapObject(klass.name) + ) + ) } for method in klass.methods { - let builder = ExportedThunkBuilder(effects: method.effects) - - if method.effects.isStatic { - for param in method.parameters { - try builder.liftParameter(param: param) - } - builder.call(name: "\(klass.swiftCallName).\(method.name)", returnType: method.returnType) - } else { - try builder.liftParameter( - param: Parameter(label: nil, name: "_self", type: BridgeType.swiftHeapObject(klass.swiftCallName)) - ) - for param in method.parameters { - try builder.liftParameter(param: param) - } - builder.callMethod( - methodName: method.name, - returnType: method.returnType + decls.append( + try renderSingleExportedMethod( + method: method, + ownerTypeName: klass.swiftCallName, + instanceSelfType: .swiftHeapObject(klass.swiftCallName) ) - } - try builder.lowerReturnValue(returnType: method.returnType) - decls.append(builder.render(abiName: method.abiName)) + ) } // Generate property getters and setters for property in klass.properties { - if property.isStatic { - decls.append( - contentsOf: try renderSingleExportedProperty( - property: property, - context: .classStatic(klass: klass) - ) - ) - } else { - decls.append( - contentsOf: try renderSingleExportedProperty( - property: property, - context: .classInstance(klass: klass) - ) - ) - } + let context: PropertyRenderingContext = + property.isStatic ? .classStatic(klass: klass) : .classInstance(klass: klass) + decls.append(contentsOf: try renderSingleExportedProperty(property: property, context: context)) } do { @@ -760,7 +758,7 @@ struct StackCodegen { func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { switch elementType { case .jsObject(let className?) where className != "JSObject": - return liftArrayExpressionInline(elementType: elementType) + return "[JSObject].bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" case .nullable, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: @@ -992,8 +990,7 @@ struct StackCodegen { let innerStatements = lowerUnwrappedOptionalStatements( wrappedType: wrappedType, - unwrappedVar: "__bjs_unwrapped_\(varPrefix)", - varPrefix: varPrefix + unwrappedVar: "__bjs_unwrapped_\(varPrefix)" ) for stmt in innerStatements { statements.append(stmt.description) @@ -1007,8 +1004,7 @@ struct StackCodegen { private func lowerUnwrappedOptionalStatements( wrappedType: BridgeType, - unwrappedVar: String, - varPrefix: String + unwrappedVar: String ) -> [CodeBlockItemSyntax] { switch wrappedType { case .jsObject(_?): diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index cd0f56694..5708e7de9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -76,16 +76,7 @@ public func _bjs_makeFoo() -> Int32 { @_cdecl("bjs_processFooArray") public func _bjs_processFooArray() -> Void { #if arch(wasm32) - let ret = processFooArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Foo] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) - } - __result.reverse() - return __result - }()) + let ret = processFooArray(_: [JSObject].bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) ret.map { $0.jsObject }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 90493f773..ff219531d 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -386,6 +386,19 @@ extension JSObject: _BridgedSwiftStackType { extension JSValue: _BridgedSwiftStackType { public typealias StackLiftResult = JSValue + @_transparent + private static func bridgeJSRetainPayloadIfNeeded(kind: Int32, payload1: Int32) -> Int32 { + guard let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) else { + return payload1 + } + switch kindEnum { + case .string, .object, .symbol, .bigInt: + return _swift_js_retain(payload1) + default: + return payload1 + } + } + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) { return withRawJSValue { raw in ( @@ -409,17 +422,7 @@ extension JSValue: _BridgedSwiftStackType { _ payload1: Int32, _ payload2: Double ) -> JSValue { - let retainedPayload1: Int32 - if let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) { - switch kindEnum { - case .string, .object, .symbol, .bigInt: - retainedPayload1 = _swift_js_retain(payload1) - default: - retainedPayload1 = payload1 - } - } else { - retainedPayload1 = payload1 - } + let retainedPayload1 = bridgeJSRetainPayloadIfNeeded(kind: kind, payload1: payload1) guard let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) else { fatalError("Invalid JSValue kind: \(kind)") @@ -440,25 +443,12 @@ extension JSValue: _BridgedSwiftStackType { } @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> JSValue { - let payload2 = _swift_js_pop_f64() - let payload1 = _swift_js_pop_i32() - let kind = _swift_js_pop_i32() - return bridgeJSLiftParameter(kind, payload1, payload2) + bridgeJSLiftParameter() } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { let lowered = bridgeJSLowerParameter() - let retainedPayload1: Int32 - if let kind = JavaScriptValueKind(rawValue: UInt32(lowered.kind)) { - switch kind { - case .string, .object, .symbol, .bigInt: - retainedPayload1 = _swift_js_retain(lowered.payload1) - default: - retainedPayload1 = lowered.payload1 - } - } else { - retainedPayload1 = lowered.payload1 - } + let retainedPayload1 = Self.bridgeJSRetainPayloadIfNeeded(kind: lowered.kind, payload1: lowered.payload1) _swift_js_push_i32(lowered.kind) _swift_js_push_i32(retainedPayload1) _swift_js_push_f64(lowered.payload2) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index e01c41511..a606ad741 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -5555,16 +5555,7 @@ public func _bjs_roundTripOptionalJSObjectArray() -> Void { @_cdecl("bjs_roundTripFooArray") public func _bjs_roundTripFooArray() -> Void { #if arch(wasm32) - let ret = roundTripFooArray(_: { - let __count = Int(_swift_js_pop_i32()) - var __result: [Foo] = [] - __result.reserveCapacity(__count) - for _ in 0..<__count { - __result.append(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) - } - __result.reverse() - return __result - }()) + let ret = roundTripFooArray(_: [JSObject].bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) ret.map { $0.jsObject }.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") From e68262d70c9c8448d8dd21a50ca3157bb082f237 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 12 Feb 2026 16:31:12 +0100 Subject: [PATCH 207/252] BridgeJS: Consolidate optional and pointer runtime intrinsics --- .../JavaScriptKit/BridgeJSIntrinsics.swift | 641 ++++++------------ 1 file changed, 199 insertions(+), 442 deletions(-) diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 90493f773..713088adf 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -520,7 +520,13 @@ extension _JSBridgedClass { @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ id: Int32) -> Self { Self(unsafelyWrapping: JSObject.bridgeJSLiftParameter(id)) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } + @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + _swift_js_push_i32(bridgeJSLowerReturn()) + } } /// A protocol that Swift protocol wrappers exposed from JavaScript must conform to. @@ -996,160 +1002,86 @@ private func _swift_js_pop_pointer_extern() -> UnsafeMutableRawPointer { // MARK: - UnsafePointer family -extension UnsafeMutableRawPointer: _BridgedSwiftStackType { - // MARK: ImportTS - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { self } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( - _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeMutableRawPointer - { - pointer - } - - // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( - _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeMutableRawPointer - { - pointer - } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeMutableRawPointer { - bridgeJSLiftParameter(_swift_js_pop_pointer()) - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { self } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_pointer(self) - } +public protocol _BridgedSwiftUnsafePointerLike: _BridgedSwiftStackType { + @_spi(BridgeJS) func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer + @_spi(BridgeJS) static func bridgeJSFromUnsafeMutableRawPointer(_ pointer: UnsafeMutableRawPointer) -> Self } -extension UnsafeRawPointer: _BridgedSwiftStackType { +extension _BridgedSwiftUnsafePointerLike { // MARK: ImportTS @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { - UnsafeMutableRawPointer(mutating: self) + bridgeJSToUnsafeMutableRawPointer() } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( - _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeRawPointer - { - UnsafeRawPointer(pointer) + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ pointer: UnsafeMutableRawPointer) -> Self { + bridgeJSFromUnsafeMutableRawPointer(pointer) } // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( - _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeRawPointer - { - UnsafeRawPointer(pointer) + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self { + bridgeJSFromUnsafeMutableRawPointer(pointer) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeRawPointer { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { bridgeJSLiftParameter(_swift_js_pop_pointer()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { - bridgeJSLowerParameter() + bridgeJSToUnsafeMutableRawPointer() } @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_pointer(UnsafeMutableRawPointer(mutating: self)) + _swift_js_push_pointer(bridgeJSToUnsafeMutableRawPointer()) } } -extension OpaquePointer: _BridgedSwiftStackType { - // MARK: ImportTS - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { - UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) - } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( +extension UnsafeMutableRawPointer: _BridgedSwiftUnsafePointerLike { + @_spi(BridgeJS) @_transparent public func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { self } + @_spi(BridgeJS) @_transparent public static func bridgeJSFromUnsafeMutableRawPointer( _ pointer: UnsafeMutableRawPointer - ) - -> OpaquePointer - { - OpaquePointer(UnsafeRawPointer(pointer)) + ) -> UnsafeMutableRawPointer { + pointer } +} - // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( - _ pointer: UnsafeMutableRawPointer - ) - -> OpaquePointer - { - OpaquePointer(UnsafeRawPointer(pointer)) - } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> OpaquePointer { - bridgeJSLiftParameter(_swift_js_pop_pointer()) - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { - bridgeJSLowerParameter() +extension UnsafeRawPointer: _BridgedSwiftUnsafePointerLike { + @_spi(BridgeJS) @_transparent public func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(mutating: self) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_pointer(UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self))) + @_spi(BridgeJS) @_transparent public static func bridgeJSFromUnsafeMutableRawPointer( + _ pointer: UnsafeMutableRawPointer + ) -> UnsafeRawPointer { + UnsafeRawPointer(pointer) } } -extension UnsafePointer: _BridgedSwiftStackType { - // MARK: ImportTS - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { +extension OpaquePointer: _BridgedSwiftUnsafePointerLike { + @_spi(BridgeJS) @_transparent public func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( + @_spi(BridgeJS) @_transparent public static func bridgeJSFromUnsafeMutableRawPointer( _ pointer: UnsafeMutableRawPointer - ) - -> UnsafePointer - { - UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self) + ) -> OpaquePointer { + OpaquePointer(UnsafeRawPointer(pointer)) } +} - // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( +extension UnsafePointer: _BridgedSwiftUnsafePointerLike { + @_spi(BridgeJS) @_transparent public func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { + UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self)) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSFromUnsafeMutableRawPointer( _ pointer: UnsafeMutableRawPointer - ) - -> UnsafePointer - { + ) -> UnsafePointer { UnsafeRawPointer(pointer).assumingMemoryBound(to: Pointee.self) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafePointer { - bridgeJSLiftParameter(_swift_js_pop_pointer()) - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { - bridgeJSLowerParameter() - } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_pointer(bridgeJSLowerParameter()) - } } -extension UnsafeMutablePointer: _BridgedSwiftStackType { - // MARK: ImportTS - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer { +extension UnsafeMutablePointer: _BridgedSwiftUnsafePointerLike { + @_spi(BridgeJS) @_transparent public func bridgeJSToUnsafeMutableRawPointer() -> UnsafeMutableRawPointer { UnsafeMutableRawPointer(self) } - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn( - _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeMutablePointer - { - pointer.assumingMemoryBound(to: Pointee.self) - } - - // MARK: ExportSwift - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter( + @_spi(BridgeJS) @_transparent public static func bridgeJSFromUnsafeMutableRawPointer( _ pointer: UnsafeMutableRawPointer - ) - -> UnsafeMutablePointer - { + ) -> UnsafeMutablePointer { pointer.assumingMemoryBound(to: Pointee.self) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UnsafeMutablePointer { - bridgeJSLiftParameter(_swift_js_pop_pointer()) - } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { - bridgeJSLowerParameter() - } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_pointer(bridgeJSLowerParameter()) - } } // Optional support for JSTypedClosure @@ -1167,145 +1099,178 @@ extension Optional { } } -extension Optional where Wrapped == Bool { - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( - isSome: Int32, value: Int32 - ) { - switch consume self { +extension Optional { + @usableFromInline @_transparent func _bridgeJSLowerParameter( + noneValue: Payload, + lowerWrapped: (Wrapped) -> Payload + ) -> (isSome: Int32, value: Payload) { + switch self { case .none: - return (isSome: 0, value: 0) + return (isSome: 0, value: noneValue) case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) + return (isSome: 1, value: lowerWrapped(wrapped)) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Bool? { + @usableFromInline @_transparent static func _bridgeJSLiftParameter( + _ isSome: Int32, + _ payload: Payload, + liftWrapped: (Payload) -> Wrapped + ) -> Wrapped? { if isSome == 0 { return nil - } else { - return Bool.bridgeJSLiftParameter(wrappedValue) - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Bool? { - let isSome = _swift_js_pop_i32() - let wrappedValue = _swift_js_pop_i32() - return bridgeJSLiftParameter(isSome, wrappedValue) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Bool? { - switch value { - case -1: - return nil - case 0: - return false - case 1: - return true - default: - return nil // Treat invalid values as null } + return liftWrapped(payload) } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - switch consume self { + @usableFromInline @_transparent func _bridgeJSLowerReturn( + noneValue: Payload, + lowerWrapped: (Wrapped) -> Payload, + write: (Int32, Payload) -> Void + ) { + switch self { case .none: - _swift_js_return_optional_bool(0, 0) - case .some(let value): - _swift_js_return_optional_bool(1, value.bridgeJSLowerReturn()) + write(0, noneValue) + case .some(let wrapped): + write(1, lowerWrapped(wrapped)) } } } -extension Optional where Wrapped == Int { - // MARK: ExportSwift +public protocol _BridgedSwiftOptionalScalarBridge: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { + @_spi(BridgeJS) static func bridgeJSPopOptionalScalarPayload() -> WasmCoreType + @_spi(BridgeJS) static var bridgeJSOptionalScalarNonePayload: WasmCoreType { get } + @_spi(BridgeJS) static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: WasmCoreType) +} - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( - isSome: Int32, value: Int32 - ) { - switch consume self { - case .none: - return (isSome: 0, value: 0) - case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) - } +public protocol _BridgedSwiftOptionalScalarSideChannelBridge: _BridgedSwiftOptionalScalarBridge { + @_spi(BridgeJS) static func bridgeJSReadOptionalSideChannelPresence() -> Int32 + @_spi(BridgeJS) static func bridgeJSReadOptionalSideChannelPayload() -> WasmCoreType +} + +extension Bool: _BridgedSwiftOptionalScalarBridge { + @_spi(BridgeJS) public static func bridgeJSPopOptionalScalarPayload() -> Int32 { _swift_js_pop_i32() } + @_spi(BridgeJS) public static var bridgeJSOptionalScalarNonePayload: Int32 { 0 } + @_spi(BridgeJS) public static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: Int32) { + _swift_js_return_optional_bool(isSome, value) } +} - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Int? { - if isSome == 0 { - return nil - } else { - return Int.bridgeJSLiftParameter(wrappedValue) - } +extension Int: _BridgedSwiftOptionalScalarSideChannelBridge { + @_spi(BridgeJS) public static func bridgeJSPopOptionalScalarPayload() -> Int32 { _swift_js_pop_i32() } + @_spi(BridgeJS) public static var bridgeJSOptionalScalarNonePayload: Int32 { 0 } + @_spi(BridgeJS) public static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: Int32) { + _swift_js_return_optional_int(isSome, value) + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPresence() -> Int32 { + _swift_js_get_optional_int_presence() + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPayload() -> Int32 { + _swift_js_get_optional_int_value() } +} - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int? { - let isSome = _swift_js_pop_i32() - let wrappedValue = _swift_js_pop_i32() - return bridgeJSLiftParameter(isSome, wrappedValue) +extension UInt: _BridgedSwiftOptionalScalarSideChannelBridge { + @_spi(BridgeJS) public static func bridgeJSPopOptionalScalarPayload() -> Int32 { _swift_js_pop_i32() } + @_spi(BridgeJS) public static var bridgeJSOptionalScalarNonePayload: Int32 { 0 } + @_spi(BridgeJS) public static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: Int32) { + _swift_js_return_optional_int(isSome, value) } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPresence() -> Int32 { + _swift_js_get_optional_int_presence() + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPayload() -> Int32 { + _swift_js_get_optional_int_value() + } +} - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Int? { - let isSome = _swift_js_get_optional_int_presence() - if isSome == 0 { - return nil - } else { - return Int.bridgeJSLiftReturn(_swift_js_get_optional_int_value()) - } +extension Float: _BridgedSwiftOptionalScalarSideChannelBridge { + @_spi(BridgeJS) public static func bridgeJSPopOptionalScalarPayload() -> Float32 { _swift_js_pop_f32() } + @_spi(BridgeJS) public static var bridgeJSOptionalScalarNonePayload: Float32 { 0.0 } + @_spi(BridgeJS) public static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: Float32) { + _swift_js_return_optional_float(isSome, value) + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPresence() -> Int32 { + _swift_js_get_optional_float_presence() } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPayload() -> Float32 { + _swift_js_get_optional_float_value() + } +} - @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - switch self { - case .none: - _swift_js_return_optional_int(0, 0) - case .some(let value): - _swift_js_return_optional_int(1, value.bridgeJSLowerReturn()) - } +extension Double: _BridgedSwiftOptionalScalarSideChannelBridge { + @_spi(BridgeJS) public static func bridgeJSPopOptionalScalarPayload() -> Float64 { _swift_js_pop_f64() } + @_spi(BridgeJS) public static var bridgeJSOptionalScalarNonePayload: Float64 { 0.0 } + @_spi(BridgeJS) public static func bridgeJSWriteOptionalReturn(_ isSome: Int32, _ value: Float64) { + _swift_js_return_optional_double(isSome, value) + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPresence() -> Int32 { + _swift_js_get_optional_double_presence() + } + @_spi(BridgeJS) public static func bridgeJSReadOptionalSideChannelPayload() -> Float64 { + _swift_js_get_optional_double_value() } } -extension Optional where Wrapped == UInt { +extension Optional where Wrapped: _BridgedSwiftOptionalScalarBridge { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( - isSome: Int32, value: Int32 + isSome: Int32, value: Wrapped.WasmCoreType ) { switch consume self { case .none: - return (isSome: 0, value: 0) + return (isSome: 0, value: Wrapped.bridgeJSOptionalScalarNonePayload) case .some(let wrapped): return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> UInt? { + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ wrappedValue: Wrapped.WasmCoreType + ) -> Wrapped? { if isSome == 0 { return nil - } else { - return UInt.bridgeJSLiftParameter(wrappedValue) } + return Wrapped.bridgeJSLiftParameter(wrappedValue) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt? { + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { let isSome = _swift_js_pop_i32() - let wrappedValue = _swift_js_pop_i32() + let wrappedValue = Wrapped.bridgeJSPopOptionalScalarPayload() return bridgeJSLiftParameter(isSome, wrappedValue) } - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> UInt? { - let isSome = _swift_js_get_optional_int_presence() + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + switch consume self { + case .none: + Wrapped.bridgeJSWriteOptionalReturn(0, Wrapped.bridgeJSOptionalScalarNonePayload) + case .some(let value): + Wrapped.bridgeJSWriteOptionalReturn(1, value.bridgeJSLowerReturn()) + } + } +} + +extension Optional where Wrapped: _BridgedSwiftOptionalScalarSideChannelBridge { + @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { + let isSome = Wrapped.bridgeJSReadOptionalSideChannelPresence() if isSome == 0 { return nil - } else { - return UInt.bridgeJSLiftReturn(_swift_js_get_optional_int_value()) } + return Wrapped.bridgeJSLiftReturn(Wrapped.bridgeJSReadOptionalSideChannelPayload()) } +} - @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - switch self { - case .none: - _swift_js_return_optional_int(0, 0) - case .some(let value): - _swift_js_return_optional_int(1, value.bridgeJSLowerReturn()) +extension Optional where Wrapped == Bool { + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Bool? { + switch value { + case -1: + return nil + case 0: + return false + case 1: + return true + default: + return nil // Treat invalid values as null } } } @@ -1315,21 +1280,12 @@ extension Optional where Wrapped == String { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { - switch consume self { - case .none: - return (isSome: 0, value: 0) - case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) - } + _bridgeJSLowerParameter(noneValue: 0, lowerWrapped: { $0.bridgeJSLowerParameter() }) } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ bytes: Int32, _ count: Int32) -> String? { - if isSome == 0 { - return nil - } else { - return String.bridgeJSLiftParameter(bytes, count) - } + _bridgeJSLiftParameter(isSome, (bytes, count), liftWrapped: { String.bridgeJSLiftParameter($0.0, $0.1) }) } @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> String? { @@ -1365,20 +1321,11 @@ extension Optional where Wrapped == JSObject { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( isSome: Int32, value: Int32 ) { - switch consume self { - case .none: - return (isSome: 0, value: 0) - case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) - } + _bridgeJSLowerParameter(noneValue: 0, lowerWrapped: { $0.bridgeJSLowerParameter() }) } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> JSObject? { - if isSome == 0 { - return nil - } else { - return JSObject.bridgeJSLiftParameter(objectId) - } + _bridgeJSLiftParameter(isSome, objectId, liftWrapped: JSObject.bridgeJSLiftParameter) } @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSObject? { @@ -1388,13 +1335,11 @@ extension Optional where Wrapped == JSObject { } @_spi(BridgeJS) public func bridgeJSLowerReturn() -> Void { - switch self { - case .none: - _swift_js_return_optional_object(0, 0) - case .some(let value): - let retainedId = value.bridgeJSLowerReturn() - _swift_js_return_optional_object(1, retainedId) - } + _bridgeJSLowerReturn( + noneValue: 0, + lowerWrapped: { $0.bridgeJSLowerReturn() }, + write: _swift_js_return_optional_object + ) } } @@ -1496,11 +1441,7 @@ extension Optional where Wrapped: _BridgedSwiftProtocolWrapper { // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ objectId: Int32) -> Wrapped? { - if isSome == 0 { - return nil - } else { - return Wrapped.bridgeJSLiftParameter(objectId) - } + _bridgeJSLiftParameter(isSome, objectId, liftWrapped: Wrapped.bridgeJSLiftParameter) } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { @@ -1569,11 +1510,7 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { _ isSome: Int32, _ pointer: UnsafeMutableRawPointer ) -> Optional { - if isSome == 0 { - return nil - } else { - return Wrapped.bridgeJSLiftParameter(pointer) - } + _bridgeJSLiftParameter(isSome, pointer, liftWrapped: Wrapped.bridgeJSLiftParameter) } @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { @@ -1601,120 +1538,16 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { } } } -extension Optional where Wrapped == Float { - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( - isSome: Int32, value: Float32 - ) { - switch consume self { - case .none: - return (isSome: 0, value: 0.0) - case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Float? { - if isSome == 0 { - return nil - } else { - return Float.bridgeJSLiftParameter(wrappedValue) - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Float? { - let isSome = _swift_js_pop_i32() - let wrappedValue = _swift_js_pop_f32() - return bridgeJSLiftParameter(isSome, wrappedValue) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Float? { - let isSome = _swift_js_get_optional_float_presence() - if isSome == 0 { - return nil - } else { - return Float.bridgeJSLiftReturn(_swift_js_get_optional_float_value()) - } - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - switch consume self { - case .none: - _swift_js_return_optional_float(0, 0.0) - case .some(let value): - _swift_js_return_optional_float(1, value.bridgeJSLowerReturn()) - } - } -} - -/// Optional support for Double -extension Optional where Wrapped == Double { - // MARK: ExportSwift - - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> ( - isSome: Int32, value: Float64 - ) { - switch consume self { - case .none: - return (isSome: 0, value: 0.0) - case .some(let wrapped): - return (isSome: 1, value: wrapped.bridgeJSLowerParameter()) - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Double? { - if isSome == 0 { - return nil - } else { - return Double.bridgeJSLiftParameter(wrappedValue) - } - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Double? { - let isSome = _swift_js_pop_i32() - let wrappedValue = _swift_js_pop_f64() - return bridgeJSLiftParameter(isSome, wrappedValue) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Double? { - let isSome = _swift_js_get_optional_double_presence() - if isSome == 0 { - return nil - } else { - return Double.bridgeJSLiftReturn(_swift_js_get_optional_double_value()) - } - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - switch consume self { - case .none: - _swift_js_return_optional_double(0, 0.0) - case .some(let value): - _swift_js_return_optional_double(1, value.bridgeJSLowerReturn()) - } - } -} - /// Optional support for case enums extension Optional where Wrapped: _BridgedSwiftCaseEnum { // MARK: ExportSwift @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - switch consume self { - case .none: - return (isSome: 0, value: 0) - case .some(let value): - return (isSome: 1, value: value.bridgeJSLowerParameter()) - } + _bridgeJSLowerParameter(noneValue: 0, lowerWrapped: { $0.bridgeJSLowerParameter() }) } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Wrapped? { - if isSome == 0 { - return nil - } else { - return Wrapped.bridgeJSLiftParameter(wrappedValue) - } + _bridgeJSLiftParameter(isSome, wrappedValue, liftWrapped: Wrapped.bridgeJSLiftParameter) } @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { @@ -1732,12 +1565,11 @@ extension Optional where Wrapped: _BridgedSwiftCaseEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - switch consume self { - case .none: - _swift_js_return_optional_int(0, 0) - case .some(let value): - _swift_js_return_optional_int(1, value.bridgeJSLowerReturn()) - } + _bridgeJSLowerReturn( + noneValue: 0, + lowerWrapped: { $0.bridgeJSLowerReturn() }, + write: _swift_js_return_optional_int + ) } } @@ -2030,12 +1862,17 @@ where Wrapped: _BridgedSwiftGenericOptionalStackType { // MARK: - _BridgedAsOptional (JSUndefinedOr) delegating to Optional -extension _BridgedAsOptional where Wrapped == Bool { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { +extension _BridgedAsOptional where Wrapped: _BridgedSwiftOptionalScalarBridge { + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> ( + isSome: Int32, value: Wrapped.WasmCoreType + ) { asOptional.bridgeJSLowerParameter() } - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { + @_spi(BridgeJS) public static func bridgeJSLiftParameter( + _ isSome: Int32, + _ wrappedValue: Wrapped.WasmCoreType + ) -> Self { Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } @@ -2043,56 +1880,20 @@ extension _BridgedAsOptional where Wrapped == Bool { Self(optional: Optional.bridgeJSLiftParameter()) } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftReturn(value)) - } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { asOptional.bridgeJSLowerReturn() } } -extension _BridgedAsOptional where Wrapped == Int { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - asOptional.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - +extension _BridgedAsOptional where Wrapped: _BridgedSwiftOptionalScalarSideChannelBridge { @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - asOptional.bridgeJSLowerReturn() - } } -extension _BridgedAsOptional where Wrapped == UInt { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { - asOptional.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Int32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - asOptional.bridgeJSLowerReturn() +extension _BridgedAsOptional where Wrapped == Bool { + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ value: Int32) -> Self { + Self(optional: Optional.bridgeJSLiftReturn(value)) } } @@ -2182,50 +1983,6 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftHeapObject { } } -extension _BridgedAsOptional where Wrapped == Float { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float32) { - asOptional.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float32) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - asOptional.bridgeJSLowerReturn() - } -} - -extension _BridgedAsOptional where Wrapped == Double { - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Float64) { - asOptional.bridgeJSLowerParameter() - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32, _ wrappedValue: Float64) -> Self { - Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) - } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { - Self(optional: Optional.bridgeJSLiftReturnFromSideChannel()) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - asOptional.bridgeJSLowerReturn() - } -} - extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, value: Int32) { asOptional.bridgeJSLowerParameter() From ac72422ca67aacefa94b79590ffdfc1c1ac11921 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 02:34:05 +0900 Subject: [PATCH 208/252] Merge pull request #627 from swiftwasm/katei/bf1a-fix-ts2swift-for Fix ts2swift alias struct naming and docs --- .../TS2Swift/JavaScript/src/processor.js | 6 +++--- .../test/__snapshots__/ts2swift.test.js.snap | 19 +++++++++++++++++++ .../test/fixtures/TypeAliasObject.d.ts | 11 +++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAliasObject.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 302058036..c71ff6fe5 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -747,8 +747,8 @@ export class TypeProcessor { * @private */ visitStructuredType(type, diagnosticNode, members) { - const symbol = type.getSymbol() ?? type.aliasSymbol; - const name = symbol?.name ?? this.checker.typeToString(type); + const symbol = type.aliasSymbol ?? type.getSymbol(); + const name = type.aliasSymbol?.name ?? symbol?.name ?? this.checker.typeToString(type); if (!name) return; if (this.emittedStructuredTypeNames.has(name)) return; this.emittedStructuredTypeNames.add(name); @@ -760,7 +760,7 @@ export class TypeProcessor { if (jsNameArg) args.push(jsNameArg); const annotation = this.renderMacroAnnotation("JSClass", args); const typeName = this.renderIdentifier(swiftName); - const docNode = symbol?.getDeclarations()?.[0] ?? diagnosticNode; + const docNode = type.aliasSymbol?.getDeclarations()?.[0] ?? symbol?.getDeclarations()?.[0] ?? diagnosticNode; if (docNode) { this.emitDocComment(docNode, { indent: "" }); } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 343f8795b..49814a996 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -426,6 +426,25 @@ exports[`ts2swift > snapshots Swift output for TypeAlias.d.ts > TypeAlias 1`] = " `; +exports[`ts2swift > snapshots Swift output for TypeAliasObject.d.ts > TypeAliasObject 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit + +@JSFunction func console() throws(JSException) -> Console + +/// Console from the environment. +@JSClass struct Console { + /// Log a message. + @JSFunction func log(_ message: String) throws(JSException) -> Void +} +" +`; + exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScriptClass 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAliasObject.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAliasObject.d.ts new file mode 100644 index 000000000..55ffdfa3a --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAliasObject.d.ts @@ -0,0 +1,11 @@ +/** + * Console from the environment. + */ +export type Console = { + /** + * Log a message. + */ + log(message: string): void; +}; + +export function console(): Console; From b3ddd88f6565ed9e5fa173350712e15e97cb7ac9 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 12 Feb 2026 18:40:34 +0100 Subject: [PATCH 209/252] Prevent cross-module inlining of f32/f64 @_extern(wasm) functions --- .../JavaScriptKit/BridgeJSIntrinsics.swift | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index ff219531d..0715703a3 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -723,22 +723,30 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_f32") -@_spi(BridgeJS) public func _swift_js_push_f32(_ value: Float32) +private func _swift_js_push_f32_extern(_ value: Float32) #else -@_spi(BridgeJS) public func _swift_js_push_f32(_ value: Float32) { +private func _swift_js_push_f32_extern(_ value: Float32) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_push_f32(_ value: Float32) { + _swift_js_push_f32_extern(value) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_f64") -@_spi(BridgeJS) public func _swift_js_push_f64(_ value: Float64) +private func _swift_js_push_f64_extern(_ value: Float64) #else -@_spi(BridgeJS) public func _swift_js_push_f64(_ value: Float64) { +private func _swift_js_push_f64_extern(_ value: Float64) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_push_f64(_ value: Float64) { + _swift_js_push_f64_extern(value) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_i32") @_spi(BridgeJS) public func _swift_js_pop_i32() -> Int32 @@ -750,22 +758,30 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_f32") -@_spi(BridgeJS) public func _swift_js_pop_f32() -> Float32 +private func _swift_js_pop_f32_extern() -> Float32 #else -@_spi(BridgeJS) public func _swift_js_pop_f32() -> Float32 { +private func _swift_js_pop_f32_extern() -> Float32 { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_pop_f32() -> Float32 { + _swift_js_pop_f32_extern() +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_f64") -@_spi(BridgeJS) public func _swift_js_pop_f64() -> Float64 +private func _swift_js_pop_f64_extern() -> Float64 #else -@_spi(BridgeJS) public func _swift_js_pop_f64() -> Float64 { +private func _swift_js_pop_f64_extern() -> Float64 { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_pop_f64() -> Float64 { + _swift_js_pop_f64_extern() +} + // MARK: Struct bridging helpers (JS-side lowering/raising) #if arch(wasm32) From e34f3824edcb9d08f2f127162f3c4a33bf318ca5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 10:21:24 +0900 Subject: [PATCH 210/252] BridgeJS: add runtime coverage for `public @JS struct` (#629) BridgeJS: add runtime coverage for public JS structs --- .../Generated/BridgeJS.swift | 67 +++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 83 +++++++++++++++++++ Tests/BridgeJSRuntimeTests/StructAPIs.swift | 14 ++++ Tests/prelude.mjs | 3 + 4 files changed, 167 insertions(+) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index a606ad741..e24775f43 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2884,6 +2884,62 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, #endif } +extension PublicPoint: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PublicPoint { + let y = Int.bridgeJSLiftParameter() + let x = Int.bridgeJSLiftParameter() + return PublicPoint(x: x, y: y) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + self.x.bridgeJSLowerStackReturn() + self.y.bridgeJSLowerStackReturn() + } + + public init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_PublicPoint(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSLiftParameter() + } + + public func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSLowerReturn() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PublicPoint())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PublicPoint") +fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PublicPoint") +fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 +#else +fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +@_expose(wasm, "bjs_PublicPoint_init") +@_cdecl("bjs_PublicPoint_init") +public func _bjs_PublicPoint_init(_ x: Int32, _ y: Int32) -> Void { + #if arch(wasm32) + let ret = PublicPoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { let zipCode = Optional.bridgeJSLiftParameter() @@ -5954,6 +6010,17 @@ public func _bjs_roundTripDataPoint() -> Void { #endif } +@_expose(wasm, "bjs_roundTripPublicPoint") +@_cdecl("bjs_roundTripPublicPoint") +public func _bjs_roundTripPublicPoint() -> Void { + #if arch(wasm32) + let ret = roundTripPublicPoint(_: PublicPoint.bridgeJSLiftParameter()) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_roundTripContact") @_cdecl("bjs_roundTripContact") public func _bjs_roundTripContact() -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 7e2d4d855..fc650b37d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -11131,6 +11131,31 @@ } } }, + { + "abiName" : "bjs_roundTripPublicPoint", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPublicPoint", + "parameters" : [ + { + "label" : "_", + "name" : "point", + "type" : { + "swiftStruct" : { + "_0" : "PublicPoint" + } + } + } + ], + "returnType" : { + "swiftStruct" : { + "_0" : "PublicPoint" + } + } + }, { "abiName" : "bjs_roundTripContact", "effects" : { @@ -12196,6 +12221,64 @@ ], "swiftCallName" : "DataPoint" }, + { + "constructor" : { + "abiName" : "bjs_PublicPoint_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "x", + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "label" : "y", + "name" : "y", + "type" : { + "int" : { + + } + } + } + ] + }, + "explicitAccessControl" : "public", + "methods" : [ + + ], + "name" : "PublicPoint", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "x", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "y", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "PublicPoint" + }, { "methods" : [ diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift index 49869e0f5..38e7b12e6 100644 --- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -40,6 +40,16 @@ } } +@JS public struct PublicPoint { + public var x: Int + public var y: Int + + @JS public init(x: Int, y: Int) { + self.x = x + self.y = y + } +} + @JS struct Address { var street: String var city: String @@ -168,6 +178,10 @@ return data } +@JS public func roundTripPublicPoint(_ point: PublicPoint) -> PublicPoint { + point +} + @JS func roundTripContact(_ contact: Contact) -> Contact { return contact } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index efb168a6d..ec37bdbc4 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -890,6 +890,9 @@ function testStructSupport(exports) { const data2 = { x: 0.0, y: 0.0, label: "", optCount: null, optFlag: null }; assert.deepEqual(exports.roundTripDataPoint(data2), data2); + const publicPoint = { x: 9, y: -3 }; + assert.deepEqual(exports.roundTripPublicPoint(publicPoint), publicPoint); + const pointerFields1 = { raw: 1, mutRaw: 4, opaque: 1024, ptr: 65536, mutPtr: 2 }; assert.deepEqual(exports.roundTripPointerFields(pointerFields1), pointerFields1); From 6682a2e7e70ba1744da1e0896b7f54a2c98e8c42 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 13:47:04 +0900 Subject: [PATCH 211/252] BridgeJS: Prepare for MVP release for documentation and relaxing feature gates (#630) * BridgeJS: Make `@JSClass`, `@JSFunction`, etc generally available without @_spi(Experimental) * BridgeJS: Remove JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS feature gate * BridgeJS: Update documentation for MVP release * [skip ci] Update READMEs --- Benchmarks/README.md | 2 +- .../Sources/Generated/BridgeJS.Macros.swift | 2 +- Examples/ExportSwift/README.md | 2 +- .../Generated/BridgeJS.Macros.swift | 2 +- Examples/PlayBridgeJS/build.sh | 2 +- Makefile | 2 +- Plugins/BridgeJS/README.md | 10 +- .../Sources/TS2Swift/JavaScript/src/cli.js | 2 +- .../test/__snapshots__/ts2swift.test.js.snap | 42 +- Plugins/PackageToJS/Sources/PackageToJS.swift | 5 - README.md | 44 +- .../BridgeJS/Ahead-of-Time-Code-Generation.md | 17 +- .../BridgeJS/BridgeJS-Configuration.md | 2 +- .../BridgeJS-Internals/BridgeJS-Internals.md | 11 + .../BridgeJS-Internals/Design-Rationale.md | 38 ++ .../Bringing-Swift-Closures-to-JavaScript.md | 80 ++++ .../BridgeJS/Exporting-Swift-to-JavaScript.md | 59 +-- .../Exporting-Swift/Exporting-Swift-Array.md | 2 +- .../Exporting-Swift/Exporting-Swift-Class.md | 5 +- .../Exporting-Swift-Closure.md | 9 +- .../Exporting-Swift-Default-Parameters.md | 4 +- .../Exporting-Swift/Exporting-Swift-Enum.md | 2 +- .../Exporting-Swift-Function.md | 2 +- .../Exporting-Swift-Optional.md | 10 +- .../Exporting-Swift-Protocols.md | 20 +- .../Exporting-Swift-Static-Functions.md | 12 +- .../Exporting-Swift-Static-Properties.md | 10 +- .../Exporting-Swift/Exporting-Swift-Struct.md | 4 +- .../Exporting-Swift/Using-Namespace.md | 6 +- .../BridgeJS/Generating-from-TypeScript.md | 419 ++++++++++++++++++ .../Importing-JavaScript-into-Swift.md | 98 ++++ .../Importing-JS-Class.md | 54 +++ .../Importing-JS-Function.md | 51 +++ .../Importing-JS-Variable.md | 59 +++ .../Importing-TypeScript-into-Swift.md | 185 -------- .../Importing-TS-Class.md | 64 --- .../Importing-TS-Function.md | 60 --- .../Importing-TS-Interface.md | 34 -- .../Importing-TS-TypeAlias.md | 47 -- .../Articles/BridgeJS/Introducing-BridgeJS.md | 32 ++ .../Articles/BridgeJS/Setting-up-BridgeJS.md | 60 +++ .../Articles/BridgeJS/Supported-Types.md | 34 +- .../Documentation.docc/Articles/FAQ.md | 28 ++ .../Documentation.docc/Documentation.md | 13 +- Sources/JavaScriptKit/Macros.swift | 12 +- .../ClosureSupportTests.swift | 2 +- .../DictionaryTests.swift | 2 +- .../BridgeJSRuntimeTests/ExportAPITests.swift | 2 +- .../Generated/BridgeJS.Macros.swift | 2 +- .../ImportArrayAPIs.swift | 2 +- .../ImportStructAPIs.swift | 2 +- .../OptionalSupportTests.swift | 2 +- Tests/BridgeJSRuntimeTests/StructAPIs.swift | 2 +- .../SwiftClassSupportTests.swift | 2 +- 54 files changed, 1091 insertions(+), 585 deletions(-) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/BridgeJS-Internals.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/Design-Rationale.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript-into-Swift.md delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Class.md delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Function.md delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Interface.md delete mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-TypeAlias.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Setting-up-BridgeJS.md create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md diff --git a/Benchmarks/README.md b/Benchmarks/README.md index f7264b6b7..65d867eba 100644 --- a/Benchmarks/README.md +++ b/Benchmarks/README.md @@ -7,7 +7,7 @@ This directory contains performance benchmarks for JavaScriptKit. Before running the benchmarks, you need to build the test suite: ```bash -JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk $SWIFT_SDK_ID js -c release +swift package --swift-sdk $SWIFT_SDK_ID js -c release ``` ## Running Benchmarks diff --git a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift index 39a46d22c..40fc29e91 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.Macros.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func benchmarkHelperNoop() throws(JSException) -> Void diff --git a/Examples/ExportSwift/README.md b/Examples/ExportSwift/README.md index 57d419295..39c66f0a6 100644 --- a/Examples/ExportSwift/README.md +++ b/Examples/ExportSwift/README.md @@ -5,7 +5,7 @@ This example demonstrates how to export Swift functions to JavaScript. 1. Build the project: ```sh - env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk $SWIFT_SDK_ID js --use-cdn + swift package --swift-sdk $SWIFT_SDK_ID js --use-cdn ``` 2. Serve the files: diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift index c619a8883..4a87a6d38 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func createTS2Swift() throws(JSException) -> TS2Swift diff --git a/Examples/PlayBridgeJS/build.sh b/Examples/PlayBridgeJS/build.sh index d2589f798..31c07896c 100755 --- a/Examples/PlayBridgeJS/build.sh +++ b/Examples/PlayBridgeJS/build.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euxo pipefail -env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" \ +swift package --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}" \ plugin --allow-writing-to-package-directory \ js --use-cdn --output ./Bundle -c "${1:-debug}" diff --git a/Makefile b/Makefile index 135465a73..270eb9b36 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ unittest: echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID='."; \ exit 2; \ } - env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \ + swift package --swift-sdk "$(SWIFT_SDK_ID)" \ $(TRACING_ARGS) \ --disable-sandbox \ js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 0559dc3fb..0b6ad121e 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -1,17 +1,17 @@ # BridgeJS > [!IMPORTANT] -> This feature is still experimental, and the API may change frequently. Use at your own risk with `JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1` environment variable. +> This feature is still experimental, and the API may change frequently. Use at your own risk. > [!NOTE] -> This documentation is intended for JavaScriptKit developers, not JavaScriptKit users. For user documentation, see [Exporting Swift to JavaScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-to-javascript) and [Importing TypeScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-typescript-into-swift). +> This documentation is intended for JavaScriptKit developers, not JavaScriptKit users. For user documentation, see [Introducing BridgeJS](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/introducing-bridgejs), [Setting up BridgeJS](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/setting-up-bridgejs), [Exporting Swift to JavaScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-to-javascript), [Importing JavaScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-javascript-into-swift), and [Generating bindings from TypeScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/generating-from-typescript). ## Overview BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. It enables: -1. **Importing TypeScript APIs into Swift**: Use TypeScript/JavaScript APIs directly from Swift code -2. **Exporting Swift APIs to JavaScript**: Make your Swift APIs available to JavaScript code +1. **Export Swift to JavaScript** – Expose Swift functions, classes, and types to JavaScript; the plugin generates TypeScript definitions (`.d.ts`) for the exported API. +2. **Import JavaScript into Swift** – Make JavaScript/TypeScript APIs callable from Swift with macro-annotated bindings or bindings generated from a TypeScript declaration file (`bridge-js.d.ts`). The workflow is: @@ -161,7 +161,7 @@ Return values use direct Wasm returns for primitives, and imported intrinsic fun - **Structs/Arrays/Enums**: Copy semantics - data serialized across boundary. No cleanup needed. - **Closures**: Boxed on source side, released when GC'd on either side. -For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#How-It-Works) in the user documentation. +For detailed semantics, see the [How It Works sections](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-class#how-it-works) in the user documentation. ## Testing diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 766cd0432..98453ebf1 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -123,7 +123,7 @@ export function run(filePath, options) { "// To update this file, just rebuild your project or run", "// `swift package bridge-js`.", "", - "@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit", + "@_spi(BridgeJS) import JavaScriptKit", "", "", ].join("\n"); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 49814a996..85d1da0de 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -7,7 +7,7 @@ exports[`ts2swift > snapshots Swift output for ArrayParameter.d.ts > ArrayParame // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func processNumbers(_ values: [Double]) throws(JSException) -> Void @@ -30,7 +30,7 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func asyncReturnVoid() throws(JSException) -> JSPromise @@ -55,7 +55,7 @@ exports[`ts2swift > snapshots Swift output for Documentation.d.ts > Documentatio // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit /// Return a greeting for a user. /// @@ -112,7 +112,7 @@ exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func returnAnimatable() throws(JSException) -> Animatable @@ -130,7 +130,7 @@ exports[`ts2swift > snapshots Swift output for InvalidPropertyNames.d.ts > Inval // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func createArrayBuffer() throws(JSException) -> ArrayBufferLike @@ -178,7 +178,7 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func createDatabaseConnection(_ config: JSValue) throws(JSException) -> DatabaseConnection @@ -215,7 +215,7 @@ exports[`ts2swift > snapshots Swift output for ObjectLikeTypes.d.ts > ObjectLike // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func acceptObject(_ v: JSObject) throws(JSException) -> Void " @@ -228,7 +228,7 @@ exports[`ts2swift > snapshots Swift output for OptionalNullUndefined.d.ts > Opti // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func roundTripNumberNull(_ value: Optional) throws(JSException) -> Optional @@ -269,7 +269,7 @@ exports[`ts2swift > snapshots Swift output for PrimitiveParameters.d.ts > Primit // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func check(_ a: Double, _ b: Bool) throws(JSException) -> Void " @@ -282,7 +282,7 @@ exports[`ts2swift > snapshots Swift output for PrimitiveReturn.d.ts > PrimitiveR // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func checkNumber() throws(JSException) -> Double @@ -297,7 +297,7 @@ exports[`ts2swift > snapshots Swift output for ReExportFrom.d.ts > ReExportFrom // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func jsRoundTripNumber(_ v: Double) throws(JSException) -> Double @@ -315,7 +315,7 @@ exports[`ts2swift > snapshots Swift output for RecordDictionary.d.ts > RecordDic // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func takeRecord(_ value: [String: Double]) throws(JSException) -> Void @@ -345,7 +345,7 @@ exports[`ts2swift > snapshots Swift output for StringEnum.d.ts > StringEnum 1`] // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit enum FeatureFlag: String { case foo = "foo" @@ -366,7 +366,7 @@ exports[`ts2swift > snapshots Swift output for StringParameter.d.ts > StringPara // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func checkString(_ a: String) throws(JSException) -> Void @@ -381,7 +381,7 @@ exports[`ts2swift > snapshots Swift output for StringReturn.d.ts > StringReturn // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func checkString() throws(JSException) -> String " @@ -394,7 +394,7 @@ exports[`ts2swift > snapshots Swift output for TS2SkeletonLike.d.ts > TS2Skeleto // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func createTS2Skeleton() throws(JSException) -> TypeScriptProcessor @@ -420,7 +420,7 @@ exports[`ts2swift > snapshots Swift output for TypeAlias.d.ts > TypeAlias 1`] = // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func checkSimple(_ a: Double) throws(JSException) -> Void " @@ -433,7 +433,7 @@ exports[`ts2swift > snapshots Swift output for TypeAliasObject.d.ts > TypeAliasO // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func console() throws(JSException) -> Console @@ -452,7 +452,7 @@ exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScript // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSClass struct Greeter { @JSGetter var name: String @@ -473,7 +473,7 @@ exports[`ts2swift > snapshots Swift output for VoidParameterVoidReturn.d.ts > Vo // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func check() throws(JSException) -> Void " @@ -486,7 +486,7 @@ exports[`ts2swift > snapshots Swift output for WebIDLDOMDocs.d.ts > WebIDLDOMDoc // To update this file, just rebuild your project or run // \`swift package bridge-js\`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document) @JSGetter var document: Document diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index 268f3f200..2e47dcf71 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -589,11 +589,6 @@ struct PackagingPlanner { packageInputs.append(packageJsonTask) if skeletons.count > 0 { - if ProcessInfo.processInfo.environment["JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS"] == nil { - fatalError( - "BridgeJS is still an experimental feature. Set the environment variable JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 to enable." - ) - } let bridgeJs = outputDir.appending(path: "bridge-js.js") let bridgeDts = outputDir.appending(path: "bridge-js.d.ts") packageInputs.append( diff --git a/README.md b/README.md index 6a0acaa27..b5cb04801 100644 --- a/README.md +++ b/README.md @@ -48,14 +48,14 @@ _ = document.body.appendChild(button) BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. It enables: -- **Exporting Swift APIs to JavaScript**: Make your Swift code callable from JavaScript -- **Importing TypeScript APIs into Swift**: Use JavaScript APIs with type safety in Swift +- **Export Swift to JavaScript** – Expose Swift functions, classes, and types to JavaScript; the plugin also generates TypeScript definitions (`.d.ts`) for the exported API. +- **Import JavaScript into Swift** – Make JavaScript/TypeScript APIs (functions, classes, globals like `document` or `console`) callable from Swift with type-safe bindings. You can declare bindings with macros in Swift or generate them from a TypeScript declaration file (`bridge-js.d.ts`). -For architecture details, see the [BridgeJS Plugin README](Plugins/BridgeJS/README.md). +For architecture details, see the [BridgeJS Plugin README](Plugins/BridgeJS/README.md). For package and build setup, see [Setting up BridgeJS](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/setting-up-bridgejs) in the documentation. ### Exporting Swift to JavaScript -Mark Swift code with `@JS` to make it callable from JavaScript: +Mark Swift code with `@JS` (the ``JS(namespace:enumStyle:)`` attribute) to make it callable from JavaScript: ```swift import JavaScriptKit @@ -81,32 +81,36 @@ console.log(greeter.greet()); // "Hello, World!" **Learn more:** [Exporting Swift to JavaScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/exporting-swift-to-javascript) -### Importing TypeScript into Swift +### Importing JavaScript into Swift -Define TypeScript interfaces and BridgeJS generates type-safe Swift bindings: +Declare bindings in Swift with macros such as `@JSFunction`, `@JSClass`, `@JSGetter`, and `@JSSetter`: -```typescript -// bridge-js.d.ts -interface Document { - title: string; - getElementById(id: string): HTMLElement; - createElement(tagName: string): HTMLElement; +```swift +import JavaScriptKit + +@JSClass struct Document { + @JSFunction func getElementById(_ id: String) throws(JSException) -> HTMLElement + @JSFunction func createElement(_ tagName: String) throws(JSException) -> HTMLElement } +@JSGetter(from: .global) var document: Document -export function getDocument(): Document; -``` +@JSClass struct HTMLElement { + @JSGetter var innerText: String + @JSSetter func setInnerText(_ newValue: String) throws(JSException) + @JSFunction func appendChild(_ child: HTMLElement) throws(JSException) +} -**Swift usage:** -```swift @JS func run() throws(JSException) { - let document = try getDocument() - try document.setTitle("My Swift App") - let button = try document.createElement("button") + let button = document.createElement("button")! try button.setInnerText("Click Me") + let container = document.getElementById("app")! + container.appendChild(button) } ``` -**Learn more:** [Importing TypeScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-typescript-into-swift) +You can also generate the same macro-annotated Swift from a TypeScript file (`bridge-js.d.ts`). See [Generating bindings from TypeScript](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/generating-from-typescript) in the documentation. + +**Learn more:** [Importing JavaScript into Swift](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/importing-javascript-into-swift) ### Try It Online diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md index ee6ac3047..776f6f577 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Ahead-of-Time-Code-Generation.md @@ -6,7 +6,7 @@ Learn how to improve build times by generating BridgeJS code ahead of time. > Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. -The BridgeJS build plugin automatically processes `@JS` annotations and TypeScript definitions during each build. While convenient, this can significantly increase build times for larger projects. To address this, JavaScriptKit provides a command plugin that lets you generate the bridge code ahead of time. +The BridgeJS build plugin automatically processes macro annotations and TypeScript definitions during each build. While convenient, this can significantly increase build times for larger projects. To address this, JavaScriptKit provides a command plugin that lets you generate the bridge code ahead of time. ## Using the Command Plugin @@ -54,7 +54,7 @@ $ echo "{}" > Sources/MyApp/bridge-js.config.json ### Step 3: Create Your Swift Code with @JS Annotations -Write your Swift code with `@JS` annotations as usual: +Write your Swift code with macro annotations as usual: ```swift import JavaScriptKit @@ -65,13 +65,13 @@ import JavaScriptKit @JS class Counter { private var count = 0 - + @JS init() {} - + @JS func increment() { count += 1 } - + @JS func getValue() -> Int { return count } @@ -104,14 +104,15 @@ swift package plugin bridge-js This command will: -1. Process all Swift files with `@JS` annotations +1. Process all Swift files with macro annotations 2. Process any TypeScript definition files 3. Generate Swift binding code in a `Generated` directory within your source folder For example, with a target named "MyApp", it will create: ``` -Sources/MyApp/Generated/BridgeJS.swift # Generated code for both exports and imports +Sources/MyApp/Generated/BridgeJS.swift # Glue code for both exports and imports +Sources/MyApp/Generated/BridgeJS.Macros.swift # Bridging interface generated from bridge-js.d.ts Sources/MyApp/Generated/JavaScript/BridgeJS.json # Unified skeleton JSON ``` @@ -173,4 +174,4 @@ git commit -m "Update generated BridgeJS code" 2. **Version Control**: Always commit the generated files if using the command plugin 3. **API Boundaries**: Try to stabilize your API boundaries to minimize regeneration 4. **Documentation**: Document your approach in your project README -5. **CI/CD**: If using the command plugin, consider verifying that generated code is up-to-date in CI +5. **CI/CD**: If using the command plugin, consider verifying that generated code is up-to-date in CI diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md index 78b5d2d37..604017aad 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Configuration.md @@ -42,7 +42,7 @@ Later files override settings from earlier files. This allows teams to commit a Controls whether exported Swift APIs are exposed to the JavaScript global namespace (`globalThis`). -When `true`, exported functions, classes, and namespaces are available via `globalThis` in JavaScript. When `false`, they are only available through the exports object returned by `createExports()`. +When `true`, exported functions, classes, and namespaces are available via `globalThis` in JavaScript. When `false`, they are only available through the exports object returned by `createExports()`. Using Exports provides better module isolation and support multiple WebAssembly instances in the same JavaScript context. Example: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/BridgeJS-Internals.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/BridgeJS-Internals.md new file mode 100644 index 000000000..b8589b49e --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/BridgeJS-Internals.md @@ -0,0 +1,11 @@ +# BridgeJS Internals + +Internal design, performance rationale, and low-level details for BridgeJS. + +## Overview + +This section is for maintainers and contributors who want to understand how BridgeJS works under the hood, why it is designed the way it is, and how it interacts with the JavaScript engine and ABI. + +## Topics + +- diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/Design-Rationale.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/Design-Rationale.md new file mode 100644 index 000000000..8bfc5d302 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/BridgeJS-Internals/Design-Rationale.md @@ -0,0 +1,38 @@ +# BridgeJS Design Rationale + +Why BridgeJS is faster than dynamic `JSObject`/`JSValue` APIs and how engine optimizations influence the design. + +## Overview + +BridgeJS generates **specialized** bridge code per exported or imported interface. That specialization, combined with stable call and property access patterns, allows JavaScript engines to optimize the boundary crossing much better than with generic dynamic code. This page explains the main performance rationale. + +## Why generated code is faster + +1. **Specialized code per interface** - Each bridged function or property gets its own glue path with known types. The engine does not need to handle arbitrary shapes or types at the call site. + +2. **Use of static type information** - The generator knows parameter and return types at compile time. It can avoid dynamic type checks and boxing where the dynamic API would require them. + +3. **IC-friendly access patterns** - Property and method accesses use stable, predictable shapes instead of a single generic subscript path. That keeps engine **inline caches (ICs)** effective instead of turning them **megamorphic**. + +## Inline caches (ICs) and megamorphic penalty + +JavaScript engines (and many other dynamic-language VMs) use **inline caches** at property and method access sites: they remember the object shape (e.g. “this property is at offset X”) so the next access with the same shape can take a fast path. + +- **Monomorphic** - One shape seen at a site → very fast, offset cached. +- **Polymorphic** - A few shapes → still fast, small dispatch in the IC. +- **Megamorphic** - Too many different shapes at the same site → the IC gives up and falls back to a generic property lookup, which is much slower. + +Engines typically allow only a small number of shapes per IC (e.g. on the order of a few) before marking the site megamorphic. + +## Why `JSObject` subscript is problematic + +`JSObject.subscript` (and similar dynamic property access) shares **one** code path for all property names and all object shapes. Every access goes through the same call site with varying keys and receiver shapes. That site therefore sees many different shapes and quickly becomes **megamorphic**, so the engine cannot cache property offsets and must do a generic lookup every time. + +So even if you cache the property name (e.g. with `CachedJSStrings`), you are still using the same generic subscript path; the call site stays megamorphic and pays the slow-path cost. + +BridgeJS avoids this by generating **separate** access paths per property or method. Each generated getter/setter or function call has a stable shape at the engine level, so the IC can stay monomorphic or polymorphic and the fast path is used. + +## What to read next + +- ABI and binary interface details will be documented in this section as they stabilize. +- For using BridgeJS in your app, see , , and . diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md new file mode 100644 index 000000000..ce1d9d555 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Bringing-Swift-Closures-to-JavaScript.md @@ -0,0 +1,80 @@ +# Bringing Swift Closures to JavaScript + +Use ``JSTypedClosure`` to pass or return Swift closures to the JavaScript world with BridgeJS-with type safety and explicit lifetime management. + +## Overview + +``JSTypedClosure`` wraps a **Swift closure** so you can **pass it or return it to JavaScript** through BridgeJS. The closure lives in Swift; JavaScript receives a function that calls back into that closure when invoked. Use it when: + +- You **pass** a Swift closure as an argument to a JavaScript API (e.g. an ``JSFunction(jsName:from:)`` that takes a callback parameter). +- You **return** a Swift closure from Swift exported by ``JS(namespace:enumStyle:)`` so JavaScript can call it later. + +Unlike ``JSClosure``, which uses untyped ``JSValue`` arguments and return values, ``JSTypedClosure`` has a concrete **signature** (e.g. `(Int) -> Int` or `(String) -> Void`). BridgeJS generates the glue code for that signature, so you get compile-time type safety when crossing into the JS world. + +You **must call** ``JSTypedClosure/release()`` when the closure is no longer needed by JavaScript. After release, any attempt to invoke the closure from JavaScript throws an explicit JS exception. + +## Creating a JSTypedClosure + +BridgeJS generates an initializer for each closure signature used in your module. Wrap your Swift closure and pass or return it to JavaScript: + +```swift +import JavaScriptKit + +// Pass a Swift closure to a JS function that expects a callback (Int) -> Int +@JSFunction static func applyTransform(_ value: Int, _ transform: JSTypedClosure<(Int) -> Int>) throws(JSException) -> Int + +let double = JSTypedClosure<(Int) -> Int> { $0 * 2 } +defer { double.release() } +let result = try applyTransform(10, double) // 20 - JS calls back into Swift +``` + +You can pass or return typed closures with other signatures the same way: + +```swift +let sum = JSTypedClosure<(Int, Int) -> Int> { $0 + $1 } +defer { sum.release() } + +let log = JSTypedClosure<(String) -> Void> { print($0) } +defer { log.release() } +``` + +## Lifetime and release() + +A ``JSTypedClosure`` keeps the Swift closure alive and exposes a JavaScript function that calls into it. To avoid leaks and use-after-free: + +1. **Call `release()` exactly once** when the closure is no longer needed by JavaScript (e.g. when the callback is unregistered or the object that held it is released). +2. Prefer **`defer { closure.release() }`** right after creating the closure so cleanup runs when the current scope exits. +3. After `release()`, calling the closure from JavaScript throws an exception with a message that includes the file and line where the ``JSTypedClosure`` was created. + +A **FinalizationRegistry** on the JavaScript side may eventually release the Swift storage if you never call `release()`, but that is non-deterministic. Do not rely on it for timely cleanup. + +## Getting the underlying JavaScript function + +When you need to store or pass the function on the JavaScript side (e.g. to compare identity or attach to a DOM node), use the ``JSTypedClosure/jsObject`` property to get the ``JSObject`` that represents the JavaScript function. + +## JSTypedClosure vs JSClosure + +Both let you pass or return a Swift closure to the JavaScript world. The difference is how they are typed and which API you use: + +| | JSTypedClosure | JSClosure | +|:--|:--|:--| +| **API** | BridgeJS (macros, generated code) | Dynamic ``JSObject`` / ``JSValue`` | +| **Types** | Typed signature, e.g. `(Int) -> Int` | Untyped `([JSValue]) -> JSValue` | +| **Lifetime** | Explicit `release()` required | Explicit `release()` required | +| **Use case** | Passing/returning closures at the BridgeJS boundary with a fixed signature | Passing Swift functions to JS via dynamic APIs (e.g. DOM events) | + +Use ``JSTypedClosure`` when you pass or return closures through BridgeJS-declared APIs. Use ``JSClosure`` when you pass a Swift function to JavaScript using the dynamic APIs (e.g. ``JSObject``, ``JSValue``) without generated glue. + +## JSTypedClosure vs auto-managed closures + +BridgeJS can also expose **plain** Swift closure types (e.g. `(String) -> String`) as parameters and return values; lifetime is then managed automatically via ``FinalizationRegistry`` and no `release()` is required. See . + +**When returning** a closure from Swift to JavaScript, we **recommend** using ``JSTypedClosure`` and managing lifetime explicitly with `release()`, rather than returning a plain closure type. Explicit release makes cleanup predictable and avoids relying solely on JavaScript GC. + +## See also + +- ``JSTypedClosure`` +- ``JSClosure`` +- +- +- diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md index 75f0fcca5..b14d2eebe 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift-to-JavaScript.md @@ -6,60 +6,11 @@ Learn how to make your Swift code callable from JavaScript. > Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS allows you to expose Swift functions, classes, and methods to JavaScript by using the `@JS` attribute. This enables JavaScript code to call into Swift code running in WebAssembly. - -## Configuring the BridgeJS plugin - -To use the BridgeJS feature, you need to enable the experimental `Extern` feature and add the BridgeJS plugin to your package. Here's an example of a `Package.swift` file: - -```swift -// swift-tools-version:6.0 - -import PackageDescription - -let package = Package( - name: "MyApp", - dependencies: [ - .package(url: "https://github.com/swiftwasm/JavaScriptKit.git", branch: "main") - ], - targets: [ - .executableTarget( - name: "MyApp", - dependencies: ["JavaScriptKit"], - swiftSettings: [ - // This is required because the generated code depends on @_extern(wasm) - .enableExperimentalFeature("Extern") - ], - plugins: [ - // Add build plugin for processing @JS and generate Swift glue code - .plugin(name: "BridgeJS", package: "JavaScriptKit") - ] - ) - ] -) -``` - -The `BridgeJS` plugin will process your Swift code to find declarations marked with `@JS` and generate the necessary bridge code to make them accessible from JavaScript. - -### Building your package for JavaScript - -After configuring your `Package.swift`, you can build your package for JavaScript using the following command: - -```bash -swift package --swift-sdk $SWIFT_SDK_ID js -``` - -This command will: - -1. Process all Swift files with `@JS` annotations -2. Generate JavaScript bindings and TypeScript type definitions (`.d.ts`) for your exported Swift code -3. Output everything to the `.build/plugins/PackageToJS/outputs/` directory - -> Note: For larger projects, you may want to generate the BridgeJS code ahead of time to improve build performance. See for more information. +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +BridgeJS allows you to expose Swift functions, classes, and methods to JavaScript by using the ``JS(namespace:enumStyle:)`` attribute. This enables JavaScript code to call into Swift code running in WebAssembly. +Configure your package and build for JavaScript as described in . Then use the topics below to expose Swift types and functions to JavaScript. ## Topics @@ -75,3 +26,7 @@ This command will: - - - + +## See Also + +- ``JS(namespace:enumStyle:)`` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md index 53d008068..e97bceefa 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Array.md @@ -4,7 +4,7 @@ Learn how to pass Swift arrays to and from JavaScript. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS allows you to pass Swift arrays as function parameters and return values. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md index 3e44581fa..9cd4a2224 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md @@ -4,7 +4,7 @@ Learn how to export Swift classes to JavaScript. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). To export a Swift class, mark both the class and any members you want to expose: @@ -51,6 +51,7 @@ cart.addItem("Laptop", 999.99, 1); cart.addItem("Mouse", 24.99, 2); console.log(`Items in cart: ${cart.getItemCount()}`); console.log(`Total: $${cart.getTotal().toFixed(2)}`); +cart.release(); // Call release() when done; don't rely on FinalizationRegistry as much as possible ``` The generated TypeScript declarations for this class would look like: @@ -83,7 +84,7 @@ Classes use **reference semantics** when crossing the Swift/JavaScript boundary: 1. **Object Creation**: When you create a class instance (via `new` in JS), the object lives on the Swift heap 2. **Reference Passing**: JavaScript receives a reference (handle) to the Swift object, not a copy 3. **Shared State**: Changes made through either Swift or JavaScript affect the same object -4. **Memory Management**: `FinalizationRegistry` automatically releases Swift objects when they're garbage collected in JavaScript. You can optionally call `release()` for deterministic cleanup. +4. **Memory Management**: `FinalizationRegistry` can release Swift objects when they're garbage collected in JavaScript, but you should **not rely on it** for cleanup. Call `release()` when an instance is no longer needed so that Swift memory is reclaimed deterministically. This is especially important for **short-lived instances**: GC may run late or not at all for objects that become unreachable quickly, so relying on `FinalizationRegistry` can delay or leak Swift-side resources. This differs from structs, which use copy semantics and transfer data by value. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md index fe934ddba..adb9ab33b 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Closure.md @@ -4,9 +4,11 @@ Learn how to use closure/function types as parameters and return values in Bridg ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). -BridgeJS supports typed closure parameters and return values, allowing you to pass functions between Swift and JavaScript with full type safety. This enables functional programming patterns like callbacks, higher-order functions, and function composition across the language boundary. +BridgeJS supports typed closure parameters and return values, allowing you to pass or return Swift closures to JavaScript with full type safety. **Lifetime is automatic**: you use plain Swift closure types (e.g. `(String) -> String`); the runtime releases them when no longer needed-no manual `release()` required. This enables callbacks, higher-order functions, and function composition across the boundary. + +**Recommendation:** When **returning** a closure from Swift to JavaScript, prefer returning a ``JSTypedClosure`` and managing its lifetime explicitly (see ). Explicit `release()` makes cleanup predictable and avoids relying solely on JavaScript garbage collection. Use plain closure types (this article) when you want fully automatic lifetime or when passing closures only as parameters into your exported API. ## Example @@ -99,6 +101,8 @@ Closures use **reference semantics** when crossing the Swift/JavaScript boundary This differs from structs and arrays, which use copy semantics and transfer data by value. +When you **return** a closure to JavaScript, we recommend using ``JSTypedClosure`` and calling `release()` when the closure is no longer needed, instead of returning a plain closure type. See . + ## Supported Features | Swift Feature | Status | @@ -113,4 +117,5 @@ This differs from structs and arrays, which use copy semantics and transfer data ## See Also +- - passing or returning closures with ``JSTypedClosure`` and explicit `release()` - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md index f6115f063..e6f4b8e9a 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Default-Parameters.md @@ -4,7 +4,7 @@ Learn how to use default parameter values in Swift functions and constructors ex ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS supports default parameter values for Swift functions and class constructors exported to JavaScript. When you specify default values in your Swift code, they are automatically applied in the generated JavaScript bindings. @@ -64,7 +64,7 @@ Constructor parameters also support default values, making it easy to create ins @JS var name: String @JS var timeout: Int @JS var retries: Int - + @JS init(name: String = "default", timeout: Int = 30, retries: Int = 3) { self.name = name self.timeout = timeout diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md index 6fb3afeda..2220d457c 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md @@ -4,7 +4,7 @@ Learn how to export Swift enums to JavaScript. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS supports two output styles for enums, controlled by the `enumStyle` parameter: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md index ebc8037c4..c26841041 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Function.md @@ -4,7 +4,7 @@ Learn how to export Swift functions to JavaScript. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). To export a Swift function to JavaScript, mark it with the `@JS` attribute and make it `public`: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md index 91fdc3472..be15b762f 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Optional.md @@ -4,14 +4,12 @@ Learn how to use Swift optionals in functions, classes, and enums exported to Ja ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS provides comprehensive support for Swift optionals across all bridged types. When you use `Optional` or `T?` in Swift, it automatically maps to `T | null` in TypeScript/JavaScript. Swift optionals are translated to union types with `null` (not `undefined`) because `null` represents an explicit "no value" state that aligns semantically with Swift's `nil`. This design choice ensures consistent null handling across the Swift-JavaScript bridge and avoids the ambiguity that comes with JavaScript's `undefined`. -> Important: BridgeJS optional support is **Swift → JavaScript only**. TypeScript → Swift optional imports are not currently supported. - ## Supported Optional Syntax BridgeJS recognizes all Swift optional syntax variants: @@ -35,7 +33,7 @@ All parameter types can be made optional, including primitives, objects, and enu ```swift @JS public func processOptionalData( text: String?, // Optional string - count: Int?, // Optional integer + count: Int?, // Optional integer flag: Bool?, // Optional boolean rate: Double?, // Optional double user: User? // Optional Swift class @@ -85,7 +83,7 @@ Constructors can accept optional parameters. @JS public var email: String? @JS public var age: Int? @JS public var avatar: User? - + @JS public init(name: String?) @JS public func updateProfile(email: String?, age: Int?) } @@ -100,7 +98,7 @@ export interface UserProfile extends SwiftHeapObject { email: string | null; age: number | null; avatar: User | null; - + updateProfile(email: string | null, age: number | null): void; } export type UserProfile = { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 111b1f052..3b2ec1526 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -4,7 +4,7 @@ Learn how to expose Swift protocols to JavaScript as TypeScript interfaces. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS allows you to export Swift protocols as TypeScript interfaces. JavaScript objects implementing these interfaces can be passed to Swift code, enabling protocol-oriented design across the Swift-JavaScript boundary. @@ -31,28 +31,28 @@ import JavaScriptKit @JS class CounterManager { var delegate: Counter - + @JS init(delegate: Counter) { self.delegate = delegate } - + @JS func incrementTwice() { delegate.increment(by: 1) delegate.increment(by: 1) } - + @JS func getCurrentValue() -> Int { return delegate.getValue() } - + @JS func getCounterName() -> String { return delegate.name } - + @JS func setCountValue(_ value: Int) { delegate.count = value } - + @JS func updateLabel(_ newLabel: String?) { delegate.label = newLabel } @@ -130,15 +130,15 @@ You can also implement protocols in Swift and use them from JavaScript: final class SwiftCounter: Counter { var count = 0 let name = "SwiftCounter" - + func increment(by amount: Int) { count += amount } - + func reset() { count = 0 } - + func getValue() -> Int { return count } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md index b6f680d1f..1c4b22abe 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Functions.md @@ -4,7 +4,7 @@ Learn how to export Swift static and class functions as JavaScript static method ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS supports exporting Swift `static func` and `class func` to JavaScript static methods. Both generate identical JavaScript output but differ in Swift inheritance behavior. @@ -17,15 +17,15 @@ Classes can export both `static` and `class` functions: ```swift @JS class MathUtils { @JS init() {} - + @JS static func add(a: Int, b: Int) -> Int { return a + b } - + @JS class func subtract(a: Int, b: Int) -> Int { return a - b } - + @JS func multiply(x: Int, y: Int) -> Int { return x * y } @@ -79,11 +79,11 @@ Enums can contain static functions that are exported as properties: @JS enum Calculator { case scientific case basic - + @JS static func square(value: Int) -> Int { return value * value } - + @JS static func cube(value: Int) -> Int { return value * value * value } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md index 4110e6166..4898535c8 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Static-Properties.md @@ -4,7 +4,7 @@ Learn how to export Swift static and class properties as JavaScript static prope ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). BridgeJS supports exporting Swift `static var`, `static let`, and `class var` properties to JavaScript static properties. Both stored and computed properties are supported. @@ -15,16 +15,16 @@ Classes can export both stored and computed static properties: ```swift @JS class Configuration { @JS init() {} - + @JS static let version = "1.0.0" @JS static var debugMode = false @JS class var defaultTimeout = 30 - + @JS static var timestamp: Double { get { return Date().timeIntervalSince1970 } set { /* custom setter logic */ } } - + @JS static var buildNumber: Int { return 12345 } @@ -81,7 +81,7 @@ Enums can contain static properties that are exported alongside enum cases: @JS enum PropertyEnum { case value1 case value2 - + @JS static var enumProperty = "mutable" @JS static let enumConstant = 42 @JS static var computedEnum: String { diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md index 10babd9b6..32bb79ed3 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md @@ -4,7 +4,7 @@ Learn how to export Swift structs to JavaScript. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). To export a Swift struct, mark it with `@JS`: @@ -91,7 +91,7 @@ export type Exports = { ```swift @JS struct Config { var name: String - + @JS nonisolated(unsafe) static var defaultTimeout: Double = 30.0 @JS static let maxRetries: Int = 3 } diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md index 057b5f030..1aff82f65 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md @@ -4,7 +4,7 @@ Learn how to organize exported Swift code into JavaScript namespaces. ## Overview -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). The `@JS` macro supports organizing your exported Swift code into namespaces using dot-separated strings. This allows you to create hierarchical structures in JavaScript that mirror your Swift code organization. @@ -121,7 +121,3 @@ export interface Greeter extends SwiftHeapObject { ``` Using namespaces can be preferable for projects with many global functions, as they help prevent naming collisions. Namespaces also provide intuitive hierarchies for organizing your exported Swift code, and they do not affect the code generated by `@JS` declarations without namespaces. - -## See Also - -- - Namespace enums section diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md new file mode 100644 index 000000000..9c0a80dc1 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Generating-from-TypeScript.md @@ -0,0 +1,419 @@ +# Generating bindings from TypeScript + +How to generate macro-annotated Swift bindings from a TypeScript declaration file (`bridge-js.d.ts`) so you don't have to write the Swift by hand. + +## Overview + +The BridgeJS plugin can read a `bridge-js.d.ts` file in your target and generate Swift code that uses the same macros as hand-written bindings (see ). + +The output is macro-annotated Swift; you can inspect the generated file at the following path to see exactly what was produced: + +``` +./build/plugins/outputs///destination/BridgeJS/BridgeJS.Macros.swift +``` + +Use this workflow when you have existing TypeScript definitions or many APIs to bind. + +> Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +## How to generate bindings from TypeScript + +### Step 1: Configure your package + +Add the BridgeJS plugin and enable the Extern feature as described in . + +### Step 2: Create TypeScript definitions + +Create a file named `bridge-js.d.ts` in your target source directory (e.g. `Sources//bridge-js.d.ts`). Declare the JavaScript APIs you want to use in Swift: + +```typescript +export function consoleLog(message: string): void; +``` + +### Step 3: Build your package + +Run: + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js +``` + +The plugin processes `bridge-js.d.ts`, generates Swift bindings (using the same macros as in ), compiles to WebAssembly, and produces JavaScript glue in `.build/plugins/PackageToJS/outputs/`. + +> Note: For larger projects, see . + +## Declaration mappings + +### Functions + +Each exported function becomes a top-level Swift function with `@JSFunction` and `throws(JSException)`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + + /** Returns the sum of two numbers. */ + export function sum(a: number, b: number): number; + /** + * Sets the document title. + * @param title - The new title string + */ + export function setDocumentTitle(title: string): void; + ``` + } + @Column { + ```swift + // Generated Swift + + /// Returns the sum of two numbers. + @JSFunction func sum(a: Double, b: Double) throws(JSException) -> Double + + + /// Sets the document title. + /// - Parameter title: The new title string + @JSFunction func setDocumentTitle(title: String) throws(JSException) + ``` + } +} + +### Global getters + +Module-level `declare const` or top-level readonly bindings that reference a bridged type become a Swift global property with `@JSGetter`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document) */ + export const document: Document; + ``` + } + @Column { + ```swift + // Generated Swift + /// [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document) + @JSGetter var document: Document + ``` + } +} + +### Classes + +A class becomes a Swift struct with `@JSClass`. The constructor becomes `init(...)` with `@JSFunction`. Properties become `@JSGetter`; writable properties also get `@JSSetter` as `set(_:)`. Methods become `@JSFunction`. Static methods become `static func` on the struct. All thunks throw `JSException` if the underlying JavaScript throws. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export class Greeter { + /** A readonly field is translated with `@JSGetter` */ + readonly id: number; + + /** A read-writable field is translated with `@JSGetter` and `@JSSetter` */ + message: string; + + /** A constructor */ + constructor(id: string, name: string); + /** A method */ + greet(): string; + /** A static method */ + static createDefault(greetingId: number, locale: string): string; + } + ``` + } + @Column { + ```swift + // Generated Swift + @JSClass struct Greeter { + /// A readonly field is translated with `@JSGetter` + @JSGetter var id: Double + + /// A read-writable field is translated with `@JSGetter` and `@JSSetter` + @JSGetter var message: String + @JSSetter func setMessage(_ newValue: String) throws(JSException) + + /// A constructor + @JSFunction init(id: String, name: String) throws(JSException) + /// A method + @JSFunction func greet() throws(JSException) -> String + @JSFunction static func createDefault(_ greetingId: Double, _ locale: String) throws(JSException) -> String + } + ``` + } +} + +### Interfaces + +An interface becomes a Swift struct with `@JSClass`. No constructor. Properties and methods are bridged the same way as for classes (`@JSGetter`, `@JSSetter`, `@JSFunction`). Instances are obtained from other calls (e.g. a function that returns the interface type). + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export interface HTMLElement { + readonly innerText: string; + className: string; + + appendChild(child: HTMLElement): void; + } + ``` + } + @Column { + ```swift + // Generated Swift + @JSClass struct HTMLElement { + @JSGetter var innerText: String + @JSGetter var className: String + @JSSetter func setClassName(_ newValue: String) throws(JSException) + @JSFunction func appendChild(_ child: HTMLElement) throws(JSException) + } + ``` + } +} + +### Type aliases + +Type aliases are resolved when generating Swift; the resolved shape is emitted, not a separate alias type. + +- **Primitive alias** (e.g. `type UserId = string`): Replaced by the underlying Swift type (e.g. `String`) everywhere it is used. +- **Object-shaped alias** (e.g. `type User = { id: string; name: string }`): The generator emits a named Swift struct with that name and the corresponding `@JSClass` / getters / setters. No constructor; use is the same as for interfaces. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export type UserId = string; + export type User = { + readonly id: UserId; + name: string; + }; + export function getUser(): User; + ``` + } + @Column { + ```swift + // Generated Swift (UserId inlined as String) + @JSClass struct User { + @JSGetter var id: String + @JSGetter var name: String + @JSSetter func setName(_ newValue: String) throws(JSException) + } + @JSFunction func getUser() throws(JSException) -> User + ``` + } +} + +### String enums + +TypeScript enums with string literal values become Swift enums with `String` raw value and the appropriate BridgeJS protocol conformances. Usable as parameter and return types. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export enum Theme { + light = "light", + dark = "dark", + } + + + export function setTheme(theme: Theme): void; + export function getTheme(): Theme; + ``` + } + @Column { + ```swift + // Generated Swift + enum Theme: String { + case light = "light" + case dark = "dark" + } + extension Theme: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} + + @JSFunction func setTheme(_ theme: Theme) throws(JSException) -> Void + @JSFunction func getTheme() throws(JSException) -> Theme + ``` + } +} + +## Type mappings + +The following mappings apply to function parameters, return types, and class/interface properties. + +### Primitives + +| TypeScript | Swift | +|------------|-------| +| `number` | `Double` | +| `string` | `String` | +| `boolean` | `Bool` | + +These appear in the function and class examples above. + +### Arrays + +`T[]` and `Array` → `[T]`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export function sumAll(values: number[]): number; + export function getScores(): number[]; + export function getLabels(): string[]; + export function normalize(values: Array): Array; + ``` + } + @Column { + ```swift + // Generated Swift + @JSFunction func sumAll(_ values: [Double]) throws(JSException) -> Double + @JSFunction func getScores() throws(JSException) -> [Double] + @JSFunction func getLabels() throws(JSException) -> [String] + @JSFunction func normalize(_ values: [Double]) throws(JSException) -> [Double] + ``` + } +} + +### Optional and undefined + +- **`T | null`** → Swift `Optional` (e.g. `Optional`, `Optional`, `Optional`). +- **`T | undefined`** or optional parameters → Swift `JSUndefinedOr`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export function parseCount(value: number | null): number | null; + export function parseLimit(value: number | undefined): number | undefined; + export function scale(factor: number, offset: number | null): number; + + export interface Payload {} + export class RequestOptions { + body: Payload | null; + + headers: Payload | undefined; + + } + ``` + } + @Column { + ```swift + // Generated Swift + @JSFunction func parseCount(_ value: Optional) throws(JSException) -> Optional + @JSFunction func parseLimit(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr + @JSFunction func scale(_ factor: Double, _ offset: Optional) throws(JSException) -> Double + + @JSClass struct Payload {} + @JSClass struct RequestOptions { + @JSGetter var body: Optional + @JSSetter func setBody(_ value: Optional) throws(JSException) + @JSGetter var headers: JSUndefinedOr + @JSSetter func setHeaders(_ value: JSUndefinedOr) throws(JSException) + } + ``` + } +} + +### Records (dictionaries) + +`Record` → Swift `[String: V]`. Supported value types: primitives, arrays, nested records, optional object types. Keys other than `string` (e.g. `Record`) are unsupported; such parameters become `JSObject`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + export function applyScores(scores: Record): void; + export function getMetadata(): Record; + export function getMatrix(value: Record>): Record>; + export function getSeries(values: Record): Record; + export function lookupByIndex(values: Record): void; + ``` + } + @Column { + ```swift + // Generated Swift + @JSFunction func applyScores(_ scores: [String: Double]) throws(JSException) -> Void + @JSFunction func getMetadata() throws(JSException) -> [String: String] + @JSFunction func getMatrix(_ value: [String: [String: Double]]) throws(JSException) -> [String: [String: Double]] + @JSFunction func getSeries(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] + @JSFunction func lookupByIndex(_ values: JSObject) throws(JSException) -> Void + ``` + } +} + +### Unbridged types (JSValue, JSObject) + +Types that cannot be expressed in the bridge (e.g. `any`, unsupported generics, or `Record`) are emitted as `JSValue` or `JSObject`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + interface Animatable { + animate(keyframes: any, options: any): any; + } + export function getAnimatable(): Animatable; + ``` + } + @Column { + ```swift + // Generated Swift + @JSClass struct Animatable { + @JSFunction func animate(_ keyframes: JSValue, _ options: JSValue) throws(JSException) -> JSValue + } + @JSFunction func getAnimatable() throws(JSException) -> Animatable + ``` + } +} + +## Name mapping + +### Invalid or special property and type names + +When a TypeScript name is not a valid Swift identifier (e.g. contains dashes, spaces, or starts with a number), or is a Swift keyword, the generator emits a Swift-safe name and uses `jsName` so the JavaScript binding remains correct. Classes whose names start with `$` are prefixed with `_` in Swift and get `@JSClass(jsName: "...")`. + +@Row { + @Column { + ```typescript + // TypeScript (bridge-js.d.ts) + interface DOMTokenList { + "data-attrib": number; + + "0": boolean; + + for: string; + + as(): void; + } + export class $jQuery { + "call-plugin"(): void; + } + ``` + } + @Column { + ```swift + // Generated Swift + @JSClass struct DOMTokenList { + @JSGetter(jsName: "data-attrib") var data_attrib: Double + @JSSetter(jsName: "data-attrib") func setData_attrib(_ value: Double) throws(JSException) + @JSGetter(jsName: "0") var _0: Bool + @JSSetter(jsName: "0") func set_0(_ value: Bool) throws(JSException) + @JSGetter var `for`: String + @JSSetter func setFor(_ value: String) throws(JSException) + @JSFunction func `as`() throws(JSException) -> Void + } + @JSClass(jsName: "$jQuery") struct _jQuery { + @JSFunction(jsName: "call-plugin") func call_plugin() throws(JSException) -> Void + } + ``` + } +} + +## Limitations + +- No first-class support for async/Promise-returning functions;. +- No generic type parameter can appear on a bridged function signature. \ No newline at end of file diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md new file mode 100644 index 000000000..14fccbfc1 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript-into-Swift.md @@ -0,0 +1,98 @@ +# Importing JavaScript into Swift + +Learn how to make JavaScript APIs callable from your Swift code using macro-annotated bindings. + +## Overview + +> Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. + +> Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). + +You can import JavaScript APIs into Swift in two ways: + +1. **Annotate Swift with macros** - Use `@JSFunction`, `@JSClass`, `@JSGetter`, and `@JSSetter` to declare bindings directly in Swift. No TypeScript required. Prefer this to get started. +2. **Generate bindings from TypeScript** - Use a `bridge-js.d.ts` file; the BridgeJS plugin generates the same macro-annotated Swift. See when you have existing `.d.ts` definitions or many APIs to bind. + +This guide covers the macro-based path. + +## How to import JavaScript APIs (macro path) + +### Step 1: Configure your package + +Add the BridgeJS plugin and enable the Extern feature as described in . + +### Step 2: Declare bindings in Swift with macros + +Create Swift declarations that mirror the JavaScript API you want to call. + +You can bring JavaScript into Swift in two ways: + +- **Inject at initialization**: Declare in Swift and supply the implementation in `getImports()` (e.g. a `today()` function). +- **Import from `globalThis`**: For APIs on the JavaScript global object (e.g. `console`, `document`), use `@JSGetter(from: .global)` so they are read from `globalThis` and you don't pass them in `getImports()`. + +```swift +import JavaScriptKit + +@JSFunction func today() -> String + +@JSClass struct JSConsole { + @JSFunction func log(_ message: String) throws(JSException) +} +@JSGetter(from: .global) var console: JSConsole + +@JSClass struct Document { + @JSFunction func getElementById(_ id: String) throws(JSException) -> HTMLElement + @JSFunction func createElement(_ tagName: String) throws(JSException) -> HTMLElement +} +@JSGetter(from: .global) var document: Document + +@JSClass struct HTMLElement { + @JSGetter var innerText: String + @JSSetter func setInnerText(_ newValue: String) throws(JSException) + @JSFunction func appendChild(_ child: HTMLElement) throws(JSException) +} +``` + +For full details, see , , and . + +### Step 3: Use the bindings in Swift + +Call the bound APIs from Swift: + +```swift +import JavaScriptKit + +@JS func run() { + try console.log("Hello from Swift! (\(today()))") + + let button = document.createElement("button")! + try button.setInnerText("Click Me") + let container = document.getElementById("app")! + container.appendChild(button) +} +``` + +### Step 5: Inject JavaScript implementations (if needed) + +Bindings imported from globalThis (e.g. `console`, `document`) are read at runtime and do not go in `getImports()`. Only APIs you inject at initialization must be supplied there: + +```javascript +// index.js +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; + +const { exports } = await init({ + getImports() { + return { + today: () => new Date().toString() + }; + } +}); + +exports.run(); +``` + +## Topics + +- +- +- \ No newline at end of file diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md new file mode 100644 index 000000000..4302e0e49 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Class.md @@ -0,0 +1,54 @@ +# Importing a JavaScript class or object into Swift + +This guide shows how to bind a JavaScript class (or object shape) so you can construct and use it from Swift with `@JSClass`. + +## Steps + +### 1. Declare a Swift struct with `@JSClass` + +Add a struct that mirrors the JavaScript class. Use `@JSFunction` for the initializer and for methods, and `@JSGetter` / `@JSSetter` for properties. Property setters are exposed as functions (e.g. `setMessage(_:)`) because Swift property setters cannot `throw`. + +```swift +import JavaScriptKit + +@JSClass struct Greeter { + @JSFunction init(id: String, name: String) throws(JSException) + + @JSGetter var id: String + @JSGetter var message: String + @JSSetter func setMessage(_ newValue: String) throws(JSException) + + @JSFunction func greet() throws(JSException) -> String +} +``` + +If the class is on `globalThis`, add `from: .global` to `@JSClass` and omit the type from `getImports()` in the next step. + +### 2. Wire the JavaScript side + +**If you chose injection:** Implement the class in JavaScript and pass it in `getImports()`. + +```javascript +// index.js +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; + +class Greeter { + constructor(id, name) { /* ... */ } + get id() { /* ... */ } + get message() { /* ... */ } + set message(value) { /* ... */ } + greet() { /* ... */ } +} + +const { exports } = await init({ + getImports() { + return { Greeter }; + } +}); +``` + +**If you chose global:** Do not pass the class in `getImports()`; the runtime will resolve it from `globalThis`. + +## Macro options + +For optional parameters (`jsName`, `from`, etc.), see the API reference: ``JSClass(jsName:from:)``, ``JSFunction(jsName:from:)``, ``JSGetter(jsName:from:)``, and ``JSSetter(jsName:from:)``. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md new file mode 100644 index 000000000..64475acfa --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md @@ -0,0 +1,51 @@ +# Importing a JavaScript function into Swift + +This guide shows how to bind a JavaScript function so it is callable from Swift using `@JSFunction`. + +## Steps + +### 1. Declare the function in Swift with `@JSFunction` + +Match the JavaScript name and signature. Use Swift types that bridge to the JS types you need (see ). + +```swift +import JavaScriptKit + +@JSFunction func add(_ a: Double, _ b: Double) throws(JSException) -> Double +@JSFunction func setTitle(_ title: String) throws(JSException) +``` + +To bind a function that lives on the JavaScript global object (e.g. `parseInt`, `setTimeout`), add `from: .global`. Use `jsName` when the Swift name differs from the JavaScript name - see the ``JSFunction(jsName:from:)`` API reference for options. + +### 2. Provide the implementation at initialization + +Return the corresponding function(s) in the object passed to `getImports()` when initializing the WebAssembly module. + +```javascript +// index.js +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; + +const { exports } = await init({ + getImports() { + return { + add: (a, b) => a + b, + setTitle: (title) => { document.title = title }, + }; + } +}); +``` + +If you used `from: .global`, do not pass the function in `getImports()`; the runtime resolves it from `globalThis`. + +### 3. Handle errors + +Bound functions are `throws(JSException)`. Call them with `try` or `try?`; they throw when the JavaScript implementation throws. + +## Supported features + +| Feature | Status | +|:--|:--| +| Primitive parameter/result types (e.g. `Double`, `Bool`) | ✅ | +| `String` parameter/result type | ✅ | +| Async function | ❌ | +| Generics | ❌ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md new file mode 100644 index 000000000..044ebbe52 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Variable.md @@ -0,0 +1,59 @@ +# Importing a global JavaScript variable into Swift + +This guide shows how to bind a JavaScript global variable (or any property you provide at initialization) so you can read and optionally write it from Swift using `@JSGetter` and `@JSSetter`. + +## Steps + +### 1. Declare the variable in Swift with `@JSGetter` + +Use a type that bridges to the JavaScript value (see ). For object-shaped values, use a struct conforming to the bridged type (e.g. a `@JSClass` struct). + +```swift +import JavaScriptKit + +@JSGetter(from: .global) var document: Document +@JSGetter(from: .global) var myConfig: String +``` + +To bind a variable that is not on `globalThis`, omit `from: .global` and supply the value in `getImports()` in the next step. Use `jsName` when the Swift name differs from the JavaScript property name - see the ``JSGetter(jsName:from:)`` API reference. + +### 2. Add a setter for writable variables (optional) + +If the JavaScript property is writable and you need to set it from Swift, add a corresponding `@JSSetter` function. Property setters are exposed as functions (e.g. `setMyConfig(_:)`) because Swift property setters cannot `throw`. + +```swift +@JSGetter(from: .global) var myConfig: String +@JSSetter(from: .global) func setMyConfig(_ newValue: String) throws(JSException) +``` + +### 3. Provide the value at initialization (injected only) + +If you did **not** use `from: .global`, pass the value in the object returned by `getImports()` when initializing the WebAssembly module. + +```javascript +// index.js +import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; + +const { exports } = await init({ + getImports() { + return { + myConfig: "production", + }; + } +}); +``` + +If you used `from: .global`, do not pass the variable in `getImports()`; the runtime reads it from `globalThis`. + +## Supported features + +| Feature | Status | +|:--|:--| +| Read-only global (e.g. `document`, `console`) | ✅ | +| Writable global | ✅ (`@JSSetter`) | +| Injected variable (via `getImports()`) | ✅ | + +## See also + +- ``JSGetter(jsName:from:)`` +- ``JSSetter(jsName:from:)`` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript-into-Swift.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript-into-Swift.md deleted file mode 100644 index b091f714b..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript-into-Swift.md +++ /dev/null @@ -1,185 +0,0 @@ -# Importing TypeScript into Swift - -Learn how to leverage TypeScript definitions to create type-safe bindings for JavaScript APIs in your Swift code. - -## Overview - -> Important: This feature is still experimental. No API stability is guaranteed, and the API may change in future releases. - -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS enables seamless integration between Swift and JavaScript by automatically generating Swift bindings from TypeScript declaration files (`.d.ts`). This provides type-safe access to JavaScript APIs directly from your Swift code. - -The key benefits of this approach over `@dynamicMemberLookup`-based APIs include: - -- **Type Safety**: Catch errors at compile-time rather than runtime -- **IDE Support**: Get autocompletion and documentation in your Swift editor -- **Performance**: Eliminating dynamism allows us to optimize the glue code - -If you prefer keeping your project simple, you can continue using `@dynamicMemberLookup`-based APIs. - -## Getting Started - -### Step 1: Configure Your Package - -First, add the BridgeJS plugin to your Swift package by modifying your `Package.swift` file: - -```swift -// swift-tools-version:6.0 - -import PackageDescription - -let package = Package( - name: "MyApp", - dependencies: [ - .package(url: "https://github.com/swiftwasm/JavaScriptKit.git", branch: "main") - ], - targets: [ - .executableTarget( - name: "MyApp", - dependencies: ["JavaScriptKit"], - swiftSettings: [ - // This is required because the generated code depends on @_extern(wasm) - .enableExperimentalFeature("Extern") - ], - plugins: [ - // Add build plugin for processing @JS and generate Swift glue code - .plugin(name: "BridgeJS", package: "JavaScriptKit") - ] - ) - ] -) -``` - -### Step 2: Create TypeScript Definitions - -Create a file named `bridge-js.d.ts` in your target source directory (e.g. `Sources//bridge-js.d.ts`). This file defines the JavaScript APIs you want to use in Swift: - -```typescript -// Simple function -export function consoleLog(message: string): void; - -// Define a subset of DOM API you want to use -interface Document { - // Properties - title: string; - readonly body: HTMLElement; - - // Methods - getElementById(id: string): HTMLElement; - createElement(tagName: string): HTMLElement; -} - -// You can use type-level operations like `Pick` to reuse -// type definitions provided by `lib.dom.d.ts`. -interface HTMLElement extends Pick { - appendChild(child: HTMLElement): void; - // TODO: Function types on function signatures are not supported yet. - // addEventListener(event: string, handler: (event: any) => void): void; -} - -// Provide access to `document` -export function getDocument(): Document; -``` - -BridgeJS will generate Swift code that matches these TypeScript declarations. For example: - -```swift -func consoleLog(message: String) - -struct Document { - var title: String { get set } - var body: HTMLElement { get } - - func getElementById(_ id: String) -> HTMLElement - func createElement(_ tagName: String) -> HTMLElement -} - -struct HTMLElement { - var innerText: String { get set } - var className: String { get set } - - func appendChild(_ child: HTMLElement) -} - -func getDocument() -> Document -``` - -### Step 3: Build Your Package - -Build your package with the following command: - -```bash -swift package --swift-sdk $SWIFT_SDK_ID js -``` - -This command: -1. Processes your TypeScript definition files -2. Generates corresponding Swift bindings -3. Compiles your Swift code to WebAssembly -4. Produces JavaScript glue code in `.build/plugins/PackageToJS/outputs/` - -> Note: For larger projects, you may want to generate the BridgeJS code ahead of time to improve build performance. See for more information. - -### Step 4: Use the Generated Swift Bindings - -The BridgeJS plugin automatically generates Swift bindings that match your TypeScript definitions. You can now use these APIs directly in your Swift code: - -```swift -import JavaScriptKit - -@JS func run() { - // Simple function call - consoleLog("Hello from Swift!") - - // Get `document` - let document = getDocument() - - // Property access - document.title = "My Swift App" - - // Method calls - let button = document.createElement("button") - button.innerText = "Click Me" - - // TODO: Function types on function signatures are not supported yet. - // buttion.addEventListener("click") { _ in - // print("On click!") - // } - - // DOM manipulation - let container = document.getElementById("app") - container.appendChild(button) -} -``` - -### Step 5: Inject JavaScript Implementations - -The final step is to provide the actual JavaScript implementations for the TypeScript declarations you defined. You need to create a JavaScript file that initializes your WebAssembly module with the appropriate implementations: - -```javascript -// index.js -import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; - -// Initialize the WebAssembly module with JavaScript implementations -const { exports } = await init({ - getImports() { - return { - consoleLog: (message) => { - console.log(message); - }, - getDocument: () => document, - } - } -}); - -// Call the entry point of your Swift application -exports.run(); -``` - -## Topics - -- -- -- -- diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Class.md deleted file mode 100644 index e04bb9e75..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Class.md +++ /dev/null @@ -1,64 +0,0 @@ -# Importing TypeScript Classes into Swift - -Learn how TypeScript classes map to Swift when importing APIs. - -## Overview - -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS reads class declarations in your `bridge-js.d.ts` and generates Swift structs that represent JS objects. Constructors, methods, and properties are bridged via thunks that call into your JavaScript implementations at runtime. - -## Example - -TypeScript definition (`bridge-js.d.ts`): - -```typescript -export class Greeter { - readonly id: string; - message: string; - constructor(id: string, name: string); - greet(): string; -} -``` - -Generated Swift API: - -```swift -struct Greeter { - init(id: String, name: String) throws(JSException) - - // Properties - // Readonly property - var id: String { get throws(JSException) } - // Writable property - var message: String { get throws(JSException) } - func setMessage(_ newValue: String) throws(JSException) - - // Methods - func greet() throws(JSException) -> String -} -``` - -Notes: -- Property setters are emitted as `set(_:)` functions, not Swift `set` accessors since `set` accessors can't have `throws` -- All thunks throw `JSException` if the underlying JS throws. - -JavaScript implementation wiring (provided by your app): - -```javascript -// index.js -import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; - -class Greeter { - readonly id: string; - message: string; - constructor(id: string, name: string) { ... } - greet(): string { ... } -} - -const { exports } = await init({ - getImports() { - return { Greeter }; - } -}); -``` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Function.md deleted file mode 100644 index 060ac390f..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Function.md +++ /dev/null @@ -1,60 +0,0 @@ -# Importing TypeScript Functions into Swift - -Learn how functions declared in TypeScript become callable Swift functions. - -## Overview - -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS reads your `bridge-js.d.ts` and generates Swift thunks that call into JavaScript implementations provided at runtime. Each imported function becomes a top-level Swift function with the same name and a throwing signature. - -### Example - -TypeScript definition (`bridge-js.d.ts`): - -```typescript -export function add(a: number, b: number): number; -export function setTitle(title: string): void; -export function fetchUser(id: string): Promise; -``` - -Generated Swift signatures: - -```swift -func add(a: Double, b: Double) throws(JSException) -> Double -func setTitle(title: String) throws(JSException) -func fetchUser(id: String) throws(JSException) -> JSPromise -``` - -JavaScript implementation wiring (provided by your app): - -```javascript -// index.js -import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js"; - -const { exports } = await init({ - getImports() { - return { - add: (a, b) => a + b, - setTitle: (title) => { document.title = title }, - fetchUser: (id) => fetch(`/api/users/${id}`).then(r => r.json()), - }; - } -}); -``` - -### Error handling - -- All imported Swift functions are generated as `throws(JSException)` and will throw if the underlying JS implementation throws. - -## Supported features - -| Feature | Status | -|:--|:--| -| Primitive parameter/result types: (e.g. `boolean`, `number`) | ✅ | -| `string` parameter/result type | ✅ | -| Enums in signatures | ❌ | -| Async function | ✅ | -| Generics | ❌ | - - diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Interface.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Interface.md deleted file mode 100644 index 0e0aed0de..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-Interface.md +++ /dev/null @@ -1,34 +0,0 @@ -# Importing TypeScript Interfaces into Swift - -Learn how TypeScript interfaces become Swift value types with methods and properties. - -## Overview - -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS converts TS interfaces to Swift structs conforming to an internal bridging protocol and provides thunks for methods and properties that call into your JavaScript implementations. - -> Note: Interfaces are bridged very similarly to classes. Methods and properties map the same way. See for more details. - -### Example - -TypeScript definition (`bridge-js.d.ts`): - -```typescript -export interface HTMLElement { - readonly innerText: string; - className: string; - appendChild(child: HTMLElement): void; -} -``` - -Generated Swift API: - -```swift -struct HTMLElement { - var innerText: String { get throws(JSException) } - var className: String { get throws(JSException) } - func setClassName(_ newValue: String) throws(JSException) - func appendChild(_ child: HTMLElement) throws(JSException) -} -``` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-TypeAlias.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-TypeAlias.md deleted file mode 100644 index b5242ee33..000000000 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-TypeScript/Importing-TS-TypeAlias.md +++ /dev/null @@ -1,47 +0,0 @@ -# Importing TypeScript Type Aliases into Swift - -Understand how TypeScript type aliases are handled when generating Swift bindings. - -## Overview - -> Tip: You can quickly preview what interfaces will be exposed on the Swift/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). - -BridgeJS resolves TypeScript aliases while importing. If an alias names an anonymous object type, Swift will generate a corresponding bridged struct using that name. - -> Note: When a type alias names an anonymous object type, its bridging behavior (constructors not applicable, but methods/properties if referenced) mirrors class/interface importing. See for more details. - -### Examples - -```typescript -// Primitive alias → maps to the underlying primitive -export type Price = number; - -// Object-shaped alias with a name → becomes a named bridged type when referenced -export type User = { - readonly id: string; - name: string; - age: Price; -} - -export function getUser(): User; -``` - -Generated Swift (simplified): - -```swift -// Price → Double - -struct User { - // Readonly property - var id: String { get throws(JSException) } - - // Writable properties - var name: String { get throws(JSException) } - func setName(_ newValue: String) throws(JSException) - - var age: Double { get throws(JSException) } - func setAge(_ newValue: Double) throws(JSException) -} - -func getUser() throws(JSException) -> User -``` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md new file mode 100644 index 000000000..da4ae0a06 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md @@ -0,0 +1,32 @@ +# Introducing BridgeJS + +Faster, easier Swift–JavaScript bridging for WebAssembly. + +## Overview + +**BridgeJS** is a layer underneath JavaScriptKit that makes Swift–JavaScript interop **faster and easier**: you declare the shape of the API in Swift (or in TypeScript, which generates Swift), and the tool generates glue code. + +Benefits over the dynamic `JSObject` / `JSValue` APIs include: + +- **Performance** - Generated code is specialized per interface, so crossing the bridge typically costs less than using generic dynamic APIs. +- **Type safety** - Mistakes are caught at compile time instead of at runtime. +- **Easier integration** - Declarative annotations and optional TypeScript input replace manual boilerplate (closures, serializers, cached strings). + +You can still use the dynamic APIs when you need them; BridgeJS is an additional option for boundaries where you want strong typing and better performance. + +## Two directions + +BridgeJS supports both directions of the bridge: + +1. **Export Swift to JavaScript** - Expose Swift functions, classes, and types to JavaScript using the ``JS(namespace:enumStyle:)`` macro. JavaScript can then call into your Swift code. See . +2. **Import JavaScript into Swift** - Make JavaScript APIs (functions, classes, globals like `document` or `console`) callable from Swift with macros such as ``JSClass(jsName:from:)``. Start with . You can also generate the same bindings from a TypeScript file; see . + +Many apps use both: import DOM or host APIs into Swift, and export an entry point or callbacks to JavaScript. + +## Getting started + +- To **call Swift from JavaScript**: +- To **call JavaScript from Swift**: +- To **generate bindings from TypeScript**: + +All require the same package and build setup; see for configuration. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Setting-up-BridgeJS.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Setting-up-BridgeJS.md new file mode 100644 index 000000000..99a3d5b1c --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Setting-up-BridgeJS.md @@ -0,0 +1,60 @@ +# Setting up BridgeJS + +Package and build setup required for all BridgeJS workflows + +## Overview + +BridgeJS requires the JavaScriptKit package dependency, the experimental `Extern` Swift feature, and the BridgeJS build plugin. The same configuration applies whether you are exporting Swift to JavaScript, importing JavaScript into Swift with macros, and generating bindings from a TypeScript file. + +## Package.swift + +Add the JavaScriptKit dependency, enable the Extern feature on the target that uses BridgeJS, and register the BridgeJS plugin: + +```swift +// swift-tools-version:6.0 + +import PackageDescription + +let package = Package( + name: "MyApp", + dependencies: [ + .package(url: "https://github.com/swiftwasm/JavaScriptKit.git", branch: "main") + ], + targets: [ + .executableTarget( + name: "MyApp", + dependencies: ["JavaScriptKit"], + swiftSettings: [ + .enableExperimentalFeature("Extern") + ], + plugins: [ + .plugin(name: "BridgeJS", package: "JavaScriptKit") + ] + ) + ] +) +``` + +- **Dependency**: The target must depend on `"JavaScriptKit"`. +- **Extern feature**: Required because the generated bridge code uses `@_extern(wasm)`. +- **BridgeJS plugin**: Processes macro annotations to generate glue code and, [when present, `bridge-js.d.ts`; generates JS binding Swift code](). + +## Build command + +Build the package for the JavaScript/WebAssembly SDK: + +```bash +swift package --swift-sdk $SWIFT_SDK_ID js +``` + +This command: + +1. Runs the BridgeJS plugin +2. Compiles Swift to WebAssembly and generates JavaScript glue and TypeScript type definitions. +3. Writes output to `.build/plugins/PackageToJS/outputs/Package/`. + +For package layout and how to consume the output from JavaScript, see . + +## Larger projects + +The build plugin runs on every build. For larger projects, generating bridge code ahead of time can improve build performance. See . diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md index c872c0dda..81a135af3 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Supported-Types.md @@ -1,18 +1,22 @@ -# TypeScript and Swift Type Mapping +# Supported Types -Use this page as a quick reference for how common TypeScript types appear in Swift when importing, and how exported Swift types surface on the TypeScript side. +Swift types and their JavaScript/TypeScript equivalents at the BridgeJS boundary. -## Type mapping +## Swift and JavaScript type mapping -| TypeScript type | Swift type | -|:--|:--| -| `number` | `Double` | -| `string` | `String` | -| `boolean` | `Bool` | -| `T[]` | `[T]` | -| TODO | `Dictionary` | -| `T \| undefined` | TODO | -| `T \| null` | `Optional` | -| `Promise` | `JSPromise` | -| `any` / `unknown` / `object` | `JSObject` | -| Other types | `JSObject` | +| Swift type | JavaScript | TypeScript | +|:--|:--|:--| +| `Int`, `UInt`, `Double`, `Float` | number | `number` | +| `String` | string | `string` | +| `Bool` | boolean | `boolean` | +| `Void` | - | `void` | +| `[T]` | array | `T[]` | +| `[String: T]` | object | `Record` | +| `Optional` | `null` or `T` | `T \| null` | +| ``JSUndefinedOr`` `` | `undefined` or `T` | `T \| undefined` | +| ``JSObject`` | object | `object` | +| ``JSValue`` | any | `any` | + +## See Also + +- diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md b/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md new file mode 100644 index 000000000..aabd2f008 --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md @@ -0,0 +1,28 @@ +# FAQ + +Common questions about JavaScriptKit and BridgeJS. + +## Why does the initialization need to be async? Why must I await it? + +Initialization is asynchronous because the runtime must **fetch and instantiate the WebAssembly module** before your Swift code can run. That means: + +1. **Fetching** the `.wasm` binary (e.g. over the network or from disk). +2. **Instantiating** it with `WebAssembly.instantiate()` (or `instantiateStreaming()`), which compiles the module and allocates the linear memory and table. + +Until that completes, there is no WebAssembly instance to call into, so the entry point that sets up the Swift–JavaScript bridge has to be `async` and must be `await`ed from the JavaScript host (e.g. in your `index.js` or HTML script). This matches the standard WebAssembly JavaScript API, which is promise-based. + +## Why does every imported JavaScript interface via BridgeJS declare `throws(JSException)`? + +This is a conservative, safety-oriented design. Calling into JavaScript can throw at any time. If the Swift call site does not expect errors (i.e. the call is not in a `throws` context and the compiler does not force handling), then when JavaScript throws: + +- Control leaves the WebAssembly call frames **without running function epilogues**. +- Even a `do { } catch { }` in Swift does not run its `catch` block in the way you might expect, because unwinding crosses the WASM/JS boundary. +- **`defer` blocks are not executed** in those frames. + +That can lead to **inconsistent memory state** and **resource leaks**. To avoid that, every call that might invoke JavaScript is modeled as throwing: all imported JS functions, property accessors, and related operations are marked with `throws(JSException)`. That way: + +- The compiler requires you to handle or propagate errors. +- You explicitly decide how to react to JavaScript exceptions (e.g. `try`/`catch`, or propagating `throws`). +- Epilogues and cleanup run in a well-defined way when you handle the error in Swift. + +So the “everything throws” rule is there to keep behavior predictable and safe when crossing the Swift–JavaScript boundary. diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index 51ee62539..75fd24d44 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -59,14 +59,25 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex - - - +- ### BridgeJS -- +- +- - +- +- +- - - - +- +- ``JS(namespace:enumStyle:)`` +- ``JSFunction(jsName:from:)`` +- ``JSClass(jsName:from:)`` +- ``JSGetter(jsName:from:)`` +- ``JSSetter(jsName:from:)`` ### Core APIs diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index 8decf1a76..67b3488bf 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -125,7 +125,7 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Bui /// Example: /// /// ```swift -/// @_spi(Experimental) import JavaScriptKit +/// import JavaScriptKit /// /// @JSGetter var count: Int /// @@ -137,7 +137,6 @@ public macro JS(namespace: String? = nil, enumStyle: JSEnumStyle = .const) = Bui /// - Parameter from: Selects where the property is read from. /// Use `.global` to read from `globalThis` (e.g. `console`, `document`). @attached(accessor) -@_spi(Experimental) public macro JSGetter(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSGetterMacro") @@ -151,12 +150,11 @@ public macro JSGetter(jsName: String? = nil, from: JSImportFrom? = nil) = /// Example: /// /// ```swift -/// @_spi(Experimental) import JavaScriptKit +/// import JavaScriptKit /// /// @JSSetter func setName(_ value: String) throws (JSException) /// ``` @attached(body) -@_spi(Experimental) public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSSetterMacro") @@ -167,7 +165,7 @@ public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) = /// Example: /// /// ```swift -/// @_spi(Experimental) import JavaScriptKit +/// import JavaScriptKit /// /// @JSFunction func greet() throws (JSException) -> String /// @JSFunction init(_ name: String) throws (JSException) @@ -178,7 +176,6 @@ public macro JSSetter(jsName: String? = nil, from: JSImportFrom? = nil) = /// - Parameter from: Selects where the function is looked up from. /// Use `.global` to call a function on `globalThis` (e.g. `setTimeout`). @attached(body) -@_spi(Experimental) public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSFunctionMacro") @@ -189,7 +186,7 @@ public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) = /// Example: /// /// ```swift -/// @_spi(Experimental) import JavaScriptKit +/// import JavaScriptKit /// /// @JSClass /// struct JsGreeter { @@ -204,6 +201,5 @@ public macro JSFunction(jsName: String? = nil, from: JSImportFrom? = nil) = /// Use `.global` to construct globals like `WebSocket` via `globalThis`. @attached(member, names: named(jsObject), named(init(unsafelyWrapping:))) @attached(extension, conformances: _JSBridgedClass) -@_spi(Experimental) public macro JSClass(jsName: String? = nil, from: JSImportFrom? = nil) = #externalMacro(module: "BridgeJSMacros", type: "JSClassMacro") diff --git a/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift index 320fec526..8078ed777 100644 --- a/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift @@ -1,5 +1,5 @@ import XCTest -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit @JSClass struct ClosureSupportImports { diff --git a/Tests/BridgeJSRuntimeTests/DictionaryTests.swift b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift index ba702205d..95f2706e6 100644 --- a/Tests/BridgeJSRuntimeTests/DictionaryTests.swift +++ b/Tests/BridgeJSRuntimeTests/DictionaryTests.swift @@ -1,4 +1,4 @@ -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit import XCTest final class DictionaryTests: XCTestCase { diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 7f9a20586..97c2d5fbf 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -1,5 +1,5 @@ import XCTest -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit import JavaScriptEventLoop @_extern(wasm, module: "BridgeJSRuntimeTests", name: "runJsWorks") diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift index 9f500f4a4..c63a421e0 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.Macros.swift @@ -4,7 +4,7 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func jsRoundTripVoid() throws(JSException) -> Void diff --git a/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift index 3f33de86a..104304d5b 100644 --- a/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/ImportArrayAPIs.swift @@ -1,4 +1,4 @@ -@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit +@_spi(BridgeJS) import JavaScriptKit @JSFunction func jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] @JSFunction func jsArrayLength(_ items: [Int]) throws(JSException) -> Int diff --git a/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift index 82908701c..41929772e 100644 --- a/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/ImportStructAPIs.swift @@ -1,4 +1,4 @@ -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit @JS struct Point { diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift index 454f5011d..998f8b90f 100644 --- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -1,5 +1,5 @@ import XCTest -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit import JavaScriptEventLoop @JSFunction func runJsOptionalSupportTests() throws diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift index 38e7b12e6..6c0079dd1 100644 --- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -1,4 +1,4 @@ -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit @JS struct PointerFields { var raw: UnsafeRawPointer diff --git a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift index 1a3dd0a4f..7eefbad56 100644 --- a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift @@ -1,5 +1,5 @@ import XCTest -@_spi(Experimental) import JavaScriptKit +import JavaScriptKit @JSClass struct SwiftClassSupportImports { @JSFunction static func jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter From a931787ea6fd3fb9c92a97ad4bb51a3ddc743a42 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 14:47:01 +0900 Subject: [PATCH 212/252] Documentation tweaks --- Plugins/BridgeJS/README.md | 6 ++-- README.md | 6 ++-- .../Articles/BridgeJS/Introducing-BridgeJS.md | 4 +-- .../Articles/BridgeJS/Unsupported-Features.md | 28 +++++++++++++++++++ .../Documentation.docc/Articles/FAQ.md | 4 +-- .../Documentation.docc/Documentation.md | 1 + 6 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 0b6ad121e..9e1e0aa08 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -10,8 +10,8 @@ BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. It enables: -1. **Export Swift to JavaScript** – Expose Swift functions, classes, and types to JavaScript; the plugin generates TypeScript definitions (`.d.ts`) for the exported API. -2. **Import JavaScript into Swift** – Make JavaScript/TypeScript APIs callable from Swift with macro-annotated bindings or bindings generated from a TypeScript declaration file (`bridge-js.d.ts`). +1. **Export Swift to JavaScript** - Expose Swift functions, classes, and types to JavaScript; the plugin generates TypeScript definitions (`.d.ts`) for the exported API. +2. **Import JavaScript into Swift** - Make JavaScript/TypeScript APIs callable from Swift with macro-annotated bindings or bindings generated from a TypeScript declaration file (`bridge-js.d.ts`). The workflow is: @@ -174,7 +174,7 @@ For detailed semantics, see the [How It Works sections](https://swiftpackageinde `BridgeJSToolInternal` exposes pipeline stages for debugging: - `emit-skeleton` - Parse Swift files (or `-` for stdin) and print the BridgeJS skeleton as JSON. -- `emit-swift-thunks` — Read skeleton JSON (from a file or `-` for stdin) and print the generated Swift glue (export and import thunks). +- `emit-swift-thunks` - Read skeleton JSON (from a file or `-` for stdin) and print the generated Swift glue (export and import thunks). - `emit-js` / `emit-dts` - Read skeleton JSON files (or `-` for stdin) and print the .js/.d.ts Use these to inspect parser output and generated code without running the full generate/link pipeline. diff --git a/README.md b/README.md index b5cb04801..ffb029298 100644 --- a/README.md +++ b/README.md @@ -48,14 +48,14 @@ _ = document.body.appendChild(button) BridgeJS provides easy interoperability between Swift and JavaScript/TypeScript. It enables: -- **Export Swift to JavaScript** – Expose Swift functions, classes, and types to JavaScript; the plugin also generates TypeScript definitions (`.d.ts`) for the exported API. -- **Import JavaScript into Swift** – Make JavaScript/TypeScript APIs (functions, classes, globals like `document` or `console`) callable from Swift with type-safe bindings. You can declare bindings with macros in Swift or generate them from a TypeScript declaration file (`bridge-js.d.ts`). +- **Export Swift to JavaScript** - Expose Swift functions, classes, and types to JavaScript; the plugin also generates TypeScript definitions (`.d.ts`) for the exported API. +- **Import JavaScript into Swift** - Make JavaScript/TypeScript APIs (functions, classes, globals like `document` or `console`) callable from Swift with type-safe bindings. You can declare bindings with macros in Swift or generate them from a TypeScript declaration file (`bridge-js.d.ts`). For architecture details, see the [BridgeJS Plugin README](Plugins/BridgeJS/README.md). For package and build setup, see [Setting up BridgeJS](https://swiftpackageindex.com/swiftwasm/JavaScriptKit/documentation/javascriptkit/setting-up-bridgejs) in the documentation. ### Exporting Swift to JavaScript -Mark Swift code with `@JS` (the ``JS(namespace:enumStyle:)`` attribute) to make it callable from JavaScript: +Mark Swift code with `@JS` to make it callable from JavaScript: ```swift import JavaScriptKit diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md index da4ae0a06..43f778f0c 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Introducing-BridgeJS.md @@ -1,10 +1,10 @@ # Introducing BridgeJS -Faster, easier Swift–JavaScript bridging for WebAssembly. +Faster, easier Swift-JavaScript bridging for WebAssembly. ## Overview -**BridgeJS** is a layer underneath JavaScriptKit that makes Swift–JavaScript interop **faster and easier**: you declare the shape of the API in Swift (or in TypeScript, which generates Swift), and the tool generates glue code. +**BridgeJS** is a layer underneath JavaScriptKit that makes Swift-JavaScript interop **faster and easier**: you declare the shape of the API in Swift (or in TypeScript, which generates Swift), and the tool generates glue code. Benefits over the dynamic `JSObject` / `JSValue` APIs include: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md new file mode 100644 index 000000000..7ba25f7ae --- /dev/null +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Unsupported-Features.md @@ -0,0 +1,28 @@ +# Unsupported Features in BridgeJS + +Limitations and unsupported patterns when using BridgeJS. + +## Overview + +BridgeJS generates glue code per Swift target (module). Some patterns that are valid in Swift or TypeScript are not supported across the bridge today. This article summarizes the main limitations so you can design your APIs accordingly. + +## Type usage crossing module boundary + +BridgeJS does **not** support using a type across module boundaries in the following situations. + +### Exporting Swift: types from another Swift module + +If you have multiple Swift targets (e.g. a library and an app), you **cannot** use a type defined in one target in an exported API of another target. + +**Unsupported example:** Module `App` exports a function that takes or returns a type defined in module `Lib`: + +```swift +// In module Lib +@JS public struct LibPoint { + let x: Double + let y: Double +} + +// In module App (depends on Lib) - unsupported +@JS public func transform(_ p: LibPoint) -> LibPoint { ... } +``` diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md b/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md index aabd2f008..c4f22a437 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/FAQ.md @@ -9,7 +9,7 @@ Initialization is asynchronous because the runtime must **fetch and instantiate 1. **Fetching** the `.wasm` binary (e.g. over the network or from disk). 2. **Instantiating** it with `WebAssembly.instantiate()` (or `instantiateStreaming()`), which compiles the module and allocates the linear memory and table. -Until that completes, there is no WebAssembly instance to call into, so the entry point that sets up the Swift–JavaScript bridge has to be `async` and must be `await`ed from the JavaScript host (e.g. in your `index.js` or HTML script). This matches the standard WebAssembly JavaScript API, which is promise-based. +Until that completes, there is no WebAssembly instance to call into, so the entry point that sets up the Swift-JavaScript bridge has to be `async` and must be `await`ed from the JavaScript host (e.g. in your `index.js` or HTML script). This matches the standard WebAssembly JavaScript API, which is promise-based. ## Why does every imported JavaScript interface via BridgeJS declare `throws(JSException)`? @@ -25,4 +25,4 @@ That can lead to **inconsistent memory state** and **resource leaks**. To avoid - You explicitly decide how to react to JavaScript exceptions (e.g. `try`/`catch`, or propagating `throws`). - Epilogues and cleanup run in a well-defined way when you handle the error in Swift. -So the “everything throws” rule is there to keep behavior predictable and safe when crossing the Swift–JavaScript boundary. +So the “everything throws” rule is there to keep behavior predictable and safe when crossing the Swift-JavaScript boundary. diff --git a/Sources/JavaScriptKit/Documentation.docc/Documentation.md b/Sources/JavaScriptKit/Documentation.docc/Documentation.md index 75fd24d44..097203f50 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Documentation.md +++ b/Sources/JavaScriptKit/Documentation.docc/Documentation.md @@ -72,6 +72,7 @@ Check out the [examples](https://github.com/swiftwasm/JavaScriptKit/tree/main/Ex - - - +- - - ``JS(namespace:enumStyle:)`` - ``JSFunction(jsName:from:)`` From bab0adb534dee552dbd99bd14b2ac8fb5bff18e1 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Fri, 13 Feb 2026 12:17:59 +0100 Subject: [PATCH 213/252] Prevent cross-module inlining of remaining @_extern(wasm) functions (#631) Extends the fix from b3ddd88f (which addressed f32/f64) to all remaining public @_extern(wasm) BridgeJS intrinsics: i32, string, pointer, throw, init_memory, and struct_cleanup. Without @inline(never) wrappers, the Swift compiler can inline these functions across module boundaries, causing the wasm import module attribute to change from "bjs" to "env". This results in a wasm-ld linker error when a downstream module (e.g. via BridgeJS codegen) references the same symbol with a different import module. Co-authored-by: Claude Opus 4.6 --- .../JavaScriptKit/BridgeJSIntrinsics.swift | 61 ++++++++++++++----- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 52a8d8298..edb41b9fa 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -15,8 +15,13 @@ import _CJavaScriptKit #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_throw") -@_spi(BridgeJS) public func _swift_js_throw(_ id: Int32) +private func _swift_js_throw_extern(_ id: Int32) #else +private func _swift_js_throw_extern(_ id: Int32) { + _onlyAvailableOnWasm() +} +#endif + /// Throws a JavaScript exception from Swift code. /// /// This function is called by the BridgeJS code generator when a Swift function throws @@ -24,10 +29,9 @@ import _CJavaScriptKit /// JavaScript-side runtime code. /// /// - Parameter id: The ID of the JavaScript exception object to throw -@_spi(BridgeJS) public func _swift_js_throw(_ id: Int32) { - _onlyAvailableOnWasm() +@_spi(BridgeJS) @inline(never) public func _swift_js_throw(_ id: Int32) { + _swift_js_throw_extern(id) } -#endif /// Retrieves and clears any pending JavaScript exception. /// @@ -702,31 +706,44 @@ where Self: RawRepresentable, RawValue: _BridgedSwiftTypeLoweredIntoSingleWasmCo #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_init_memory") -@_spi(BridgeJS) public func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) +private func _swift_js_init_memory_extern(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) #else -@_spi(BridgeJS) public func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) { +private func _swift_js_init_memory_extern(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) +{ + _swift_js_init_memory_extern(sourceId, ptr) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_string") -@_spi(BridgeJS) public func _swift_js_push_string(_ ptr: UnsafePointer?, _ len: Int32) +private func _swift_js_push_string_extern(_ ptr: UnsafePointer?, _ len: Int32) #else -@_spi(BridgeJS) public func _swift_js_push_string(_ ptr: UnsafePointer?, _ len: Int32) { +private func _swift_js_push_string_extern(_ ptr: UnsafePointer?, _ len: Int32) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_push_string(_ ptr: UnsafePointer?, _ len: Int32) { + _swift_js_push_string_extern(ptr, len) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_i32") -@_spi(BridgeJS) public func _swift_js_push_i32(_ value: Int32) +private func _swift_js_push_i32_extern(_ value: Int32) #else -@_spi(BridgeJS) public func _swift_js_push_i32(_ value: Int32) { +private func _swift_js_push_i32_extern(_ value: Int32) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_push_i32(_ value: Int32) { + _swift_js_push_i32_extern(value) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_f32") private func _swift_js_push_f32_extern(_ value: Float32) @@ -755,13 +772,17 @@ private func _swift_js_push_f64_extern(_ value: Float64) { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_i32") -@_spi(BridgeJS) public func _swift_js_pop_i32() -> Int32 +private func _swift_js_pop_i32_extern() -> Int32 #else -@_spi(BridgeJS) public func _swift_js_pop_i32() -> Int32 { +private func _swift_js_pop_i32_extern() -> Int32 { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_pop_i32() -> Int32 { + _swift_js_pop_i32_extern() +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_f32") private func _swift_js_pop_f32_extern() -> Float32 @@ -792,13 +813,17 @@ private func _swift_js_pop_f64_extern() -> Float64 { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_cleanup") -@_spi(BridgeJS) public func _swift_js_struct_cleanup(_ cleanupId: Int32) +private func _swift_js_struct_cleanup_extern(_ cleanupId: Int32) #else -@_spi(BridgeJS) public func _swift_js_struct_cleanup(_ cleanupId: Int32) { +private func _swift_js_struct_cleanup_extern(_ cleanupId: Int32) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_struct_cleanup(_ cleanupId: Int32) { + _swift_js_struct_cleanup_extern(cleanupId) +} + // MARK: Wasm externs used by type lowering/lifting #if arch(wasm32) @@ -986,13 +1011,17 @@ func _swift_js_return_optional_double(_ isSome: Int32, _ value: Float64) { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_pointer") -@_spi(BridgeJS) public func _swift_js_push_pointer(_ pointer: UnsafeMutableRawPointer) +private func _swift_js_push_pointer_extern(_ pointer: UnsafeMutableRawPointer) #else -@_spi(BridgeJS) public func _swift_js_push_pointer(_ pointer: UnsafeMutableRawPointer) { +private func _swift_js_push_pointer_extern(_ pointer: UnsafeMutableRawPointer) { _onlyAvailableOnWasm() } #endif +@_spi(BridgeJS) @inline(never) public func _swift_js_push_pointer(_ pointer: UnsafeMutableRawPointer) { + _swift_js_push_pointer_extern(pointer) +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_pop_pointer") private func _swift_js_pop_pointer_extern() -> UnsafeMutableRawPointer From d0c02822ab7e9750273c6e7ae2255cbc3fcfa936 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 20:23:59 +0900 Subject: [PATCH 214/252] CI: Use debug builds for SwiftSyntax in ./Examples/Embedded (#632) --- Examples/Embedded/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Embedded/build.sh b/Examples/Embedded/build.sh index 2d035493a..d756d8d1e 100755 --- a/Examples/Embedded/build.sh +++ b/Examples/Embedded/build.sh @@ -2,4 +2,4 @@ set -euxo pipefail package_dir="$(cd "$(dirname "$0")" && pwd)" swift package --package-path "$package_dir" \ - -c release --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}-embedded" js + --swift-sdk "${SWIFT_SDK_ID_wasm32_unknown_wasip1:-${SWIFT_SDK_ID:-wasm32-unknown-wasip1}}-embedded" js -c release From 83995af7fd97ba980f62ca69bc894176862eaa22 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 13 Feb 2026 22:05:15 +0900 Subject: [PATCH 215/252] [skip ci] Fix BridgeJS code snippet on README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ffb029298..03129c3e2 100644 --- a/README.md +++ b/README.md @@ -101,10 +101,10 @@ import JavaScriptKit } @JS func run() throws(JSException) { - let button = document.createElement("button")! + let button = try document.createElement("button") try button.setInnerText("Click Me") - let container = document.getElementById("app")! - container.appendChild(button) + let container = try document.getElementById("app") + try container.appendChild(button) } ``` From dadff8bbb0d402a641f2015f29951f32df774080 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Sat, 14 Feb 2026 15:01:35 +0100 Subject: [PATCH 216/252] NFC: BridgeJS: Reduce retained object cleanup warning noise in BridgeJS glue (#633) --- .../Sources/BridgeJSLink/JSGlueGen.swift | 22 +------------------ .../ImportedTypeInExportedInterface.js | 16 +------------- .../BridgeJSLinkTests/SwiftStruct.js | 16 +------------- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 36d463ab4..ffb50c7a8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -3026,7 +3026,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let idVar = scope.variable("id") printer.write("let \(idVar);") @@ -3040,16 +3040,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(idVar) !== undefined ? \(idVar) : 0", printer: printer) - cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") - cleanup.indent { - cleanup.write("try {") - cleanup.indent { - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanup.write("} catch(e) {}") - } - cleanup.write("}") return [idVar] } ) @@ -3208,16 +3198,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {") - cleanup.indent { - cleanup.write("try {") - cleanup.indent { - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanup.write("} catch(e) {}") - } - cleanup.write("}") return [idVar] } else { switch wrappedType { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 7e2f48981..48aab8fbb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -49,21 +49,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if(id !== undefined && id !== 0) { - try { - swift.memory.getObject(id); - swift.memory.release(id); - } catch(e) {} - } - if(id1 !== undefined && id1 !== 0) { - try { - swift.memory.getObject(id1); - swift.memory.release(id1); - } catch(e) {} - } - }; - return { cleanup }; + return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index ff8c8f8b0..dca01b33c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -243,21 +243,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if(id !== undefined && id !== 0) { - try { - swift.memory.getObject(id); - swift.memory.release(id); - } catch(e) {} - } - if(id1 !== undefined && id1 !== 0) { - try { - swift.memory.getObject(id1); - swift.memory.release(id1); - } catch(e) {} - } - }; - return { cleanup }; + return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); From a8b249c0c671f2b8ce03b1a9bcc90796eeb7b3de Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 15 Feb 2026 12:58:18 +0900 Subject: [PATCH 217/252] [NFC] BridgeJS: Rename Stack ABI operation methods (#634) To make push/pop operations agnostic to import/export contexts, rename the following methods: - `bridgeJSLiftParameter()` -> `bridgeJSStackPop()` - `bridgeJSLowerStackReturn()` -> `bridgeJSStackPush()` --- Benchmarks/Sources/Generated/BridgeJS.swift | 268 +++---- .../Sources/BridgeJSCore/ExportSwift.swift | 56 +- .../BridgeJSCodegenTests/ArrayTypes.swift | 114 +-- .../DefaultParameters.swift | 54 +- .../EnumAssociatedValue.swift | 184 ++--- .../ImportedTypeInExportedInterface.swift | 24 +- .../BridgeJSCodegenTests/JSValue.swift | 6 +- .../BridgeJSCodegenTests/Protocol.swift | 18 +- .../StaticFunctions.Global.swift | 8 +- .../StaticFunctions.swift | 8 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 20 +- .../BridgeJSCodegenTests/SwiftStruct.swift | 132 ++-- .../SwiftStructImports.swift | 16 +- .../BridgeJSCodegenTests/UnsafePointer.swift | 28 +- .../JavaScriptKit/BridgeJSIntrinsics.swift | 401 +++++----- .../Generated/BridgeJS.swift | 738 +++++++++--------- 16 files changed, 1055 insertions(+), 1020 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 9a1b30dc4..6ec87dca8 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -11,15 +11,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) case 2: - return .flag(Bool.bridgeJSLiftParameter()) + return .flag(Bool.bridgeJSStackPop()) case 3: - return .rate(Float.bridgeJSLiftParameter()) + return .rate(Float.bridgeJSStackPop()) case 4: - return .precise(Double.bridgeJSLiftParameter()) + return .precise(Double.bridgeJSStackPop()) case 5: return .info default: @@ -30,19 +30,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .flag(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .rate(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(3) case .precise(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(4) case .info: return Int32(5) @@ -54,17 +54,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .error(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) case 2: - return .location(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .location(Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), String.bridgeJSStackPop()) case 3: - return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .status(Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), String.bridgeJSStackPop()) case 4: - return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) + return .coordinates(Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop()) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .comprehensive(Bool.bridgeJSStackPop(), Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), Int.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop()) case 6: return .info default: @@ -75,37 +75,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) case .location(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(2) case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(3) case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() + param3.bridgeJSStackPush() + param4.bridgeJSStackPush() + param5.bridgeJSStackPush() + param6.bridgeJSStackPush() + param7.bridgeJSStackPush() + param8.bridgeJSStackPush() return Int32(5) case .info: return Int32(6) @@ -114,21 +114,21 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { } extension SimpleStruct: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SimpleStruct { - let precise = Double.bridgeJSLiftParameter() - let rate = Float.bridgeJSLiftParameter() - let flag = Bool.bridgeJSLiftParameter() - let count = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> SimpleStruct { + let precise = Double.bridgeJSStackPop() + let rate = Float.bridgeJSStackPop() + let flag = Bool.bridgeJSStackPop() + let count = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return SimpleStruct(name: name, count: count, flag: flag, rate: rate, precise: precise) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.count.bridgeJSLowerStackReturn() - self.flag.bridgeJSLowerStackReturn() - self.rate.bridgeJSLowerStackReturn() - self.precise.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.count.bridgeJSStackPush() + self.flag.bridgeJSStackPush() + self.rate.bridgeJSStackPush() + self.precise.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -136,12 +136,12 @@ extension SimpleStruct: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SimpleStruct())) } } @@ -165,17 +165,17 @@ fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { #endif extension Address: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Int.bridgeJSLiftParameter() - let city = String.bridgeJSLiftParameter() - let street = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address { + let zipCode = Int.bridgeJSStackPop() + let city = String.bridgeJSStackPop() + let street = String.bridgeJSStackPop() return Address(street: street, city: city, zipCode: zipCode) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.street.bridgeJSLowerStackReturn() - self.city.bridgeJSLowerStackReturn() - self.zipCode.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.street.bridgeJSStackPush() + self.city.bridgeJSStackPush() + self.zipCode.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -183,12 +183,12 @@ extension Address: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -212,21 +212,21 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { #endif extension Person: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter() - let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Person { + let email = Optional.bridgeJSStackPop() + let address = Address.bridgeJSStackPop() + let age = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return Person(name: name, age: age, address: address, email: email) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.age.bridgeJSLowerStackReturn() - self.address.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.age.bridgeJSStackPush() + self.address.bridgeJSStackPush() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -236,12 +236,12 @@ extension Person: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Person())) } } @@ -265,23 +265,23 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { #endif extension ComplexStruct: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ComplexStruct { - let metadata = String.bridgeJSLiftParameter() - let tags = String.bridgeJSLiftParameter() - let score = Double.bridgeJSLiftParameter() - let active = Bool.bridgeJSLiftParameter() - let title = String.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ComplexStruct { + let metadata = String.bridgeJSStackPop() + let tags = String.bridgeJSStackPop() + let score = Double.bridgeJSStackPop() + let active = Bool.bridgeJSStackPop() + let title = String.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return ComplexStruct(id: id, title: title, active: active, score: score, tags: tags, metadata: metadata) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() - self.title.bridgeJSLowerStackReturn() - self.active.bridgeJSLowerStackReturn() - self.score.bridgeJSLowerStackReturn() - self.tags.bridgeJSLowerStackReturn() - self.metadata.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() + self.title.bridgeJSStackPush() + self.active.bridgeJSStackPush() + self.score.bridgeJSStackPush() + self.tags.bridgeJSStackPush() + self.metadata.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -289,12 +289,12 @@ extension ComplexStruct: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ComplexStruct())) } } @@ -318,15 +318,15 @@ fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { #endif extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter() - let x = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { + let y = Double.bridgeJSStackPop() + let x = Double.bridgeJSStackPop() return Point(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -334,12 +334,12 @@ extension Point: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } @@ -1329,7 +1329,7 @@ public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ArrayRoundtrip_takeIntArray") public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: [Int].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: [Int].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1340,7 +1340,7 @@ public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) - public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1350,8 +1350,8 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ArrayRoundtrip_roundtripIntArray") public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: [Int].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1362,7 +1362,7 @@ public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1372,7 +1372,7 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ArrayRoundtrip_takeDoubleArray") public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: [Double].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: [Double].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1383,7 +1383,7 @@ public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1393,8 +1393,8 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripDoubleArray") public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: [Double].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: [Double].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1404,7 +1404,7 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takeStringArray") public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: [String].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: [String].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1415,7 +1415,7 @@ public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeStringArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1425,8 +1425,8 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripStringArray") public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: [String].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: [String].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1436,7 +1436,7 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takePointArray") public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: [Point].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: [Point].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1447,7 +1447,7 @@ public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1457,8 +1457,8 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ArrayRoundtrip_roundtripPointArray") public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: [Point].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: [Point].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1469,7 +1469,7 @@ public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPoi public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1479,7 +1479,7 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ArrayRoundtrip_takeNestedIntArray") public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: [[Int]].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1490,7 +1490,7 @@ public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPoin public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1500,8 +1500,8 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ArrayRoundtrip_roundtripNestedIntArray") public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: [[Int]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1511,7 +1511,7 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa @_cdecl("bjs_ArrayRoundtrip_takeNestedPointArray") public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) + ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: [[Point]].bridgeJSStackPop()) #else fatalError("Only available on WebAssembly") #endif @@ -1522,7 +1522,7 @@ public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPo public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1532,8 +1532,8 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_roundtripNestedPointArray") public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: [[Point]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1548,7 +1548,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPo var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -1566,7 +1566,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -1585,7 +1585,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -1593,7 +1593,7 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -1612,7 +1612,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRaw var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -1628,7 +1628,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalPointArray() for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() + __bjs_elem_ret.bridgeJSStackPush() } _swift_js_push_i32(Int32(ret.count)) #else @@ -1645,13 +1645,13 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() + __bjs_elem_ret.bridgeJSStackPush() } _swift_js_push_i32(Int32(ret.count)) #else @@ -1674,7 +1674,7 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1685,7 +1685,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -1696,7 +1696,7 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index bb42e9d1e..207f6ee69 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -739,9 +739,9 @@ struct StackCodegen { case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer, .swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum: - return "\(raw: type.swiftType).bridgeJSLiftParameter()" + return "\(raw: type.swiftType).bridgeJSStackPop()" case .jsObject(let className?): - return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSLiftParameter())" + return "\(raw: className)(unsafelyWrapping: JSObject.bridgeJSStackPop())" case .nullable(let wrappedType, let kind): return liftNullableExpression(wrappedType: wrappedType, kind: kind) case .array(let elementType): @@ -749,7 +749,7 @@ struct StackCodegen { case .dictionary(let valueType): return liftDictionaryExpression(valueType: valueType) case .closure: - return "JSObject.bridgeJSLiftParameter()" + return "JSObject.bridgeJSStackPop()" case .void, .namespaceEnum: return "()" } @@ -758,13 +758,13 @@ struct StackCodegen { func liftArrayExpression(elementType: BridgeType) -> ExprSyntax { switch elementType { case .jsObject(let className?) where className != "JSObject": - return "[JSObject].bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" + return "[JSObject].bridgeJSStackPop().map { \(raw: className)(unsafelyWrapping: $0) }" case .nullable, .closure: return liftArrayExpressionInline(elementType: elementType) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") default: - return "[\(raw: elementType.swiftType)].bridgeJSLiftParameter()" + return "[\(raw: elementType.swiftType)].bridgeJSStackPop()" } } @@ -790,7 +790,7 @@ struct StackCodegen { case .jsObject(let className?) where className != "JSObject": return """ { - let __dict = [String: JSObject].bridgeJSLiftParameter() + let __dict = [String: JSObject].bridgeJSStackPop() return __dict.mapValues { \(raw: className)(unsafelyWrapping: $0) } }() """ @@ -799,7 +799,7 @@ struct StackCodegen { case .void, .namespaceEnum: fatalError("Invalid dictionary value type: \(valueType)") default: - return "[String: \(raw: valueType.swiftType)].bridgeJSLiftParameter()" + return "[String: \(raw: valueType.swiftType)].bridgeJSStackPop()" } } @@ -813,7 +813,7 @@ struct StackCodegen { __result.reserveCapacity(__count) for _ in 0..<__count { let __value = \(valueLift) - let __key = String.bridgeJSLiftParameter() + let __key = String.bridgeJSStackPop() __result[__key] = __value } return __result @@ -827,9 +827,9 @@ struct StackCodegen { case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum, .array, .dictionary: - return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSLiftParameter()" + return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSStackPop()" case .jsObject(let className?): - return "\(raw: typeName).bridgeJSLiftParameter().map { \(raw: className)(unsafelyWrapping: $0) }" + return "\(raw: typeName).bridgeJSStackPop().map { \(raw: className)(unsafelyWrapping: $0) }" case .nullable, .void, .namespaceEnum, .closure, .unsafePointer, .swiftProtocol: fatalError("Invalid nullable wrapped type: \(wrappedType)") } @@ -850,13 +850,13 @@ struct StackCodegen { case .string, .int, .uint, .bool, .float, .double, .jsValue, .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure, .caseEnum, .rawValueEnum: - return ["\(raw: accessor).bridgeJSLowerStackReturn()"] + return ["\(raw: accessor).bridgeJSStackPush()"] case .jsObject(_?): - return ["\(raw: accessor).jsObject.bridgeJSLowerStackReturn()"] + return ["\(raw: accessor).jsObject.bridgeJSStackPush()"] case .swiftProtocol: - return ["(\(raw: accessor) as! \(raw: type.swiftType)).bridgeJSLowerStackReturn()"] + return ["(\(raw: accessor) as! \(raw: type.swiftType)).bridgeJSStackPush()"] case .associatedValueEnum, .swiftStruct: - return ["\(raw: accessor).bridgeJSLowerReturn()"] + return ["\(raw: accessor).bridgeJSStackPush()"] case .nullable(let wrappedType, _): return lowerOptionalStatements(wrappedType: wrappedType, accessor: accessor, varPrefix: varPrefix) case .void, .namespaceEnum: @@ -875,9 +875,9 @@ struct StackCodegen { ) -> [CodeBlockItemSyntax] { switch elementType { case .jsObject(let className?) where className != "JSObject": - return ["\(raw: accessor).map { $0.jsObject }.bridgeJSLowerReturn()"] + return ["\(raw: accessor).map { $0.jsObject }.bridgeJSStackPush()"] case .swiftProtocol: - return ["\(raw: accessor).map { $0 as! \(raw: elementType.swiftType) }.bridgeJSLowerReturn()"] + return ["\(raw: accessor).map { $0 as! \(raw: elementType.swiftType) }.bridgeJSStackPush()"] case .nullable, .closure: return lowerArrayStatementsInline( elementType: elementType, @@ -887,7 +887,7 @@ struct StackCodegen { case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") default: - return ["\(raw: accessor).bridgeJSLowerReturn()"] + return ["\(raw: accessor).bridgeJSStackPush()"] } } @@ -922,9 +922,9 @@ struct StackCodegen { ) -> [CodeBlockItemSyntax] { switch valueType { case .jsObject(let className?) where className != "JSObject": - return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSLowerReturn()"] + return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSStackPush()"] case .swiftProtocol: - return ["\(raw: accessor).mapValues { $0 as! \(raw: valueType.swiftType) }.bridgeJSLowerReturn()"] + return ["\(raw: accessor).mapValues { $0 as! \(raw: valueType.swiftType) }.bridgeJSStackPush()"] case .nullable, .closure: return lowerDictionaryStatementsInline( valueType: valueType, @@ -934,7 +934,7 @@ struct StackCodegen { case .void, .namespaceEnum: fatalError("Invalid dictionary value type: \(valueType)") default: - return ["\(raw: accessor).bridgeJSLowerReturn()"] + return ["\(raw: accessor).bridgeJSStackPush()"] } } @@ -979,7 +979,7 @@ struct StackCodegen { ) -> [CodeBlockItemSyntax] { switch wrappedType { case .array, .dictionary, .swiftStruct: - return ["\(raw: accessor).bridgeJSLowerReturn()"] + return ["\(raw: accessor).bridgeJSStackPush()"] default: break } @@ -1008,13 +1008,13 @@ struct StackCodegen { ) -> [CodeBlockItemSyntax] { switch wrappedType { case .jsObject(_?): - return ["\(raw: unwrappedVar).jsObject.bridgeJSLowerStackReturn()"] + return ["\(raw: unwrappedVar).jsObject.bridgeJSStackPush()"] case .swiftProtocol: - return ["(\(raw: unwrappedVar) as! \(raw: wrappedType.swiftType)).bridgeJSLowerStackReturn()"] + return ["(\(raw: unwrappedVar) as! \(raw: wrappedType.swiftType)).bridgeJSStackPush()"] case .string, .int, .uint, .bool, .float, .double, .jsValue, .jsObject(nil), .swiftHeapObject, .unsafePointer, .closure, .caseEnum, .rawValueEnum, .associatedValueEnum: - return ["\(raw: unwrappedVar).bridgeJSLowerStackReturn()"] + return ["\(raw: unwrappedVar).bridgeJSStackPush()"] default: return ["preconditionFailure(\"BridgeJS: unsupported optional wrapped type\")"] } @@ -1225,14 +1225,14 @@ struct StructCodegen { let printer = CodeFragmentPrinter() printer.write("extension \(typeName): _BridgedSwiftStruct {") printer.indent { - printer.write("@_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> \(typeName) {") + printer.write("@_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> \(typeName) {") printer.indent { printer.write(lines: generateStructLiftCode(structDef: structDef)) } printer.write("}") printer.nextLine() - printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() {") + printer.write("@_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() {") printer.indent { printer.write(lines: generateStructLowerCode(structDef: structDef)) } @@ -1247,7 +1247,7 @@ struct StructCodegen { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } """ ) @@ -1257,7 +1257,7 @@ struct StructCodegen { multilineString: """ \(accessControl)func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: \(liftFunctionName)())) } """ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 3eedb418d..3141139ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -45,15 +45,15 @@ extension Status: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter() - let x = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { + let y = Double.bridgeJSStackPop() + let x = Double.bridgeJSStackPop() return Point(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -61,12 +61,12 @@ extension Point: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } @@ -93,8 +93,8 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { @_cdecl("bjs_processIntArray") public func _bjs_processIntArray() -> Void { #if arch(wasm32) - let ret = processIntArray(_: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processIntArray(_: [Int].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -104,8 +104,8 @@ public func _bjs_processIntArray() -> Void { @_cdecl("bjs_processStringArray") public func _bjs_processStringArray() -> Void { #if arch(wasm32) - let ret = processStringArray(_: [String].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processStringArray(_: [String].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -115,8 +115,8 @@ public func _bjs_processStringArray() -> Void { @_cdecl("bjs_processDoubleArray") public func _bjs_processDoubleArray() -> Void { #if arch(wasm32) - let ret = processDoubleArray(_: [Double].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processDoubleArray(_: [Double].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -126,8 +126,8 @@ public func _bjs_processDoubleArray() -> Void { @_cdecl("bjs_processBoolArray") public func _bjs_processBoolArray() -> Void { #if arch(wasm32) - let ret = processBoolArray(_: [Bool].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processBoolArray(_: [Bool].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -137,8 +137,8 @@ public func _bjs_processBoolArray() -> Void { @_cdecl("bjs_processPointArray") public func _bjs_processPointArray() -> Void { #if arch(wasm32) - let ret = processPointArray(_: [Point].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processPointArray(_: [Point].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -148,8 +148,8 @@ public func _bjs_processPointArray() -> Void { @_cdecl("bjs_processDirectionArray") public func _bjs_processDirectionArray() -> Void { #if arch(wasm32) - let ret = processDirectionArray(_: [Direction].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processDirectionArray(_: [Direction].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -159,8 +159,8 @@ public func _bjs_processDirectionArray() -> Void { @_cdecl("bjs_processStatusArray") public func _bjs_processStatusArray() -> Void { #if arch(wasm32) - let ret = processStatusArray(_: [Status].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processStatusArray(_: [Status].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -170,7 +170,7 @@ public func _bjs_processStatusArray() -> Void { @_cdecl("bjs_sumIntArray") public func _bjs_sumIntArray() -> Int32 { #if arch(wasm32) - let ret = sumIntArray(_: [Int].bridgeJSLiftParameter()) + let ret = sumIntArray(_: [Int].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -181,7 +181,7 @@ public func _bjs_sumIntArray() -> Int32 { @_cdecl("bjs_findFirstPoint") public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { #if arch(wasm32) - let ret = findFirstPoint(_: [Point].bridgeJSLiftParameter(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) + let ret = findFirstPoint(_: [Point].bridgeJSStackPop(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -192,8 +192,8 @@ public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) @_cdecl("bjs_processUnsafeRawPointerArray") public func _bjs_processUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -203,8 +203,8 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { @_cdecl("bjs_processUnsafeMutableRawPointerArray") public func _bjs_processUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -214,8 +214,8 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { @_cdecl("bjs_processOpaquePointerArray") public func _bjs_processOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = processOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -230,7 +230,7 @@ public func _bjs_processOptionalIntArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -238,7 +238,7 @@ public func _bjs_processOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -257,7 +257,7 @@ public func _bjs_processOptionalStringArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -265,7 +265,7 @@ public func _bjs_processOptionalStringArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -280,7 +280,7 @@ public func _bjs_processOptionalStringArray() -> Void { public func _bjs_processOptionalArray() -> Void { #if arch(wasm32) let ret = processOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -295,13 +295,13 @@ public func _bjs_processOptionalPointArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() + __bjs_elem_ret.bridgeJSStackPush() } _swift_js_push_i32(Int32(ret.count)) #else @@ -318,7 +318,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -326,7 +326,7 @@ public func _bjs_processOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -345,7 +345,7 @@ public func _bjs_processOptionalStatusArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -353,7 +353,7 @@ public func _bjs_processOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -367,8 +367,8 @@ public func _bjs_processOptionalStatusArray() -> Void { @_cdecl("bjs_processNestedIntArray") public func _bjs_processNestedIntArray() -> Void { #if arch(wasm32) - let ret = processNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processNestedIntArray(_: [[Int]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -378,8 +378,8 @@ public func _bjs_processNestedIntArray() -> Void { @_cdecl("bjs_processNestedStringArray") public func _bjs_processNestedStringArray() -> Void { #if arch(wasm32) - let ret = processNestedStringArray(_: [[String]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processNestedStringArray(_: [[String]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -389,8 +389,8 @@ public func _bjs_processNestedStringArray() -> Void { @_cdecl("bjs_processNestedPointArray") public func _bjs_processNestedPointArray() -> Void { #if arch(wasm32) - let ret = processNestedPointArray(_: [[Point]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processNestedPointArray(_: [[Point]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -400,8 +400,8 @@ public func _bjs_processNestedPointArray() -> Void { @_cdecl("bjs_processItemArray") public func _bjs_processItemArray() -> Void { #if arch(wasm32) - let ret = processItemArray(_: [Item].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processItemArray(_: [Item].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -411,8 +411,8 @@ public func _bjs_processItemArray() -> Void { @_cdecl("bjs_processNestedItemArray") public func _bjs_processNestedItemArray() -> Void { #if arch(wasm32) - let ret = processNestedItemArray(_: [[Item]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processNestedItemArray(_: [[Item]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -422,8 +422,8 @@ public func _bjs_processNestedItemArray() -> Void { @_cdecl("bjs_processJSObjectArray") public func _bjs_processJSObjectArray() -> Void { #if arch(wasm32) - let ret = processJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processJSObjectArray(_: [JSObject].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -438,7 +438,7 @@ public func _bjs_processOptionalJSObjectArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -446,7 +446,7 @@ public func _bjs_processOptionalJSObjectArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -460,8 +460,8 @@ public func _bjs_processOptionalJSObjectArray() -> Void { @_cdecl("bjs_processNestedJSObjectArray") public func _bjs_processNestedJSObjectArray() -> Void { #if arch(wasm32) - let ret = processNestedJSObjectArray(_: [[JSObject]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = processNestedJSObjectArray(_: [[JSObject]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift index 16cae49e8..e8f367f1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift @@ -38,17 +38,17 @@ extension Status: _BridgedSwiftCaseEnum { } extension Config: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let enabled = Bool.bridgeJSLiftParameter() - let value = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Config { + let enabled = Bool.bridgeJSStackPop() + let value = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return Config(name: name, value: value, enabled: enabled) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.value.bridgeJSLowerStackReturn() - self.enabled.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.value.bridgeJSStackPush() + self.enabled.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -56,12 +56,12 @@ extension Config: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config())) } } @@ -85,13 +85,13 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { #endif extension MathOperations: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations { + let baseValue = Double.bridgeJSStackPop() return MathOperations(baseValue: baseValue) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.baseValue.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.baseValue.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -99,12 +99,12 @@ extension MathOperations: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations())) } } @@ -318,8 +318,8 @@ public func _bjs_testOptionalStructWithValueDefault() -> Void { @_cdecl("bjs_testIntArrayDefault") public func _bjs_testIntArrayDefault() -> Void { #if arch(wasm32) - let ret = testIntArrayDefault(values: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = testIntArrayDefault(values: [Int].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -329,8 +329,8 @@ public func _bjs_testIntArrayDefault() -> Void { @_cdecl("bjs_testStringArrayDefault") public func _bjs_testStringArrayDefault() -> Void { #if arch(wasm32) - let ret = testStringArrayDefault(names: [String].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = testStringArrayDefault(names: [String].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -340,8 +340,8 @@ public func _bjs_testStringArrayDefault() -> Void { @_cdecl("bjs_testDoubleArrayDefault") public func _bjs_testDoubleArrayDefault() -> Void { #if arch(wasm32) - let ret = testDoubleArrayDefault(values: [Double].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = testDoubleArrayDefault(values: [Double].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -351,8 +351,8 @@ public func _bjs_testDoubleArrayDefault() -> Void { @_cdecl("bjs_testBoolArrayDefault") public func _bjs_testBoolArrayDefault() -> Void { #if arch(wasm32) - let ret = testBoolArrayDefault(flags: [Bool].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = testBoolArrayDefault(flags: [Bool].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -362,8 +362,8 @@ public func _bjs_testBoolArrayDefault() -> Void { @_cdecl("bjs_testEmptyArrayDefault") public func _bjs_testEmptyArrayDefault() -> Void { #if arch(wasm32) - let ret = testEmptyArrayDefault(items: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = testEmptyArrayDefault(items: [Int].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -373,7 +373,7 @@ public func _bjs_testEmptyArrayDefault() -> Void { @_cdecl("bjs_testMixedWithArrayDefault") public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: [Int].bridgeJSLiftParameter(), enabled: Bool.bridgeJSLiftParameter(enabled)) + let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: [Int].bridgeJSStackPop(), enabled: Bool.bridgeJSLiftParameter(enabled)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index fa19b481c..3d23c6bff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -2,15 +2,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) case 2: - return .flag(Bool.bridgeJSLiftParameter()) + return .flag(Bool.bridgeJSStackPop()) case 3: - return .rate(Float.bridgeJSLiftParameter()) + return .rate(Float.bridgeJSStackPop()) case 4: - return .precise(Double.bridgeJSLiftParameter()) + return .precise(Double.bridgeJSStackPop()) case 5: return .info default: @@ -21,19 +21,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .flag(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .rate(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(3) case .precise(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(4) case .info: return Int32(5) @@ -45,15 +45,15 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .error(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) case 2: - return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .status(Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), String.bridgeJSStackPop()) case 3: - return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) + return .coordinates(Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop()) case 4: - return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .comprehensive(Bool.bridgeJSStackPop(), Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), Int.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop()) case 5: return .info default: @@ -64,32 +64,32 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(2) case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(3) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() + param3.bridgeJSStackPush() + param4.bridgeJSStackPush() + param5.bridgeJSStackPush() + param6.bridgeJSStackPush() + param7.bridgeJSStackPush() + param8.bridgeJSStackPush() return Int32(4) case .info: return Int32(5) @@ -101,11 +101,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .failure(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) case 2: - return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .status(Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), String.bridgeJSStackPop()) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -114,16 +114,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(2) } } @@ -133,9 +133,9 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .failure(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) default: fatalError("Unknown NetworkingResult case ID: \(caseId)") } @@ -144,11 +144,11 @@ extension NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) } } @@ -158,11 +158,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter()) + return .success(Optional.bridgeJSStackPop()) case 1: - return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + return .failure(Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop()) case 2: - return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + return .status(Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop()) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } @@ -173,36 +173,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -260,13 +260,13 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: - return .precision(Precision.bridgeJSLiftParameter()) + return .precision(Precision.bridgeJSStackPop()) case 1: - return .direction(CardinalDirection.bridgeJSLiftParameter()) + return .direction(CardinalDirection.bridgeJSStackPop()) case 2: - return .optPrecision(Optional.bridgeJSLiftParameter()) + return .optPrecision(Optional.bridgeJSStackPop()) case 3: - return .optDirection(Optional.bridgeJSLiftParameter()) + return .optDirection(Optional.bridgeJSStackPop()) case 4: return .empty default: @@ -277,22 +277,22 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .precision(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .direction(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) @@ -306,15 +306,15 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AllTypesResult { switch caseId { case 0: - return .structPayload(Point.bridgeJSLiftParameter()) + return .structPayload(Point.bridgeJSStackPop()) case 1: - return .classPayload(User.bridgeJSLiftParameter()) + return .classPayload(User.bridgeJSStackPop()) case 2: - return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) + return .jsObjectPayload(JSObject.bridgeJSStackPop()) case 3: - return .nestedEnum(APIResult.bridgeJSLiftParameter()) + return .nestedEnum(APIResult.bridgeJSStackPop()) case 4: - return .arrayPayload([Int].bridgeJSLiftParameter()) + return .arrayPayload([Int].bridgeJSStackPop()) case 5: return .empty default: @@ -325,19 +325,19 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .structPayload(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(0) case .classPayload(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .jsObjectPayload(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .nestedEnum(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(3) case .arrayPayload(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(4) case .empty: return Int32(5) @@ -349,15 +349,15 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult { switch caseId { case 0: - return .optStruct(Optional.bridgeJSLiftParameter()) + return .optStruct(Optional.bridgeJSStackPop()) case 1: - return .optClass(Optional.bridgeJSLiftParameter()) + return .optClass(Optional.bridgeJSStackPop()) case 2: - return .optJSObject(Optional.bridgeJSLiftParameter()) + return .optJSObject(Optional.bridgeJSStackPop()) case 3: - return .optNestedEnum(Optional.bridgeJSLiftParameter()) + return .optNestedEnum(Optional.bridgeJSStackPop()) case 4: - return .optArray(Optional<[Int]>.bridgeJSLiftParameter()) + return .optArray(Optional<[Int]>.bridgeJSStackPop()) case 5: return .empty default: @@ -368,31 +368,31 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .optStruct(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(1) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(4) case .empty: return Int32(5) @@ -401,15 +401,15 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { } extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Double.bridgeJSLiftParameter() - let x = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { + let y = Double.bridgeJSStackPop() + let x = Double.bridgeJSStackPop() return Point(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -417,12 +417,12 @@ extension Point: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index 5708e7de9..7fcc4d3c7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -1,15 +1,15 @@ extension FooContainer: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { - let optionalFoo = Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) } - let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> FooContainer { + let optionalFoo = Optional.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) } + let foo = Foo(unsafelyWrapping: JSObject.bridgeJSStackPop()) return FooContainer(foo: foo, optionalFoo: optionalFoo) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.foo.jsObject.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.foo.jsObject.bridgeJSStackPush() let __bjs_isSome_optionalFoo = self.optionalFoo != nil if let __bjs_unwrapped_optionalFoo = self.optionalFoo { - __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) } @@ -19,12 +19,12 @@ extension FooContainer: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer())) } } @@ -76,8 +76,8 @@ public func _bjs_makeFoo() -> Int32 { @_cdecl("bjs_processFooArray") public func _bjs_processFooArray() -> Void { #if arch(wasm32) - let ret = processFooArray(_: [JSObject].bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) - ret.map { $0.jsObject }.bridgeJSLowerReturn() + let ret = processFooArray(_: [JSObject].bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }) + ret.map { $0.jsObject }.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -92,7 +92,7 @@ public func _bjs_processOptionalFooArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) + __result.append(Optional.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }) } __result.reverse() return __result @@ -100,7 +100,7 @@ public func _bjs_processOptionalFooArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.jsObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index 931605a50..41d04ebab 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -24,8 +24,8 @@ public func _bjs_roundTripOptionalJSValue(_ valueIsSome: Int32, _ valueKind: Int @_cdecl("bjs_roundTripJSValueArray") public func _bjs_roundTripJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripJSValueArray(_: [JSValue].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripJSValueArray(_: [JSValue].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -36,7 +36,7 @@ public func _bjs_roundTripJSValueArray() -> Void { public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalJSValueArray(_: Optional<[JSValue]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 4051f5c9e..65ff9e67c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -366,9 +366,9 @@ extension Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) default: fatalError("Unknown Result case ID: \(caseId)") } @@ -377,10 +377,10 @@ extension Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) } } @@ -393,8 +393,8 @@ extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { @_cdecl("bjs_processDelegates") public func _bjs_processDelegates() -> Void { #if arch(wasm32) - let ret = processDelegates(_: [AnyMyViewControllerDelegate].bridgeJSLiftParameter()) - ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSLowerReturn() + let ret = processDelegates(_: [AnyMyViewControllerDelegate].bridgeJSStackPop()) + ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -611,7 +611,7 @@ fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_init") public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DelegateManager(delegates: [AnyMyViewControllerDelegate].bridgeJSLiftParameter()) + let ret = DelegateManager(delegates: [AnyMyViewControllerDelegate].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -633,7 +633,7 @@ public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates - ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSLowerReturn() + ret.map { $0 as! AnyMyViewControllerDelegate }.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -643,7 +643,7 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_delegates_set") public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DelegateManager.bridgeJSLiftParameter(_self).delegates = [AnyMyViewControllerDelegate].bridgeJSLiftParameter() + DelegateManager.bridgeJSLiftParameter(_self).delegates = [AnyMyViewControllerDelegate].bridgeJSStackPop() #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index 6622ef3da..8ad34d283 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) default: fatalError("Unknown APIResult case ID: \(caseId)") } @@ -59,10 +59,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index 6622ef3da..8ad34d283 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -48,9 +48,9 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) default: fatalError("Unknown APIResult case ID: \(caseId)") } @@ -59,10 +59,10 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index 57a963637..925ab5937 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -1191,15 +1191,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) case 2: - return .flag(Bool.bridgeJSLiftParameter()) + return .flag(Bool.bridgeJSStackPop()) case 3: - return .rate(Float.bridgeJSLiftParameter()) + return .rate(Float.bridgeJSStackPop()) case 4: - return .precise(Double.bridgeJSLiftParameter()) + return .precise(Double.bridgeJSStackPop()) case 5: return .info default: @@ -1210,19 +1210,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .flag(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .rate(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(3) case .precise(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(4) case .info: return Int32(5) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index 2e551452d..fb78c3fd0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -2,27 +2,27 @@ extension Precision: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { } extension DataPoint: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter() - let optCount = Optional.bridgeJSLiftParameter() - let label = String.bridgeJSLiftParameter() - let y = Double.bridgeJSLiftParameter() - let x = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> DataPoint { + let optFlag = Optional.bridgeJSStackPop() + let optCount = Optional.bridgeJSStackPop() + let label = String.bridgeJSStackPop() + let y = Double.bridgeJSStackPop() + let x = Double.bridgeJSStackPop() return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() - self.label.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() + self.label.bridgeJSStackPush() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() + __bjs_unwrapped_optCount.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() + __bjs_unwrapped_optFlag.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -32,12 +32,12 @@ extension DataPoint: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint())) } } @@ -72,19 +72,19 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, } extension Address: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter() - let city = String.bridgeJSLiftParameter() - let street = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address { + let zipCode = Optional.bridgeJSStackPop() + let city = String.bridgeJSStackPop() + let street = String.bridgeJSStackPop() return Address(street: street, city: city, zipCode: zipCode) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.street.bridgeJSLowerStackReturn() - self.city.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.street.bridgeJSStackPush() + self.city.bridgeJSStackPush() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() + __bjs_unwrapped_zipCode.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -94,12 +94,12 @@ extension Address: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -123,21 +123,21 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { #endif extension Person: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Person { - let email = Optional.bridgeJSLiftParameter() - let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Person { + let email = Optional.bridgeJSStackPop() + let address = Address.bridgeJSStackPop() + let age = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return Person(name: name, age: age, address: address, email: email) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.age.bridgeJSLowerStackReturn() - self.address.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.age.bridgeJSStackPush() + self.address.bridgeJSStackPush() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) } @@ -147,12 +147,12 @@ extension Person: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Person())) } } @@ -176,15 +176,15 @@ fileprivate func _bjs_struct_lift_Person() -> Int32 { #endif extension Session: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Session { - let owner = Greeter.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Session { + let owner = Greeter.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return Session(id: id, owner: owner) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() - self.owner.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() + self.owner.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -192,12 +192,12 @@ extension Session: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Session())) } } @@ -221,19 +221,19 @@ fileprivate func _bjs_struct_lift_Session() -> Int32 { #endif extension Measurement: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Measurement { - let optionalPrecision = Optional.bridgeJSLiftParameter() - let precision = Precision.bridgeJSLiftParameter() - let value = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Measurement { + let optionalPrecision = Optional.bridgeJSStackPop() + let precision = Precision.bridgeJSStackPop() + let value = Double.bridgeJSStackPop() return Measurement(value: value, precision: precision, optionalPrecision: optionalPrecision) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.value.bridgeJSLowerStackReturn() - self.precision.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.value.bridgeJSStackPush() + self.precision.bridgeJSStackPush() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalPrecision.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) } @@ -243,12 +243,12 @@ extension Measurement: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Measurement())) } } @@ -272,11 +272,11 @@ fileprivate func _bjs_struct_lift_Measurement() -> Int32 { #endif extension ConfigStruct: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ConfigStruct { return ConfigStruct() } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { } init(unsafelyCopying jsObject: JSObject) { @@ -284,12 +284,12 @@ extension ConfigStruct: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct())) } } @@ -388,17 +388,17 @@ public func _bjs_ConfigStruct_static_update(_ timeout: Float64) -> Float64 { } extension Container: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Container { - let optionalObject = Optional.bridgeJSLiftParameter() - let object = JSObject.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Container { + let optionalObject = Optional.bridgeJSStackPop() + let object = JSObject.bridgeJSStackPop() return Container(object: object, optionalObject: optionalObject) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.object.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.object.bridgeJSStackPush() let __bjs_isSome_optionalObject = self.optionalObject != nil if let __bjs_unwrapped_optionalObject = self.optionalObject { - __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) } @@ -408,12 +408,12 @@ extension Container: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Container())) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift index 187f3369a..089912afe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift @@ -1,13 +1,13 @@ extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Int.bridgeJSLiftParameter() - let x = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { + let y = Int.bridgeJSStackPop() + let x = Int.bridgeJSStackPop() return Point(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -15,12 +15,12 @@ extension Point: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift index 752cc6bc3..a4f372e9b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift @@ -1,19 +1,19 @@ extension PointerFields: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() - let ptr = UnsafePointer.bridgeJSLiftParameter() - let opaque = OpaquePointer.bridgeJSLiftParameter() - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() - let raw = UnsafeRawPointer.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PointerFields { + let mutPtr = UnsafeMutablePointer.bridgeJSStackPop() + let ptr = UnsafePointer.bridgeJSStackPop() + let opaque = OpaquePointer.bridgeJSStackPop() + let mutRaw = UnsafeMutableRawPointer.bridgeJSStackPop() + let raw = UnsafeRawPointer.bridgeJSStackPop() return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.raw.bridgeJSLowerStackReturn() - self.mutRaw.bridgeJSLowerStackReturn() - self.opaque.bridgeJSLowerStackReturn() - self.ptr.bridgeJSLowerStackReturn() - self.mutPtr.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.raw.bridgeJSStackPush() + self.mutRaw.bridgeJSStackPush() + self.opaque.bridgeJSStackPush() + self.ptr.bridgeJSStackPush() + self.mutPtr.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -21,12 +21,12 @@ extension PointerFields: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) } } diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index edb41b9fa..d761e7576 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -102,10 +102,13 @@ internal func _swift_js_closure_unregister(_ id: Int32) { // // MARK: ExportSwift // @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ ...) -> <#Self#> { // } -// @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> <#Self#> { -// } // @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> <#WasmCoreType#> { // } +// // MARK: Stack ABI +// @_spi(BridgeJS) public static func bridgeJSStackPop() -> <#Self#> { +// } +// @_spi(BridgeJS) public consuming func bridgeJSStackPush() { +// } // } // ``` // @@ -115,10 +118,10 @@ internal func _swift_js_closure_unregister(_ id: Int32) { // - `func bridgeJSLowerParameter()`: lower the given higher-level parameter to a WebAssembly core type // - `func bridgeJSLiftReturn(_ ...) -> <#TargetType#>`: lift the given Wasm core type return value to a higher-level type // - `func bridgeJSLiftParameter(_ ...) -> <#TargetType#>`: lift the given Wasm core type parameters to a higher-level type -// - `func bridgeJSLiftParameter() -> <#TargetType#>`: no-arg overload that pops parameters from the param stack internally. -// Note: Pop order must match Swift's left-to-right argument evaluation order. // - `func bridgeJSLowerReturn() -> <#WasmCoreType#>`: lower the given higher-level return value to a Wasm core type -// - `func bridgeJSLowerStackReturn()`: push the value onto the return stack (used by _BridgedSwiftStackType for array elements) +// - `func bridgeJSStackPop() -> <#TargetType#>`: no-arg overload that pops parameters from the param stack internally. +// Note: Pop order must match Swift's left-to-right argument evaluation order. +// - `func bridgeJSStackPush()`: push the value onto the return stack (used by _BridgedSwiftStackType for array elements) // // Optional types (ExportSwift only) additionally define: // - `func bridgeJSLowerParameterWithRetain()`: lower optional heap object with ownership transfer for escaping closures @@ -139,8 +142,8 @@ public protocol _BridgedSwiftTypeLoweredIntoSingleWasmCoreType { public protocol _BridgedSwiftStackType { associatedtype StackLiftResult = Self - static func bridgeJSLiftParameter() -> StackLiftResult - consuming func bridgeJSLowerStackReturn() + static func bridgeJSStackPop() -> StackLiftResult + consuming func bridgeJSStackPush() } /// Types that bridge with the same (isSome, value) ABI as Optional. @@ -163,13 +166,13 @@ extension Bool: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftSta @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Bool { value == 1 } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Bool { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Bool { bridgeJSLiftParameter(_swift_js_pop_i32()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { self ? 1 : 0 } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(self ? 1 : 0) } } @@ -186,13 +189,13 @@ extension Int: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftStac @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> Int { Int(value) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Int { bridgeJSLiftParameter(_swift_js_pop_i32()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { Int32(self) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(Int32(self)) } } @@ -209,49 +212,49 @@ extension UInt: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftSta @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> UInt { UInt(UInt32(bitPattern: value)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> UInt { bridgeJSLiftParameter(_swift_js_pop_i32()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { Int32(bitPattern: UInt32(self)) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(Int32(bitPattern: UInt32(self))) } } extension Int32: _BridgedSwiftStackType { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int32 { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Int32 { _swift_js_pop_i32() } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(self) } } extension Int64: _BridgedSwiftStackType { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Int64 { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Int64 { Int64(_swift_js_pop_i32()) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(Int32(self)) } } extension UInt32: _BridgedSwiftStackType { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt32 { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> UInt32 { UInt32(bitPattern: _swift_js_pop_i32()) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(Int32(bitPattern: self)) } } extension UInt64: _BridgedSwiftStackType { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> UInt64 { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> UInt64 { UInt64(UInt32(bitPattern: _swift_js_pop_i32())) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(Int32(bitPattern: UInt32(self))) } } @@ -268,13 +271,13 @@ extension Float: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftSt @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Float32) -> Float { Float(value) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Float { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Float { bridgeJSLiftParameter(_swift_js_pop_f32()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Float32 { Float32(self) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_f32(Float32(self)) } } @@ -291,13 +294,13 @@ extension Double: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftS @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Float64) -> Double { Double(value) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Double { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Double { bridgeJSLiftParameter(_swift_js_pop_f64()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Float64 { Float64(self) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_f64(Float64(self)) } } @@ -335,7 +338,7 @@ extension String: _BridgedSwiftStackType { } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> String { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> String { let bytes = _swift_js_pop_i32() let count = _swift_js_pop_i32() return bridgeJSLiftParameter(bytes, count) @@ -347,7 +350,7 @@ extension String: _BridgedSwiftStackType { } } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { self.withUTF8 { ptr in _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) } @@ -374,7 +377,7 @@ extension JSObject: _BridgedSwiftStackType { JSObject(id: JavaScriptObjectRef(bitPattern: id)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSObject { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> JSObject { bridgeJSLiftParameter(_swift_js_pop_i32()) } @@ -382,7 +385,7 @@ extension JSObject: _BridgedSwiftStackType { return _swift_js_retain(Int32(bitPattern: self.id)) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(bridgeJSLowerReturn()) } } @@ -403,6 +406,21 @@ extension JSValue: _BridgedSwiftStackType { } } + @_spi(BridgeJS) public static func bridgeJSStackPop() -> JSValue { + let payload2 = _swift_js_pop_f64() + let payload1 = _swift_js_pop_i32() + let kind = _swift_js_pop_i32() + return bridgeJSLiftParameter(kind, payload1, payload2) + } + + @_spi(BridgeJS) public consuming func bridgeJSStackPush() -> Void { + let lowered = bridgeJSLowerParameter() + let retainedPayload1 = Self.bridgeJSRetainPayloadIfNeeded(kind: lowered.kind, payload1: lowered.payload1) + _swift_js_push_i32(lowered.kind) + _swift_js_push_i32(retainedPayload1) + _swift_js_push_f64(lowered.payload2) + } + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) { return withRawJSValue { raw in ( @@ -413,14 +431,6 @@ extension JSValue: _BridgedSwiftStackType { } } - @_spi(BridgeJS) public static func bridgeJSLiftReturn( - _ kind: Int32, - _ payload1: Int32, - _ payload2: Double - ) -> JSValue { - return bridgeJSLiftParameter(kind, payload1, payload2) - } - @_spi(BridgeJS) public static func bridgeJSLiftParameter( _ kind: Int32, _ payload1: Int32, @@ -439,27 +449,12 @@ extension JSValue: _BridgedSwiftStackType { return rawValue.jsValue } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSValue { - let payload2 = _swift_js_pop_f64() - let payload1 = _swift_js_pop_i32() - let kind = _swift_js_pop_i32() - return bridgeJSLiftParameter(kind, payload1, payload2) - } - @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> JSValue { - bridgeJSLiftParameter() + bridgeJSStackPop() } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - let lowered = bridgeJSLowerParameter() - let retainedPayload1 = Self.bridgeJSRetainPayloadIfNeeded(kind: lowered.kind, payload1: lowered.payload1) - _swift_js_push_i32(lowered.kind) - _swift_js_push_i32(retainedPayload1) - _swift_js_push_f64(lowered.payload2) - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + bridgeJSStackPush() } } @@ -485,14 +480,15 @@ extension _BridgedSwiftHeapObject { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self { Unmanaged.fromOpaque(pointer).takeUnretainedValue() } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - bridgeJSLiftParameter(_swift_js_pop_pointer()) - } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { // Perform a manual retain on the object, which will be balanced by a release called via FinalizationRegistry return Unmanaged.passRetained(self).toOpaque() } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + bridgeJSLiftParameter(_swift_js_pop_pointer()) + } + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_pointer(Unmanaged.passRetained(self).toOpaque()) } } @@ -514,11 +510,11 @@ extension _JSBridgedClass { @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ id: Int32) -> Self { Self(unsafelyWrapping: JSObject.bridgeJSLiftParameter(id)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { bridgeJSLiftParameter(_swift_js_pop_i32()) } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(bridgeJSLowerReturn()) } } @@ -534,20 +530,24 @@ public protocol _BridgedSwiftProtocolWrapper: _BridgedSwiftStackType { extension _BridgedSwiftProtocolWrapper { // MARK: ExportSwift @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - bridgeJSLiftParameter(_swift_js_pop_i32()) + bridgeJSStackPop() } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Int32 { jsObject.bridgeJSLowerReturn() } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - _swift_js_push_i32(jsObject.bridgeJSLowerReturn()) - } - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { jsObject.bridgeJSLowerParameter() } + + // MARK: Stack ABI + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + bridgeJSLiftParameter(_swift_js_pop_i32()) + } + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { + _swift_js_push_i32(jsObject.bridgeJSLowerReturn()) + } } /// A protocol that Swift enum types that do not have a payload can conform to. @@ -566,11 +566,11 @@ public protocol _BridgedSwiftRawValueEnum: _BridgedSwiftStackType, RawRepresenta where RawValue: _BridgedSwiftStackType, RawValue.StackLiftResult == RawValue {} extension _BridgedSwiftRawValueEnum { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(rawValue: RawValue.bridgeJSLiftParameter())! + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(rawValue: RawValue.bridgeJSStackPop())! } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - rawValue.bridgeJSLowerStackReturn() + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { + rawValue.bridgeJSStackPush() } } @@ -588,11 +588,11 @@ public protocol _BridgedSwiftCaseEnum: _BridgedSwiftStackType { } extension _BridgedSwiftCaseEnum { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { bridgeJSLiftParameter(_swift_js_pop_i32()) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_i32(bridgeJSLowerReturn()) } } @@ -614,12 +614,12 @@ public protocol _BridgedSwiftAssociatedValueEnum: _BridgedSwiftTypeLoweredIntoVo } extension _BridgedSwiftAssociatedValueEnum { - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { bridgeJSStackPopPayload(_swift_js_pop_i32()) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { + _swift_js_push_i32(bridgeJSStackPushPayload()) } @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ caseId: Int32) -> Self { @@ -627,7 +627,7 @@ extension _BridgedSwiftAssociatedValueEnum { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { - _swift_js_push_i32(bridgeJSStackPushPayload()) + bridgeJSStackPush() } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -644,8 +644,8 @@ extension _BridgedSwiftAssociatedValueEnum { /// The conformance is automatically synthesized by the BridgeJS code generator. public protocol _BridgedSwiftStruct: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftGenericOptionalStackType { // MARK: ExportSwift - @_spi(BridgeJS) static func bridgeJSLiftParameter() -> Self - @_spi(BridgeJS) consuming func bridgeJSLowerReturn() -> Void + @_spi(BridgeJS) static func bridgeJSStackPop() -> Self + @_spi(BridgeJS) consuming func bridgeJSStackPush() -> Void /// Initializes a Swift struct by copying the fields from a bridged JS object. init(unsafelyCopying jsObject: JSObject) @@ -663,8 +663,11 @@ extension _BridgedSwiftStruct { return Self(unsafelyCopying: jsObject) } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + bridgeJSStackPop() + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + bridgeJSStackPush() } } @@ -1055,13 +1058,13 @@ extension _BridgedSwiftUnsafePointerLike { @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ pointer: UnsafeMutableRawPointer) -> Self { bridgeJSFromUnsafeMutableRawPointer(pointer) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { bridgeJSLiftParameter(_swift_js_pop_pointer()) } @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> UnsafeMutableRawPointer { bridgeJSToUnsafeMutableRawPointer() } - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { _swift_js_push_pointer(bridgeJSToUnsafeMutableRawPointer()) } } @@ -1269,7 +1272,7 @@ extension Optional where Wrapped: _BridgedSwiftOptionalScalarBridge { return Wrapped.bridgeJSLiftParameter(wrappedValue) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = Wrapped.bridgeJSPopOptionalScalarPayload() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1323,7 +1326,7 @@ extension Optional where Wrapped == String { _bridgeJSLiftParameter(isSome, (bytes, count), liftWrapped: { String.bridgeJSLiftParameter($0.0, $0.1) }) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> String? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> String? { let isSome = _swift_js_pop_i32() let bytes = _swift_js_pop_i32() let count = _swift_js_pop_i32() @@ -1363,7 +1366,7 @@ extension Optional where Wrapped == JSObject { _bridgeJSLiftParameter(isSome, objectId, liftWrapped: JSObject.bridgeJSLiftParameter) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> JSObject? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> JSObject? { let isSome = _swift_js_pop_i32() let objectId = _swift_js_pop_i32() return bridgeJSLiftParameter(isSome, objectId) @@ -1548,7 +1551,7 @@ extension Optional where Wrapped: _BridgedSwiftHeapObject { _bridgeJSLiftParameter(isSome, pointer, liftWrapped: Wrapped.bridgeJSLiftParameter) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let pointer = _swift_js_pop_pointer() return bridgeJSLiftParameter(isSome, pointer) @@ -1585,7 +1588,7 @@ extension Optional where Wrapped: _BridgedSwiftCaseEnum { _bridgeJSLiftParameter(isSome, wrappedValue, liftWrapped: Wrapped.bridgeJSLiftParameter) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = _swift_js_pop_i32() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1638,13 +1641,6 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { - let isSome = _swift_js_pop_i32() - let bytes = _swift_js_pop_i32() - let count = _swift_js_pop_i32() - return bridgeJSLiftParameter(isSome, bytes, count) - } - @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Wrapped? { let length = _swift_js_get_optional_string() if length < 0 { @@ -1659,6 +1655,12 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres let optionalRawValue: String? = self?.rawValue optionalRawValue.bridgeJSLowerReturn() } + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { + let isSome = _swift_js_pop_i32() + let bytes = _swift_js_pop_i32() + let count = _swift_js_pop_i32() + return bridgeJSLiftParameter(isSome, bytes, count) + } } extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == Int { @@ -1677,7 +1679,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = _swift_js_pop_i32() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1707,7 +1709,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = _swift_js_pop_i32() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1738,7 +1740,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = _swift_js_pop_f32() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1779,7 +1781,7 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres return optionalRawValue.flatMap { Wrapped(rawValue: $0) } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let wrappedValue = _swift_js_pop_f64() return bridgeJSLiftParameter(isSome, wrappedValue) @@ -1804,6 +1806,22 @@ extension Optional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepres // MARK: Optional Associated Value Enum Support extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { + private static func bridgeJSStackPopPayload(_ discriminant: Int32) -> Wrapped? { + if discriminant == -1 { + return nil + } else { + return Wrapped.bridgeJSStackPopPayload(discriminant) + } + } + private consuming func bridgeJSStackPushPayload() -> Int32 { + switch consume self { + case .none: + return -1 + case .some(let value): + return value.bridgeJSStackPushPayload() + } + } + // MARK: ExportSwift @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (isSome: Int32, caseId: Int32) { @@ -1823,26 +1841,26 @@ extension Optional where Wrapped: _BridgedSwiftAssociatedValueEnum { } } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Wrapped? { + return bridgeJSStackPopPayload(caseId) + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + bridgeJSStackPush() + } + + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() let caseId = _swift_js_pop_i32() return bridgeJSLiftParameter(isSome, caseId) } - @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Wrapped? { - if caseId == -1 { - return nil - } else { - return Wrapped.bridgeJSLiftReturn(caseId) - } - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() -> Void { switch consume self { case .none: _swift_js_push_i32(-1) // Use -1 as sentinel for null case .some(let value): - value.bridgeJSLowerReturn() + value.bridgeJSStackPush() } } } @@ -1854,9 +1872,12 @@ extension Optional where Wrapped: _BridgedSwiftStruct { if isSome == 0 { return nil } else { - return Wrapped.bridgeJSLiftParameter() + return Wrapped.bridgeJSStackPop() } } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + return bridgeJSStackPop() + } } // MARK: - Generic Optional Stack Support @@ -1872,27 +1893,31 @@ extension Optional: _BridgedSwiftStackType where Wrapped: _BridgedSwiftGenericOptionalStackType { public typealias StackLiftResult = Wrapped? - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Wrapped? { let isSome = _swift_js_pop_i32() if isSome == 0 { return nil } - return Wrapped.bridgeJSLiftParameter() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() + return Wrapped.bridgeJSStackPop() } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { switch consume self { case .none: _swift_js_push_i32(0) case .some(let value): - value.bridgeJSLowerStackReturn() + value.bridgeJSStackPush() _swift_js_push_i32(1) } } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Wrapped? { + return bridgeJSStackPop() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + bridgeJSStackPush() + } } // MARK: - _BridgedAsOptional (JSUndefinedOr) delegating to Optional @@ -1911,8 +1936,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftOptionalScalarBridge { Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { @@ -1945,8 +1970,8 @@ extension _BridgedAsOptional where Wrapped == String { Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -1967,8 +1992,8 @@ extension _BridgedAsOptional where Wrapped == JSObject { Self(optional: Optional.bridgeJSLiftParameter(isSome, objectId)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { @@ -2005,8 +2030,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftHeapObject { Self(optional: Optional.bridgeJSLiftParameter(isSome, pointer)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -2027,8 +2052,8 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { @@ -2054,8 +2079,8 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra Self(optional: Optional.bridgeJSLiftParameter(isSome, bytes, count)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -2077,8 +2102,8 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -2096,8 +2121,8 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { @@ -2115,8 +2140,8 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -2138,8 +2163,8 @@ where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.Ra Self(optional: Optional.bridgeJSLiftParameter(isSome, wrappedValue)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturnFromSideChannel() -> Self { @@ -2160,15 +2185,15 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftAssociatedValueEnum { Self(optional: Optional.bridgeJSLiftParameter(isSome, caseId)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) } @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ caseId: Int32) -> Self { Self(optional: Optional.bridgeJSLiftReturn(caseId)) } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { asOptional.bridgeJSLowerReturn() } } @@ -2178,13 +2203,17 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftStruct { Self(optional: Optional.bridgeJSLiftParameter(isSome)) } - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> Self { - Self(optional: Optional.bridgeJSLiftParameter()) - } - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { asOptional.bridgeJSLowerReturn() } + + // MARK: Stack ABI + @_spi(BridgeJS) public static func bridgeJSStackPop() -> Self { + Self(optional: Optional.bridgeJSStackPop()) + } + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { + asOptional.bridgeJSStackPush() + } } // MARK: - Array Support @@ -2194,35 +2223,37 @@ where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element {} extension Array: _BridgedSwiftStackType where Element: _BridgedSwiftStackType, Element.StackLiftResult == Element { public typealias StackLiftResult = [Element] - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [Element] { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> [Element] { let count = Int(_swift_js_pop_i32()) var result: [Element] = [] result.reserveCapacity(count) for _ in 0.. [Element] { - bridgeJSLiftParameter() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { let array = self for elem in array { - elem.bridgeJSLowerStackReturn() + elem.bridgeJSStackPush() } _swift_js_push_i32(Int32(array.count)) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [Element] { + bridgeJSStackPop() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + self.bridgeJSStackPush() + } @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() { - bridgeJSLowerReturn() + self.bridgeJSStackPush() + } + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [Element] { + bridgeJSStackPop() } } @@ -2250,66 +2281,70 @@ extension Dictionary: _BridgedSwiftTypeLoweredIntoVoidType, _BridgedSwiftDiction where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Value { public typealias DictionaryValue = Value - @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Value] { + @_spi(BridgeJS) public static func bridgeJSStackPop() -> [String: Value] { let count = Int(_swift_js_pop_i32()) var result: [String: Value] = [:] result.reserveCapacity(count) for _ in 0.. [String: Value] { - bridgeJSLiftParameter() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerStackReturn() { - bridgeJSLowerReturn() - } - - @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + @_spi(BridgeJS) public consuming func bridgeJSStackPush() { let count = Int32(self.count) for (key, value) in self { - key.bridgeJSLowerStackReturn() - value.bridgeJSLowerStackReturn() + key.bridgeJSStackPush() + value.bridgeJSStackPush() } _swift_js_push_i32(count) } + @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Value] { + bridgeJSStackPop() + } + @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() { + self.bridgeJSStackPush() + } @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() { - bridgeJSLowerReturn() + self.bridgeJSStackPush() + } + @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [String: Value] { + bridgeJSStackPop() } } extension Optional where Wrapped: _BridgedSwiftDictionaryStackType { typealias DictionaryValue = Wrapped.DictionaryValue - @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + private consuming func bridgeJSStackPushPayload() -> Int32 { switch consume self { case .none: return 0 case .some(let dict): - dict.bridgeJSLowerReturn() + dict.bridgeJSStackPush() return 1 } } - - @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? { + private static func bridgeJSStackPopPayload(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? { if isSome == 0 { return nil } - return Dictionary.bridgeJSLiftParameter() + return Dictionary.bridgeJSStackPop() + } + + @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSStackPushPayload() + } + + @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? { + return bridgeJSStackPopPayload(isSome) } @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [String: Wrapped.DictionaryValue]? { - let isSome = _swift_js_pop_i32() - if isSome == 0 { - return nil - } - return Dictionary.bridgeJSLiftParameter() + return bridgeJSStackPopPayload(_swift_js_pop_i32()) } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index e24775f43..91dd822c1 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2029,15 +2029,15 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(Int.bridgeJSLiftParameter()) + return .failure(Int.bridgeJSStackPop()) case 2: - return .flag(Bool.bridgeJSLiftParameter()) + return .flag(Bool.bridgeJSStackPop()) case 3: - return .rate(Float.bridgeJSLiftParameter()) + return .rate(Float.bridgeJSStackPop()) case 4: - return .precise(Double.bridgeJSLiftParameter()) + return .precise(Double.bridgeJSStackPop()) case 5: return .info default: @@ -2048,19 +2048,19 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .flag(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .rate(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(3) case .precise(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(4) case .info: return Int32(5) @@ -2072,17 +2072,17 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> ComplexResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .error(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .error(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) case 2: - return .location(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .location(Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), String.bridgeJSStackPop()) case 3: - return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .status(Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), String.bridgeJSStackPop()) case 4: - return .coordinates(Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter()) + return .coordinates(Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop()) case 5: - return .comprehensive(Bool.bridgeJSLiftParameter(), Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), Double.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .comprehensive(Bool.bridgeJSStackPop(), Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), Int.bridgeJSStackPop(), Double.bridgeJSStackPop(), Double.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop(), String.bridgeJSStackPop()) case 6: return .info default: @@ -2093,37 +2093,37 @@ extension ComplexResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .error(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) case .location(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(2) case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(3) case .coordinates(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(4) case .comprehensive(let param0, let param1, let param2, let param3, let param4, let param5, let param6, let param7, let param8): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() - param3.bridgeJSLowerStackReturn() - param4.bridgeJSLowerStackReturn() - param5.bridgeJSLowerStackReturn() - param6.bridgeJSLowerStackReturn() - param7.bridgeJSLowerStackReturn() - param8.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() + param3.bridgeJSStackPush() + param4.bridgeJSStackPush() + param5.bridgeJSStackPush() + param6.bridgeJSStackPush() + param7.bridgeJSStackPush() + param8.bridgeJSStackPush() return Int32(5) case .info: return Int32(6) @@ -2135,11 +2135,11 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> Utilities.Result { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .failure(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) case 2: - return .status(Bool.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter(), String.bridgeJSLiftParameter()) + return .status(Bool.bridgeJSStackPop(), Int.bridgeJSStackPop(), String.bridgeJSStackPop()) default: fatalError("Unknown Utilities.Result case ID: \(caseId)") } @@ -2148,16 +2148,16 @@ extension Utilities.Result: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) case .status(let param0, let param1, let param2): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() - param2.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() + param2.bridgeJSStackPush() return Int32(2) } } @@ -2167,9 +2167,9 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> API.NetworkingResult { switch caseId { case 0: - return .success(String.bridgeJSLiftParameter()) + return .success(String.bridgeJSStackPop()) case 1: - return .failure(String.bridgeJSLiftParameter(), Int.bridgeJSLiftParameter()) + return .failure(String.bridgeJSStackPop(), Int.bridgeJSStackPop()) default: fatalError("Unknown API.NetworkingResult case ID: \(caseId)") } @@ -2178,11 +2178,11 @@ extension API.NetworkingResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .success(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .failure(let param0, let param1): - param0.bridgeJSLowerStackReturn() - param1.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() + param1.bridgeJSStackPush() return Int32(1) } } @@ -2192,17 +2192,17 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> AllTypesResult { switch caseId { case 0: - return .structPayload(Address.bridgeJSLiftParameter()) + return .structPayload(Address.bridgeJSStackPop()) case 1: - return .classPayload(Greeter.bridgeJSLiftParameter()) + return .classPayload(Greeter.bridgeJSStackPop()) case 2: - return .jsObjectPayload(JSObject.bridgeJSLiftParameter()) + return .jsObjectPayload(JSObject.bridgeJSStackPop()) case 3: - return .nestedEnum(APIResult.bridgeJSLiftParameter()) + return .nestedEnum(APIResult.bridgeJSStackPop()) case 4: - return .arrayPayload([Int].bridgeJSLiftParameter()) + return .arrayPayload([Int].bridgeJSStackPop()) case 5: - return .jsClassPayload(Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter())) + return .jsClassPayload(Foo(unsafelyWrapping: JSObject.bridgeJSStackPop())) case 6: return .empty default: @@ -2213,22 +2213,22 @@ extension AllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .structPayload(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(0) case .classPayload(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .jsObjectPayload(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(2) case .nestedEnum(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(3) case .arrayPayload(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(4) case .jsClassPayload(let param0): - param0.jsObject.bridgeJSLowerStackReturn() + param0.jsObject.bridgeJSStackPush() return Int32(5) case .empty: return Int32(6) @@ -2240,13 +2240,13 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> TypedPayloadResult { switch caseId { case 0: - return .precision(Precision.bridgeJSLiftParameter()) + return .precision(Precision.bridgeJSStackPop()) case 1: - return .direction(Direction.bridgeJSLiftParameter()) + return .direction(Direction.bridgeJSStackPop()) case 2: - return .optPrecision(Optional.bridgeJSLiftParameter()) + return .optPrecision(Optional.bridgeJSStackPop()) case 3: - return .optDirection(Optional.bridgeJSLiftParameter()) + return .optDirection(Optional.bridgeJSStackPop()) case 4: return .empty default: @@ -2257,22 +2257,22 @@ extension TypedPayloadResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .precision(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(0) case .direction(let param0): - param0.bridgeJSLowerStackReturn() + param0.bridgeJSStackPush() return Int32(1) case .optPrecision(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optDirection(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) @@ -2591,17 +2591,17 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> OptionalAllTypesResult { switch caseId { case 0: - return .optStruct(Optional
        .bridgeJSLiftParameter()) + return .optStruct(Optional
        .bridgeJSStackPop()) case 1: - return .optClass(Optional.bridgeJSLiftParameter()) + return .optClass(Optional.bridgeJSStackPop()) case 2: - return .optJSObject(Optional.bridgeJSLiftParameter()) + return .optJSObject(Optional.bridgeJSStackPop()) case 3: - return .optNestedEnum(Optional.bridgeJSLiftParameter()) + return .optNestedEnum(Optional.bridgeJSStackPop()) case 4: - return .optArray(Optional<[Int]>.bridgeJSLiftParameter()) + return .optArray(Optional<[Int]>.bridgeJSStackPop()) case 5: - return .optJsClass(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) + return .optJsClass(Optional.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }) case 6: return .empty default: @@ -2612,36 +2612,36 @@ extension OptionalAllTypesResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPushPayload() -> Int32 { switch self { case .optStruct(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(0) case .optClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(1) case .optJSObject(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(2) case .optNestedEnum(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(3) case .optArray(let param0): - param0.bridgeJSLowerReturn() + param0.bridgeJSStackPush() return Int32(4) case .optJsClass(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.jsObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(5) @@ -2655,11 +2655,11 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPopPayload(_ caseId: Int32) -> APIOptionalResult { switch caseId { case 0: - return .success(Optional.bridgeJSLiftParameter()) + return .success(Optional.bridgeJSStackPop()) case 1: - return .failure(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + return .failure(Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop()) case 2: - return .status(Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter(), Optional.bridgeJSLiftParameter()) + return .status(Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop(), Optional.bridgeJSStackPop()) default: fatalError("Unknown APIOptionalResult case ID: \(caseId)") } @@ -2670,36 +2670,36 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { case .success(let param0): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) return Int32(0) case .failure(let param0, let param1): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) return Int32(1) case .status(let param0, let param1, let param2): let __bjs_isSome_param0 = param0 != nil if let __bjs_unwrapped_param0 = param0 { - __bjs_unwrapped_param0.bridgeJSLowerStackReturn() + __bjs_unwrapped_param0.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param0 ? 1 : 0) let __bjs_isSome_param1 = param1 != nil if let __bjs_unwrapped_param1 = param1 { - __bjs_unwrapped_param1.bridgeJSLowerStackReturn() + __bjs_unwrapped_param1.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param1 ? 1 : 0) let __bjs_isSome_param2 = param2 != nil if let __bjs_unwrapped_param2 = param2 { - __bjs_unwrapped_param2.bridgeJSLowerStackReturn() + __bjs_unwrapped_param2.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_param2 ? 1 : 0) return Int32(2) @@ -2708,15 +2708,15 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } extension Point: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Point { - let y = Int.bridgeJSLiftParameter() - let x = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { + let y = Int.bridgeJSStackPop() + let x = Int.bridgeJSStackPop() return Point(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -2724,12 +2724,12 @@ extension Point: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Point())) } } @@ -2753,21 +2753,21 @@ fileprivate func _bjs_struct_lift_Point() -> Int32 { #endif extension PointerFields: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PointerFields { - let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter() - let ptr = UnsafePointer.bridgeJSLiftParameter() - let opaque = OpaquePointer.bridgeJSLiftParameter() - let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter() - let raw = UnsafeRawPointer.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PointerFields { + let mutPtr = UnsafeMutablePointer.bridgeJSStackPop() + let ptr = UnsafePointer.bridgeJSStackPop() + let opaque = OpaquePointer.bridgeJSStackPop() + let mutRaw = UnsafeMutableRawPointer.bridgeJSStackPop() + let raw = UnsafeRawPointer.bridgeJSStackPop() return PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.raw.bridgeJSLowerStackReturn() - self.mutRaw.bridgeJSLowerStackReturn() - self.opaque.bridgeJSLowerStackReturn() - self.ptr.bridgeJSLowerStackReturn() - self.mutPtr.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.raw.bridgeJSStackPush() + self.mutRaw.bridgeJSStackPush() + self.opaque.bridgeJSStackPush() + self.ptr.bridgeJSStackPush() + self.mutPtr.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -2775,12 +2775,12 @@ extension PointerFields: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PointerFields())) } } @@ -2815,27 +2815,27 @@ public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: Un } extension DataPoint: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> DataPoint { - let optFlag = Optional.bridgeJSLiftParameter() - let optCount = Optional.bridgeJSLiftParameter() - let label = String.bridgeJSLiftParameter() - let y = Double.bridgeJSLiftParameter() - let x = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> DataPoint { + let optFlag = Optional.bridgeJSStackPop() + let optCount = Optional.bridgeJSStackPop() + let label = String.bridgeJSStackPop() + let y = Double.bridgeJSStackPop() + let x = Double.bridgeJSStackPop() return DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() - self.label.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() + self.label.bridgeJSStackPush() let __bjs_isSome_optCount = self.optCount != nil if let __bjs_unwrapped_optCount = self.optCount { - __bjs_unwrapped_optCount.bridgeJSLowerStackReturn() + __bjs_unwrapped_optCount.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optCount ? 1 : 0) let __bjs_isSome_optFlag = self.optFlag != nil if let __bjs_unwrapped_optFlag = self.optFlag { - __bjs_unwrapped_optFlag.bridgeJSLowerStackReturn() + __bjs_unwrapped_optFlag.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optFlag ? 1 : 0) } @@ -2845,12 +2845,12 @@ extension DataPoint: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_DataPoint())) } } @@ -2885,15 +2885,15 @@ public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, } extension PublicPoint: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> PublicPoint { - let y = Int.bridgeJSLiftParameter() - let x = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PublicPoint { + let y = Int.bridgeJSStackPop() + let x = Int.bridgeJSStackPop() return PublicPoint(x: x, y: y) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() - self.y.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() + self.y.bridgeJSStackPush() } public init(unsafelyCopying jsObject: JSObject) { @@ -2901,12 +2901,12 @@ extension PublicPoint: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } public func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PublicPoint())) } } @@ -2941,19 +2941,19 @@ public func _bjs_PublicPoint_init(_ x: Int32, _ y: Int32) -> Void { } extension Address: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Address { - let zipCode = Optional.bridgeJSLiftParameter() - let city = String.bridgeJSLiftParameter() - let street = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address { + let zipCode = Optional.bridgeJSStackPop() + let city = String.bridgeJSStackPop() + let street = String.bridgeJSStackPop() return Address(street: street, city: city, zipCode: zipCode) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.street.bridgeJSLowerStackReturn() - self.city.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.street.bridgeJSStackPush() + self.city.bridgeJSStackPush() let __bjs_isSome_zipCode = self.zipCode != nil if let __bjs_unwrapped_zipCode = self.zipCode { - __bjs_unwrapped_zipCode.bridgeJSLowerStackReturn() + __bjs_unwrapped_zipCode.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_zipCode ? 1 : 0) } @@ -2963,12 +2963,12 @@ extension Address: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Address())) } } @@ -2992,25 +2992,25 @@ fileprivate func _bjs_struct_lift_Address() -> Int32 { #endif extension Contact: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Contact { - let secondaryAddress = Optional
        .bridgeJSLiftParameter() - let email = Optional.bridgeJSLiftParameter() - let address = Address.bridgeJSLiftParameter() - let age = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Contact { + let secondaryAddress = Optional
        .bridgeJSStackPop() + let email = Optional.bridgeJSStackPop() + let address = Address.bridgeJSStackPop() + let age = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return Contact(name: name, age: age, address: address, email: email, secondaryAddress: secondaryAddress) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.age.bridgeJSLowerStackReturn() - self.address.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.age.bridgeJSStackPush() + self.address.bridgeJSStackPush() let __bjs_isSome_email = self.email != nil if let __bjs_unwrapped_email = self.email { - __bjs_unwrapped_email.bridgeJSLowerStackReturn() + __bjs_unwrapped_email.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_email ? 1 : 0) - self.secondaryAddress.bridgeJSLowerReturn() + self.secondaryAddress.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3018,12 +3018,12 @@ extension Contact: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Contact())) } } @@ -3047,27 +3047,27 @@ fileprivate func _bjs_struct_lift_Contact() -> Int32 { #endif extension Config: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> Config { - let status = Status.bridgeJSLiftParameter() - let direction = Optional.bridgeJSLiftParameter() - let theme = Optional.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Config { + let status = Status.bridgeJSStackPop() + let direction = Optional.bridgeJSStackPop() + let theme = Optional.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return Config(name: name, theme: theme, direction: direction, status: status) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() let __bjs_isSome_theme = self.theme != nil if let __bjs_unwrapped_theme = self.theme { - __bjs_unwrapped_theme.bridgeJSLowerStackReturn() + __bjs_unwrapped_theme.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_theme ? 1 : 0) let __bjs_isSome_direction = self.direction != nil if let __bjs_unwrapped_direction = self.direction { - __bjs_unwrapped_direction.bridgeJSLowerStackReturn() + __bjs_unwrapped_direction.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_direction ? 1 : 0) - self.status.bridgeJSLowerStackReturn() + self.status.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3075,12 +3075,12 @@ extension Config: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_Config())) } } @@ -3104,17 +3104,17 @@ fileprivate func _bjs_struct_lift_Config() -> Int32 { #endif extension SessionData: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> SessionData { - let owner = Optional.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> SessionData { + let owner = Optional.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return SessionData(id: id, owner: owner) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() let __bjs_isSome_owner = self.owner != nil if let __bjs_unwrapped_owner = self.owner { - __bjs_unwrapped_owner.bridgeJSLowerStackReturn() + __bjs_unwrapped_owner.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_owner ? 1 : 0) } @@ -3124,12 +3124,12 @@ extension SessionData: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_SessionData())) } } @@ -3153,25 +3153,25 @@ fileprivate func _bjs_struct_lift_SessionData() -> Int32 { #endif extension ValidationReport: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ValidationReport { - let outcome = Optional.bridgeJSLiftParameter() - let status = Optional.bridgeJSLiftParameter() - let result = APIResult.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ValidationReport { + let outcome = Optional.bridgeJSStackPop() + let status = Optional.bridgeJSStackPop() + let result = APIResult.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return ValidationReport(id: id, result: result, status: status, outcome: outcome) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() - self.result.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() + self.result.bridgeJSStackPush() let __bjs_isSome_status = self.status != nil if let __bjs_unwrapped_status = self.status { - __bjs_unwrapped_status.bridgeJSLowerStackReturn() + __bjs_unwrapped_status.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_status ? 1 : 0) let __bjs_isSome_outcome = self.outcome != nil if let __bjs_unwrapped_outcome = self.outcome { - __bjs_unwrapped_outcome.bridgeJSLowerStackReturn() + __bjs_unwrapped_outcome.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_outcome ? 1 : 0) } @@ -3181,12 +3181,12 @@ extension ValidationReport: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ValidationReport())) } } @@ -3210,39 +3210,39 @@ fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { #endif extension AdvancedConfig: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> AdvancedConfig { - let overrideDefaults = Optional.bridgeJSLiftParameter() - let defaults = ConfigStruct.bridgeJSLiftParameter() - let location = Optional.bridgeJSLiftParameter() - let metadata = Optional.bridgeJSLiftParameter() - let result = Optional.bridgeJSLiftParameter() - let status = Status.bridgeJSLiftParameter() - let theme = Theme.bridgeJSLiftParameter() - let enabled = Bool.bridgeJSLiftParameter() - let title = String.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> AdvancedConfig { + let overrideDefaults = Optional.bridgeJSStackPop() + let defaults = ConfigStruct.bridgeJSStackPop() + let location = Optional.bridgeJSStackPop() + let metadata = Optional.bridgeJSStackPop() + let result = Optional.bridgeJSStackPop() + let status = Status.bridgeJSStackPop() + let theme = Theme.bridgeJSStackPop() + let enabled = Bool.bridgeJSStackPop() + let title = String.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return AdvancedConfig(id: id, title: title, enabled: enabled, theme: theme, status: status, result: result, metadata: metadata, location: location, defaults: defaults, overrideDefaults: overrideDefaults) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() - self.title.bridgeJSLowerStackReturn() - self.enabled.bridgeJSLowerStackReturn() - self.theme.bridgeJSLowerStackReturn() - self.status.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() + self.title.bridgeJSStackPush() + self.enabled.bridgeJSStackPush() + self.theme.bridgeJSStackPush() + self.status.bridgeJSStackPush() let __bjs_isSome_result = self.result != nil if let __bjs_unwrapped_result = self.result { - __bjs_unwrapped_result.bridgeJSLowerStackReturn() + __bjs_unwrapped_result.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_result ? 1 : 0) let __bjs_isSome_metadata = self.metadata != nil if let __bjs_unwrapped_metadata = self.metadata { - __bjs_unwrapped_metadata.bridgeJSLowerStackReturn() + __bjs_unwrapped_metadata.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_metadata ? 1 : 0) - self.location.bridgeJSLowerReturn() - self.defaults.bridgeJSLowerReturn() - self.overrideDefaults.bridgeJSLowerReturn() + self.location.bridgeJSStackPush() + self.defaults.bridgeJSStackPush() + self.overrideDefaults.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3250,12 +3250,12 @@ extension AdvancedConfig: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_AdvancedConfig())) } } @@ -3279,25 +3279,25 @@ fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { #endif extension MeasurementConfig: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MeasurementConfig { - let optionalRatio = Optional.bridgeJSLiftParameter() - let optionalPrecision = Optional.bridgeJSLiftParameter() - let ratio = Ratio.bridgeJSLiftParameter() - let precision = Precision.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MeasurementConfig { + let optionalRatio = Optional.bridgeJSStackPop() + let optionalPrecision = Optional.bridgeJSStackPop() + let ratio = Ratio.bridgeJSStackPop() + let precision = Precision.bridgeJSStackPop() return MeasurementConfig(precision: precision, ratio: ratio, optionalPrecision: optionalPrecision, optionalRatio: optionalRatio) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.precision.bridgeJSLowerStackReturn() - self.ratio.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.precision.bridgeJSStackPush() + self.ratio.bridgeJSStackPush() let __bjs_isSome_optionalPrecision = self.optionalPrecision != nil if let __bjs_unwrapped_optionalPrecision = self.optionalPrecision { - __bjs_unwrapped_optionalPrecision.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalPrecision.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalPrecision ? 1 : 0) let __bjs_isSome_optionalRatio = self.optionalRatio != nil if let __bjs_unwrapped_optionalRatio = self.optionalRatio { - __bjs_unwrapped_optionalRatio.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalRatio.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalRatio ? 1 : 0) } @@ -3307,12 +3307,12 @@ extension MeasurementConfig: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MeasurementConfig())) } } @@ -3336,13 +3336,13 @@ fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { #endif extension MathOperations: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> MathOperations { - let baseValue = Double.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations { + let baseValue = Double.bridgeJSStackPop() return MathOperations(baseValue: baseValue) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.baseValue.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.baseValue.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3350,12 +3350,12 @@ extension MathOperations: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_MathOperations())) } } @@ -3423,17 +3423,17 @@ public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> F } extension CopyableCart: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCart { - let note = Optional.bridgeJSLiftParameter() - let x = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCart { + let note = Optional.bridgeJSStackPop() + let x = Int.bridgeJSStackPop() return CopyableCart(x: x, note: note) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.x.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.x.bridgeJSStackPush() let __bjs_isSome_note = self.note != nil if let __bjs_unwrapped_note = self.note { - __bjs_unwrapped_note.bridgeJSLowerStackReturn() + __bjs_unwrapped_note.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_note ? 1 : 0) } @@ -3443,12 +3443,12 @@ extension CopyableCart: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCart())) } } @@ -3483,15 +3483,15 @@ public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void { } extension CopyableCartItem: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableCartItem { - let quantity = Int.bridgeJSLiftParameter() - let sku = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableCartItem { + let quantity = Int.bridgeJSStackPop() + let sku = String.bridgeJSStackPop() return CopyableCartItem(sku: sku, quantity: quantity) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.sku.bridgeJSLowerStackReturn() - self.quantity.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.sku.bridgeJSStackPush() + self.quantity.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3499,12 +3499,12 @@ extension CopyableCartItem: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableCartItem())) } } @@ -3528,17 +3528,17 @@ fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { #endif extension CopyableNestedCart: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> CopyableNestedCart { - let shippingAddress = Optional
        .bridgeJSLiftParameter() - let item = CopyableCartItem.bridgeJSLiftParameter() - let id = Int.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableNestedCart { + let shippingAddress = Optional
        .bridgeJSStackPop() + let item = CopyableCartItem.bridgeJSStackPop() + let id = Int.bridgeJSStackPop() return CopyableNestedCart(id: id, item: item, shippingAddress: shippingAddress) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.id.bridgeJSLowerStackReturn() - self.item.bridgeJSLowerReturn() - self.shippingAddress.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.id.bridgeJSStackPush() + self.item.bridgeJSStackPush() + self.shippingAddress.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3546,12 +3546,12 @@ extension CopyableNestedCart: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_CopyableNestedCart())) } } @@ -3586,15 +3586,15 @@ public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void } extension ConfigStruct: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ConfigStruct { - let value = Int.bridgeJSLiftParameter() - let name = String.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ConfigStruct { + let value = Int.bridgeJSStackPop() + let name = String.bridgeJSStackPop() return ConfigStruct(name: name, value: value) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.name.bridgeJSLowerStackReturn() - self.value.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.name.bridgeJSStackPush() + self.value.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3602,12 +3602,12 @@ extension ConfigStruct: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ConfigStruct())) } } @@ -3695,17 +3695,17 @@ public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { } extension JSObjectContainer: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> JSObjectContainer { - let optionalObject = Optional.bridgeJSLiftParameter() - let object = JSObject.bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSObjectContainer { + let optionalObject = Optional.bridgeJSStackPop() + let object = JSObject.bridgeJSStackPop() return JSObjectContainer(object: object, optionalObject: optionalObject) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.object.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.object.bridgeJSStackPush() let __bjs_isSome_optionalObject = self.optionalObject != nil if let __bjs_unwrapped_optionalObject = self.optionalObject { - __bjs_unwrapped_optionalObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalObject ? 1 : 0) } @@ -3715,12 +3715,12 @@ extension JSObjectContainer: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSObjectContainer())) } } @@ -3744,17 +3744,17 @@ fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 { #endif extension FooContainer: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> FooContainer { - let optionalFoo = Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) } - let foo = Foo(unsafelyWrapping: JSObject.bridgeJSLiftParameter()) + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> FooContainer { + let optionalFoo = Optional.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) } + let foo = Foo(unsafelyWrapping: JSObject.bridgeJSStackPop()) return FooContainer(foo: foo, optionalFoo: optionalFoo) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.foo.jsObject.bridgeJSLowerStackReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.foo.jsObject.bridgeJSStackPush() let __bjs_isSome_optionalFoo = self.optionalFoo != nil if let __bjs_unwrapped_optionalFoo = self.optionalFoo { - __bjs_unwrapped_optionalFoo.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_optionalFoo.jsObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_optionalFoo ? 1 : 0) } @@ -3764,12 +3764,12 @@ extension FooContainer: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_FooContainer())) } } @@ -3793,15 +3793,15 @@ fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { #endif extension ArrayMembers: _BridgedSwiftStruct { - @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter() -> ArrayMembers { - let optStrings = Optional<[String]>.bridgeJSLiftParameter() - let ints = [Int].bridgeJSLiftParameter() + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ArrayMembers { + let optStrings = Optional<[String]>.bridgeJSStackPop() + let ints = [Int].bridgeJSStackPop() return ArrayMembers(ints: ints, optStrings: optStrings) } - @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() { - self.ints.bridgeJSLowerReturn() - self.optStrings.bridgeJSLowerReturn() + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.ints.bridgeJSStackPush() + self.optStrings.bridgeJSStackPush() } init(unsafelyCopying jsObject: JSObject) { @@ -3809,12 +3809,12 @@ extension ArrayMembers: _BridgedSwiftStruct { defer { _swift_js_struct_cleanup(__bjs_cleanupId) } - self = Self.bridgeJSLiftParameter() + self = Self.bridgeJSStackPop() } func toJSObject() -> JSObject { let __bjs_self = self - __bjs_self.bridgeJSLowerReturn() + __bjs_self.bridgeJSStackPush() return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_ArrayMembers())) } } @@ -3841,7 +3841,7 @@ fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 { @_cdecl("bjs_ArrayMembers_sumValues") public func _bjs_ArrayMembers_sumValues() -> Int32 { #if arch(wasm32) - let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSLiftParameter()) + let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -3852,7 +3852,7 @@ public func _bjs_ArrayMembers_sumValues() -> Int32 { @_cdecl("bjs_ArrayMembers_firstString") public func _bjs_ArrayMembers_firstString() -> Void { #if arch(wasm32) - let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSLiftParameter()) + let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4060,8 +4060,8 @@ public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vP @_cdecl("bjs_roundTripJSValueArray") public func _bjs_roundTripJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripJSValueArray(v: [JSValue].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripJSValueArray(v: [JSValue].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -4072,7 +4072,7 @@ public func _bjs_roundTripJSValueArray() -> Void { public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) let ret = roundTripOptionalJSValueArray(v: Optional<[JSValue]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5079,7 +5079,7 @@ public func _bjs_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutab @_cdecl("bjs_arrayWithDefault") public func _bjs_arrayWithDefault() -> Int32 { #if arch(wasm32) - let ret = arrayWithDefault(_: [Int].bridgeJSLiftParameter()) + let ret = arrayWithDefault(_: [Int].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5101,7 +5101,7 @@ public func _bjs_arrayWithOptionalDefault() -> Int32 { @_cdecl("bjs_arrayMixedDefaults") public func _bjs_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSLiftParameter(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let ret = arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSStackPop(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5145,8 +5145,8 @@ public func _bjs_makeAdder(_ base: Int32) -> Int32 { @_cdecl("bjs_roundTripIntArray") public func _bjs_roundTripIntArray() -> Void { #if arch(wasm32) - let ret = roundTripIntArray(_: [Int].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripIntArray(_: [Int].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5156,8 +5156,8 @@ public func _bjs_roundTripIntArray() -> Void { @_cdecl("bjs_roundTripStringArray") public func _bjs_roundTripStringArray() -> Void { #if arch(wasm32) - let ret = roundTripStringArray(_: [String].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripStringArray(_: [String].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5167,8 +5167,8 @@ public func _bjs_roundTripStringArray() -> Void { @_cdecl("bjs_roundTripDoubleArray") public func _bjs_roundTripDoubleArray() -> Void { #if arch(wasm32) - let ret = roundTripDoubleArray(_: [Double].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripDoubleArray(_: [Double].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5178,8 +5178,8 @@ public func _bjs_roundTripDoubleArray() -> Void { @_cdecl("bjs_roundTripBoolArray") public func _bjs_roundTripBoolArray() -> Void { #if arch(wasm32) - let ret = roundTripBoolArray(_: [Bool].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripBoolArray(_: [Bool].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5189,8 +5189,8 @@ public func _bjs_roundTripBoolArray() -> Void { @_cdecl("bjs_roundTripDirectionArray") public func _bjs_roundTripDirectionArray() -> Void { #if arch(wasm32) - let ret = roundTripDirectionArray(_: [Direction].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripDirectionArray(_: [Direction].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5200,8 +5200,8 @@ public func _bjs_roundTripDirectionArray() -> Void { @_cdecl("bjs_roundTripStatusArray") public func _bjs_roundTripStatusArray() -> Void { #if arch(wasm32) - let ret = roundTripStatusArray(_: [Status].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripStatusArray(_: [Status].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5211,8 +5211,8 @@ public func _bjs_roundTripStatusArray() -> Void { @_cdecl("bjs_roundTripThemeArray") public func _bjs_roundTripThemeArray() -> Void { #if arch(wasm32) - let ret = roundTripThemeArray(_: [Theme].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripThemeArray(_: [Theme].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5222,8 +5222,8 @@ public func _bjs_roundTripThemeArray() -> Void { @_cdecl("bjs_roundTripHttpStatusArray") public func _bjs_roundTripHttpStatusArray() -> Void { #if arch(wasm32) - let ret = roundTripHttpStatusArray(_: [HttpStatus].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripHttpStatusArray(_: [HttpStatus].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5233,8 +5233,8 @@ public func _bjs_roundTripHttpStatusArray() -> Void { @_cdecl("bjs_roundTripDataPointArray") public func _bjs_roundTripDataPointArray() -> Void { #if arch(wasm32) - let ret = roundTripDataPointArray(_: [DataPoint].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripDataPointArray(_: [DataPoint].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5244,8 +5244,8 @@ public func _bjs_roundTripDataPointArray() -> Void { @_cdecl("bjs_roundTripGreeterArray") public func _bjs_roundTripGreeterArray() -> Void { #if arch(wasm32) - let ret = roundTripGreeterArray(_: [Greeter].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripGreeterArray(_: [Greeter].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5260,7 +5260,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -5268,7 +5268,7 @@ public func _bjs_roundTripOptionalIntArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -5287,7 +5287,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -5295,7 +5295,7 @@ public func _bjs_roundTripOptionalStringArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -5314,13 +5314,13 @@ public func _bjs_roundTripOptionalDataPointArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result }()) for __bjs_elem_ret in ret { - __bjs_elem_ret.bridgeJSLowerReturn() + __bjs_elem_ret.bridgeJSStackPush() } _swift_js_push_i32(Int32(ret.count)) #else @@ -5337,7 +5337,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -5345,7 +5345,7 @@ public func _bjs_roundTripOptionalDirectionArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -5364,7 +5364,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -5372,7 +5372,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -5387,7 +5387,7 @@ public func _bjs_roundTripOptionalStatusArray() -> Void { public func _bjs_roundTripOptionalIntArrayType() -> Void { #if arch(wasm32) let ret = roundTripOptionalIntArrayType(_: Optional<[Int]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5398,7 +5398,7 @@ public func _bjs_roundTripOptionalIntArrayType() -> Void { public func _bjs_roundTripOptionalStringArrayType() -> Void { #if arch(wasm32) let ret = roundTripOptionalStringArrayType(_: Optional<[String]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5409,7 +5409,7 @@ public func _bjs_roundTripOptionalStringArrayType() -> Void { public func _bjs_roundTripOptionalGreeterArrayType() -> Void { #if arch(wasm32) let ret = roundTripOptionalGreeterArrayType(_: Optional<[Greeter]>.bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5419,8 +5419,8 @@ public func _bjs_roundTripOptionalGreeterArrayType() -> Void { @_cdecl("bjs_roundTripNestedIntArray") public func _bjs_roundTripNestedIntArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedIntArray(_: [[Int]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedIntArray(_: [[Int]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5430,8 +5430,8 @@ public func _bjs_roundTripNestedIntArray() -> Void { @_cdecl("bjs_roundTripNestedStringArray") public func _bjs_roundTripNestedStringArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedStringArray(_: [[String]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedStringArray(_: [[String]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5441,8 +5441,8 @@ public func _bjs_roundTripNestedStringArray() -> Void { @_cdecl("bjs_roundTripNestedDoubleArray") public func _bjs_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDoubleArray(_: [[Double]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedDoubleArray(_: [[Double]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5452,8 +5452,8 @@ public func _bjs_roundTripNestedDoubleArray() -> Void { @_cdecl("bjs_roundTripNestedBoolArray") public func _bjs_roundTripNestedBoolArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedBoolArray(_: [[Bool]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedBoolArray(_: [[Bool]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5463,8 +5463,8 @@ public func _bjs_roundTripNestedBoolArray() -> Void { @_cdecl("bjs_roundTripNestedDataPointArray") public func _bjs_roundTripNestedDataPointArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDataPointArray(_: [[DataPoint]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedDataPointArray(_: [[DataPoint]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5474,8 +5474,8 @@ public func _bjs_roundTripNestedDataPointArray() -> Void { @_cdecl("bjs_roundTripNestedDirectionArray") public func _bjs_roundTripNestedDirectionArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedDirectionArray(_: [[Direction]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedDirectionArray(_: [[Direction]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5485,8 +5485,8 @@ public func _bjs_roundTripNestedDirectionArray() -> Void { @_cdecl("bjs_roundTripNestedGreeterArray") public func _bjs_roundTripNestedGreeterArray() -> Void { #if arch(wasm32) - let ret = roundTripNestedGreeterArray(_: [[Greeter]].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripNestedGreeterArray(_: [[Greeter]].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5496,8 +5496,8 @@ public func _bjs_roundTripNestedGreeterArray() -> Void { @_cdecl("bjs_roundTripUnsafeRawPointerArray") public func _bjs_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5507,8 +5507,8 @@ public func _bjs_roundTripUnsafeRawPointerArray() -> Void { @_cdecl("bjs_roundTripUnsafeMutableRawPointerArray") public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5518,8 +5518,8 @@ public func _bjs_roundTripUnsafeMutableRawPointerArray() -> Void { @_cdecl("bjs_roundTripOpaquePointerArray") public func _bjs_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5529,8 +5529,8 @@ public func _bjs_roundTripOpaquePointerArray() -> Void { @_cdecl("bjs_roundTripUnsafePointerArray") public func _bjs_roundTripUnsafePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5540,8 +5540,8 @@ public func _bjs_roundTripUnsafePointerArray() -> Void { @_cdecl("bjs_roundTripUnsafeMutablePointerArray") public func _bjs_roundTripUnsafeMutablePointerArray() -> Void { #if arch(wasm32) - let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5551,7 +5551,7 @@ public func _bjs_roundTripUnsafeMutablePointerArray() -> Void { @_cdecl("bjs_consumeDataProcessorArrayType") public func _bjs_consumeDataProcessorArrayType() -> Int32 { #if arch(wasm32) - let ret = consumeDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) + let ret = consumeDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSStackPop()) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5562,8 +5562,8 @@ public func _bjs_consumeDataProcessorArrayType() -> Int32 { @_cdecl("bjs_roundTripDataProcessorArrayType") public func _bjs_roundTripDataProcessorArrayType() -> Void { #if arch(wasm32) - let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSLiftParameter()) - ret.map { $0 as! AnyDataProcessor }.bridgeJSLowerReturn() + let ret = roundTripDataProcessorArrayType(_: [AnyDataProcessor].bridgeJSStackPop()) + ret.map { $0 as! AnyDataProcessor }.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5573,8 +5573,8 @@ public func _bjs_roundTripDataProcessorArrayType() -> Void { @_cdecl("bjs_roundTripJSObjectArray") public func _bjs_roundTripJSObjectArray() -> Void { #if arch(wasm32) - let ret = roundTripJSObjectArray(_: [JSObject].bridgeJSLiftParameter()) - ret.bridgeJSLowerReturn() + let ret = roundTripJSObjectArray(_: [JSObject].bridgeJSStackPop()) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5589,7 +5589,7 @@ public func _bjs_roundTripOptionalJSObjectArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter()) + __result.append(Optional.bridgeJSStackPop()) } __result.reverse() return __result @@ -5597,7 +5597,7 @@ public func _bjs_roundTripOptionalJSObjectArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -5611,8 +5611,8 @@ public func _bjs_roundTripOptionalJSObjectArray() -> Void { @_cdecl("bjs_roundTripFooArray") public func _bjs_roundTripFooArray() -> Void { #if arch(wasm32) - let ret = roundTripFooArray(_: [JSObject].bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) - ret.map { $0.jsObject }.bridgeJSLowerReturn() + let ret = roundTripFooArray(_: [JSObject].bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }) + ret.map { $0.jsObject }.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif @@ -5627,7 +5627,7 @@ public func _bjs_roundTripOptionalFooArray() -> Void { var __result: [Optional] = [] __result.reserveCapacity(__count) for _ in 0..<__count { - __result.append(Optional.bridgeJSLiftParameter().map { Foo(unsafelyWrapping: $0) }) + __result.append(Optional.bridgeJSStackPop().map { Foo(unsafelyWrapping: $0) }) } __result.reverse() return __result @@ -5635,7 +5635,7 @@ public func _bjs_roundTripOptionalFooArray() -> Void { for __bjs_elem_ret in ret { let __bjs_isSome_ret_elem = __bjs_elem_ret != nil if let __bjs_unwrapped_ret_elem = __bjs_elem_ret { - __bjs_unwrapped_ret_elem.jsObject.bridgeJSLowerStackReturn() + __bjs_unwrapped_ret_elem.jsObject.bridgeJSStackPush() } _swift_js_push_i32(__bjs_isSome_ret_elem ? 1 : 0) } @@ -6148,7 +6148,7 @@ public func _bjs_roundTripArrayMembers() -> Void { @_cdecl("bjs_arrayMembersSum") public func _bjs_arrayMembersSum() -> Int32 { #if arch(wasm32) - let _tmp_values = [Int].bridgeJSLiftParameter() + let _tmp_values = [Int].bridgeJSStackPop() let _tmp_value = ArrayMembers.bridgeJSLiftParameter() let ret = arrayMembersSum(_: _tmp_value, _: _tmp_values) return ret.bridgeJSLowerReturn() @@ -6161,7 +6161,7 @@ public func _bjs_arrayMembersSum() -> Int32 { @_cdecl("bjs_arrayMembersFirst") public func _bjs_arrayMembersFirst() -> Void { #if arch(wasm32) - let _tmp_values = [String].bridgeJSLiftParameter() + let _tmp_values = [String].bridgeJSStackPop() let _tmp_value = ArrayMembers.bridgeJSLiftParameter() let ret = arrayMembersFirst(_: _tmp_value, _: _tmp_values) return ret.bridgeJSLowerReturn() From e9855d1f63682acdd049243b544fb7daeb779553 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 11:01:22 +0900 Subject: [PATCH 218/252] BridgeJS: Fix double-release of JSObject when passing a `JSObject?` JS->Swift --- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ffb50c7a8..99afffd73 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -931,11 +931,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") } printer.write("}") - cleanupCode.write("if (\(idVar) !== undefined) {") - cleanupCode.indent { - cleanupCode.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanupCode.write("}") return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0"] default: return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] From 18d56d8071510844d479afd809daaedc70edd81d Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 11:06:40 +0900 Subject: [PATCH 219/252] [NFC] BridgeJS: Move optional support test imports to their own JS class --- .../Generated/BridgeJS.swift | 88 +++++----- .../Generated/JavaScript/BridgeJS.json | 164 ++++++++++-------- .../JavaScript/OptionalSupportTests.mjs | 25 +++ .../OptionalSupportTests.swift | 63 ++++--- Tests/prelude.mjs | 14 +- 5 files changed, 190 insertions(+), 164 deletions(-) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 91dd822c1..de56d7306 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -10147,93 +10147,93 @@ func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runJsOptionalSupportTests") -fileprivate func bjs_runJsOptionalSupportTests() -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static") +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_runJsOptionalSupportTests() -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -func _$runJsOptionalSupportTests() throws(JSException) -> Void { - bjs_runJsOptionalSupportTests() - if let error = _swift_js_take_exception() { - throw error - } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static") +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +#else +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") } +#endif #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberNull") -fileprivate func bjs_jsRoundTripOptionalNumberNull(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static") +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void #else -fileprivate func bjs_jsRoundTripOptionalNumberNull(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -func _$jsRoundTripOptionalNumberNull(_ value: Optional) throws(JSException) -> Optional { - let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalNumberNull(valueIsSome, valueValue) - if let error = _swift_js_take_exception() { - throw error - } - return Optional.bridgeJSLiftReturnFromSideChannel() +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static") +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void +#else +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { + fatalError("Only available on WebAssembly") } +#endif #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalNumberUndefined") -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_runJsOptionalSupportTests_static") +fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static() -> Void #else -fileprivate func bjs_jsRoundTripOptionalNumberUndefined(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static() -> Void { fatalError("Only available on WebAssembly") } #endif -func _$jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { +func _$OptionalSupportImports_jsRoundTripOptionalNumberNull(_ value: Optional) throws(JSException) -> Optional { let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalNumberUndefined(valueIsSome, valueValue) + bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(valueIsSome, valueValue) if let error = _swift_js_take_exception() { throw error } - return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() + return Optional.bridgeJSLiftReturnFromSideChannel() } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalStringNull") -fileprivate func bjs_jsRoundTripOptionalStringNull(_ nameIsSome: Int32, _ nameValue: Int32) -> Void -#else -fileprivate func bjs_jsRoundTripOptionalStringNull(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { - fatalError("Only available on WebAssembly") +func _$OptionalSupportImports_jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { + let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() + bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(valueIsSome, valueValue) + if let error = _swift_js_take_exception() { + throw error + } + return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() } -#endif -func _$jsRoundTripOptionalStringNull(_ name: Optional) throws(JSException) -> Optional { +func _$OptionalSupportImports_jsRoundTripOptionalStringNull(_ name: Optional) throws(JSException) -> Optional { let (nameIsSome, nameValue) = name.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalStringNull(nameIsSome, nameValue) + bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(nameIsSome, nameValue) if let error = _swift_js_take_exception() { throw error } return Optional.bridgeJSLiftReturnFromSideChannel() } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalStringUndefined") -fileprivate func bjs_jsRoundTripOptionalStringUndefined(_ nameIsSome: Int32, _ nameValue: Int32) -> Void -#else -fileprivate func bjs_jsRoundTripOptionalStringUndefined(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { - fatalError("Only available on WebAssembly") -} -#endif - -func _$jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { +func _$OptionalSupportImports_jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { let (nameIsSome, nameValue) = name.bridgeJSLowerParameter() - bjs_jsRoundTripOptionalStringUndefined(nameIsSome, nameValue) + bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(nameIsSome, nameValue) if let error = _swift_js_take_exception() { throw error } return JSUndefinedOr.bridgeJSLiftReturnFromSideChannel() } +func _$OptionalSupportImports_runJsOptionalSupportTests() throws(JSException) -> Void { + bjs_OptionalSupportImports_runJsOptionalSupportTests_static() + if let error = _swift_js_take_exception() { + throw error + } +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripGreeter_static") fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index fc650b37d..4cc153013 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -15266,23 +15266,39 @@ }, { "functions" : [ + + ], + "types" : [ { - "name" : "runJsOptionalSupportTests", - "parameters" : [ + "getters" : [ ], - "returnType" : { - "void" : { + "methods" : [ - } - } - }, - { - "name" : "jsRoundTripOptionalNumberNull", - "parameters" : [ + ], + "name" : "OptionalSupportImports", + "setters" : [ + + ], + "staticMethods" : [ { - "name" : "value", - "type" : { + "name" : "jsRoundTripOptionalNumberNull", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { "nullable" : { "_0" : { "int" : { @@ -15292,25 +15308,25 @@ "_1" : "null" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "int" : { + }, + { + "name" : "jsRoundTripOptionalNumberUndefined", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "int" : { + } + }, + "_1" : "undefined" + } + } } - }, - "_1" : "null" - } - } - }, - { - "name" : "jsRoundTripOptionalNumberUndefined", - "parameters" : [ - { - "name" : "value", - "type" : { + ], + "returnType" : { "nullable" : { "_0" : { "int" : { @@ -15320,25 +15336,25 @@ "_1" : "undefined" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "int" : { + }, + { + "name" : "jsRoundTripOptionalStringNull", + "parameters" : [ + { + "name" : "name", + "type" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "null" + } + } } - }, - "_1" : "undefined" - } - } - }, - { - "name" : "jsRoundTripOptionalStringNull", - "parameters" : [ - { - "name" : "name", - "type" : { + ], + "returnType" : { "nullable" : { "_0" : { "string" : { @@ -15348,25 +15364,25 @@ "_1" : "null" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "string" : { + }, + { + "name" : "jsRoundTripOptionalStringUndefined", + "parameters" : [ + { + "name" : "name", + "type" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "undefined" + } + } } - }, - "_1" : "null" - } - } - }, - { - "name" : "jsRoundTripOptionalStringUndefined", - "parameters" : [ - { - "name" : "name", - "type" : { + ], + "returnType" : { "nullable" : { "_0" : { "string" : { @@ -15376,22 +15392,20 @@ "_1" : "undefined" } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "string" : { + }, + { + "name" : "runJsOptionalSupportTests", + "parameters" : [ + + ], + "returnType" : { + "void" : { } - }, - "_1" : "undefined" + } } - } + ] } - ], - "types" : [ - ] }, { diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs index 8a856582d..518e4d79a 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs @@ -15,6 +15,31 @@ import { import { ImportedFoo } from './Types.mjs'; +/** + * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["OptionalSupportImports"]} + */ +export function getImports(importsContext) { + return { + jsRoundTripOptionalNumberNull: (v) => { + return v ?? null; + }, + jsRoundTripOptionalNumberUndefined: (v) => { + return v === undefined ? undefined : v; + }, + jsRoundTripOptionalStringNull: (v) => { + return v ?? null; + }, + jsRoundTripOptionalStringUndefined: (v) => { + return v === undefined ? undefined : v; + }, + runJsOptionalSupportTests: () => { + const exports = importsContext.getExports(); + if (!exports) { throw new Error("No exports!?"); } + runJsOptionalSupportTests(exports); + }, + }; +} + /** * Optional value bridging coverage for BridgeJS runtime tests. * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift index 998f8b90f..d0b5afad0 100644 --- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -2,61 +2,58 @@ import XCTest import JavaScriptKit import JavaScriptEventLoop -@JSFunction func runJsOptionalSupportTests() throws + +@JSClass struct OptionalSupportImports { + @JSFunction static func jsRoundTripOptionalNumberNull(_ value: Int?) throws -> Int? + @JSFunction static func jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws -> JSUndefinedOr + @JSFunction static func jsRoundTripOptionalStringNull(_ name: String?) throws -> String? + @JSFunction static func jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws -> JSUndefinedOr + + @JSFunction static func runJsOptionalSupportTests() throws(JSException) +} final class OptionalSupportTests: XCTestCase { func testRunJsOptionalSupportTests() throws { - try runJsOptionalSupportTests() + try OptionalSupportImports.runJsOptionalSupportTests() } - func testRoundTripOptionalStringNull() throws { - try XCTAssertEqual(jsRoundTripOptionalStringNull("hello"), "hello") - try XCTAssertNil(jsRoundTripOptionalStringNull(nil)) + private func roundTripTest(_ fn: (T?) throws -> T?, _ some: T) throws { + try XCTAssertNil(fn(nil)) + try XCTAssertEqual(fn(some), some) } - - func testRoundTripOptionalStringUndefined() throws { - let some = try jsRoundTripOptionalStringUndefined(.value("hi")) - switch some { + private func roundTripTest(_ fn: (JSUndefinedOr) throws -> JSUndefinedOr, _ some: T) throws { + let undefined = try fn(.undefined) + if case .value = undefined { + XCTFail("Expected undefined") + } + let value = try fn(.value(some)) + switch value { case .value(let value): - XCTAssertEqual(value, "hi") + XCTAssertEqual(value, some) case .undefined: XCTFail("Expected defined value") } + } - let undefined = try jsRoundTripOptionalStringUndefined(.undefined) - if case .value = undefined { - XCTFail("Expected undefined") - } + func testRoundTripOptionalStringNull() throws { + try roundTripTest(OptionalSupportImports.jsRoundTripOptionalStringNull, "hello") + } + + func testRoundTripOptionalStringUndefined() throws { + try roundTripTest(OptionalSupportImports.jsRoundTripOptionalStringUndefined, "hi") } func testRoundTripOptionalNumberNull() throws { - try XCTAssertEqual(jsRoundTripOptionalNumberNull(42), 42) - try XCTAssertNil(jsRoundTripOptionalNumberNull(nil)) + try roundTripTest(OptionalSupportImports.jsRoundTripOptionalNumberNull, 42) } func testRoundTripOptionalNumberUndefined() throws { - let some = try jsRoundTripOptionalNumberUndefined(.value(42)) - switch some { - case .value(let value): - XCTAssertEqual(value, 42) - case .undefined: - XCTFail("Expected defined value") - } - - let undefined = try jsRoundTripOptionalNumberUndefined(.undefined) - if case .value = undefined { - XCTFail("Expected undefined") - } + try roundTripTest(OptionalSupportImports.jsRoundTripOptionalNumberUndefined, 42) } } // MARK: - Optional Bridging -@JSFunction func jsRoundTripOptionalNumberNull(_ value: Int?) throws -> Int? -@JSFunction func jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws -> JSUndefinedOr -@JSFunction func jsRoundTripOptionalStringNull(_ name: String?) throws -> String? -@JSFunction func jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws -> JSUndefinedOr - @JS func roundTripOptionalString(name: String?) -> String? { name } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index ec37bdbc4..d40a2845c 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -7,6 +7,7 @@ import { ImportedFoo } from './BridgeJSRuntimeTests/JavaScript/Types.mjs'; import { runJsOptionalSupportTests } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; import { getImports as getClosureSupportImports } from './BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs'; import { getImports as getSwiftClassSupportImports } from './BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs'; +import { getImports as getOptionalSupportImports } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ export async function setupOptions(options, context) { @@ -90,18 +91,6 @@ export async function setupOptions(options, context) { "jsRoundTripUndefinedDictionary": (dict) => { return dict; }, - "jsRoundTripOptionalNumberNull": (v) => { - return v ?? null; - }, - "jsRoundTripOptionalNumberUndefined": (v) => { - return v === undefined ? undefined : v; - }, - "jsRoundTripOptionalStringNull": (v) => { - return v ?? null; - }, - "jsRoundTripOptionalStringUndefined": (v) => { - return v === undefined ? undefined : v; - }, "jsRoundTripJSValue": (v) => { return v; }, @@ -215,6 +204,7 @@ export async function setupOptions(options, context) { }, ClosureSupportImports: getClosureSupportImports(importsContext), SwiftClassSupportImports: getSwiftClassSupportImports(importsContext), + OptionalSupportImports: getOptionalSupportImports(importsContext), }; }, addToCoreImports(importObject, importsContext) { From 072b0d0f41ed39664212f2966e1d7f50c6dd2611 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 11:13:22 +0900 Subject: [PATCH 220/252] Tests: Cover a test case to kill JSObject? double-release --- .../Generated/BridgeJS.swift | 10 +++++++ .../Generated/JavaScript/BridgeJS.json | 30 +++++++++++++++++++ .../JavaScript/OptionalSupportTests.mjs | 2 ++ .../OptionalSupportTests.swift | 7 +++-- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index de56d7306..96ca9be2e 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -5843,6 +5843,16 @@ public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ re #endif } +@_expose(wasm, "bjs_takeOptionalJSObject") +@_cdecl("bjs_takeOptionalJSObject") +public func _bjs_takeOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + #if arch(wasm32) + takeOptionalJSObject(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_compareAPIResults") @_cdecl("bjs_compareAPIResults") public func _bjs_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 4cc153013..9c086c808 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -10564,6 +10564,36 @@ } } }, + { + "abiName" : "bjs_takeOptionalJSObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "takeOptionalJSObject", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "jsObject" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, { "abiName" : "bjs_compareAPIResults", "effects" : { diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs index 518e4d79a..58215560c 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs @@ -241,4 +241,6 @@ export function runJsOptionalSupportTests(exports) { assert.deepEqual(exports.roundTripOptionalPayloadResultOpt(oatr_empty), oatr_empty); assert.equal(exports.roundTripOptionalPayloadResultOpt(null), null); + exports.takeOptionalJSObject(null); + assert.doesNotThrow(() => exports.takeOptionalJSObject({ key: "value" })); } diff --git a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift index d0b5afad0..a99bb0bb1 100644 --- a/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/OptionalSupportTests.swift @@ -2,12 +2,13 @@ import XCTest import JavaScriptKit import JavaScriptEventLoop - @JSClass struct OptionalSupportImports { @JSFunction static func jsRoundTripOptionalNumberNull(_ value: Int?) throws -> Int? @JSFunction static func jsRoundTripOptionalNumberUndefined(_ value: JSUndefinedOr) throws -> JSUndefinedOr @JSFunction static func jsRoundTripOptionalStringNull(_ name: String?) throws -> String? - @JSFunction static func jsRoundTripOptionalStringUndefined(_ name: JSUndefinedOr) throws -> JSUndefinedOr + @JSFunction static func jsRoundTripOptionalStringUndefined( + _ name: JSUndefinedOr + ) throws -> JSUndefinedOr @JSFunction static func runJsOptionalSupportTests() throws(JSException) } @@ -127,6 +128,8 @@ typealias OptionalAge = Int? result } +@JS func takeOptionalJSObject(_ value: JSObject?) {} + @JS func compareAPIResults(_ r1: APIResult?, _ r2: APIResult?) -> String { let r1Str: String switch r1 { From 118db02a09ed0791204ddaea14a44519ed191d80 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 11:37:54 +0900 Subject: [PATCH 221/252] BridgeJS: Take ownership of source Uint8Array id in `swift_js_init_memory` (#635) This allows us to insert cleanup code for String parameter passing for JS -> Swift. --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 3 + .../Sources/BridgeJSLink/JSGlueGen.swift | 33 +---------- .../BridgeJSLinkTests/ArrayTypes.js | 12 +--- .../__Snapshots__/BridgeJSLinkTests/Async.js | 2 +- .../BridgeJSLinkTests/DefaultParameters.js | 28 +--------- .../BridgeJSLinkTests/DictionaryTypes.js | 22 +------- .../BridgeJSLinkTests/EnumAssociatedValue.js | 55 +++++-------------- .../BridgeJSLinkTests/EnumCase.js | 1 + .../BridgeJSLinkTests/EnumNamespace.Global.js | 1 + .../BridgeJSLinkTests/EnumNamespace.js | 1 + .../BridgeJSLinkTests/EnumRawType.js | 14 +---- .../BridgeJSLinkTests/GlobalGetter.js | 1 + .../BridgeJSLinkTests/GlobalThisImports.js | 1 + .../BridgeJSLinkTests/ImportArray.js | 1 + .../ImportedTypeInExportedInterface.js | 1 + .../BridgeJSLinkTests/InvalidPropertyNames.js | 1 + .../BridgeJSLinkTests/JSClass.js | 1 + .../JSClassStaticFunctions.js | 1 + .../BridgeJSLinkTests/JSValue.js | 1 + .../BridgeJSLinkTests/MixedGlobal.js | 1 + .../BridgeJSLinkTests/MixedModules.js | 1 + .../BridgeJSLinkTests/MixedPrivate.js | 1 + .../BridgeJSLinkTests/Namespaces.Global.js | 2 +- .../BridgeJSLinkTests/Namespaces.js | 2 +- .../BridgeJSLinkTests/Optionals.js | 37 +------------ .../BridgeJSLinkTests/PrimitiveParameters.js | 1 + .../BridgeJSLinkTests/PrimitiveReturn.js | 1 + .../BridgeJSLinkTests/PropertyTypes.js | 6 +- .../BridgeJSLinkTests/Protocol.js | 8 +-- .../StaticFunctions.Global.js | 6 +- .../BridgeJSLinkTests/StaticFunctions.js | 6 +- .../StaticProperties.Global.js | 9 +-- .../BridgeJSLinkTests/StaticProperties.js | 9 +-- .../BridgeJSLinkTests/StringParameter.js | 3 +- .../BridgeJSLinkTests/StringReturn.js | 1 + .../BridgeJSLinkTests/SwiftClass.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.js | 14 +---- .../BridgeJSLinkTests/SwiftClosureImports.js | 1 + .../BridgeJSLinkTests/SwiftStruct.js | 18 +----- .../BridgeJSLinkTests/SwiftStructImports.js | 1 + .../__Snapshots__/BridgeJSLinkTests/Throws.js | 1 + .../BridgeJSLinkTests/UnsafePointer.js | 1 + .../VoidParameterVoidReturn.js | 1 + .../JavaScriptKit/BridgeJSIntrinsics.swift | 6 ++ 44 files changed, 72 insertions(+), 249 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 44b6f0c38..b779e0171 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -297,6 +297,9 @@ public struct BridgeJSLink { printer.write( "const source = \(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).getObject(sourceId);" ) + printer.write( + "\(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).release(sourceId);" + ) printer.write( "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr);" ) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index ffb50c7a8..8082ea6c3 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -238,13 +238,12 @@ struct IntrinsicJSFragment: Sendable { static let stringLowerParameter = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let argument = arguments[0] let bytesLabel = scope.variable("\(argument)Bytes") let bytesIdLabel = scope.variable("\(argument)Id") printer.write("const \(bytesLabel) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(argument));") printer.write("const \(bytesIdLabel) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesLabel));") - cleanupCode.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(bytesIdLabel));") return [bytesIdLabel, "\(bytesLabel).length"] } ) @@ -840,12 +839,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") } printer.write("}") - cleanupCode.write("if (\(idVar) != undefined) {") - cleanupCode.indent { - cleanupCode.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanupCode.write("}") - return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0", "\(isSomeVar) ? \(bytesVar).length : 0"] case .jsValue: let lowered = try jsValueLower.printCode([value], context) @@ -1920,11 +1913,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if(\(idVar)) {") - cleanup.indent { - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") - } - cleanup.write("}") case .int, .uint: scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) @@ -1964,13 +1952,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if(\(idVar)) {") - cleanup.indent { - cleanup.write( - "\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));" - ) - } - cleanup.write("}") case .float: scope.emitPushF32Parameter("\(isSomeVar) ? Math.fround(\(value)) : 0.0", printer: printer) scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) @@ -2554,7 +2535,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") @@ -2562,7 +2543,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) scope.emitPushI32Parameter(idVar, printer: printer) - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [] } ) @@ -2632,7 +2612,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") @@ -2644,7 +2624,6 @@ struct IntrinsicJSFragment: Sendable { ) scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) scope.emitPushI32Parameter(idVar, printer: printer) - cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [] } ) @@ -3088,9 +3067,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write( - "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" - ) return [idVar] case .float: printer.write("if (\(isSomeVar)) {") @@ -3179,9 +3155,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write( - "if(\(idVar) !== undefined) { \(JSGlueVariableScope.reservedSwift).memory.release(\(idVar)); }" - ) return [idVar] } else if case .jsObject = wrappedType { let idVar = scope.variable("id") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 97531d378..52438d27d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -71,6 +71,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -317,9 +318,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); } i32Stack.push(ret.length); } catch (error) { @@ -411,9 +409,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); } i32Stack.push(values.length); instance.exports.bjs_processStringArray(); @@ -539,7 +534,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); const structValue = structHelpers.Point.lift(); for (const cleanup of arrayCleanups) { cleanup(); } - swift.memory.release(matchingId); return structValue; }, processUnsafeRawPointerArray: function bjs_processUnsafeRawPointerArray(values) { @@ -632,7 +626,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { swift.memory.release(id); }); } else { i32Stack.push(0); i32Stack.push(0); @@ -817,9 +810,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups1.push(() => { - swift.memory.release(id); - }); } i32Stack.push(elem.length); arrayCleanups.push(() => { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index b215b3691..bd57f0fd4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -225,7 +226,6 @@ export async function createInstantiator(options, swift) { const ret = instance.exports.bjs_asyncRoundTripString(vId, vBytes.length); const ret1 = swift.memory.getObject(ret); swift.memory.release(ret); - swift.memory.release(vId); return ret1; }, asyncRoundTripBool: function bjs_asyncRoundTripBool(v) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index fba9f9c6b..6182298a1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -44,10 +44,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.value | 0)); i32Stack.push(value.enabled ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; - return { cleanup }; + return { cleanup: undefined }; }, lift: () => { const bool = i32Stack.pop() !== 0; @@ -96,6 +93,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -325,7 +323,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_DefaultGreeter_init(nameId, nameBytes.length); - swift.memory.release(nameId); return DefaultGreeter.__construct(ret); } get name() { @@ -338,7 +335,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_DefaultGreeter_name_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } } class EmptyGreeter extends SwiftHeapObject { @@ -366,10 +362,6 @@ export async function createInstantiator(options, swift) { tagId = swift.memory.retain(tagBytes); } const ret = instance.exports.bjs_ConstructorDefaults_init(nameId, nameBytes.length, count, enabled, status, +isSome, isSome ? tagId : 0, isSome ? tagBytes.length : 0); - swift.memory.release(nameId); - if (tagId != undefined) { - swift.memory.release(tagId); - } return ConstructorDefaults.__construct(ret); } get name() { @@ -382,7 +374,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_ConstructorDefaults_name_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } get count() { const ret = instance.exports.bjs_ConstructorDefaults_count_get(this.pointer); @@ -419,9 +410,6 @@ export async function createInstantiator(options, swift) { valueId = swift.memory.retain(valueBytes); } instance.exports.bjs_ConstructorDefaults_tag_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); - if (valueId != undefined) { - swift.memory.release(valueId); - } } } const ConfigHelpers = __bjs_createConfigHelpers()(); @@ -440,7 +428,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testStringDefault(messageId, messageBytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(messageId); return ret; }, testNegativeIntDefault: function bjs_testNegativeIntDefault(value = -42) { @@ -469,9 +456,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testOptionalDefault(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, testOptionalStringDefault: function bjs_testOptionalStringDefault(greeting = "Hi") { @@ -484,9 +468,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testOptionalStringDefault(+isSome, isSome ? greetingId : 0, isSome ? greetingBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (greetingId != undefined) { - swift.memory.release(greetingId); - } return optResult; }, testMultipleDefaults: function bjs_testMultipleDefaults(title = "Default Title", count = 10, enabled = false) { @@ -495,7 +476,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testMultipleDefaults(titleId, titleBytes.length, count, enabled); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(titleId); return ret; }, testEnumDefault: function bjs_testEnumDefault(status = StatusValues.Active) { @@ -572,9 +552,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); } i32Stack.push(names.length); instance.exports.bjs_testStringArrayDefault(); @@ -650,7 +627,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(nameId); for (const cleanup of arrayCleanups) { cleanup(); } return ret; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 1f7fe91e1..4f71aa76e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -222,9 +223,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); f64Stack.push(value); } i32Stack.push(entries.length); @@ -280,9 +278,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); i32Stack.push((value | 0)); } i32Stack.push(entries.length); @@ -309,16 +304,10 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); const bytes1 = textEncoder.encode(value); const id1 = swift.memory.retain(bytes1); i32Stack.push(bytes1.length); i32Stack.push(id1); - arrayCleanups.push(() => { - swift.memory.release(id1); - }); } i32Stack.push(entries.length); valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); @@ -351,9 +340,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); const arrayCleanups1 = []; for (const elem of value) { i32Stack.push((elem | 0)); @@ -390,9 +376,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); ptrStack.push(value.pointer); } i32Stack.push(entries.length); @@ -417,9 +400,6 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - arrayCleanups.push(() => { - swift.memory.release(id); - }); const isSome = value != null ? 1 : 0; if (isSome) { ptrStack.push(value.pointer); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 3a4818463..af81d52fe 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -134,9 +134,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { @@ -205,9 +203,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ComplexResultValues.Tag.Success, cleanup }; } case ComplexResultValues.Tag.Error: { @@ -216,9 +212,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ComplexResultValues.Tag.Error, cleanup }; } case ComplexResultValues.Tag.Status: { @@ -228,9 +222,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.param1 | 0)); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ComplexResultValues.Tag.Status, cleanup }; } case ComplexResultValues.Tag.Coordinates: { @@ -259,11 +251,7 @@ export async function createInstantiator(options, swift) { i32Stack.push((value.param2 | 0)); i32Stack.push(value.param1 ? 1 : 0); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - swift.memory.release(id1); - swift.memory.release(id2); - }; + const cleanup = undefined; return { caseId: ComplexResultValues.Tag.Comprehensive, cleanup }; } case ComplexResultValues.Tag.Info: { @@ -325,9 +313,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ResultValues.Tag.Success, cleanup }; } case ResultValues.Tag.Failure: { @@ -336,9 +322,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ResultValues.Tag.Failure, cleanup }; } case ResultValues.Tag.Status: { @@ -348,9 +332,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.param1 | 0)); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ResultValues.Tag.Status, cleanup }; } default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); @@ -389,9 +371,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: NetworkingResultValues.Tag.Success, cleanup }; } case NetworkingResultValues.Tag.Failure: { @@ -400,9 +380,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: NetworkingResultValues.Tag.Failure, cleanup }; } default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); @@ -443,11 +421,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if(id) { - swift.memory.release(id); - } - }; + const cleanup = undefined; return { caseId: APIOptionalResultValues.Tag.Success, cleanup }; } case APIOptionalResultValues.Tag.Failure: { @@ -479,11 +453,7 @@ export async function createInstantiator(options, swift) { const isSome2 = value.param0 != null; i32Stack.push(isSome2 ? (value.param0 ? 1 : 0) : 0); i32Stack.push(isSome2 ? 1 : 0); - const cleanup = () => { - if(id) { - swift.memory.release(id); - } - }; + const cleanup = undefined; return { caseId: APIOptionalResultValues.Tag.Status, cleanup }; } default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); @@ -889,6 +859,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 341ffb260..72d78dbe0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -67,6 +67,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index fa4586a2d..392788ef6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -87,6 +87,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 5d85347ee..0a2826a5e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -68,6 +68,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 04d667b8e..b1ee0538f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -119,6 +119,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -306,7 +307,6 @@ export async function createInstantiator(options, swift) { const themeBytes = textEncoder.encode(theme); const themeId = swift.memory.retain(themeBytes); instance.exports.bjs_setTheme(themeId, themeBytes.length); - swift.memory.release(themeId); }, getTheme: function bjs_getTheme() { instance.exports.bjs_getTheme(); @@ -324,16 +324,12 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripOptionalTheme(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (inputId != undefined) { - swift.memory.release(inputId); - } return optResult; }, setTSTheme: function bjs_setTSTheme(theme) { const themeBytes = textEncoder.encode(theme); const themeId = swift.memory.retain(themeBytes); instance.exports.bjs_setTSTheme(themeId, themeBytes.length); - swift.memory.release(themeId); }, getTSTheme: function bjs_getTSTheme() { instance.exports.bjs_getTSTheme(); @@ -351,16 +347,12 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripOptionalTSTheme(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (inputId != undefined) { - swift.memory.release(inputId); - } return optResult; }, setFeatureFlag: function bjs_setFeatureFlag(flag) { const flagBytes = textEncoder.encode(flag); const flagId = swift.memory.retain(flagBytes); instance.exports.bjs_setFeatureFlag(flagId, flagBytes.length); - swift.memory.release(flagId); }, getFeatureFlag: function bjs_getFeatureFlag() { instance.exports.bjs_getFeatureFlag(); @@ -378,9 +370,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripOptionalFeatureFlag(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (inputId != undefined) { - swift.memory.release(inputId); - } return optResult; }, setHttpStatus: function bjs_setHttpStatus(status) { @@ -513,7 +502,6 @@ export async function createInstantiator(options, swift) { const themeBytes = textEncoder.encode(theme); const themeId = swift.memory.retain(themeBytes); const ret = instance.exports.bjs_processTheme(themeId, themeBytes.length); - swift.memory.release(themeId); return ret; }, convertPriority: function bjs_convertPriority(status) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index a60d5377f..6f6bf9531 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index e0b4f8f94..9d57a04d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index 80ff1cead..7c946a716 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 48aab8fbb..5d724202b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -94,6 +94,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 3f5d49f35..54a0f2018 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 66abcf418..a192a1a8b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index 138bef6a1..1166d1f62 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 426fd8c1a..d45efc771 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -133,6 +133,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 590e84cc3..675aa3798 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 18fb5af6c..6a6c75ef4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 27bad9aea..f36211310 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 9e6782d12..09ad002a1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); - swift.memory.release(nameId); return Greeter.__construct(ret); } greet() { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index 94a4b73fb..7368e52fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -250,7 +251,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); - swift.memory.release(nameId); return Greeter.__construct(ret); } greet() { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index f637af601..c4f99c84b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -506,9 +507,6 @@ export async function createInstantiator(options, swift) { nameId = swift.memory.retain(nameBytes); } const ret = instance.exports.bjs_Greeter_init(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); - if (nameId != undefined) { - swift.memory.release(nameId); - } return Greeter.__construct(ret); } greet() { @@ -525,9 +523,6 @@ export async function createInstantiator(options, swift) { nameId = swift.memory.retain(nameBytes); } instance.exports.bjs_Greeter_changeName(this.pointer, +isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); - if (nameId != undefined) { - swift.memory.release(nameId); - } } get name() { instance.exports.bjs_Greeter_name_get(this.pointer); @@ -543,9 +538,6 @@ export async function createInstantiator(options, swift) { valueId = swift.memory.retain(valueBytes); } instance.exports.bjs_Greeter_name_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); - if (valueId != undefined) { - swift.memory.release(valueId); - } } } class OptionalPropertyHolder extends SwiftHeapObject { @@ -571,9 +563,6 @@ export async function createInstantiator(options, swift) { valueId = swift.memory.retain(valueBytes); } instance.exports.bjs_OptionalPropertyHolder_optionalName_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); - if (valueId != undefined) { - swift.memory.release(valueId); - } } get optionalAge() { instance.exports.bjs_OptionalPropertyHolder_optionalAge_get(this.pointer); @@ -626,9 +615,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripString(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, roundTripInt: function bjs_roundTripInt(value) { @@ -669,9 +655,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, roundTripMixSyntax: function bjs_roundTripMixSyntax(name) { @@ -684,9 +667,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripMixSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, roundTripSwiftSyntax: function bjs_roundTripSwiftSyntax(name) { @@ -699,9 +679,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripSwiftSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, roundTripMixedSwiftSyntax: function bjs_roundTripMixedSwiftSyntax(name) { @@ -714,9 +691,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripMixedSwiftSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, roundTripWithSpaces: function bjs_roundTripWithSpaces(value) { @@ -743,9 +717,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundTripOptionalAlias(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (nameId != undefined) { - swift.memory.release(nameId); - } return optResult; }, testMixedOptionals: function bjs_testMixedOptionals(firstName, lastName, age, active) { @@ -765,12 +736,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testMixedOptionals(+isSome, isSome ? firstNameId : 0, isSome ? firstNameBytes.length : 0, +isSome1, isSome1 ? lastNameId : 0, isSome1 ? lastNameBytes.length : 0, +isSome2, isSome2 ? age : 0, active); const optResult = tmpRetString; tmpRetString = undefined; - if (firstNameId != undefined) { - swift.memory.release(firstNameId); - } - if (lastNameId != undefined) { - swift.memory.release(lastNameId); - } return optResult; }, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index dd59941f7..83c77397a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index a67637e58..f1fda2cb7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 35bc1d028..b39362233 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -242,7 +243,6 @@ export async function createInstantiator(options, swift) { const stringValueBytes = textEncoder.encode(stringValue); const stringValueId = swift.memory.retain(stringValueBytes); const ret = instance.exports.bjs_PropertyHolder_init(intValue, floatValue, doubleValue, boolValue, stringValueId, stringValueBytes.length, swift.memory.retain(jsObject)); - swift.memory.release(stringValueId); return PropertyHolder.__construct(ret); } getAllValues() { @@ -289,7 +289,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyHolder_stringValue_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } get readonlyInt() { const ret = instance.exports.bjs_PropertyHolder_readonlyInt_get(this.pointer); @@ -339,7 +338,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyHolder_lazyValue_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } get computedReadonly() { const ret = instance.exports.bjs_PropertyHolder_computedReadonly_get(this.pointer); @@ -355,7 +353,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyHolder_computedReadWrite_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } get observedProperty() { const ret = instance.exports.bjs_PropertyHolder_observedProperty_get(this.pointer); @@ -371,7 +368,6 @@ export async function createInstantiator(options, swift) { const stringValueBytes = textEncoder.encode(stringValue); const stringValueId = swift.memory.retain(stringValueBytes); const ret = instance.exports.bjs_createPropertyHolder(intValue, floatValue, doubleValue, boolValue, stringValueId, stringValueBytes.length, swift.memory.retain(jsObject)); - swift.memory.release(stringValueId); return PropertyHolder.__construct(ret); }, testPropertyHolder: function bjs_testPropertyHolder(holder) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index d783e8968..1d413db20 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -63,9 +63,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: ResultValues.Tag.Success, cleanup }; } case ResultValues.Tag.Failure: { @@ -106,6 +104,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -632,7 +631,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_MyViewController_updateValue(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } updateCount(count) { const ret = instance.exports.bjs_MyViewController_updateCount(this.pointer, count); @@ -644,8 +642,6 @@ export async function createInstantiator(options, swift) { const suffixBytes = textEncoder.encode(suffix); const suffixId = swift.memory.retain(suffixBytes); instance.exports.bjs_MyViewController_updateLabel(this.pointer, prefixId, prefixBytes.length, suffixId, suffixBytes.length); - swift.memory.release(prefixId); - swift.memory.release(suffixId); } checkEvenCount() { const ret = instance.exports.bjs_MyViewController_checkEvenCount(this.pointer); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 892110aca..07f7a3c77 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -50,9 +50,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { @@ -93,6 +91,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -341,7 +340,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_Utils_String_static_uppercase(textId, textBytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(textId); return ret; }, }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index f2c93adae..c2c3f9a70 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -50,9 +50,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { @@ -93,6 +91,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -335,7 +334,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_Utils_String_static_uppercase(textId, textBytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(textId); return ret; }, }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index adb809f6f..3784b5a7e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -48,6 +48,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -279,7 +280,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyClass_static_classVariable_set(valueId, valueBytes.length); - swift.memory.release(valueId); } static get computedProperty() { instance.exports.bjs_PropertyClass_static_computedProperty_get(); @@ -291,7 +291,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyClass_static_computedProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); } static get readOnlyComputed() { const ret = instance.exports.bjs_PropertyClass_static_readOnlyComputed_get(); @@ -311,9 +310,6 @@ export async function createInstantiator(options, swift) { valueId = swift.memory.retain(valueBytes); } instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); - if (valueId != undefined) { - swift.memory.release(valueId); - } } } if (typeof globalThis.PropertyNamespace === 'undefined') { @@ -336,7 +332,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyEnum_static_enumProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); }, get enumConstant() { const ret = instance.exports.bjs_PropertyEnum_static_enumConstant_get(); @@ -352,7 +347,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyEnum_static_computedEnum_set(valueId, valueBytes.length); - swift.memory.release(valueId); } }, PropertyNamespace: { @@ -366,7 +360,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyNamespace_static_namespaceProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); }, get namespaceConstant() { instance.exports.bjs_PropertyNamespace_static_namespaceConstant_get(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index f1273821a..47f0092af 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -48,6 +48,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -279,7 +280,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyClass_static_classVariable_set(valueId, valueBytes.length); - swift.memory.release(valueId); } static get computedProperty() { instance.exports.bjs_PropertyClass_static_computedProperty_get(); @@ -291,7 +291,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyClass_static_computedProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); } static get readOnlyComputed() { const ret = instance.exports.bjs_PropertyClass_static_readOnlyComputed_get(); @@ -311,9 +310,6 @@ export async function createInstantiator(options, swift) { valueId = swift.memory.retain(valueBytes); } instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); - if (valueId != undefined) { - swift.memory.release(valueId); - } } } const exports = { @@ -330,7 +326,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyEnum_static_enumProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); }, get enumConstant() { const ret = instance.exports.bjs_PropertyEnum_static_enumConstant_get(); @@ -346,7 +341,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyEnum_static_computedEnum_set(valueId, valueBytes.length); - swift.memory.release(valueId); } }, PropertyNamespace: { @@ -360,7 +354,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_PropertyNamespace_static_namespaceProperty_set(valueId, valueBytes.length); - swift.memory.release(valueId); }, get namespaceConstant() { instance.exports.bjs_PropertyNamespace_static_namespaceConstant_get(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index b81a4990b..0f92074d4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -231,7 +232,6 @@ export async function createInstantiator(options, swift) { const aBytes = textEncoder.encode(a); const aId = swift.memory.retain(aBytes); instance.exports.bjs_checkString(aId, aBytes.length); - swift.memory.release(aId); }, roundtripString: function bjs_roundtripString(a) { const aBytes = textEncoder.encode(a); @@ -239,7 +239,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_roundtripString(aId, aBytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(aId); return ret; }, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index 112f853d4..f86fce218 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index fc2fc58c6..9f8f93c5b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -270,7 +271,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); - swift.memory.release(nameId); return Greeter.__construct(ret); } greet() { @@ -283,7 +283,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); instance.exports.bjs_Greeter_changeName(this.pointer, nameId, nameBytes.length); - swift.memory.release(nameId); } get name() { instance.exports.bjs_Greeter_name_get(this.pointer); @@ -295,7 +294,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } } class PublicGreeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 4df3d5018..3371cf1b3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -94,9 +94,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = () => { - swift.memory.release(id); - }; + const cleanup = undefined; return { caseId: APIResultValues.Tag.Success, cleanup }; } case APIResultValues.Tag.Failure: { @@ -169,6 +167,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -366,7 +365,6 @@ export async function createInstantiator(options, swift) { instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(param0Id); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -469,7 +467,6 @@ export async function createInstantiator(options, swift) { instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); const ret = tmpRetString; tmpRetString = undefined; - swift.memory.release(param0Id); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -628,9 +625,6 @@ export async function createInstantiator(options, swift) { instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (param0Id != undefined) { - swift.memory.release(param0Id); - } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -772,9 +766,6 @@ export async function createInstantiator(options, swift) { instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); const optResult = tmpRetString; tmpRetString = undefined; - if (param0Id != undefined) { - swift.memory.release(param0Id); - } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -941,7 +932,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_Person_init(nameId, nameBytes.length); - swift.memory.release(nameId); return Person.__construct(ret); } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 8744f5e45..61347e817 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -69,6 +69,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index dca01b33c..316dfb709 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -57,10 +57,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome1 ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - }; - return { cleanup }; + return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -104,11 +101,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - swift.memory.release(id); - swift.memory.release(id1); - }; - return { cleanup }; + return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -147,9 +140,7 @@ export async function createInstantiator(options, swift) { } i32Stack.push(isSome ? 1 : 0); const cleanup = () => { - swift.memory.release(id); if (structResult.cleanup) { structResult.cleanup(); } - if(id1 !== undefined) { swift.memory.release(id1); } }; return { cleanup }; }, @@ -287,6 +278,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } @@ -563,7 +555,6 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length); - swift.memory.release(nameId); return Greeter.__construct(ret); } greet() { @@ -582,7 +573,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length); - swift.memory.release(valueId); } } const DataPointHelpers = __bjs_createDataPointHelpers()(); @@ -631,7 +621,6 @@ export async function createInstantiator(options, swift) { const isSome1 = optFlag != null; instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag : 0); const structValue = structHelpers.DataPoint.lift(); - swift.memory.release(labelId); return structValue; }, }, @@ -650,7 +639,6 @@ export async function createInstantiator(options, swift) { const valueBytes = textEncoder.encode(value); const valueId = swift.memory.retain(valueBytes); instance.exports.bjs_ConfigStruct_static_defaultConfig_set(valueId, valueBytes.length); - swift.memory.release(valueId); }, get timeout() { const ret = instance.exports.bjs_ConfigStruct_static_timeout_get(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index a33914d89..4962e659b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -58,6 +58,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index e81050bf6..3726a48ae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -43,6 +43,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index cdcd6db3a..7c3627d13 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -63,6 +63,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 05a16a3eb..e338c840d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); const bytes = new Uint8Array(memory.buffer, bytesPtr); bytes.set(source); } diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index d761e7576..28bdaa6db 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -716,6 +716,12 @@ private func _swift_js_init_memory_extern(_ sourceId: Int32, _ ptr: UnsafeMutabl } #endif +/// Initializes WebAssembly memory with a Uint8Array referenced by `sourceId` at `ptr`. +/// Note that the ownership of the source Uint8Array id is taken by the callee, so callers +/// must not release the source Uint8Array id by themselves. +/// +/// - Parameter sourceId: The object ID of the source Uint8Array. +/// - Parameter ptr: The pointer to the WebAssembly memory to initialize. @_spi(BridgeJS) @inline(never) public func _swift_js_init_memory(_ sourceId: Int32, _ ptr: UnsafeMutablePointer) { _swift_js_init_memory_extern(sourceId, ptr) From 3fffd36d17a5c77648caf534aeb0bbf64d764648 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 13:07:00 +0900 Subject: [PATCH 222/252] TS2Swift: Make it easier to use ts2swift directly --- .../Sources/TS2Swift/JavaScript/package.json | 3 +- .../Sources/TS2Swift/JavaScript/src/cli.js | 61 +++++++++++-------- .../TS2Swift/JavaScript/src/processor.js | 34 +++++------ .../TS2Swift/JavaScript/test/ts2swift.test.js | 2 +- .../Sources/TS2Swift/JavaScript/tsconfig.json | 14 +++++ 5 files changed, 70 insertions(+), 44 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/tsconfig.json diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json index de3af1ab8..0c8a50c48 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package.json @@ -7,6 +7,7 @@ "ts2swift": "./bin/ts2swift.js" }, "scripts": { - "test": "vitest run" + "test": "vitest run", + "tsc": "tsc --noEmit" } } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 98453ebf1..89f35d0ea 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -7,7 +7,7 @@ import path from 'path'; class DiagnosticEngine { /** - * @param {string} level + * @param {keyof typeof DiagnosticEngine.LEVELS} level */ constructor(level) { const levelInfo = DiagnosticEngine.LEVELS[level]; @@ -73,20 +73,18 @@ class DiagnosticEngine { } function printUsage() { - console.error('Usage: ts2swift -p [--global ]... [-o output.swift]'); + console.error('Usage: ts2swift ... [-p ] [--global ]... [-o output.swift]'); } /** * Run ts2swift for a single input file (programmatic API, no process I/O). - * @param {string} filePath - Path to the .d.ts file - * @param {{ tsconfigPath: string, logLevel?: string, globalFiles?: string[] }} options + * @param {string[]} filePaths - Paths to the .d.ts files + * @param {{ tsconfigPath: string, logLevel?: keyof typeof DiagnosticEngine.LEVELS, globalFiles?: string[] }} options * @returns {string} Generated Swift source * @throws {Error} on parse/type-check errors (diagnostics are included in the message) */ -export function run(filePath, options) { - const { tsconfigPath, logLevel = 'info', globalFiles: globalFilesOpt = [] } = options; - const globalFiles = Array.isArray(globalFilesOpt) ? globalFilesOpt : (globalFilesOpt ? [globalFilesOpt] : []); - +export function run(filePaths, options) { + const { tsconfigPath, logLevel = 'info', globalFiles = [] } = options; const diagnosticEngine = new DiagnosticEngine(logLevel); const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile); @@ -105,7 +103,7 @@ export function run(filePath, options) { throw new Error(`TypeScript config/parse errors:\n${message}`); } - const program = TypeProcessor.createProgram([filePath, ...globalFiles], configParseResult.options); + const program = TypeProcessor.createProgram([...filePaths, ...globalFiles], configParseResult.options); const diagnostics = program.getSemanticDiagnostics(); if (diagnostics.length > 0) { const message = ts.formatDiagnosticsWithColorAndContext(diagnostics, { @@ -131,7 +129,7 @@ export function run(filePath, options) { /** @type {string[]} */ const bodies = []; const globalFileSet = new Set(globalFiles); - for (const inputPath of [filePath, ...globalFiles]) { + for (const inputPath of [...filePaths, ...globalFiles]) { const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, { defaultImportFromGlobal: globalFileSet.has(inputPath), }); @@ -169,39 +167,52 @@ export function main(args) { type: 'string', default: 'info', }, + help: { + type: 'boolean', + short: 'h', + }, }, allowPositionals: true }) - if (options.positionals.length !== 1) { + if (options.values.help) { printUsage(); - process.exit(1); + process.exit(0); } - const tsconfigPath = options.values.project; - if (!tsconfigPath) { + if (options.positionals.length !== 1) { printUsage(); process.exit(1); } - const filePath = options.positionals[0]; - const logLevel = options.values["log-level"] || "info"; - /** @type {string[]} */ - const globalFiles = Array.isArray(options.values.global) - ? options.values.global - : (options.values.global ? [options.values.global] : []); + const filePaths = options.positionals; + const logLevel = /** @type {keyof typeof DiagnosticEngine.LEVELS} */ ((() => { + const logLevel = options.values["log-level"] || "info"; + if (!Object.keys(DiagnosticEngine.LEVELS).includes(logLevel)) { + console.error(`Invalid log level: ${logLevel}. Valid levels are: ${Object.keys(DiagnosticEngine.LEVELS).join(", ")}`); + process.exit(1); + } + return logLevel; + })()); + const globalFiles = options.values.global || []; + const tsconfigPath = options.values.project || "tsconfig.json"; const diagnosticEngine = new DiagnosticEngine(logLevel); - diagnosticEngine.print("verbose", `Processing ${filePath}...`); + diagnosticEngine.print("verbose", `Processing ${filePaths.join(", ")}`); let swiftOutput; try { - swiftOutput = run(filePath, { tsconfigPath, logLevel, globalFiles }); - } catch (err) { - console.error(err.message); + swiftOutput = run(filePaths, { tsconfigPath, logLevel, globalFiles }); + } catch (/** @type {unknown} */ err) { + if (err instanceof Error) { + diagnosticEngine.print("error", err.message); + } else { + diagnosticEngine.print("error", String(err)); + } process.exit(1); } - if (options.values.output) { + // Write to file or stdout + if (options.values.output && options.values.output !== "-") { if (swiftOutput.length > 0) { fs.mkdirSync(path.dirname(options.values.output), { recursive: true }); fs.writeFileSync(options.values.output, swiftOutput); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index c71ff6fe5..53216a78c 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -20,14 +20,13 @@ import ts from 'typescript'; export class TypeProcessor { /** * Create a TypeScript program from a d.ts file - * @param {string} filePath - Path to the d.ts file + * @param {string[]} filePaths - Paths to the d.ts file * @param {ts.CompilerOptions} options - Compiler options * @returns {ts.Program} TypeScript program object */ static createProgram(filePaths, options) { const host = ts.createCompilerHost(options); - const roots = Array.isArray(filePaths) ? filePaths : [filePaths]; - return ts.createProgram(roots, { + return ts.createProgram(filePaths, { ...options, noCheck: true, skipLibCheck: true, @@ -39,14 +38,7 @@ export class TypeProcessor { * @param {DiagnosticEngine} diagnosticEngine - Diagnostic engine */ constructor(checker, diagnosticEngine, options = { - inheritIterable: true, - inheritArraylike: true, - inheritPromiselike: true, - addAllParentMembersToClass: true, - replaceAliasToFunction: true, - replaceRankNFunction: true, - replaceNewableFunction: true, - noExtendsInTyprm: false, + defaultImportFromGlobal: false, }) { this.checker = checker; this.diagnosticEngine = diagnosticEngine; @@ -163,8 +155,12 @@ export class TypeProcessor { } } }); - } catch (error) { - this.diagnosticEngine.print("error", `Error processing ${sourceFile.fileName}: ${error.message}`); + } catch (/** @type {unknown} */ error) { + if (error instanceof Error) { + this.diagnosticEngine.print("error", `Error processing ${sourceFile.fileName}: ${error.message}`); + } else { + this.diagnosticEngine.print("error", `Error processing ${sourceFile.fileName}: ${String(error)}`); + } } } @@ -388,7 +384,7 @@ export class TypeProcessor { canBeIntEnum = false; } const swiftEnumName = this.renderTypeIdentifier(enumName); - const dedupeNames = (items) => { + const dedupeNames = (/** @type {{ name: string, raw: string | number }[]} */ items) => { const seen = new Map(); return items.map(item => { const count = seen.get(item.name) ?? 0; @@ -401,6 +397,10 @@ export class TypeProcessor { if (canBeStringEnum && stringMembers.length > 0) { this.swiftLines.push(`enum ${swiftEnumName}: String {`); for (const { name, raw } of dedupeNames(stringMembers)) { + if (typeof raw !== "string") { + this.diagnosticEngine.print("warning", `Invalid string literal: ${raw}`, diagnosticNode); + continue; + } this.swiftLines.push(` case ${this.renderIdentifier(name)} = "${raw.replaceAll("\"", "\\\\\"")}"`); } this.swiftLines.push("}"); @@ -815,7 +815,7 @@ export class TypeProcessor { visitType(type, node) { const typeArguments = this.getTypeArguments(type); if (this.checker.isArrayType(type)) { - const typeArgs = this.checker.getTypeArguments(type); + const typeArgs = this.checker.getTypeArguments(/** @type {ts.TypeReference} */ (type)); if (typeArgs && typeArgs.length > 0) { const elementType = this.visitType(typeArgs[0], node); return `[${elementType}]`; @@ -920,7 +920,7 @@ export class TypeProcessor { * Convert a `Record` TypeScript type into a Swift dictionary type. * Falls back to `JSObject` when keys are not string-compatible or type arguments are missing. * @param {ts.Type} type - * @param {ts.Type[]} typeArguments + * @param {readonly ts.Type[]} typeArguments * @param {ts.Node} node * @returns {string | null} * @private @@ -952,7 +952,7 @@ export class TypeProcessor { /** * Retrieve type arguments for a given type, including type alias instantiations. * @param {ts.Type} type - * @returns {ts.Type[]} + * @returns {readonly ts.Type[]} * @private */ getTypeArguments(type) { diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js index a65386924..8ca1df7c9 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js @@ -12,7 +12,7 @@ const inputsDir = path.resolve(__dirname, 'fixtures'); const tsconfigPath = path.join(inputsDir, 'tsconfig.json'); function runTs2Swift(dtsPath) { - return run(dtsPath, { tsconfigPath, logLevel: 'error' }); + return run([dtsPath], { tsconfigPath, logLevel: 'error' }); } function collectDtsInputs() { diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/tsconfig.json b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/tsconfig.json new file mode 100644 index 000000000..ed3dcf4bf --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/tsconfig.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "strict": true, + "allowJs": true, + "skipLibCheck": true, + "noEmit": true, + "target": "ES2022", + "module": "NodeNext", + "moduleResolution": "nodenext" + }, + "include": [ + "src/*.js" + ] +} From 8abb79d13e10139ac45963cb0e3d1f5a023ef117 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 16 Feb 2026 13:16:47 +0900 Subject: [PATCH 223/252] TS2Swift: Support reading from stdin --- .../Sources/TS2Swift/JavaScript/src/cli.js | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 89f35d0ea..25d88b828 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -1,9 +1,10 @@ // @ts-check import * as fs from 'fs'; -import { TypeProcessor } from './processor.js'; +import os from 'os'; +import path from 'path'; import { parseArgs } from 'util'; import ts from 'typescript'; -import path from 'path'; +import { TypeProcessor } from './processor.js'; class DiagnosticEngine { /** @@ -73,7 +74,24 @@ class DiagnosticEngine { } function printUsage() { - console.error('Usage: ts2swift ... [-p ] [--global ]... [-o output.swift]'); + console.error(`Usage: ts2swift [options] + + Path to a .d.ts file, or "-" to read from stdin + +Options: + -o, --output Write Swift to . Use "-" for stdout (default). + -p, --project Path to tsconfig.json (default: tsconfig.json). + --global Add a .d.ts as a global declaration file (repeatable). + --log-level One of: verbose, info, warning, error (default: info). + -h, --help Show this help. + +Examples: + ts2swift lib.d.ts + ts2swift lib.d.ts -o Generated.swift + ts2swift lib.d.ts -p ./tsconfig.build.json -o Sources/Bridge/API.swift + cat lib.d.ts | ts2swift - -o Generated.swift + ts2swift lib.d.ts --global dom.d.ts --global lib.d.ts +`); } /** @@ -185,7 +203,18 @@ export function main(args) { process.exit(1); } - const filePaths = options.positionals; + /** @type {string[]} */ + let filePaths = options.positionals; + /** @type {(() => void)[]} cleanup functions to run after completion */ + const cleanups = []; + + if (filePaths[0] === '-') { + const content = fs.readFileSync(0, 'utf-8'); + const stdinTempPath = path.join(os.tmpdir(), `ts2swift-stdin-${process.pid}-${Date.now()}.d.ts`); + fs.writeFileSync(stdinTempPath, content); + cleanups.push(() => fs.unlinkSync(stdinTempPath)); + filePaths = [stdinTempPath]; + } const logLevel = /** @type {keyof typeof DiagnosticEngine.LEVELS} */ ((() => { const logLevel = options.values["log-level"] || "info"; if (!Object.keys(DiagnosticEngine.LEVELS).includes(logLevel)) { @@ -210,6 +239,10 @@ export function main(args) { diagnosticEngine.print("error", String(err)); } process.exit(1); + } finally { + for (const cleanup of cleanups) { + cleanup(); + } } // Write to file or stdout if (options.values.output && options.values.output !== "-") { From 9589496efabbc294678183be55f176460d0b8d8b Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Mon, 16 Feb 2026 11:49:07 +0100 Subject: [PATCH 224/252] BridgeJS: Add additionalSourceDirs config for cross-plugin file discovery --- .../BridgeJSBuildPlugin.swift | 58 ++++++++++++++++++- .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 43 +++++++++++++- .../Sources/BridgeJSTool/BridgeJSTool.swift | 11 ++++ 3 files changed, 109 insertions(+), 3 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift index aec9f3bca..55015d41b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift @@ -32,6 +32,11 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { inputFiles.append(configFile) } + let additionalDirs = resolveAdditionalSourceDirs(targetDirectory: target.directoryURL) + for dir in additionalDirs { + inputFiles.append(contentsOf: recursivelyCollectSwiftFiles(from: dir)) + } + let inputTSFile = target.directoryURL.appending(path: "bridge-js.d.ts") let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json") @@ -47,7 +52,6 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { ] if FileManager.default.fileExists(atPath: inputTSFile.path) { - // Add .d.ts file and tsconfig.json as inputs inputFiles.append(contentsOf: [inputTSFile, tsconfigPath]) arguments.append(contentsOf: [ "--project", @@ -66,4 +70,56 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { ) } } + +private struct PluginConfig: Decodable { + var additionalSourceDirs: [String]? +} + +private func resolveAdditionalSourceDirs(targetDirectory: URL) -> [URL] { + let configFiles = [ + targetDirectory.appending(path: "bridge-js.config.json"), + targetDirectory.appending(path: "bridge-js.config.local.json"), + ] + var dirs: [String] = [] + for file in configFiles { + guard FileManager.default.fileExists(atPath: file.path), + let data = try? Data(contentsOf: file), + let config = try? JSONDecoder().decode(PluginConfig.self, from: data), + let additional = config.additionalSourceDirs + else { continue } + dirs.append(contentsOf: additional) + } + return dirs.compactMap { dir in + let resolved = targetDirectory.appending(path: dir).standardized + var isDirectory: ObjCBool = false + guard FileManager.default.fileExists(atPath: resolved.path, isDirectory: &isDirectory), + isDirectory.boolValue + else { + return nil + } + return resolved + } +} + +private func recursivelyCollectSwiftFiles(from directory: URL) -> [URL] { + var swiftFiles: [URL] = [] + guard + let enumerator = FileManager.default.enumerator( + at: directory, + includingPropertiesForKeys: [.isRegularFileKey], + options: [.skipsHiddenFiles] + ) + else { + return [] + } + for case let fileURL as URL in enumerator { + if fileURL.pathExtension == "swift" { + let resourceValues = try? fileURL.resourceValues(forKeys: [.isRegularFileKey]) + if resourceValues?.isRegularFile == true { + swiftFiles.append(fileURL) + } + } + } + return swiftFiles.sorted { $0.path < $1.path } +} #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 9db11b14d..2b166d1be 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -309,6 +309,7 @@ public struct BridgeJSCoreError: Swift.Error, CustomStringConvertible { import struct Foundation.URL import struct Foundation.Data +import struct Foundation.ObjCBool import class Foundation.FileManager import class Foundation.JSONDecoder @@ -328,20 +329,33 @@ public struct BridgeJSConfig: Codable { /// Default: `false` public var exposeToGlobal: Bool - public init(tools: [String: String]? = nil, exposeToGlobal: Bool = false) { + /// Additional directories containing Swift source files to scan for + /// `@JS` annotations. + /// + /// Paths are resolved relative to the target directory. This is useful + /// when Swift files with `@JS` annotations are generated by another + /// build plugin whose outputs aren't included in `target.sourceFiles`. + /// + /// Default: `nil` (no additional directories) + public var additionalSourceDirs: [String]? + + public init(tools: [String: String]? = nil, exposeToGlobal: Bool = false, additionalSourceDirs: [String]? = nil) { self.tools = tools self.exposeToGlobal = exposeToGlobal + self.additionalSourceDirs = additionalSourceDirs } enum CodingKeys: String, CodingKey { case tools case exposeToGlobal + case additionalSourceDirs } public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) tools = try container.decodeIfPresent([String: String].self, forKey: .tools) exposeToGlobal = try container.decodeIfPresent(Bool.self, forKey: .exposeToGlobal) ?? false + additionalSourceDirs = try container.decodeIfPresent([String].self, forKey: .additionalSourceDirs) } /// Load the configuration file from the SwiftPM package target directory. @@ -380,11 +394,36 @@ public struct BridgeJSConfig: Codable { return try JSONDecoder().decode(BridgeJSConfig.self, from: data) } + /// Resolve additional source directories relative to a base URL. + /// + /// Returns absolute URLs for each configured additional source directory. + /// Directories that don't exist are silently skipped. + public func resolveAdditionalSourceDirs(relativeTo baseURL: URL) -> [URL] { + guard let dirs = additionalSourceDirs else { return [] } + return dirs.compactMap { dir in + let resolved = baseURL.appending(path: dir).standardized + var isDirectory: ObjCBool = false + guard FileManager.default.fileExists(atPath: resolved.path, isDirectory: &isDirectory), + isDirectory.boolValue + else { + return nil + } + return resolved + } + } + /// Merge the current configuration with the overrides. func merging(overrides: BridgeJSConfig) -> BridgeJSConfig { + let mergedDirs: [String]? = { + let base = self.additionalSourceDirs ?? [] + let extra = overrides.additionalSourceDirs ?? [] + let combined = base + extra + return combined.isEmpty ? nil : combined + }() return BridgeJSConfig( tools: (tools ?? [:]).merging(overrides.tools ?? [:], uniquingKeysWith: { $1 }), - exposeToGlobal: overrides.exposeToGlobal + exposeToGlobal: overrides.exposeToGlobal, + additionalSourceDirs: mergedDirs ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 3b784b732..a699dc9c8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -146,6 +146,17 @@ import BridgeJSUtilities var inputFiles = withSpan("Collecting Swift files") { return inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) } + + let additionalDirs = config.resolveAdditionalSourceDirs(relativeTo: targetDirectory) + for dir in additionalDirs { + let additionalFiles = recursivelyCollectSwiftFiles(from: dir).map(\.path) + .filter { !inputFiles.contains($0) } + if !additionalFiles.isEmpty { + progress.print("Found \(additionalFiles.count) additional Swift files in \(dir.lastPathComponent)") + } + inputFiles.append(contentsOf: additionalFiles) + } + // BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need // to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin // filters out Generated/ files, so we explicitly add it here after generation. From 53f69d4522c0aa971aeef9e901607b48a3a92441 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Mon, 16 Feb 2026 12:57:43 +0100 Subject: [PATCH 225/252] BridgeJS: Test different approach for cross-plugin file discovery --- .../BridgeJSBuildPlugin.swift | 65 +++---------------- .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 43 +----------- .../Sources/BridgeJSTool/BridgeJSTool.swift | 10 --- 3 files changed, 11 insertions(+), 107 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift index 55015d41b..3cb6dc860 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift @@ -32,10 +32,14 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { inputFiles.append(configFile) } - let additionalDirs = resolveAdditionalSourceDirs(targetDirectory: target.directoryURL) - for dir in additionalDirs { - inputFiles.append(contentsOf: recursivelyCollectSwiftFiles(from: dir)) + // Include Swift files generated by other plugins applied to this + // target (available in tools-version 6.0+). This lets BridgeJS + // process @JS annotations in files produced by earlier plugins + // without requiring any extra configuration. + let pluginGeneratedSwiftFiles = target.pluginGeneratedSources.filter { + $0.pathExtension == "swift" } + inputFiles.append(contentsOf: pluginGeneratedSwiftFiles) let inputTSFile = target.directoryURL.appending(path: "bridge-js.d.ts") let tsconfigPath = context.package.directoryURL.appending(path: "tsconfig.json") @@ -59,7 +63,8 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { ]) } - arguments.append(contentsOf: inputSwiftFiles.map(\.path)) + let allSwiftFiles = inputSwiftFiles + pluginGeneratedSwiftFiles + arguments.append(contentsOf: allSwiftFiles.map(\.path)) return .buildCommand( displayName: "Generate BridgeJS code", @@ -70,56 +75,4 @@ struct BridgeJSBuildPlugin: BuildToolPlugin { ) } } - -private struct PluginConfig: Decodable { - var additionalSourceDirs: [String]? -} - -private func resolveAdditionalSourceDirs(targetDirectory: URL) -> [URL] { - let configFiles = [ - targetDirectory.appending(path: "bridge-js.config.json"), - targetDirectory.appending(path: "bridge-js.config.local.json"), - ] - var dirs: [String] = [] - for file in configFiles { - guard FileManager.default.fileExists(atPath: file.path), - let data = try? Data(contentsOf: file), - let config = try? JSONDecoder().decode(PluginConfig.self, from: data), - let additional = config.additionalSourceDirs - else { continue } - dirs.append(contentsOf: additional) - } - return dirs.compactMap { dir in - let resolved = targetDirectory.appending(path: dir).standardized - var isDirectory: ObjCBool = false - guard FileManager.default.fileExists(atPath: resolved.path, isDirectory: &isDirectory), - isDirectory.boolValue - else { - return nil - } - return resolved - } -} - -private func recursivelyCollectSwiftFiles(from directory: URL) -> [URL] { - var swiftFiles: [URL] = [] - guard - let enumerator = FileManager.default.enumerator( - at: directory, - includingPropertiesForKeys: [.isRegularFileKey], - options: [.skipsHiddenFiles] - ) - else { - return [] - } - for case let fileURL as URL in enumerator { - if fileURL.pathExtension == "swift" { - let resourceValues = try? fileURL.resourceValues(forKeys: [.isRegularFileKey]) - if resourceValues?.isRegularFile == true { - swiftFiles.append(fileURL) - } - } - } - return swiftFiles.sorted { $0.path < $1.path } -} #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 2b166d1be..9db11b14d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -309,7 +309,6 @@ public struct BridgeJSCoreError: Swift.Error, CustomStringConvertible { import struct Foundation.URL import struct Foundation.Data -import struct Foundation.ObjCBool import class Foundation.FileManager import class Foundation.JSONDecoder @@ -329,33 +328,20 @@ public struct BridgeJSConfig: Codable { /// Default: `false` public var exposeToGlobal: Bool - /// Additional directories containing Swift source files to scan for - /// `@JS` annotations. - /// - /// Paths are resolved relative to the target directory. This is useful - /// when Swift files with `@JS` annotations are generated by another - /// build plugin whose outputs aren't included in `target.sourceFiles`. - /// - /// Default: `nil` (no additional directories) - public var additionalSourceDirs: [String]? - - public init(tools: [String: String]? = nil, exposeToGlobal: Bool = false, additionalSourceDirs: [String]? = nil) { + public init(tools: [String: String]? = nil, exposeToGlobal: Bool = false) { self.tools = tools self.exposeToGlobal = exposeToGlobal - self.additionalSourceDirs = additionalSourceDirs } enum CodingKeys: String, CodingKey { case tools case exposeToGlobal - case additionalSourceDirs } public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) tools = try container.decodeIfPresent([String: String].self, forKey: .tools) exposeToGlobal = try container.decodeIfPresent(Bool.self, forKey: .exposeToGlobal) ?? false - additionalSourceDirs = try container.decodeIfPresent([String].self, forKey: .additionalSourceDirs) } /// Load the configuration file from the SwiftPM package target directory. @@ -394,36 +380,11 @@ public struct BridgeJSConfig: Codable { return try JSONDecoder().decode(BridgeJSConfig.self, from: data) } - /// Resolve additional source directories relative to a base URL. - /// - /// Returns absolute URLs for each configured additional source directory. - /// Directories that don't exist are silently skipped. - public func resolveAdditionalSourceDirs(relativeTo baseURL: URL) -> [URL] { - guard let dirs = additionalSourceDirs else { return [] } - return dirs.compactMap { dir in - let resolved = baseURL.appending(path: dir).standardized - var isDirectory: ObjCBool = false - guard FileManager.default.fileExists(atPath: resolved.path, isDirectory: &isDirectory), - isDirectory.boolValue - else { - return nil - } - return resolved - } - } - /// Merge the current configuration with the overrides. func merging(overrides: BridgeJSConfig) -> BridgeJSConfig { - let mergedDirs: [String]? = { - let base = self.additionalSourceDirs ?? [] - let extra = overrides.additionalSourceDirs ?? [] - let combined = base + extra - return combined.isEmpty ? nil : combined - }() return BridgeJSConfig( tools: (tools ?? [:]).merging(overrides.tools ?? [:], uniquingKeysWith: { $1 }), - exposeToGlobal: overrides.exposeToGlobal, - additionalSourceDirs: mergedDirs + exposeToGlobal: overrides.exposeToGlobal ) } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index a699dc9c8..f7adbfb8e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -147,16 +147,6 @@ import BridgeJSUtilities return inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments) } - let additionalDirs = config.resolveAdditionalSourceDirs(relativeTo: targetDirectory) - for dir in additionalDirs { - let additionalFiles = recursivelyCollectSwiftFiles(from: dir).map(\.path) - .filter { !inputFiles.contains($0) } - if !additionalFiles.isEmpty { - progress.print("Found \(additionalFiles.count) additional Swift files in \(dir.lastPathComponent)") - } - inputFiles.append(contentsOf: additionalFiles) - } - // BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need // to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin // filters out Generated/ files, so we explicitly add it here after generation. From 96c691b84d6721043049364e54e31196fd1111b8 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Mon, 16 Feb 2026 13:31:37 +0100 Subject: [PATCH 226/252] BridgeJS: Skip writing output files when content is unchanged --- .../Sources/BridgeJSTool/BridgeJSTool.swift | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 3b784b732..2f742318b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -225,7 +225,7 @@ import BridgeJSUtilities withIntermediateDirectories: true, attributes: nil ) - try outputSwift.write(to: outputSwiftURL, atomically: true, encoding: .utf8) + try writeIfChanged(outputSwift, to: outputSwiftURL) } } @@ -240,7 +240,7 @@ import BridgeJSUtilities let encoder = JSONEncoder() encoder.outputFormatting = [.prettyPrinted, .sortedKeys] let skeletonData = try encoder.encode(skeleton) - try skeletonData.write(to: outputSkeletonURL) + try writeIfChanged(skeletonData, to: outputSkeletonURL) } if skeleton.exported != nil || skeleton.imported != nil { @@ -282,6 +282,18 @@ private func hasBridgeJSSkipComment(_ content: String) -> Bool { BridgeJSGeneratedFile.hasSkipComment(content) } +private func writeIfChanged(_ content: String, to url: URL) throws { + let existing = try? String(contentsOf: url, encoding: .utf8) + guard existing != content else { return } + try content.write(to: url, atomically: true, encoding: .utf8) +} + +private func writeIfChanged(_ data: Data, to url: URL) throws { + let existing = try? Data(contentsOf: url) + guard existing != data else { return } + try data.write(to: url) +} + private func combineGeneratedSwift(_ pieces: [String]) -> String { let trimmedPieces = pieces From 4d7b7733a6e63328b0174627ad0a0c25a96e4b0c Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 17 Feb 2026 16:10:46 +0900 Subject: [PATCH 227/252] BridgeJS: Fix `@JSClass` on public/package access level struct Also cover more access levels in `@JSFunction` tests. --- .../Sources/BridgeJSMacros/JSClassMacro.swift | 57 +++++++- .../BridgeJSMacros/JSMacroSupport.swift | 4 + .../JSClassMacroTests.swift | 98 +++++++++++++ .../Generated/BridgeJS.swift | 131 +++++++++++++++++ .../Generated/JavaScript/BridgeJS.json | 132 ++++++++++++++++++ .../JSClassCompileTests.swift | 11 ++ .../JSFunctionCompileTests.swift | 7 + 7 files changed, 438 insertions(+), 2 deletions(-) create mode 100644 Tests/BridgeJSRuntimeTests/MacroCompileTests/JSClassCompileTests.swift create mode 100644 Tests/BridgeJSRuntimeTests/MacroCompileTests/JSFunctionCompileTests.swift diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift index 79c3105ee..c44655c7e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSClassMacro.swift @@ -47,6 +47,21 @@ extension JSClassMacro: MemberMacro { } var members: [DeclSyntax] = [] + guard let structDecl = declaration.as(StructDeclSyntax.self) else { return members } + + if let accessLevel = accessLevel(from: structDecl.modifiers), + accessLevel == .private || accessLevel == .fileprivate + { + context.diagnose( + Diagnostic( + node: Syntax(structDecl), + message: JSMacroMessage.jsClassRequiresAtLeastInternal + ) + ) + return [] + } + + let memberAccessModifier = synthesizedMemberAccessModifier(for: declaration).map { "\($0) " } ?? "" let existingMembers = declaration.memberBlock.members let hasJSObjectProperty = existingMembers.contains { member in @@ -57,7 +72,7 @@ extension JSClassMacro: MemberMacro { } if !hasJSObjectProperty { - members.append(DeclSyntax("let jsObject: JSObject")) + members.append(DeclSyntax("\(raw: memberAccessModifier)let jsObject: JSObject")) } let hasUnsafelyWrappingInit = existingMembers.contains { member in @@ -73,7 +88,7 @@ extension JSClassMacro: MemberMacro { members.append( DeclSyntax( """ - init(unsafelyWrapping jsObject: JSObject) { + \(raw: memberAccessModifier)init(unsafelyWrapping jsObject: JSObject) { self.jsObject = jsObject } """ @@ -95,6 +110,11 @@ extension JSClassMacro: ExtensionMacro { ) throws -> [ExtensionDeclSyntax] { guard let structDecl = declaration.as(StructDeclSyntax.self) else { return [] } guard !protocols.isEmpty else { return [] } + if let accessLevel = accessLevel(from: structDecl.modifiers), + accessLevel == .private || accessLevel == .fileprivate + { + return [] + } // Do not add extension if the struct already conforms to _JSBridgedClass if let clause = structDecl.inheritanceClause, @@ -108,4 +128,37 @@ extension JSClassMacro: ExtensionMacro { try ExtensionDeclSyntax("extension \(type.trimmed): \(raw: conformanceList) {}") ] } + + private static func synthesizedMemberAccessModifier(for declaration: some DeclGroupSyntax) -> String? { + guard let structDecl = declaration.as(StructDeclSyntax.self) else { return nil } + switch accessLevel(from: structDecl.modifiers) { + case .public: return "public" + case .package: return "package" + case .internal: return "internal" + case .fileprivate, .private, .none: return nil + } + } + + private enum AccessLevel { + case `public` + case package + case `internal` + case `fileprivate` + case `private` + } + + private static func accessLevel(from modifiers: DeclModifierListSyntax?) -> AccessLevel? { + guard let modifiers else { return nil } + for modifier in modifiers { + switch modifier.name.tokenKind { + case .keyword(.public): return .public + case .keyword(.package): return .package + case .keyword(.internal): return .internal + case .keyword(.fileprivate): return .fileprivate + case .keyword(.private): return .private + default: continue + } + } + return nil + } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift index c30d91dd1..224462ddb 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -14,6 +14,10 @@ enum JSMacroMessage: String, DiagnosticMessage { case setterRequiresThrows = "@JSSetter function must declare throws(JSException)." case jsFunctionRequiresThrows = "@JSFunction throws must be declared as throws(JSException)." case requiresJSClass = "JavaScript members must be declared inside a @JSClass struct." + case jsClassRequiresAtLeastInternal = + "@JSClass does not support private/fileprivate access level. Use internal, package, or public." + case jsClassMemberRequiresAtLeastInternal = + "@JSClass requires jsObject and init(unsafelyWrapping:) to be at least internal." var message: String { rawValue } var diagnosticID: MessageID { MessageID(domain: "JavaScriptKitMacros", id: rawValue) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift index 86a1f6b7c..77dc814eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSMacrosTests/JSClassMacroTests.swift @@ -370,4 +370,102 @@ import BridgeJSMacros indentationWidth: indentationWidth ) } + + @Test func publicStructSynthesizesPublicMembers() { + TestSupport.assertMacroExpansion( + """ + @JSClass + public struct MyClass { + } + """, + expandedSource: """ + public struct MyClass { + + public let jsObject: JSObject + + public init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + + extension MyClass: _JSBridgedClass { + } + """, + macroSpecs: macroSpecs, + indentationWidth: indentationWidth + ) + } + + @Test func packageStructSynthesizesPackageMembers() { + TestSupport.assertMacroExpansion( + """ + @JSClass + package struct MyClass { + } + """, + expandedSource: """ + package struct MyClass { + + package let jsObject: JSObject + + package init(unsafelyWrapping jsObject: JSObject) { + self.jsObject = jsObject + } + } + + extension MyClass: _JSBridgedClass { + } + """, + macroSpecs: macroSpecs, + indentationWidth: indentationWidth + ) + } + + @Test func privateStructIsRejected() { + TestSupport.assertMacroExpansion( + """ + @JSClass + private struct MyClass { + } + """, + expandedSource: """ + private struct MyClass { + } + """, + diagnostics: [ + DiagnosticSpec( + message: + "@JSClass does not support private/fileprivate access level. Use internal, package, or public.", + line: 1, + column: 1 + ) + ], + macroSpecs: macroSpecs, + indentationWidth: indentationWidth + ) + } + + @Test func fileprivateStructIsRejected() { + TestSupport.assertMacroExpansion( + """ + @JSClass + fileprivate struct MyClass { + } + """, + expandedSource: """ + fileprivate struct MyClass { + } + """, + diagnostics: [ + DiagnosticSpec( + message: + "@JSClass does not support private/fileprivate access level. Use internal, package, or public.", + line: 1, + column: 1 + ) + ], + macroSpecs: macroSpecs, + indentationWidth: indentationWidth + ) + } } diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 96ca9be2e..78c9014d7 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -10156,6 +10156,137 @@ func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException return Point.bridgeJSLiftReturn(ret) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassInternal_init") +fileprivate func bjs_MyJSClassInternal_init() -> Int32 +#else +fileprivate func bjs_MyJSClassInternal_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$MyJSClassInternal_init() throws(JSException) -> JSObject { + let ret = bjs_MyJSClassInternal_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassPublic_init") +fileprivate func bjs_MyJSClassPublic_init() -> Int32 +#else +fileprivate func bjs_MyJSClassPublic_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$MyJSClassPublic_init() throws(JSException) -> JSObject { + let ret = bjs_MyJSClassPublic_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassPackage_init") +fileprivate func bjs_MyJSClassPackage_init() -> Int32 +#else +fileprivate func bjs_MyJSClassPackage_init() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +func _$MyJSClassPackage_init() throws(JSException) -> JSObject { + let ret = bjs_MyJSClassPackage_init() + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPackageAccess") +fileprivate func bjs_jsFunctionWithPackageAccess() -> Void +#else +fileprivate func bjs_jsFunctionWithPackageAccess() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsFunctionWithPackageAccess() throws(JSException) -> Void { + bjs_jsFunctionWithPackageAccess() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPublicAccess") +fileprivate func bjs_jsFunctionWithPublicAccess() -> Void +#else +fileprivate func bjs_jsFunctionWithPublicAccess() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsFunctionWithPublicAccess() throws(JSException) -> Void { + bjs_jsFunctionWithPublicAccess() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithInternalAccess") +fileprivate func bjs_jsFunctionWithInternalAccess() -> Void +#else +fileprivate func bjs_jsFunctionWithInternalAccess() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsFunctionWithInternalAccess() throws(JSException) -> Void { + bjs_jsFunctionWithInternalAccess() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithFilePrivateAccess") +fileprivate func bjs_jsFunctionWithFilePrivateAccess() -> Void +#else +fileprivate func bjs_jsFunctionWithFilePrivateAccess() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsFunctionWithFilePrivateAccess() throws(JSException) -> Void { + bjs_jsFunctionWithFilePrivateAccess() + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPrivateAccess") +fileprivate func bjs_jsFunctionWithPrivateAccess() -> Void +#else +fileprivate func bjs_jsFunctionWithPrivateAccess() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$jsFunctionWithPrivateAccess() throws(JSException) -> Void { + bjs_jsFunctionWithPrivateAccess() + if let error = _swift_js_take_exception() { + throw error + } +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static") fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 9c086c808..2cd992ea4 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -15297,6 +15297,138 @@ { "functions" : [ + ], + "types" : [ + { + "constructor" : { + "parameters" : [ + + ] + }, + "from" : "global", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "MyJSClassInternal", + "setters" : [ + + ], + "staticMethods" : [ + + ] + }, + { + "constructor" : { + "parameters" : [ + + ] + }, + "from" : "global", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "MyJSClassPublic", + "setters" : [ + + ], + "staticMethods" : [ + + ] + }, + { + "constructor" : { + "parameters" : [ + + ] + }, + "from" : "global", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "MyJSClassPackage", + "setters" : [ + + ], + "staticMethods" : [ + + ] + } + ] + }, + { + "functions" : [ + { + "name" : "jsFunctionWithPackageAccess", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsFunctionWithPublicAccess", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsFunctionWithInternalAccess", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsFunctionWithFilePrivateAccess", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "name" : "jsFunctionWithPrivateAccess", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + }, + { + "functions" : [ + ], "types" : [ { diff --git a/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSClassCompileTests.swift b/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSClassCompileTests.swift new file mode 100644 index 000000000..05a23d9de --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSClassCompileTests.swift @@ -0,0 +1,11 @@ +import JavaScriptKit + +@JSClass(from: .global) internal struct MyJSClassInternal { + @JSFunction init() throws(JSException) +} +@JSClass(from: .global) public struct MyJSClassPublic { + @JSFunction init() throws(JSException) +} +@JSClass(from: .global) package struct MyJSClassPackage { + @JSFunction init() throws(JSException) +} diff --git a/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSFunctionCompileTests.swift b/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSFunctionCompileTests.swift new file mode 100644 index 000000000..e74c84d51 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/MacroCompileTests/JSFunctionCompileTests.swift @@ -0,0 +1,7 @@ +import JavaScriptKit + +@JSFunction package func jsFunctionWithPackageAccess() throws(JSException) +@JSFunction public func jsFunctionWithPublicAccess() throws(JSException) +@JSFunction internal func jsFunctionWithInternalAccess() throws(JSException) +@JSFunction fileprivate func jsFunctionWithFilePrivateAccess() throws(JSException) +@JSFunction private func jsFunctionWithPrivateAccess() throws(JSException) From 312e7157907dc416a19b452487ffb14f358c16d1 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 17 Feb 2026 14:51:53 +0900 Subject: [PATCH 228/252] PlayBridgeJS: Surface BridgeJS diagnostics inside editors --- .../PlayBridgeJS/Sources/JavaScript/app.js | 31 ++- .../PlayBridgeJS/Sources/JavaScript/editor.js | 67 +++++- .../PlayBridgeJS/Generated/BridgeJS.swift | 226 ++++++++++++------ .../Generated/JavaScript/BridgeJS.json | 194 ++++++++++----- .../Sources/PlayBridgeJS/main.swift | 63 +++-- .../BridgeJS/Sources/BridgeJSCore/Misc.swift | 28 ++- .../BridgeJSCore/SwiftToSkeleton.swift | 6 +- .../Sources/BridgeJSTool/BridgeJSTool.swift | 8 +- 8 files changed, 452 insertions(+), 171 deletions(-) diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/app.js b/Examples/PlayBridgeJS/Sources/JavaScript/app.js index 7da78e038..5580c802d 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/app.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/app.js @@ -268,19 +268,38 @@ export class BridgeJSPlayground { try { this.hideError(); + this.editorSystem.clearDiagnostics(); const inputs = this.editorSystem.getInputs(); const swiftCode = inputs.swift; const dtsCode = inputs.dts; // Process the code and get PlayBridgeJSOutput - const result = this.playBridgeJS.update(swiftCode, dtsCode); - - // Update outputs using the PlayBridgeJSOutput object - this.editorSystem.updateOutputs(result); - - console.log('Code generated successfully'); + const result = this.playBridgeJS.updateDetailed(swiftCode, dtsCode); + + const diagnostics = result.diagnostics; + if (diagnostics && diagnostics.length > 0) { + const mapped = diagnostics.map(d => ({ + file: d.file, + startLineNumber: d.startLine, + startColumn: d.startColumn, + endLineNumber: d.endLine, + endColumn: d.endColumn, + message: d.message + })); + this.editorSystem.showDiagnostics(mapped); + return; + } + const output = result.output; + if (output) { + // Update outputs using the PlayBridgeJSOutput object + this.editorSystem.updateOutputs(output); + this.hideError(); + console.log('Code generated successfully'); + } else { + this.showError('No output produced.'); + } } catch (error) { console.error('Error generating code:', error); this.showError('Error generating code: ' + error.message); diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js index dc3d362eb..c894598a4 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js @@ -43,7 +43,7 @@ export class EditorSystem { language: 'swift', placeholder: '// Import Swift Macros will appear here...', readOnly: true, - modelUri: 'BridgeJS.Macros.swift' + modelUri: 'Playground.Macros.swift' }, { key: 'swift-glue', @@ -206,10 +206,10 @@ export class EditorSystem { updateOutputs(result) { const outputMap = { - 'swift-glue': () => result.swiftGlue(), - 'swift-import-macros': () => result.importSwiftMacroDecls(), - 'js-generated': () => result.outputJs(), - 'dts-generated': () => result.outputDts() + 'swift-glue': () => result.swiftGlue, + 'swift-import-macros': () => result.importSwiftMacroDecls, + 'js-generated': () => result.outputJs, + 'dts-generated': () => result.outputDts }; Object.entries(outputMap).forEach(([key, getContent]) => { @@ -230,6 +230,63 @@ export class EditorSystem { }); } + clearDiagnostics() { + // Remove all diagnostics owned by the playground. + this.editors.forEach(editor => { + const model = editor.getModel(); + if (!model || typeof monaco === 'undefined') return; + monaco.editor.setModelMarkers(model, 'bridgejs', []); + }); + } + + /** + * @param {{file: string, startLineNumber: number, startColumn: number, endLineNumber?: number, endColumn?: number, message: string}[]} diagnostics + */ + showDiagnostics(diagnostics) { + if (typeof monaco === 'undefined') return; + + // Group diagnostics per model so we can set markers in batches. + const markersByModel = new Map(); + + diagnostics.forEach(diag => { + const model = this.findModelForFile(diag.file); + if (!model) return; + + const markers = markersByModel.get(model) ?? []; + const lineLength = model.getLineMaxColumn(diag.startLineNumber); + const endLine = diag.endLineNumber ?? diag.startLineNumber; + const endColumn = Math.min(lineLength, diag.endColumn ?? diag.startColumn + 1); + + markers.push({ + severity: monaco.MarkerSeverity.Error, + message: diag.message, + startLineNumber: diag.startLineNumber, + startColumn: diag.startColumn, + endLineNumber: endLine, + endColumn + }); + + markersByModel.set(model, markers); + }); + + markersByModel.forEach((markers, model) => { + monaco.editor.setModelMarkers(model, 'bridgejs', markers); + }); + } + + findModelForFile(fileName) { + const normalized = fileName.startsWith('/') ? fileName.slice(1) : fileName; + for (const editor of this.editors.values()) { + const model = editor.getModel(); + if (!model) continue; + const uriPath = model.uri.path.startsWith('/') ? model.uri.path.slice(1) : model.uri.path; + if (uriPath === normalized || uriPath.endsWith('/' + normalized)) { + return model; + } + } + return null; + } + // Utility methods getConfigByKey(key) { return [...this.config.input, ...this.config.output].find(c => c.key === key); diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index f97c181d9..6e146dbc3 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -7,6 +7,153 @@ @_spi(BridgeJS) import JavaScriptKit +extension PlayBridgeJSOutput: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PlayBridgeJSOutput { + let swiftGlue = String.bridgeJSStackPop() + let importSwiftMacroDecls = String.bridgeJSStackPop() + let outputDts = String.bridgeJSStackPop() + let outputJs = String.bridgeJSStackPop() + return PlayBridgeJSOutput(outputJs: outputJs, outputDts: outputDts, importSwiftMacroDecls: importSwiftMacroDecls, swiftGlue: swiftGlue) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.outputJs.bridgeJSStackPush() + self.outputDts.bridgeJSStackPush() + self.importSwiftMacroDecls.bridgeJSStackPush() + self.swiftGlue.bridgeJSStackPush() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSOutput(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSStackPop() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSStackPush() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PlayBridgeJSOutput())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSOutput") +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSOutput") +fileprivate func _bjs_struct_lift_PlayBridgeJSOutput() -> Int32 +#else +fileprivate func _bjs_struct_lift_PlayBridgeJSOutput() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension PlayBridgeJSDiagnostic: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PlayBridgeJSDiagnostic { + let endColumn = Int.bridgeJSStackPop() + let endLine = Int.bridgeJSStackPop() + let startColumn = Int.bridgeJSStackPop() + let startLine = Int.bridgeJSStackPop() + let message = String.bridgeJSStackPop() + let file = String.bridgeJSStackPop() + return PlayBridgeJSDiagnostic(file: file, message: message, startLine: startLine, startColumn: startColumn, endLine: endLine, endColumn: endColumn) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.file.bridgeJSStackPush() + self.message.bridgeJSStackPush() + self.startLine.bridgeJSStackPush() + self.startColumn.bridgeJSStackPush() + self.endLine.bridgeJSStackPush() + self.endColumn.bridgeJSStackPush() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSDiagnostic(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSStackPop() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSStackPush() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PlayBridgeJSDiagnostic())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSDiagnostic") +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSDiagnostic") +fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic() -> Int32 +#else +fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +extension PlayBridgeJSResult: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PlayBridgeJSResult { + let diagnostics = [PlayBridgeJSDiagnostic].bridgeJSStackPop() + let output = Optional.bridgeJSStackPop() + return PlayBridgeJSResult(output: output, diagnostics: diagnostics) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.output.bridgeJSStackPush() + self.diagnostics.bridgeJSStackPush() + } + + init(unsafelyCopying jsObject: JSObject) { + let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSResult(jsObject.bridgeJSLowerParameter()) + defer { + _swift_js_struct_cleanup(__bjs_cleanupId) + } + self = Self.bridgeJSStackPop() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSStackPush() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_PlayBridgeJSResult())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSResult") +fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Int32 +#else +fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSResult") +fileprivate func _bjs_struct_lift_PlayBridgeJSResult() -> Int32 +#else +fileprivate func _bjs_struct_lift_PlayBridgeJSResult() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif + @_expose(wasm, "bjs_PlayBridgeJS_init") @_cdecl("bjs_PlayBridgeJS_init") public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer { @@ -18,12 +165,12 @@ public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer { #endif } -@_expose(wasm, "bjs_PlayBridgeJS_update") -@_cdecl("bjs_PlayBridgeJS_update") -public func _bjs_PlayBridgeJS_update(_ _self: UnsafeMutableRawPointer, _ swiftSourceBytes: Int32, _ swiftSourceLength: Int32, _ dtsSourceBytes: Int32, _ dtsSourceLength: Int32) -> UnsafeMutableRawPointer { +@_expose(wasm, "bjs_PlayBridgeJS_updateDetailed") +@_cdecl("bjs_PlayBridgeJS_updateDetailed") +public func _bjs_PlayBridgeJS_updateDetailed(_ _self: UnsafeMutableRawPointer, _ swiftSourceBytes: Int32, _ swiftSourceLength: Int32, _ dtsSourceBytes: Int32, _ dtsSourceLength: Int32) -> Void { #if arch(wasm32) do { - let ret = try PlayBridgeJS.bridgeJSLiftParameter(_self).update(swiftSource: String.bridgeJSLiftParameter(swiftSourceBytes, swiftSourceLength), dtsSource: String.bridgeJSLiftParameter(dtsSourceBytes, dtsSourceLength)) + let ret = try PlayBridgeJS.bridgeJSLiftParameter(_self).updateDetailed(swiftSource: String.bridgeJSLiftParameter(swiftSourceBytes, swiftSourceLength), dtsSource: String.bridgeJSLiftParameter(dtsSourceBytes, dtsSourceLength)) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -36,7 +183,7 @@ public func _bjs_PlayBridgeJS_update(_ _self: UnsafeMutableRawPointer, _ swiftSo _swift_js_throw(Int32(bitPattern: $0.id)) } } - return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped + return } #else fatalError("Only available on WebAssembly") @@ -68,75 +215,6 @@ fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> I } #endif -@_expose(wasm, "bjs_PlayBridgeJSOutput_outputJs") -@_cdecl("bjs_PlayBridgeJSOutput_outputJs") -public func _bjs_PlayBridgeJSOutput_outputJs(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).outputJs() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_PlayBridgeJSOutput_outputDts") -@_cdecl("bjs_PlayBridgeJSOutput_outputDts") -public func _bjs_PlayBridgeJSOutput_outputDts(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).outputDts() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_PlayBridgeJSOutput_importSwiftMacroDecls") -@_cdecl("bjs_PlayBridgeJSOutput_importSwiftMacroDecls") -public func _bjs_PlayBridgeJSOutput_importSwiftMacroDecls(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).importSwiftMacroDecls() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_PlayBridgeJSOutput_swiftGlue") -@_cdecl("bjs_PlayBridgeJSOutput_swiftGlue") -public func _bjs_PlayBridgeJSOutput_swiftGlue(_ _self: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - let ret = PlayBridgeJSOutput.bridgeJSLiftParameter(_self).swiftGlue() - return ret.bridgeJSLowerReturn() - #else - fatalError("Only available on WebAssembly") - #endif -} - -@_expose(wasm, "bjs_PlayBridgeJSOutput_deinit") -@_cdecl("bjs_PlayBridgeJSOutput_deinit") -public func _bjs_PlayBridgeJSOutput_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { - #if arch(wasm32) - Unmanaged.fromOpaque(pointer).release() - #else - fatalError("Only available on WebAssembly") - #endif -} - -extension PlayBridgeJSOutput: ConvertibleToJSValue, _BridgedSwiftHeapObject { - var jsValue: JSValue { - return .object(JSObject(id: UInt32(bitPattern: _bjs_PlayBridgeJSOutput_wrap(Unmanaged.passRetained(self).toOpaque())))) - } -} - -#if arch(wasm32) -@_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJSOutput_wrap") -fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 -#else -fileprivate func _bjs_PlayBridgeJSOutput_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { - fatalError("Only available on WebAssembly") -} -#endif - #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Swift") fileprivate func bjs_createTS2Swift() -> Int32 diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json index 743925c5f..3046e1f01 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json @@ -15,13 +15,13 @@ }, "methods" : [ { - "abiName" : "bjs_PlayBridgeJS_update", + "abiName" : "bjs_PlayBridgeJS_updateDetailed", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "update", + "name" : "updateDetailed", "parameters" : [ { "label" : "swiftSource", @@ -43,8 +43,8 @@ } ], "returnType" : { - "swiftHeapObject" : { - "_0" : "PlayBridgeJSOutput" + "swiftStruct" : { + "_0" : "PlayBridgeJSResult" } } } @@ -54,97 +54,175 @@ ], "swiftCallName" : "PlayBridgeJS" - }, + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + + ], + "protocols" : [ + + ], + "structs" : [ { "methods" : [ + + ], + "name" : "PlayBridgeJSOutput", + "properties" : [ { - "abiName" : "bjs_PlayBridgeJSOutput_outputJs", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, + "isReadonly" : true, + "isStatic" : false, "name" : "outputJs", - "parameters" : [ - - ], - "returnType" : { + "type" : { "string" : { } } }, { - "abiName" : "bjs_PlayBridgeJSOutput_outputDts", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, + "isReadonly" : true, + "isStatic" : false, "name" : "outputDts", - "parameters" : [ - - ], - "returnType" : { + "type" : { "string" : { } } }, { - "abiName" : "bjs_PlayBridgeJSOutput_importSwiftMacroDecls", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, + "isReadonly" : true, + "isStatic" : false, "name" : "importSwiftMacroDecls", - "parameters" : [ - - ], - "returnType" : { + "type" : { "string" : { } } }, { - "abiName" : "bjs_PlayBridgeJSOutput_swiftGlue", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, + "isReadonly" : true, + "isStatic" : false, "name" : "swiftGlue", - "parameters" : [ - - ], - "returnType" : { + "type" : { "string" : { } } } ], - "name" : "PlayBridgeJSOutput", - "properties" : [ + "swiftCallName" : "PlayBridgeJSOutput" + }, + { + "methods" : [ ], - "swiftCallName" : "PlayBridgeJSOutput" - } - ], - "enums" : [ + "name" : "PlayBridgeJSDiagnostic", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "file", + "type" : { + "string" : { - ], - "exposeToGlobal" : false, - "functions" : [ + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "message", + "type" : { + "string" : { - ], - "protocols" : [ + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "startLine", + "type" : { + "int" : { - ], - "structs" : [ + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "startColumn", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "endLine", + "type" : { + "int" : { + + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "endColumn", + "type" : { + "int" : { + + } + } + } + ], + "swiftCallName" : "PlayBridgeJSDiagnostic" + }, + { + "methods" : [ + ], + "name" : "PlayBridgeJSResult", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "output", + "type" : { + "nullable" : { + "_0" : { + "swiftStruct" : { + "_0" : "PlayBridgeJSOutput" + } + }, + "_1" : "null" + } + } + }, + { + "isReadonly" : true, + "isStatic" : false, + "name" : "diagnostics", + "type" : { + "array" : { + "_0" : { + "swiftStruct" : { + "_0" : "PlayBridgeJSDiagnostic" + } + } + } + } + } + ], + "swiftCallName" : "PlayBridgeJSResult" + } ] }, "imported" : { diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift index 80572962a..ec9eda774 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift @@ -1,14 +1,40 @@ import JavaScriptEventLoop import JavaScriptKit import SwiftParser +import SwiftSyntax import class Foundation.JSONDecoder @JS class PlayBridgeJS { @JS init() {} - @JS func update(swiftSource: String, dtsSource: String) throws(JSException) -> PlayBridgeJSOutput { + /// Structured entry point used by the playground so JS doesn't need to parse diagnostics. + @JS func updateDetailed(swiftSource: String, dtsSource: String) throws(JSException) -> PlayBridgeJSResult { do { - return try _update(swiftSource: swiftSource, dtsSource: dtsSource) + let output = try _update(swiftSource: swiftSource, dtsSource: dtsSource) + return PlayBridgeJSResult(output: output, diagnostics: []) + } catch let error as BridgeJSCoreDiagnosticError { + let diagnostics = error.diagnostics.map { diag -> PlayBridgeJSDiagnostic in + let converter = SourceLocationConverter(fileName: diag.file, tree: diag.diagnostic.node.root) + let start = converter.location(for: diag.diagnostic.node.positionAfterSkippingLeadingTrivia) + let end = converter.location(for: diag.diagnostic.node.endPositionBeforeTrailingTrivia) + + let startLine = start.line + let startColumn = start.column + let endLine = end.line + let endColumn = max(startColumn + 1, end.column) + + return PlayBridgeJSDiagnostic( + file: diag.file, + message: diag.diagnostic.message, + startLine: startLine, + startColumn: startColumn, + endLine: endLine, + endColumn: endColumn + ) + } + return PlayBridgeJSResult(output: nil, diagnostics: diagnostics) + } catch let error as BridgeJSCoreError { + throw JSException(message: error.description) } catch let error as JSException { throw error } catch { @@ -49,23 +75,26 @@ import class Foundation.JSONDecoder swiftGlue: (importResult ?? "") + "\n\n" + (exportResult ?? "") ) } + } -@JS class PlayBridgeJSOutput { - let _outputJs: String - let _outputDts: String - let _importSwiftMacroDecls: String - let _swiftGlue: String +@JS struct PlayBridgeJSOutput { + let outputJs: String + let outputDts: String + let importSwiftMacroDecls: String + let swiftGlue: String +} - init(outputJs: String, outputDts: String, importSwiftMacroDecls: String, swiftGlue: String) { - self._outputJs = outputJs - self._outputDts = outputDts - self._importSwiftMacroDecls = importSwiftMacroDecls - self._swiftGlue = swiftGlue - } +@JS struct PlayBridgeJSDiagnostic { + let file: String + let message: String + let startLine: Int + let startColumn: Int + let endLine: Int + let endColumn: Int +} - @JS func outputJs() -> String { self._outputJs } - @JS func outputDts() -> String { self._outputDts } - @JS func importSwiftMacroDecls() -> String { self._importSwiftMacroDecls } - @JS func swiftGlue() -> String { self._swiftGlue } +@JS struct PlayBridgeJSResult { + let output: PlayBridgeJSOutput? + let diagnostics: [PlayBridgeJSDiagnostic] } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift index 9db11b14d..06fb422a9 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/Misc.swift @@ -136,12 +136,12 @@ private enum JSON { import SwiftSyntax import class Foundation.ProcessInfo -struct DiagnosticError: Error { - let node: Syntax - let message: String - let hint: String? +public struct DiagnosticError: Error { + public let node: Syntax + public let message: String + public let hint: String? - init(node: some SyntaxProtocol, message: String, hint: String? = nil) { + public init(node: some SyntaxProtocol, message: String, hint: String? = nil) { self.node = Syntax(node) self.message = message self.hint = hint @@ -153,7 +153,7 @@ struct DiagnosticError: Error { /// - fileName: The name of the file to display in the output. /// - colorize: Whether to colorize the output with ANSI escape sequences. /// - Returns: The formatted diagnostic error string. - func formattedDescription(fileName: String, colorize: Bool = Self.shouldColorize) -> String { + public func formattedDescription(fileName: String, colorize: Bool = Self.shouldColorize) -> String { let displayFileName = fileName == "-" ? "" : fileName let converter = SourceLocationConverter(fileName: displayFileName, tree: node.root) let startLocation = converter.location(for: node.positionAfterSkippingLeadingTrivia) @@ -273,7 +273,7 @@ struct DiagnosticError: Error { return "\(gutter) | \(text)" } - private static var shouldColorize: Bool { + public static var shouldColorize: Bool { let env = ProcessInfo.processInfo.environment let termIsDumb = env["TERM"] == "dumb" return env["NO_COLOR"] == nil && !termIsDumb @@ -286,6 +286,20 @@ struct DiagnosticError: Error { return String.Index(utf8Index, within: line)! } } +/// Carries the diagnostics produced during SwiftToSkeleton. +public struct BridgeJSCoreDiagnosticError: Swift.Error, CustomStringConvertible { + public let diagnostics: [(file: String, diagnostic: DiagnosticError)] + + public init(diagnostics: [(file: String, diagnostic: DiagnosticError)]) { + self.diagnostics = diagnostics + } + + public var description: String { + diagnostics + .map { (file, diag) in diag.formattedDescription(fileName: file, colorize: false) } + .joined(separator: "\n") + } +} private enum ANSI { static let reset = "\u{001B}[0;0m" diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index 1d775fbc6..0cf5a567f 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -78,10 +78,10 @@ public final class SwiftToSkeleton { } if !perSourceErrors.isEmpty { - let allErrors = perSourceErrors.flatMap { inputFilePath, errors in - errors.map { $0.formattedDescription(fileName: inputFilePath) } + let diagnostics = perSourceErrors.flatMap { inputFilePath, errors in + errors.map { (file: inputFilePath, diagnostic: $0) } } - throw BridgeJSCoreError(allErrors.joined(separator: "\n")) + throw BridgeJSCoreDiagnosticError(diagnostics: diagnostics) } let importedSkeleton: ImportedModuleSkeleton? = { let module = ImportedModuleSkeleton(children: importedFiles) diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift index 9410b2909..a71aaee44 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift @@ -61,7 +61,13 @@ import BridgeJSUtilities try run() } } catch { - printStderr("error: \(error)") + if let diagError = error as? BridgeJSCoreDiagnosticError { + diagError.diagnostics.forEach { file, diagnostic in + printStderr(diagnostic.formattedDescription(fileName: file)) + } + } else { + printStderr("error: \(error)") + } exit(1) } } From 76e03622e26984689ca7ac0a98e5c58c37174436 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Tue, 17 Feb 2026 16:57:50 +0900 Subject: [PATCH 229/252] Make PlayBridgeJS tabs scroll when overflow --- Examples/PlayBridgeJS/Sources/JavaScript/styles.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/styles.css b/Examples/PlayBridgeJS/Sources/JavaScript/styles.css index ab943c6e0..f8eafbec9 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/styles.css +++ b/Examples/PlayBridgeJS/Sources/JavaScript/styles.css @@ -306,6 +306,10 @@ body { margin: 0; background-color: var(--color-fill-secondary); border-bottom: 1px solid var(--color-border); + overflow-x: auto; + overflow-y: hidden; + scrollbar-gutter: stable; + -webkit-overflow-scrolling: touch; } .tab-button { @@ -319,6 +323,8 @@ body { transition: all 0.2s ease; position: relative; border-bottom: 2px solid transparent; + flex: 0 0 auto; + white-space: nowrap; } .tab-button:hover { @@ -411,12 +417,10 @@ body { } .tab-group { - flex-wrap: wrap; + scroll-padding-inline: 12px; } .tab-button { - flex: 1; - min-width: 0; text-align: center; } @@ -447,4 +451,4 @@ body { .share-url-input { font-size: 12px; } -} \ No newline at end of file +} From 487cf7911307c60efbb6c3613cf61915d721be20 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 17 Feb 2026 12:14:57 +0100 Subject: [PATCH 230/252] BridgeJS: Use indirect _exports lookup in wrap functions --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 2 +- .../__Snapshots__/BridgeJSLinkTests/ArrayTypes.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/DefaultParameters.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/EnumNamespace.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/JSValue.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/MixedGlobal.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/MixedModules.js | 4 ++-- .../__Snapshots__/BridgeJSLinkTests/MixedPrivate.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/Namespaces.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/Optionals.js | 4 ++-- .../__Snapshots__/BridgeJSLinkTests/PropertyTypes.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/Protocol.js | 6 +++--- .../BridgeJSLinkTests/StaticFunctions.Global.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/StaticFunctions.js | 2 +- .../BridgeJSLinkTests/StaticProperties.Global.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/StaticProperties.js | 2 +- .../__Snapshots__/BridgeJSLinkTests/SwiftClass.js | 6 +++--- .../__Snapshots__/BridgeJSLinkTests/SwiftClosure.js | 4 ++-- .../__Snapshots__/BridgeJSLinkTests/SwiftStruct.js | 2 +- 23 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index b779e0171..625b82b6e 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1122,7 +1122,7 @@ public struct BridgeJSLink { for klass in classes.sorted(by: { $0.name < $1.name }) { let wrapperFunctionName = "bjs_\(klass.name)_wrap" wrapperLines.append("importObject[\"\(moduleName)\"][\"\(wrapperFunctionName)\"] = function(pointer) {") - wrapperLines.append(" const obj = \(klass.name).__construct(pointer);") + wrapperLines.append(" const obj = _exports['\(klass.name)'].__construct(pointer);") wrapperLines.append(" return \(JSGlueVariableScope.reservedSwift).memory.retain(obj);") wrapperLines.append("};") } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 52438d27d..5944dc257 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -239,7 +239,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Item_wrap"] = function(pointer) { - const obj = Item.__construct(pointer); + const obj = _exports['Item'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 6182298a1..adb9143cf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -272,15 +272,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_ConstructorDefaults_wrap"] = function(pointer) { - const obj = ConstructorDefaults.__construct(pointer); + const obj = _exports['ConstructorDefaults'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_DefaultGreeter_wrap"] = function(pointer) { - const obj = DefaultGreeter.__construct(pointer); + const obj = _exports['DefaultGreeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_EmptyGreeter_wrap"] = function(pointer) { - const obj = EmptyGreeter.__construct(pointer); + const obj = _exports['EmptyGreeter'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 4f71aa76e..41a6074ea 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -201,7 +201,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Box_wrap"] = function(pointer) { - const obj = Box.__construct(pointer); + const obj = _exports['Box'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index af81d52fe..a5ead8a1c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -1027,7 +1027,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_User_wrap"] = function(pointer) { - const obj = User.__construct(pointer); + const obj = _exports['User'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 392788ef6..887f5ff3f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -244,15 +244,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { - const obj = Converter.__construct(pointer); + const obj = _exports['Converter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) { - const obj = HTTPServer.__construct(pointer); + const obj = _exports['HTTPServer'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) { - const obj = TestServer.__construct(pointer); + const obj = _exports['TestServer'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 0a2826a5e..a9470aad7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -225,15 +225,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { - const obj = Converter.__construct(pointer); + const obj = _exports['Converter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) { - const obj = HTTPServer.__construct(pointer); + const obj = _exports['HTTPServer'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) { - const obj = TestServer.__construct(pointer); + const obj = _exports['TestServer'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index d45efc771..ab59944ce 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -290,7 +290,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_JSValueHolder_wrap"] = function(pointer) { - const obj = JSValueHolder.__construct(pointer); + const obj = _exports['JSValueHolder'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 675aa3798..ee89f5e5f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_GlobalClass_wrap"] = function(pointer) { - const obj = GlobalClass.__construct(pointer); + const obj = _exports['GlobalClass'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 6a6c75ef4..ab54a88c3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) { importObject["GlobalModule"] = {}; } importObject["GlobalModule"]["bjs_GlobalClass_wrap"] = function(pointer) { - const obj = GlobalClass.__construct(pointer); + const obj = _exports['GlobalClass'].__construct(pointer); return swift.memory.retain(obj); }; // Wrapper functions for module: PrivateModule @@ -208,7 +208,7 @@ export async function createInstantiator(options, swift) { importObject["PrivateModule"] = {}; } importObject["PrivateModule"]["bjs_PrivateClass_wrap"] = function(pointer) { - const obj = PrivateClass.__construct(pointer); + const obj = _exports['PrivateClass'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index f36211310..24dac8d27 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_PrivateClass_wrap"] = function(pointer) { - const obj = PrivateClass.__construct(pointer); + const obj = _exports['PrivateClass'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 09ad002a1..3ce2779e1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -200,15 +200,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { - const obj = Converter.__construct(pointer); + const obj = _exports['Converter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); + const obj = _exports['Greeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) { - const obj = UUID.__construct(pointer); + const obj = _exports['UUID'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index 7368e52fa..d4437f0c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -200,15 +200,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) { - const obj = Converter.__construct(pointer); + const obj = _exports['Converter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); + const obj = _exports['Greeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) { - const obj = UUID.__construct(pointer); + const obj = _exports['UUID'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index c4f99c84b..349921a25 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -201,11 +201,11 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); + const obj = _exports['Greeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_OptionalPropertyHolder_wrap"] = function(pointer) { - const obj = OptionalPropertyHolder.__construct(pointer); + const obj = _exports['OptionalPropertyHolder'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index b39362233..024523591 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -200,7 +200,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_PropertyHolder_wrap"] = function(pointer) { - const obj = PropertyHolder.__construct(pointer); + const obj = _exports['PropertyHolder'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 1d413db20..0ff740ad1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -261,15 +261,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_DelegateManager_wrap"] = function(pointer) { - const obj = DelegateManager.__construct(pointer); + const obj = _exports['DelegateManager'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_Helper_wrap"] = function(pointer) { - const obj = Helper.__construct(pointer); + const obj = _exports['Helper'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_MyViewController_wrap"] = function(pointer) { - const obj = MyViewController.__construct(pointer); + const obj = _exports['MyViewController'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 07f7a3c77..370ca98b4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -248,7 +248,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_MathUtils_wrap"] = function(pointer) { - const obj = MathUtils.__construct(pointer); + const obj = _exports['MathUtils'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index c2c3f9a70..bd7964c85 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -248,7 +248,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_MathUtils_wrap"] = function(pointer) { - const obj = MathUtils.__construct(pointer); + const obj = _exports['MathUtils'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 3784b5a7e..b5155bddf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -205,7 +205,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_PropertyClass_wrap"] = function(pointer) { - const obj = PropertyClass.__construct(pointer); + const obj = _exports['PropertyClass'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index 47f0092af..47918485d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -205,7 +205,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_PropertyClass_wrap"] = function(pointer) { - const obj = PropertyClass.__construct(pointer); + const obj = _exports['PropertyClass'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 9f8f93c5b..7dce46d8e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -201,15 +201,15 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); + const obj = _exports['Greeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_PackageGreeter_wrap"] = function(pointer) { - const obj = PackageGreeter.__construct(pointer); + const obj = _exports['PackageGreeter'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_PublicGreeter_wrap"] = function(pointer) { - const obj = PublicGreeter.__construct(pointer); + const obj = _exports['PublicGreeter'].__construct(pointer); return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 3371cf1b3..d701e93d7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -885,11 +885,11 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Person_wrap"] = function(pointer) { - const obj = Person.__construct(pointer); + const obj = _exports['Person'].__construct(pointer); return swift.memory.retain(obj); }; importObject["TestModule"]["bjs_TestProcessor_wrap"] = function(pointer) { - const obj = TestProcessor.__construct(pointer); + const obj = _exports['TestProcessor'].__construct(pointer); return swift.memory.retain(obj); }; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index 316dfb709..f3c0810c1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -512,7 +512,7 @@ export async function createInstantiator(options, swift) { importObject["TestModule"] = {}; } importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) { - const obj = Greeter.__construct(pointer); + const obj = _exports['Greeter'].__construct(pointer); return swift.memory.retain(obj); }; }, From 40790973697a41e510127761c1681c7985e64f56 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 17 Feb 2026 12:15:53 +0100 Subject: [PATCH 231/252] PackageToJS: Replace @ts-ignore with @ts-expect-error in templates --- Plugins/PackageToJS/Templates/instantiate.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index 955c2928c..c9bc9efb4 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -4,17 +4,17 @@ import { SwiftRuntime } from "./runtime.js" export const MODULE_PATH = "@PACKAGE_TO_JS_MODULE_PATH@"; /* #if USE_SHARED_MEMORY */ export const MEMORY_TYPE = { - // @ts-ignore + // @ts-expect-error Substituted by PackageToJS preprocessor initial: import.meta.PACKAGE_TO_JS_MEMORY_INITIAL, - // @ts-ignore + // @ts-expect-error Substituted by PackageToJS preprocessor maximum: import.meta.PACKAGE_TO_JS_MEMORY_MAXIMUM, - // @ts-ignore + // @ts-expect-error Substituted by PackageToJS preprocessor shared: import.meta.PACKAGE_TO_JS_MEMORY_SHARED, } /* #endif */ /* #if HAS_BRIDGE */ -// @ts-ignore +// @ts-expect-error Substituted by PackageToJS preprocessor import { createInstantiator } from "./bridge-js.js" /* #else */ /** From a4206f2828e610954c40486a9e491d33edfc77d5 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 17 Feb 2026 12:33:39 +0100 Subject: [PATCH 232/252] Runtime: Simplify find-global.ts to just globalThis --- Runtime/src/find-global.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Runtime/src/find-global.ts b/Runtime/src/find-global.ts index f20afbf34..1530f446e 100644 --- a/Runtime/src/find-global.ts +++ b/Runtime/src/find-global.ts @@ -1,13 +1 @@ -interface GlobalVariable {} -declare const global: GlobalVariable; - -export let globalVariable: any; -if (typeof globalThis !== "undefined") { - globalVariable = globalThis; -} else if (typeof window !== "undefined") { - globalVariable = window; -} else if (typeof global !== "undefined") { - globalVariable = global; -} else if (typeof self !== "undefined") { - globalVariable = self; -} +export const globalVariable: any = globalThis; From 504ae31f438e5bb80637911a1dd6fab8b73ae6af Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Tue, 17 Feb 2026 12:33:44 +0100 Subject: [PATCH 233/252] Runtime: Apply prettier formatting and enforce in CI --- .github/workflows/test.yml | 10 + Plugins/PackageToJS/Templates/runtime.mjs | 114 +++--- Runtime/src/closure-heap.ts | 2 +- Runtime/src/index.ts | 403 +++++++++++++++------- Runtime/src/itc.ts | 173 ++++++---- Runtime/src/js-value.ts | 28 +- Runtime/src/object-heap.ts | 2 +- Runtime/src/types.ts | 2 +- 8 files changed, 494 insertions(+), 240 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e9060f19..69f63a27c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -119,6 +119,16 @@ jobs: env: DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/ + prettier: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-node@v6 + with: + node-version: '20' + - run: npm install + - run: npx prettier --check Runtime/src + format: runs-on: ubuntu-latest container: diff --git a/Plugins/PackageToJS/Templates/runtime.mjs b/Plugins/PackageToJS/Templates/runtime.mjs index a40fc3df6..e0bcf3e05 100644 --- a/Plugins/PackageToJS/Templates/runtime.mjs +++ b/Plugins/PackageToJS/Templates/runtime.mjs @@ -1,6 +1,6 @@ /// Memory lifetime of closures in Swift are managed by Swift side class SwiftClosureDeallocator { - constructor(exports) { + constructor(exports$1) { if (typeof FinalizationRegistry === "undefined") { throw new Error("The Swift part of JavaScriptKit was configured to require " + "the availability of JavaScript WeakRefs. Please build " + @@ -8,7 +8,7 @@ class SwiftClosureDeallocator { "disable features that use WeakRefs."); } this.functionRegistry = new FinalizationRegistry((id) => { - exports.swjs_free_host_function(id); + exports$1.swjs_free_host_function(id); }); } track(func, func_ref) { @@ -126,12 +126,12 @@ class ITCInterface { } send(sendingObject, transferringObjects, sendingContext) { const object = this.memory.getObject(sendingObject); - const transfer = transferringObjects.map(ref => this.memory.getObject(ref)); + const transfer = transferringObjects.map((ref) => this.memory.getObject(ref)); return { object, sendingContext, transfer }; } sendObjects(sendingObjects, transferringObjects, sendingContext) { - const objects = sendingObjects.map(ref => this.memory.getObject(ref)); - const transfer = transferringObjects.map(ref => this.memory.getObject(ref)); + const objects = sendingObjects.map((ref) => this.memory.getObject(ref)); + const transfer = transferringObjects.map((ref) => this.memory.getObject(ref)); return { object: objects, sendingContext, transfer }; } release(objectRef) { @@ -168,7 +168,9 @@ class MessageBroker { this.handlers.onResponse(message); return; } - const transfer = message.data.response.ok ? message.data.response.value.transfer : []; + const transfer = message.data.response.ok + ? message.data.response.value.transfer + : []; if ("postMessageToWorkerThread" in this.threadChannel) { // The response is for another worker thread sent from the main thread this.threadChannel.postMessageToWorkerThread(message.data.sourceTid, message, transfer); @@ -186,7 +188,7 @@ class MessageBroker { this.handlers.onRequest(message); } else if ("postMessageToWorkerThread" in this.threadChannel) { - // Receive a request from a worker thread to other worker on main thread. + // Receive a request from a worker thread to other worker on main thread. // Proxy the request to the target worker thread. this.threadChannel.postMessageToWorkerThread(message.data.targetTid, message, []); } @@ -202,7 +204,9 @@ class MessageBroker { else if ("postMessageToWorkerThread" in this.threadChannel) { // Receive a response from a worker thread to other worker on main thread. // Proxy the response to the target worker thread. - const transfer = message.data.response.ok ? message.data.response.value.transfer : []; + const transfer = message.data.response.ok + ? message.data.response.value.transfer + : []; this.threadChannel.postMessageToWorkerThread(message.data.sourceTid, message, transfer); } else if ("postMessageToMainThread" in this.threadChannel) { @@ -213,7 +217,14 @@ class MessageBroker { } function serializeError(error) { if (error instanceof Error) { - return { isError: true, value: { message: error.message, name: error.name, stack: error.stack } }; + return { + isError: true, + value: { + message: error.message, + name: error.name, + stack: error.stack, + }, + }; } return { isError: false, value: error }; } @@ -224,19 +235,7 @@ function deserializeError(error) { return error.value; } -let globalVariable; -if (typeof globalThis !== "undefined") { - globalVariable = globalThis; -} -else if (typeof window !== "undefined") { - globalVariable = window; -} -else if (typeof global !== "undefined") { - globalVariable = global; -} -else if (typeof self !== "undefined") { - globalVariable = self; -} +const globalVariable = globalThis; class JSObjectSpace { constructor() { @@ -312,7 +311,8 @@ class SwiftRuntime { // 1. It may not be available in the global scope if the context is not cross-origin isolated. // 2. The underlying buffer may be still backed by SAB even if the context is not cross-origin // isolated (e.g. localhost on Chrome on Android). - if (Object.getPrototypeOf(wasmMemory.buffer).constructor.name === "SharedArrayBuffer") { + if (Object.getPrototypeOf(wasmMemory.buffer).constructor.name === + "SharedArrayBuffer") { // When the wasm memory is backed by a SharedArrayBuffer, growing the memory // doesn't invalidate the data view by setting the byte length to 0. Instead, // the data view points to an old buffer after growing the memory. So we have @@ -463,7 +463,10 @@ class SwiftRuntime { returnValue = { ok: true, value: result }; } catch (error) { - returnValue = { ok: false, error: serializeError(error) }; + returnValue = { + ok: false, + error: serializeError(error), + }; } const responseMessage = { type: "response", @@ -479,7 +482,7 @@ class SwiftRuntime { catch (error) { responseMessage.data.response = { ok: false, - error: serializeError(new TypeError(`Failed to serialize message: ${error}`)) + error: serializeError(new TypeError(`Failed to serialize message: ${error}`)), }; newBroker.reply(responseMessage); } @@ -494,7 +497,7 @@ class SwiftRuntime { const errorObject = this.memory.retain(error); this.exports.swjs_receive_error(errorObject, message.data.context); } - } + }, }); broker = newBroker; return newBroker; @@ -532,21 +535,19 @@ class SwiftRuntime { this.getDataView().setUint32(bytes_ptr_result, bytes_ptr, true); return bytes.length; }, - swjs_decode_string: ( + swjs_decode_string: // NOTE: TextDecoder can't decode typed arrays backed by SharedArrayBuffer this.options.sharedMemory == true - ? ((bytes_ptr, length) => { - const bytes = this.getUint8Array() - .slice(bytes_ptr, bytes_ptr + length); + ? (bytes_ptr, length) => { + const bytes = this.getUint8Array().slice(bytes_ptr, bytes_ptr + length); const string = this.textDecoder.decode(bytes); return this.memory.retain(string); - }) - : ((bytes_ptr, length) => { - const bytes = this.getUint8Array() - .subarray(bytes_ptr, bytes_ptr + length); + } + : (bytes_ptr, length) => { + const bytes = this.getUint8Array().subarray(bytes_ptr, bytes_ptr + length); const string = this.textDecoder.decode(bytes); return this.memory.retain(string); - })), + }, swjs_load_string: (ref, buffer) => { const bytes = this.memory.getObject(ref); this.getUint8Array().set(bytes, buffer); @@ -658,7 +659,9 @@ class SwiftRuntime { // Call `.slice()` to copy the memory return this.memory.retain(array.slice()); }, - swjs_create_object: () => { return this.memory.retain({}); }, + swjs_create_object: () => { + return this.memory.retain({}); + }, swjs_load_typed_array: (ref, buffer) => { const memory = this.memory; const typedArray = memory.getObject(ref); @@ -683,8 +686,8 @@ class SwiftRuntime { request: { method: "release", parameters: [ref], - } - } + }, + }, }); }, swjs_i64_to_bigint: (value, signed) => { @@ -708,17 +711,23 @@ class SwiftRuntime { swjs_i64_to_bigint_slow: (lower, upper, signed) => { const value = BigInt.asUintN(32, BigInt(lower)) + (BigInt.asUintN(32, BigInt(upper)) << BigInt(32)); - return this.memory.retain(signed ? BigInt.asIntN(64, value) : BigInt.asUintN(64, value)); + return this.memory.retain(signed + ? BigInt.asIntN(64, value) + : BigInt.asUintN(64, value)); }, swjs_unsafe_event_loop_yield: () => { throw new UnsafeEventLoopYield(); }, swjs_send_job_to_main_thread: (unowned_job) => { - this.postMessageToMainThread({ type: "job", data: unowned_job }); + this.postMessageToMainThread({ + type: "job", + data: unowned_job, + }); }, swjs_listen_message_from_main_thread: () => { const threadChannel = this.options.threadChannel; - if (!(threadChannel && "listenMessageFromMainThread" in threadChannel)) { + if (!(threadChannel && + "listenMessageFromMainThread" in threadChannel)) { throw new Error("listenMessageFromMainThread is not set in options given to SwiftRuntime. Please set it to listen to wake events from the main thread."); } const broker = getMessageBroker(threadChannel); @@ -746,7 +755,8 @@ class SwiftRuntime { }, swjs_listen_message_from_worker_thread: (tid) => { const threadChannel = this.options.threadChannel; - if (!(threadChannel && "listenMessageFromWorkerThread" in threadChannel)) { + if (!(threadChannel && + "listenMessageFromWorkerThread" in threadChannel)) { throw new Error("listenMessageFromWorkerThread is not set in options given to SwiftRuntime. Please set it to listen to jobs from worker threads."); } const broker = getMessageBroker(threadChannel); @@ -795,9 +805,13 @@ class SwiftRuntime { context: sending_context, request: { method: "send", - parameters: [sending_object, transferringObjects, sending_context], - } - } + parameters: [ + sending_object, + transferringObjects, + sending_context, + ], + }, + }, }); }, swjs_request_sending_objects: (sending_objects, sending_objects_count, transferring_objects, transferring_objects_count, object_source_tid, sending_context) => { @@ -817,9 +831,13 @@ class SwiftRuntime { context: sending_context, request: { method: "sendObjects", - parameters: [sendingObjects, transferringObjects, sending_context], - } - } + parameters: [ + sendingObjects, + transferringObjects, + sending_context, + ], + }, + }, }); }, }; diff --git a/Runtime/src/closure-heap.ts b/Runtime/src/closure-heap.ts index 269934390..0ec0ba9ac 100644 --- a/Runtime/src/closure-heap.ts +++ b/Runtime/src/closure-heap.ts @@ -10,7 +10,7 @@ export class SwiftClosureDeallocator { "The Swift part of JavaScriptKit was configured to require " + "the availability of JavaScript WeakRefs. Please build " + "with `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS` to " + - "disable features that use WeakRefs." + "disable features that use WeakRefs.", ); } diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts index 27b52c7da..1d36c95d1 100644 --- a/Runtime/src/index.ts +++ b/Runtime/src/index.ts @@ -7,7 +7,16 @@ import { MAIN_THREAD_TID, } from "./types.js"; import * as JSValue from "./js-value.js"; -import { deserializeError, MainToWorkerMessage, MessageBroker, ResponseMessage, ITCInterface, serializeError, SwiftRuntimeThreadChannel, WorkerToMainMessage } from "./itc.js"; +import { + deserializeError, + MainToWorkerMessage, + MessageBroker, + ResponseMessage, + ITCInterface, + serializeError, + SwiftRuntimeThreadChannel, + WorkerToMainMessage, +} from "./itc.js"; import { decodeObjectRefs } from "./js-value.js"; import { JSObjectSpace } from "./object-heap.js"; export { SwiftRuntimeThreadChannel }; @@ -36,8 +45,8 @@ export class SwiftRuntime { private textEncoder = new TextEncoder(); // Only support utf-8 /** The thread ID of the current thread. */ private tid: number | null; - private getDataView: (() => DataView); - private getUint8Array: (() => Uint8Array); + private getDataView: () => DataView; + private getUint8Array: () => Uint8Array; private wasmMemory: WebAssembly.Memory | null; UnsafeEventLoopYield = UnsafeEventLoopYield; @@ -49,10 +58,14 @@ export class SwiftRuntime { this.tid = null; this.options = options || {}; this.getDataView = () => { - throw new Error("Please call setInstance() before using any JavaScriptKit APIs from Swift."); + throw new Error( + "Please call setInstance() before using any JavaScriptKit APIs from Swift.", + ); }; this.getUint8Array = () => { - throw new Error("Please call setInstance() before using any JavaScriptKit APIs from Swift."); + throw new Error( + "Please call setInstance() before using any JavaScriptKit APIs from Swift.", + ); }; this.wasmMemory = null; } @@ -70,7 +83,10 @@ export class SwiftRuntime { // 1. It may not be available in the global scope if the context is not cross-origin isolated. // 2. The underlying buffer may be still backed by SAB even if the context is not cross-origin // isolated (e.g. localhost on Chrome on Android). - if (Object.getPrototypeOf(wasmMemory.buffer).constructor.name === "SharedArrayBuffer") { + if ( + Object.getPrototypeOf(wasmMemory.buffer).constructor.name === + "SharedArrayBuffer" + ) { // When the wasm memory is backed by a SharedArrayBuffer, growing the memory // doesn't invalidate the data view by setting the byte length to 0. Instead, // the data view points to an old buffer after growing the memory. So we have @@ -105,14 +121,16 @@ export class SwiftRuntime { } this.wasmMemory = wasmMemory; } else { - throw new Error("instance.exports.memory is not a WebAssembly.Memory!?"); + throw new Error( + "instance.exports.memory is not a WebAssembly.Memory!?", + ); } if (typeof (this.exports as any)._start === "function") { throw new Error( `JavaScriptKit supports only WASI reactor ABI. Please make sure you are building with: -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor - ` + `, ); } if (this.exports.swjs_library_version() != this.version) { @@ -120,7 +138,7 @@ export class SwiftRuntime { `The versions of JavaScriptKit are incompatible. WebAssembly runtime ${this.exports.swjs_library_version()} != JS runtime ${ this.version - }` + }`, ); } } @@ -159,7 +177,7 @@ export class SwiftRuntime { instance.exports.wasi_thread_start(tid, startArg); } else { throw new Error( - `The WebAssembly module is not built for wasm32-unknown-wasip1-threads target.` + `The WebAssembly module is not built for wasm32-unknown-wasip1-threads target.`, ); } } catch (error) { @@ -190,7 +208,7 @@ export class SwiftRuntime { (features & LibraryFeatures.WeakRefs) != 0; if (librarySupportsWeakRef) { this._closureDeallocator = new SwiftClosureDeallocator( - this.exports + this.exports, ); } return this._closureDeallocator; @@ -200,7 +218,7 @@ export class SwiftRuntime { host_func_id: number, line: number, file: string, - args: any[] + args: any[], ) { const argc = args.length; const argv = this.exports.swjs_prepare_host_function_call(argc); @@ -209,7 +227,15 @@ export class SwiftRuntime { for (let index = 0; index < args.length; index++) { const argument = args[index]; const base = argv + 16 * index; - JSValue.write(argument, base, base + 4, base + 8, false, dataView, memory); + JSValue.write( + argument, + base, + base + 4, + base + 8, + false, + dataView, + memory, + ); } let output: any; // This ref is released by the swjs_call_host_function implementation @@ -220,11 +246,11 @@ export class SwiftRuntime { host_func_id, argv, argc, - callback_func_ref + callback_func_ref, ); if (alreadyReleased) { throw new Error( - `The JSClosure has been already released by Swift side. The closure is created at ${file}:${line} @${host_func_id}` + `The JSClosure has been already released by Swift side. The closure is created at ${file}:${line} @${host_func_id}`, ); } this.exports.swjs_cleanup_host_function_call(argv); @@ -244,10 +270,15 @@ export class SwiftRuntime { let returnValue: ResponseMessage["data"]["response"]; try { // @ts-ignore - const result = itcInterface[message.data.request.method](...message.data.request.parameters); + const result = itcInterface[ + message.data.request.method + ](...message.data.request.parameters); returnValue = { ok: true, value: result }; } catch (error) { - returnValue = { ok: false, error: serializeError(error) }; + returnValue = { + ok: false, + error: serializeError(error), + }; } const responseMessage: ResponseMessage = { type: "response", @@ -256,38 +287,52 @@ export class SwiftRuntime { context: message.data.context, response: returnValue, }, - } + }; try { newBroker.reply(responseMessage); } catch (error) { responseMessage.data.response = { ok: false, - error: serializeError(new TypeError(`Failed to serialize message: ${error}`)) + error: serializeError( + new TypeError( + `Failed to serialize message: ${error}`, + ), + ), }; newBroker.reply(responseMessage); } }, onResponse: (message) => { if (message.data.response.ok) { - const object = this.memory.retain(message.data.response.value.object); - this.exports.swjs_receive_response(object, message.data.context); + const object = this.memory.retain( + message.data.response.value.object, + ); + this.exports.swjs_receive_response( + object, + message.data.context, + ); } else { - const error = deserializeError(message.data.response.error); + const error = deserializeError( + message.data.response.error, + ); const errorObject = this.memory.retain(error); - this.exports.swjs_receive_error(errorObject, message.data.context); + this.exports.swjs_receive_error( + errorObject, + message.data.context, + ); } - } - }) + }, + }); broker = newBroker; return newBroker; - } + }; return { swjs_set_prop: ( ref: ref, name: ref, kind: JSValue.Kind, payload1: number, - payload2: number + payload2: number, ) => { const memory = this.memory; const obj = memory.getObject(ref); @@ -299,7 +344,7 @@ export class SwiftRuntime { ref: ref, name: ref, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const memory = this.memory; const obj = memory.getObject(ref); @@ -311,7 +356,7 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, @@ -320,7 +365,7 @@ export class SwiftRuntime { index: number, kind: JSValue.Kind, payload1: number, - payload2: number + payload2: number, ) => { const memory = this.memory; const obj = memory.getObject(ref); @@ -331,7 +376,7 @@ export class SwiftRuntime { ref: ref, index: number, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const obj = this.memory.getObject(ref); const result = obj[index]; @@ -341,7 +386,7 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, @@ -352,22 +397,25 @@ export class SwiftRuntime { this.getDataView().setUint32(bytes_ptr_result, bytes_ptr, true); return bytes.length; }, - swjs_decode_string: ( + swjs_decode_string: // NOTE: TextDecoder can't decode typed arrays backed by SharedArrayBuffer this.options.sharedMemory == true - ? ((bytes_ptr: pointer, length: number) => { - const bytes = this.getUint8Array() - .slice(bytes_ptr, bytes_ptr + length); - const string = this.textDecoder.decode(bytes); - return this.memory.retain(string); - }) - : ((bytes_ptr: pointer, length: number) => { - const bytes = this.getUint8Array() - .subarray(bytes_ptr, bytes_ptr + length); - const string = this.textDecoder.decode(bytes); - return this.memory.retain(string); - }) - ), + ? (bytes_ptr: pointer, length: number) => { + const bytes = this.getUint8Array().slice( + bytes_ptr, + bytes_ptr + length, + ); + const string = this.textDecoder.decode(bytes); + return this.memory.retain(string); + } + : (bytes_ptr: pointer, length: number) => { + const bytes = this.getUint8Array().subarray( + bytes_ptr, + bytes_ptr + length, + ); + const string = this.textDecoder.decode(bytes); + return this.memory.retain(string); + }, swjs_load_string: (ref: ref, buffer: pointer) => { const bytes = this.memory.getObject(ref); this.getUint8Array().set(bytes, buffer); @@ -378,13 +426,18 @@ export class SwiftRuntime { argv: pointer, argc: number, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const memory = this.memory; const func = memory.getObject(ref); let result = undefined; try { - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); result = func(...args); } catch (error) { return JSValue.writeAndReturnKindBits( @@ -393,7 +446,7 @@ export class SwiftRuntime { payload2_ptr, true, this.getDataView(), - this.memory + this.memory, ); } return JSValue.writeAndReturnKindBits( @@ -402,7 +455,7 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, swjs_call_function_no_catch: ( @@ -410,11 +463,16 @@ export class SwiftRuntime { argv: pointer, argc: number, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const memory = this.memory; const func = memory.getObject(ref); - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); const result = func(...args); return JSValue.writeAndReturnKindBits( result, @@ -422,7 +480,7 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, @@ -432,14 +490,19 @@ export class SwiftRuntime { argv: pointer, argc: number, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const memory = this.memory; const obj = memory.getObject(obj_ref); const func = memory.getObject(func_ref); let result: any; try { - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); result = func.apply(obj, args); } catch (error) { return JSValue.writeAndReturnKindBits( @@ -448,7 +511,7 @@ export class SwiftRuntime { payload2_ptr, true, this.getDataView(), - this.memory + this.memory, ); } return JSValue.writeAndReturnKindBits( @@ -457,7 +520,7 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, swjs_call_function_with_this_no_catch: ( @@ -466,13 +529,18 @@ export class SwiftRuntime { argv: pointer, argc: number, payload1_ptr: pointer, - payload2_ptr: pointer + payload2_ptr: pointer, ) => { const memory = this.memory; const obj = memory.getObject(obj_ref); const func = memory.getObject(func_ref); let result = undefined; - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); result = func.apply(obj, args); return JSValue.writeAndReturnKindBits( result, @@ -480,14 +548,19 @@ export class SwiftRuntime { payload2_ptr, false, this.getDataView(), - this.memory + this.memory, ); }, swjs_call_new: (ref: ref, argv: pointer, argc: number) => { const memory = this.memory; const constructor = memory.getObject(ref); - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); const instance = new constructor(...args); return this.memory.retain(instance); }, @@ -497,13 +570,18 @@ export class SwiftRuntime { argc: number, exception_kind_ptr: pointer, exception_payload1_ptr: pointer, - exception_payload2_ptr: pointer + exception_payload2_ptr: pointer, ) => { let memory = this.memory; const constructor = memory.getObject(ref); let result: any; try { - const args = JSValue.decodeArray(argv, argc, this.getDataView(), memory); + const args = JSValue.decodeArray( + argv, + argc, + this.getDataView(), + memory, + ); result = new constructor(...args); } catch (error) { JSValue.write( @@ -513,7 +591,7 @@ export class SwiftRuntime { exception_payload2_ptr, true, this.getDataView(), - this.memory + this.memory, ); return -1; } @@ -525,7 +603,7 @@ export class SwiftRuntime { exception_payload2_ptr, false, this.getDataView(), - memory + memory, ); return memory.retain(result); }, @@ -547,7 +625,7 @@ export class SwiftRuntime { swjs_create_function: ( host_func_id: number, line: number, - file: ref + file: ref, ) => { const fileString = this.memory.getObject(file) as string; const func = (...args: any[]) => @@ -560,7 +638,7 @@ export class SwiftRuntime { swjs_create_oneshot_function: ( host_func_id: number, line: number, - file: ref + file: ref, ) => { const fileString = this.memory.getObject(file) as string; const func = (...args: any[]) => @@ -569,13 +647,30 @@ export class SwiftRuntime { return func_ref; }, - swjs_create_typed_array: ( + swjs_create_typed_array: < + T extends + | Int8Array + | Uint8Array + | Int16Array + | Uint16Array + | Int32Array + | Uint32Array + | BigInt64Array + | BigUint64Array + | Float32Array + | Float64Array + | Uint8ClampedArray, + >( constructor_ref: ref, elementsPtr: pointer, - length: number + length: number, ) => { type TypedArrayConstructor = { - new (buffer: ArrayBuffer, byteOffset: number, length: number): T; + new ( + buffer: ArrayBuffer, + byteOffset: number, + length: number, + ): T; new (): T; }; const ArrayType: TypedArrayConstructor = @@ -592,13 +687,15 @@ export class SwiftRuntime { const array = new ArrayType( this.wasmMemory!.buffer, elementsPtr, - length + length, ); // Call `.slice()` to copy the memory return this.memory.retain(array.slice()); }, - swjs_create_object: () => { return this.memory.retain({}); }, + swjs_create_object: () => { + return this.memory.retain({}); + }, swjs_load_typed_array: (ref: ref, buffer: pointer) => { const memory = this.memory; @@ -613,7 +710,9 @@ export class SwiftRuntime { swjs_release_remote: (tid: number, ref: ref) => { if (!this.options.threadChannel) { - throw new Error("threadChannel is not set in options given to SwiftRuntime. Please set it to release objects on remote threads."); + throw new Error( + "threadChannel is not set in options given to SwiftRuntime. Please set it to release objects on remote threads.", + ); } const broker = getMessageBroker(this.options.threadChannel); broker.request({ @@ -625,20 +724,22 @@ export class SwiftRuntime { request: { method: "release", parameters: [ref], - } - } - }) + }, + }, + }); }, swjs_i64_to_bigint: (value: bigint, signed: number) => { return this.memory.retain( - signed ? value : BigInt.asUintN(64, value) + signed ? value : BigInt.asUintN(64, value), ); }, swjs_bigint_to_i64: (ref: ref, signed: number) => { const object = this.memory.getObject(ref); if (typeof object !== "bigint") { - throw new Error(`Expected a BigInt, but got ${typeof object}`); + throw new Error( + `Expected a BigInt, but got ${typeof object}`, + ); } if (signed) { return object; @@ -649,44 +750,60 @@ export class SwiftRuntime { return BigInt.asIntN(64, object); } }, - swjs_i64_to_bigint_slow: (lower: number, upper: number, signed: number) => { + swjs_i64_to_bigint_slow: ( + lower: number, + upper: number, + signed: number, + ) => { const value = BigInt.asUintN(32, BigInt(lower)) + (BigInt.asUintN(32, BigInt(upper)) << BigInt(32)); return this.memory.retain( - signed ? BigInt.asIntN(64, value) : BigInt.asUintN(64, value) + signed + ? BigInt.asIntN(64, value) + : BigInt.asUintN(64, value), ); }, swjs_unsafe_event_loop_yield: () => { throw new UnsafeEventLoopYield(); }, swjs_send_job_to_main_thread: (unowned_job: number) => { - this.postMessageToMainThread({ type: "job", data: unowned_job }); + this.postMessageToMainThread({ + type: "job", + data: unowned_job, + }); }, swjs_listen_message_from_main_thread: () => { const threadChannel = this.options.threadChannel; - if (!(threadChannel && "listenMessageFromMainThread" in threadChannel)) { + if ( + !( + threadChannel && + "listenMessageFromMainThread" in threadChannel + ) + ) { throw new Error( - "listenMessageFromMainThread is not set in options given to SwiftRuntime. Please set it to listen to wake events from the main thread." + "listenMessageFromMainThread is not set in options given to SwiftRuntime. Please set it to listen to wake events from the main thread.", ); } const broker = getMessageBroker(threadChannel); threadChannel.listenMessageFromMainThread((message) => { switch (message.type) { - case "wake": - this.exports.swjs_wake_worker_thread(); - break; - case "request": { - broker.onReceivingRequest(message); - break; - } - case "response": { - broker.onReceivingResponse(message); - break; - } - default: - const unknownMessage: never = message; - throw new Error(`Unknown message type: ${unknownMessage}`); + case "wake": + this.exports.swjs_wake_worker_thread(); + break; + case "request": { + broker.onReceivingRequest(message); + break; + } + case "response": { + broker.onReceivingResponse(message); + break; + } + default: + const unknownMessage: never = message; + throw new Error( + `Unknown message type: ${unknownMessage}`, + ); } }); }, @@ -695,17 +812,23 @@ export class SwiftRuntime { }, swjs_listen_message_from_worker_thread: (tid: number) => { const threadChannel = this.options.threadChannel; - if (!(threadChannel && "listenMessageFromWorkerThread" in threadChannel)) { + if ( + !( + threadChannel && + "listenMessageFromWorkerThread" in threadChannel + ) + ) { throw new Error( - "listenMessageFromWorkerThread is not set in options given to SwiftRuntime. Please set it to listen to jobs from worker threads." + "listenMessageFromWorkerThread is not set in options given to SwiftRuntime. Please set it to listen to jobs from worker threads.", ); } const broker = getMessageBroker(threadChannel); - threadChannel.listenMessageFromWorkerThread( - tid, (message) => { - switch (message.type) { + threadChannel.listenMessageFromWorkerThread(tid, (message) => { + switch (message.type) { case "job": - this.exports.swjs_enqueue_main_job_from_worker(message.data); + this.exports.swjs_enqueue_main_job_from_worker( + message.data, + ); break; case "request": { broker.onReceivingRequest(message); @@ -717,10 +840,11 @@ export class SwiftRuntime { } default: const unknownMessage: never = message; - throw new Error(`Unknown message type: ${unknownMessage}`); - } - }, - ); + throw new Error( + `Unknown message type: ${unknownMessage}`, + ); + } + }); }, swjs_terminate_worker_thread: (tid: number) => { const threadChannel = this.options.threadChannel; @@ -740,10 +864,16 @@ export class SwiftRuntime { sending_context: pointer, ) => { if (!this.options.threadChannel) { - throw new Error("threadChannel is not set in options given to SwiftRuntime. Please set it to request transferring objects."); + throw new Error( + "threadChannel is not set in options given to SwiftRuntime. Please set it to request transferring objects.", + ); } const broker = getMessageBroker(this.options.threadChannel); - const transferringObjects = decodeObjectRefs(transferring_objects, transferring_objects_count, this.getDataView()); + const transferringObjects = decodeObjectRefs( + transferring_objects, + transferring_objects_count, + this.getDataView(), + ); broker.request({ type: "request", data: { @@ -752,10 +882,14 @@ export class SwiftRuntime { context: sending_context, request: { method: "send", - parameters: [sending_object, transferringObjects, sending_context], - } - } - }) + parameters: [ + sending_object, + transferringObjects, + sending_context, + ], + }, + }, + }); }, swjs_request_sending_objects: ( sending_objects: pointer, @@ -766,12 +900,22 @@ export class SwiftRuntime { sending_context: pointer, ) => { if (!this.options.threadChannel) { - throw new Error("threadChannel is not set in options given to SwiftRuntime. Please set it to request transferring objects."); + throw new Error( + "threadChannel is not set in options given to SwiftRuntime. Please set it to request transferring objects.", + ); } const broker = getMessageBroker(this.options.threadChannel); const dataView = this.getDataView(); - const sendingObjects = decodeObjectRefs(sending_objects, sending_objects_count, dataView); - const transferringObjects = decodeObjectRefs(transferring_objects, transferring_objects_count, dataView); + const sendingObjects = decodeObjectRefs( + sending_objects, + sending_objects_count, + dataView, + ); + const transferringObjects = decodeObjectRefs( + transferring_objects, + transferring_objects_count, + dataView, + ); broker.request({ type: "request", data: { @@ -780,29 +924,40 @@ export class SwiftRuntime { context: sending_context, request: { method: "sendObjects", - parameters: [sendingObjects, transferringObjects, sending_context], - } - } - }) + parameters: [ + sendingObjects, + transferringObjects, + sending_context, + ], + }, + }, + }); }, }; } - private postMessageToMainThread(message: WorkerToMainMessage, transfer: any[] = []) { + private postMessageToMainThread( + message: WorkerToMainMessage, + transfer: any[] = [], + ) { const threadChannel = this.options.threadChannel; if (!(threadChannel && "postMessageToMainThread" in threadChannel)) { throw new Error( - "postMessageToMainThread is not set in options given to SwiftRuntime. Please set it to send messages to the main thread." + "postMessageToMainThread is not set in options given to SwiftRuntime. Please set it to send messages to the main thread.", ); } threadChannel.postMessageToMainThread(message, transfer); } - private postMessageToWorkerThread(tid: number, message: MainToWorkerMessage, transfer: any[] = []) { + private postMessageToWorkerThread( + tid: number, + message: MainToWorkerMessage, + transfer: any[] = [], + ) { const threadChannel = this.options.threadChannel; if (!(threadChannel && "postMessageToWorkerThread" in threadChannel)) { throw new Error( - "postMessageToWorkerThread is not set in options given to SwiftRuntime. Please set it to send messages to worker threads." + "postMessageToWorkerThread is not set in options given to SwiftRuntime. Please set it to send messages to worker threads.", ); } threadChannel.postMessageToWorkerThread(tid, message, transfer); diff --git a/Runtime/src/itc.ts b/Runtime/src/itc.ts index 08b420640..9fadff54a 100644 --- a/Runtime/src/itc.ts +++ b/Runtime/src/itc.ts @@ -39,19 +39,24 @@ import { JSObjectSpace as JSObjectSpace } from "./object-heap.js"; */ export type SwiftRuntimeThreadChannel = | { - /** - * This function is used to send messages from the worker thread to the main thread. - * The message submitted by this function is expected to be listened by `listenMessageFromWorkerThread`. - * @param message The message to be sent to the main thread. - * @param transfer The array of objects to be transferred to the main thread. - */ - postMessageToMainThread: (message: WorkerToMainMessage, transfer: any[]) => void; + /** + * This function is used to send messages from the worker thread to the main thread. + * The message submitted by this function is expected to be listened by `listenMessageFromWorkerThread`. + * @param message The message to be sent to the main thread. + * @param transfer The array of objects to be transferred to the main thread. + */ + postMessageToMainThread: ( + message: WorkerToMainMessage, + transfer: any[], + ) => void; /** * This function is expected to be set in the worker thread and should listen * to messages from the main thread sent by `postMessageToWorkerThread`. * @param listener The listener function to be called when a message is received from the main thread. */ - listenMessageFromMainThread: (listener: (message: MainToWorkerMessage) => void) => void; + listenMessageFromMainThread: ( + listener: (message: MainToWorkerMessage) => void, + ) => void; } | { /** @@ -61,7 +66,11 @@ export type SwiftRuntimeThreadChannel = * @param message The message to be sent to the worker thread. * @param transfer The array of objects to be transferred to the worker thread. */ - postMessageToWorkerThread: (tid: number, message: MainToWorkerMessage, transfer: any[]) => void; + postMessageToWorkerThread: ( + tid: number, + message: MainToWorkerMessage, + transfer: any[], + ) => void; /** * This function is expected to be set in the main thread and should listen * to messages sent by `postMessageToMainThread` from the worker thread. @@ -70,7 +79,7 @@ export type SwiftRuntimeThreadChannel = */ listenMessageFromWorkerThread: ( tid: number, - listener: (message: WorkerToMainMessage) => void + listener: (message: WorkerToMainMessage) => void, ) => void; /** @@ -81,23 +90,34 @@ export type SwiftRuntimeThreadChannel = terminateWorkerThread?: (tid: number) => void; }; - export class ITCInterface { constructor(private memory: JSObjectSpace) {} - send(sendingObject: ref, transferringObjects: ref[], sendingContext: pointer): { object: any, sendingContext: pointer, transfer: Transferable[] } { + send( + sendingObject: ref, + transferringObjects: ref[], + sendingContext: pointer, + ): { object: any; sendingContext: pointer; transfer: Transferable[] } { const object = this.memory.getObject(sendingObject); - const transfer = transferringObjects.map(ref => this.memory.getObject(ref)); + const transfer = transferringObjects.map((ref) => + this.memory.getObject(ref), + ); return { object, sendingContext, transfer }; } - sendObjects(sendingObjects: ref[], transferringObjects: ref[], sendingContext: pointer): { object: any[], sendingContext: pointer, transfer: Transferable[] } { - const objects = sendingObjects.map(ref => this.memory.getObject(ref)); - const transfer = transferringObjects.map(ref => this.memory.getObject(ref)); + sendObjects( + sendingObjects: ref[], + transferringObjects: ref[], + sendingContext: pointer, + ): { object: any[]; sendingContext: pointer; transfer: Transferable[] } { + const objects = sendingObjects.map((ref) => this.memory.getObject(ref)); + const transfer = transferringObjects.map((ref) => + this.memory.getObject(ref), + ); return { object: objects, sendingContext, transfer }; } - release(objectRef: ref): { object: undefined, transfer: Transferable[] } { + release(objectRef: ref): { object: undefined; transfer: Transferable[] } { this.memory.release(objectRef); return { object: undefined, transfer: [] }; } @@ -105,16 +125,18 @@ export class ITCInterface { type AllRequests> = { [K in keyof Interface]: { - method: K, - parameters: Parameters, - } -} + method: K; + parameters: Parameters; + }; +}; -type ITCRequest> = AllRequests[keyof AllRequests]; +type ITCRequest> = + AllRequests[keyof AllRequests]; type AllResponses> = { - [K in keyof Interface]: ReturnType -} -type ITCResponse> = AllResponses[keyof AllResponses]; + [K in keyof Interface]: ReturnType; +}; +type ITCResponse> = + AllResponses[keyof AllResponses]; export type RequestMessage = { type: "request"; @@ -127,10 +149,12 @@ export type RequestMessage = { context: pointer; /** The request content */ request: ITCRequest; - } -} + }; +}; -type SerializedError = { isError: true; value: Error } | { isError: false; value: unknown } +type SerializedError = + | { isError: true; value: Error } + | { isError: false; value: unknown }; export type ResponseMessage = { type: "response"; @@ -140,36 +164,42 @@ export type ResponseMessage = { /** The context pointer of the request */ context: pointer; /** The response content */ - response: { - ok: true, - value: ITCResponse; - } | { - ok: false, - error: SerializedError; - }; - } -} + response: + | { + ok: true; + value: ITCResponse; + } + | { + ok: false; + error: SerializedError; + }; + }; +}; -export type MainToWorkerMessage = { - type: "wake"; -} | RequestMessage | ResponseMessage; - -export type WorkerToMainMessage = { - type: "job"; - data: number; -} | RequestMessage | ResponseMessage; +export type MainToWorkerMessage = + | { + type: "wake"; + } + | RequestMessage + | ResponseMessage; +export type WorkerToMainMessage = + | { + type: "job"; + data: number; + } + | RequestMessage + | ResponseMessage; export class MessageBroker { constructor( private selfTid: number, private threadChannel: SwiftRuntimeThreadChannel, private handlers: { - onRequest: (message: RequestMessage) => void, - onResponse: (message: ResponseMessage) => void, - } - ) { - } + onRequest: (message: RequestMessage) => void; + onResponse: (message: ResponseMessage) => void; + }, + ) {} request(message: RequestMessage) { if (message.data.targetTid == this.selfTid) { @@ -177,7 +207,11 @@ export class MessageBroker { this.handlers.onRequest(message); } else if ("postMessageToWorkerThread" in this.threadChannel) { // The request is for another worker thread sent from the main thread - this.threadChannel.postMessageToWorkerThread(message.data.targetTid, message, []); + this.threadChannel.postMessageToWorkerThread( + message.data.targetTid, + message, + [], + ); } else if ("postMessageToMainThread" in this.threadChannel) { // The request is for other worker threads or the main thread sent from a worker thread this.threadChannel.postMessageToMainThread(message, []); @@ -192,10 +226,16 @@ export class MessageBroker { this.handlers.onResponse(message); return; } - const transfer = message.data.response.ok ? message.data.response.value.transfer : []; + const transfer = message.data.response.ok + ? message.data.response.value.transfer + : []; if ("postMessageToWorkerThread" in this.threadChannel) { // The response is for another worker thread sent from the main thread - this.threadChannel.postMessageToWorkerThread(message.data.sourceTid, message, transfer); + this.threadChannel.postMessageToWorkerThread( + message.data.sourceTid, + message, + transfer, + ); } else if ("postMessageToMainThread" in this.threadChannel) { // The response is for other worker threads or the main thread sent from a worker thread this.threadChannel.postMessageToMainThread(message, transfer); @@ -208,9 +248,13 @@ export class MessageBroker { if (message.data.targetTid == this.selfTid) { this.handlers.onRequest(message); } else if ("postMessageToWorkerThread" in this.threadChannel) { - // Receive a request from a worker thread to other worker on main thread. + // Receive a request from a worker thread to other worker on main thread. // Proxy the request to the target worker thread. - this.threadChannel.postMessageToWorkerThread(message.data.targetTid, message, []); + this.threadChannel.postMessageToWorkerThread( + message.data.targetTid, + message, + [], + ); } else if ("postMessageToMainThread" in this.threadChannel) { // A worker thread won't receive a request for other worker threads throw new Error("unreachable"); @@ -223,8 +267,14 @@ export class MessageBroker { } else if ("postMessageToWorkerThread" in this.threadChannel) { // Receive a response from a worker thread to other worker on main thread. // Proxy the response to the target worker thread. - const transfer = message.data.response.ok ? message.data.response.value.transfer : []; - this.threadChannel.postMessageToWorkerThread(message.data.sourceTid, message, transfer); + const transfer = message.data.response.ok + ? message.data.response.value.transfer + : []; + this.threadChannel.postMessageToWorkerThread( + message.data.sourceTid, + message, + transfer, + ); } else if ("postMessageToMainThread" in this.threadChannel) { // A worker thread won't receive a response for other worker threads throw new Error("unreachable"); @@ -234,7 +284,14 @@ export class MessageBroker { export function serializeError(error: unknown): SerializedError { if (error instanceof Error) { - return { isError: true, value: { message: error.message, name: error.name, stack: error.stack } }; + return { + isError: true, + value: { + message: error.message, + name: error.name, + stack: error.stack, + }, + }; } return { isError: false, value: error }; } diff --git a/Runtime/src/js-value.ts b/Runtime/src/js-value.ts index a188808bb..26574b532 100644 --- a/Runtime/src/js-value.ts +++ b/Runtime/src/js-value.ts @@ -1,5 +1,10 @@ import { JSObjectSpace } from "./object-heap.js"; -import { assertNever, JavaScriptValueKindAndFlags, pointer, ref } from "./types.js"; +import { + assertNever, + JavaScriptValueKindAndFlags, + pointer, + ref, +} from "./types.js"; export const enum Kind { Boolean = 0, @@ -16,7 +21,7 @@ export const decode = ( kind: Kind, payload1: number, payload2: number, - objectSpace: JSObjectSpace + objectSpace: JSObjectSpace, ) => { switch (kind) { case Kind.Boolean: @@ -48,7 +53,12 @@ export const decode = ( // Note: // `decodeValues` assumes that the size of RawJSValue is 16. -export const decodeArray = (ptr: pointer, length: number, memory: DataView, objectSpace: JSObjectSpace) => { +export const decodeArray = ( + ptr: pointer, + length: number, + memory: DataView, + objectSpace: JSObjectSpace, +) => { // fast path for empty array if (length === 0) { return []; @@ -76,7 +86,7 @@ export const write = ( payload2_ptr: pointer, is_exception: boolean, memory: DataView, - objectSpace: JSObjectSpace + objectSpace: JSObjectSpace, ) => { const kind = writeAndReturnKindBits( value, @@ -84,7 +94,7 @@ export const write = ( payload2_ptr, is_exception, memory, - objectSpace + objectSpace, ); memory.setUint32(kind_ptr, kind, true); }; @@ -95,7 +105,7 @@ export const writeAndReturnKindBits = ( payload2_ptr: pointer, is_exception: boolean, memory: DataView, - objectSpace: JSObjectSpace + objectSpace: JSObjectSpace, ): JavaScriptValueKindAndFlags => { const exceptionBit = (is_exception ? 1 : 0) << 31; if (value === null) { @@ -141,7 +151,11 @@ export const writeAndReturnKindBits = ( throw new Error("Unreachable"); }; -export function decodeObjectRefs(ptr: pointer, length: number, memory: DataView): ref[] { +export function decodeObjectRefs( + ptr: pointer, + length: number, + memory: DataView, +): ref[] { const result: ref[] = new Array(length); for (let i = 0; i < length; i++) { result[i] = memory.getUint32(ptr + 4 * i, true); diff --git a/Runtime/src/object-heap.ts b/Runtime/src/object-heap.ts index b90fc4eff..ba9cf8021 100644 --- a/Runtime/src/object-heap.ts +++ b/Runtime/src/object-heap.ts @@ -51,7 +51,7 @@ export class JSObjectSpace { const value = this._heapValueById.get(ref); if (value === undefined) { throw new ReferenceError( - "Attempted to read invalid reference " + ref + "Attempted to read invalid reference " + ref, ); } return value; diff --git a/Runtime/src/types.ts b/Runtime/src/types.ts index b8345cdfa..b39e949b2 100644 --- a/Runtime/src/types.ts +++ b/Runtime/src/types.ts @@ -13,7 +13,7 @@ export interface ExportedFunctions { host_func_id: number, argv: pointer, argc: number, - callback_func_ref: ref + callback_func_ref: ref, ): bool; swjs_free_host_function(host_func_id: number): void; From 116b6d94425afa951cace0578e181c6f3509cbeb Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 09:52:27 +0900 Subject: [PATCH 234/252] PlayBridgeJS: Stop wrapping lines in the editor --- Examples/PlayBridgeJS/Sources/JavaScript/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js index c894598a4..97e78a1f8 100644 --- a/Examples/PlayBridgeJS/Sources/JavaScript/editor.js +++ b/Examples/PlayBridgeJS/Sources/JavaScript/editor.js @@ -97,7 +97,7 @@ export class EditorSystem { scrollbar: { vertical: 'visible', horizontal: 'visible' }, fixedOverflowWidgets: true, renderWhitespace: 'none', - wordWrap: 'on' + wordWrap: 'off' }; // Create all editors from config From 1b35993919fce1f8f3aa24b5b333782c55c484aa Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 09:50:33 +0900 Subject: [PATCH 235/252] BridgeJS: Add runtime tests for `@JS class` to JSObject conversion --- Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift index 7eefbad56..64eaeafd4 100644 --- a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift @@ -19,4 +19,10 @@ final class SwiftClassSupportTests: XCTestCase { let greeter2 = try SwiftClassSupportImports.jsRoundTripOptionalGreeter(Greeter(name: "Hello")) XCTAssertEqual(greeter2?.name, "Hello") } + + func testSwiftClassToJSObject() throws { + let greeter = Greeter(name: "BridgeJS") + let jsGreeter = try XCTUnwrap(greeter.jsValue.object) + XCTAssertEqual(jsGreeter["name"].string, "BridgeJS") + } } From 969e696af3ebb4084586e36cca838b2ba576efdb Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 14:13:50 +0900 Subject: [PATCH 236/252] PackageToJS: Rebuild bridge-js.js when BridgeJSLink is changed Also use `ProcessInfo.processInfo.arguments[0]` instead of `#filePath` to detect changes to the plugin executable, which is more robust to changes in the source file location. --- Plugins/PackageToJS/Sources/PackageToJS.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index 2e47dcf71..3e22736be 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -422,7 +422,10 @@ struct PackagingPlanner { wasmFilename: String, configuration: String, triple: String, - selfPath: BuildPath = BuildPath(absolute: #filePath), + // NOTE: We should use `ProcessInfo.processInfo.arguments[0]` instead of `CommandLine.arguments[0]` + // because the latter may not always be the full executable path (e.g. when invoked through PATH lookup). + // https://github.com/swiftlang/swift-foundation/blob/f5143f96d01cdb6d280665de8221b75fc8631d95/Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift#L47 + selfPath: BuildPath = BuildPath(absolute: ProcessInfo.processInfo.arguments[0]), system: any PackagingSystem ) { self.options = options @@ -592,7 +595,7 @@ struct PackagingPlanner { let bridgeJs = outputDir.appending(path: "bridge-js.js") let bridgeDts = outputDir.appending(path: "bridge-js.d.ts") packageInputs.append( - make.addTask(inputFiles: skeletons, output: bridgeJs) { _, scope in + make.addTask(inputFiles: skeletons + [selfPath], output: bridgeJs) { _, scope in var link = BridgeJSLink( sharedMemory: Self.isSharedMemoryEnabled(triple: triple) ) From 012fb6b101ea8a9c5e9637ee29ecea29c7133a0e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 14:45:08 +0900 Subject: [PATCH 237/252] BridgeJS: Fix SwiftHeapObject finalization registry leaks and double release --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 26 ++++++++++----- .../BridgeJSLinkTests/ArrayTypes.js | 26 ++++++++++----- .../BridgeJSLinkTests/DefaultParameters.js | 26 ++++++++++----- .../BridgeJSLinkTests/DictionaryTypes.js | 26 ++++++++++----- .../BridgeJSLinkTests/EnumAssociatedValue.js | 26 ++++++++++----- .../BridgeJSLinkTests/EnumNamespace.Global.js | 26 ++++++++++----- .../BridgeJSLinkTests/EnumNamespace.js | 26 ++++++++++----- .../BridgeJSLinkTests/JSValue.js | 26 ++++++++++----- .../BridgeJSLinkTests/MixedGlobal.js | 26 ++++++++++----- .../BridgeJSLinkTests/MixedModules.js | 26 ++++++++++----- .../BridgeJSLinkTests/MixedPrivate.js | 26 ++++++++++----- .../BridgeJSLinkTests/Namespaces.Global.js | 26 ++++++++++----- .../BridgeJSLinkTests/Namespaces.js | 26 ++++++++++----- .../BridgeJSLinkTests/Optionals.js | 26 ++++++++++----- .../BridgeJSLinkTests/PropertyTypes.js | 26 ++++++++++----- .../BridgeJSLinkTests/Protocol.js | 26 ++++++++++----- .../StaticFunctions.Global.js | 26 ++++++++++----- .../BridgeJSLinkTests/StaticFunctions.js | 26 ++++++++++----- .../StaticProperties.Global.js | 26 ++++++++++----- .../BridgeJSLinkTests/StaticProperties.js | 26 ++++++++++----- .../BridgeJSLinkTests/SwiftClass.js | 26 ++++++++++----- .../BridgeJSLinkTests/SwiftClosure.js | 26 ++++++++++----- .../BridgeJSLinkTests/SwiftStruct.js | 26 ++++++++++----- .../Generated/BridgeJS.swift | 16 ++++++++++ .../Generated/JavaScript/BridgeJS.json | 11 +++++++ .../SwiftClassSupportTests.swift | 32 +++++++++++++++++++ Tests/prelude.mjs | 5 +++ 27 files changed, 478 insertions(+), 184 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 625b82b6e..5bf17256d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -51,23 +51,33 @@ public struct BridgeJSLink { """ let swiftHeapObjectClassJs = """ + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } """ diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 5944dc257..7db995321 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -355,23 +355,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Item extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index adb9143cf..a89b07fc3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -295,23 +295,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class DefaultGreeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 41a6074ea..d42fd4b2b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -242,23 +242,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Box extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index a5ead8a1c..2d2c6924b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -1042,23 +1042,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class User extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 887f5ff3f..ee93a950a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -267,23 +267,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Converter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index a9470aad7..099ef0576 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -248,23 +248,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Converter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index ab59944ce..8151ea913 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -343,23 +343,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class JSValueHolder extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index ee89f5e5f..900d9b19c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -215,23 +215,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class GlobalClass extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index ab54a88c3..9b5f9267e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -223,23 +223,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class GlobalClass extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 24dac8d27..1ab3809cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -215,23 +215,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class PrivateClass extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index 3ce2779e1..ea5902783 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -223,23 +223,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Greeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index d4437f0c1..5930b6914 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -223,23 +223,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Greeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 349921a25..4c0bd0d13 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -475,23 +475,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Greeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index 024523591..e7d80bb4d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -215,23 +215,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class PropertyHolder extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 0ff740ad1..58928211e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -576,23 +576,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Helper extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 370ca98b4..247374a3b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -263,23 +263,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class MathUtils extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index bd7964c85..a3bfb8a24 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -263,23 +263,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class MathUtils extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index b5155bddf..05127cd14 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -220,23 +220,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class PropertyClass extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index 47918485d..5e89f1bb4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -220,23 +220,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class PropertyClass extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 7dce46d8e..8f0552b64 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -243,23 +243,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Greeter extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index d701e93d7..5fbde8c82 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -904,23 +904,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Person extends SwiftHeapObject { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index f3c0810c1..6f704013b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -527,23 +527,33 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.deinit(state.pointer); + }); + /// Represents a Swift heap object like a class instance or an actor instance. class SwiftHeapObject { static __wrap(pointer, deinit, prototype) { const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false }; obj.pointer = pointer; - obj.hasReleased = false; - obj.deinit = deinit; - obj.registry = new FinalizationRegistry((pointer) => { - deinit(pointer); - }); - obj.registry.register(this, obj.pointer); + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); return obj; } release() { - this.registry.unregister(this); - this.deinit(this.pointer); + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.deinit(state.pointer); } } class Greeter extends SwiftHeapObject { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 78c9014d7..8c1d63854 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -10375,6 +10375,22 @@ func _$OptionalSupportImports_runJsOptionalSupportTests() throws(JSException) -> } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_gc") +fileprivate func bjs_gc() -> Void +#else +fileprivate func bjs_gc() -> Void { + fatalError("Only available on WebAssembly") +} +#endif + +func _$gc() throws(JSException) -> Void { + bjs_gc() + if let error = _swift_js_take_exception() { + throw error + } +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripGreeter_static") fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index 2cd992ea4..45acc8a9c 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -15572,7 +15572,18 @@ }, { "functions" : [ + { + "from" : "global", + "name" : "gc", + "parameters" : [ + + ], + "returnType" : { + "void" : { + } + } + } ], "types" : [ { diff --git a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift index 64eaeafd4..d9a68b1cc 100644 --- a/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/SwiftClassSupportTests.swift @@ -6,6 +6,8 @@ import JavaScriptKit @JSFunction static func jsRoundTripOptionalGreeter(_ greeter: Greeter?) throws(JSException) -> Greeter? } +@JSFunction(from: .global) func gc() throws(JSException) -> Void + final class SwiftClassSupportTests: XCTestCase { func testRoundTripGreeter() throws { let greeter = try SwiftClassSupportImports.jsRoundTripGreeter(Greeter(name: "Hello")) @@ -25,4 +27,34 @@ final class SwiftClassSupportTests: XCTestCase { let jsGreeter = try XCTUnwrap(greeter.jsValue.object) XCTAssertEqual(jsGreeter["name"].string, "BridgeJS") } + + func testJSWrapperIsDeallocatedAfterFinalization() async throws { + weak var weakGreeter: Greeter? + var wrapperObject: JSObject? + do { + let greeter: Greeter = Greeter(name: "Hello") + weakGreeter = greeter + // Create a JS wrapper object but don't keep a reference to it + wrapperObject = try XCTUnwrap(greeter.jsValue.object) + } + // Here, the wrapper object is still alive so the greeter should still be alive + XCTAssertNotNil(weakGreeter) + + // Release the strong reference to the greeter + wrapperObject = nil + _ = wrapperObject + + // Trigger garbage collection to call the finalizer of the JS wrapper object + for _ in 0..<100 { + try gc() + // Tick the event loop to allow the garbage collector to run finalizers + // registered by FinalizationRegistry. + try await Task.sleep(for: .milliseconds(0)) + if weakGreeter == nil { + break + } + } + // Here, the greeter should be deallocated + XCTAssertNil(weakGreeter) + } } diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index d40a2845c..e55266e9c 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -337,6 +337,11 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(g2.prefix, "Hello"); g2.release(); + // release should be idempotent + const g3 = new exports.Greeter("Idempotent"); + g3.release(); + g3.release(); + g.release(); const foo = exports.makeImportedFoo("hello"); From 0387eef7b050e474ab1749d4dcef67405154b012 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 18 Feb 2026 08:23:42 +0100 Subject: [PATCH 238/252] Add AI coding agent config files to gitignore --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index c34d4dfe2..61397cf5b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,19 @@ Plugins/BridgeJS/Sources/TS2Swift/JavaScript/package-lock.json Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/**/*.actual bridge-js.config.local.json _site/ + +# AI coding agent config files +AGENTS.md +CLAUDE.md +GEMINI.md +.claude/ +.opencode/ +.cursor/ +.cursorrules +.codex/ +.aider* +.cline/ +.clinerules +.windsurf/ +.windsurfrules +.codeiumignore From 7fbf3e171b3be6d1f5b92793eca6ff95767b1d7a Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 18 Feb 2026 08:26:19 +0100 Subject: [PATCH 239/252] Runtime: Fix lint issues in compiled output --- Plugins/PackageToJS/Templates/runtime.mjs | 12 +++++++----- Runtime/src/index.ts | 11 ++++++----- Runtime/src/js-value.ts | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Plugins/PackageToJS/Templates/runtime.mjs b/Plugins/PackageToJS/Templates/runtime.mjs index e0bcf3e05..d79275476 100644 --- a/Plugins/PackageToJS/Templates/runtime.mjs +++ b/Plugins/PackageToJS/Templates/runtime.mjs @@ -30,6 +30,7 @@ const decode = (kind, payload1, payload2, objectSpace) => { case 1: return true; } + // falls through case 2 /* Kind.Number */: return payload2; case 1 /* Kind.String */: @@ -555,7 +556,7 @@ class SwiftRuntime { swjs_call_function: (ref, argv, argc, payload1_ptr, payload2_ptr) => { const memory = this.memory; const func = memory.getObject(ref); - let result = undefined; + let result; try { const args = decodeArray(argv, argc, this.getDataView(), memory); result = func(...args); @@ -590,9 +591,8 @@ class SwiftRuntime { const memory = this.memory; const obj = memory.getObject(obj_ref); const func = memory.getObject(func_ref); - let result = undefined; const args = decodeArray(argv, argc, this.getDataView(), memory); - result = func.apply(obj, args); + const result = func.apply(obj, args); return writeAndReturnKindBits(result, payload1_ptr, payload2_ptr, false, this.getDataView(), this.memory); }, swjs_call_new: (ref, argv, argc) => { @@ -744,9 +744,10 @@ class SwiftRuntime { broker.onReceivingResponse(message); break; } - default: + default: { const unknownMessage = message; throw new Error(`Unknown message type: ${unknownMessage}`); + } } }); }, @@ -773,9 +774,10 @@ class SwiftRuntime { broker.onReceivingResponse(message); break; } - default: + default: { const unknownMessage = message; throw new Error(`Unknown message type: ${unknownMessage}`); + } } }); }, diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts index 1d36c95d1..5d6fe258f 100644 --- a/Runtime/src/index.ts +++ b/Runtime/src/index.ts @@ -430,7 +430,7 @@ export class SwiftRuntime { ) => { const memory = this.memory; const func = memory.getObject(ref); - let result = undefined; + let result: any; try { const args = JSValue.decodeArray( argv, @@ -534,14 +534,13 @@ export class SwiftRuntime { const memory = this.memory; const obj = memory.getObject(obj_ref); const func = memory.getObject(func_ref); - let result = undefined; const args = JSValue.decodeArray( argv, argc, this.getDataView(), memory, ); - result = func.apply(obj, args); + const result = func.apply(obj, args); return JSValue.writeAndReturnKindBits( result, payload1_ptr, @@ -799,11 +798,12 @@ export class SwiftRuntime { broker.onReceivingResponse(message); break; } - default: + default: { const unknownMessage: never = message; throw new Error( `Unknown message type: ${unknownMessage}`, ); + } } }); }, @@ -838,11 +838,12 @@ export class SwiftRuntime { broker.onReceivingResponse(message); break; } - default: + default: { const unknownMessage: never = message; throw new Error( `Unknown message type: ${unknownMessage}`, ); + } } }); }, diff --git a/Runtime/src/js-value.ts b/Runtime/src/js-value.ts index 26574b532..b044e5cbe 100644 --- a/Runtime/src/js-value.ts +++ b/Runtime/src/js-value.ts @@ -31,6 +31,7 @@ export const decode = ( case 1: return true; } + // falls through case Kind.Number: return payload2; From 67a3104fc7bd6e0fd5c001cccef4cb9004048ec3 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 19:01:53 +0900 Subject: [PATCH 240/252] BridgeJS: Improve ts2swift diagnostics on invalid definitions ``` $ cat /tmp/tmp.UUlUCtSa64/foo.d.ts export function x(): ; $ node Plugins/BridgeJS/Sources/TS2Swift/JavaScript/bin/ts2swift.js /tmp/tmp.UUlUCtSa64/foo.d.ts error: TypeScript syntax errors: /tmp/tmp.UUlUCtSa64/foo.d.ts:1:22 - error TS1110: Type expected. 1 export function x(): ; ``` --- .../Sources/TS2Swift/JavaScript/src/cli.js | 29 +++++++++++++++++-- .../TS2Swift/JavaScript/test/ts2swift.test.js | 14 ++++++++- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index 25d88b828..c7ac79051 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -122,14 +122,30 @@ export function run(filePaths, options) { } const program = TypeProcessor.createProgram([...filePaths, ...globalFiles], configParseResult.options); - const diagnostics = program.getSemanticDiagnostics(); - if (diagnostics.length > 0) { + + const formatDiagnostics = (diagnostics, kind) => { + if (diagnostics.length === 0) return null; const message = ts.formatDiagnosticsWithColorAndContext(diagnostics, { getCanonicalFileName: (fileName) => fileName, getNewLine: () => ts.sys.newLine, getCurrentDirectory: () => ts.sys.getCurrentDirectory(), }); - throw new Error(`TypeScript semantic errors:\n${message}`); + return `${kind} errors:\n${message}`; + }; + + const syntaxErrors = formatDiagnostics(program.getSyntacticDiagnostics(), "TypeScript syntax"); + if (syntaxErrors) { + throw new Error(syntaxErrors); + } + + const optionErrors = formatDiagnostics(program.getOptionsDiagnostics(), "TypeScript option"); + if (optionErrors) { + throw new Error(optionErrors); + } + + const semanticErrors = formatDiagnostics(program.getSemanticDiagnostics(), "TypeScript semantic"); + if (semanticErrors) { + throw new Error(semanticErrors); } const prelude = [ @@ -244,6 +260,13 @@ export function main(args) { cleanup(); } } + + if (swiftOutput.length === 0) { + diagnosticEngine.print( + "warning", + "No Swift declarations were generated. This usually means the .d.ts contained constructs that BridgeJS cannot import." + ); + } // Write to file or stdout if (options.values.output && options.values.output !== "-") { if (swiftOutput.length > 0) { diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js index 8ca1df7c9..d0ccf220a 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js @@ -1,8 +1,9 @@ // @ts-check import { describe, it, expect } from 'vitest'; -import { readdirSync } from 'fs'; +import { readdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs'; import { fileURLToPath } from 'url'; import path from 'path'; +import os from 'os'; import { run } from '../src/cli.js'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); @@ -38,4 +39,15 @@ describe('ts2swift', () => { expect(swiftOutput).toMatchSnapshot(name); }); } + + it('reports TypeScript syntax errors via thrown message', () => { + const tmpDir = mkdtempSync(path.join(os.tmpdir(), 'ts2swift-invalid-')); + const invalidPath = path.join(tmpDir, 'invalid.d.ts'); + writeFileSync(invalidPath, 'function foo(x'); + try { + expect(() => runTs2Swift(invalidPath)).toThrowError(/TypeScript syntax errors/); + } finally { + rmSync(tmpDir, { recursive: true, force: true }); + } + }); }); From 9527aa5801643ad7389b41cd28940b06cc1fc906 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 20:50:24 +0900 Subject: [PATCH 241/252] TS2Swift: emit enums for string literal unions --- .../TS2Swift/JavaScript/src/processor.js | 92 +++++++++++++++++++ .../test/__snapshots__/ts2swift.test.js.snap | 27 ++++++ .../test/fixtures/StringLiteralUnion.d.ts | 3 + 3 files changed, 122 insertions(+) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringLiteralUnion.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 53216a78c..fd4873752 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -54,6 +54,10 @@ export class TypeProcessor { this.emittedEnumNames = new Set(); /** @type {Set} */ this.emittedStructuredTypeNames = new Set(); + /** @type {Set} */ + this.emittedStringLiteralUnionNames = new Set(); + /** @type {Set} */ + this.emittedStringLiteralUnionNames = new Set(); /** @type {Set} */ this.visitedDeclarationKeys = new Set(); @@ -145,6 +149,11 @@ export class TypeProcessor { for (const [type, node] of this.seenTypes) { this.seenTypes.delete(type); + const stringLiteralUnion = this.getStringLiteralUnionLiterals(type); + if (stringLiteralUnion && stringLiteralUnion.length > 0) { + this.emitStringLiteralUnion(type, node); + continue; + } if (this.isEnumType(type)) { this.visitEnumType(type, node); continue; @@ -296,6 +305,73 @@ export class TypeProcessor { return (symbol.flags & ts.SymbolFlags.Enum) !== 0; } + dedupeSwiftEnumCaseNames(items) { + const seen = new Map(); + return items.map(item => { + const count = seen.get(item.name) ?? 0; + seen.set(item.name, count + 1); + if (count === 0) return item; + return { ...item, name: `${item.name}_${count + 1}` }; + }); + } + + /** + * Extract string literal values if the type is a union containing only string literals. + * Returns null when any member is not a string literal. + * @param {ts.Type} type + * @returns {string[] | null} + * @private + */ + getStringLiteralUnionLiterals(type) { + if ((type.flags & ts.TypeFlags.Union) === 0) return null; + /** @type {ts.UnionType} */ + // @ts-ignore + const unionType = type; + /** @type {string[]} */ + const literals = []; + const seen = new Set(); + for (const member of unionType.types) { + if ((member.flags & ts.TypeFlags.StringLiteral) === 0) { + return null; + } + // @ts-ignore value exists for string literal types + const value = String(member.value); + if (seen.has(value)) continue; + seen.add(value); + literals.push(value); + } + return literals; + } + + /** + * @param {ts.Type} type + * @param {ts.Node} diagnosticNode + * @private + */ + emitStringLiteralUnion(type, diagnosticNode) { + const typeName = this.deriveTypeName(type); + if (!typeName) return; + if (this.emittedStringLiteralUnionNames.has(typeName)) return; + this.emittedStringLiteralUnionNames.add(typeName); + + const literals = this.getStringLiteralUnionLiterals(type); + if (!literals || literals.length === 0) return; + + const swiftEnumName = this.renderTypeIdentifier(typeName); + /** @type {{ name: string, raw: string }[]} */ + const members = literals.map(raw => ({ name: makeValidSwiftIdentifier(String(raw), { emptyFallback: "_case" }), raw: String(raw) })); + const deduped = this.dedupeSwiftEnumCaseNames(members); + + this.emitDocComment(diagnosticNode, { indent: "" }); + this.swiftLines.push(`enum ${swiftEnumName}: String {`); + for (const { name, raw } of deduped) { + this.swiftLines.push(` case ${this.renderIdentifier(name)} = "${raw.replaceAll("\"", "\\\"")}"`); + } + this.swiftLines.push("}"); + this.swiftLines.push(`extension ${swiftEnumName}: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {}`); + this.swiftLines.push(""); + } + /** * @param {ts.EnumDeclaration} node * @private @@ -841,6 +917,7 @@ export class TypeProcessor { * @returns {string} */ const convert = (type) => { + const originalType = type; // Handle nullable/undefined unions (e.g. T | null, T | undefined) const isUnionType = (type.flags & ts.TypeFlags.Union) !== 0; if (isUnionType) { @@ -863,6 +940,15 @@ export class TypeProcessor { } return `JSUndefinedOr<${wrapped}>`; } + + const stringLiteralUnion = this.getStringLiteralUnionLiterals(type); + if (stringLiteralUnion && stringLiteralUnion.length > 0) { + const typeName = this.deriveTypeName(originalType) ?? this.deriveTypeName(type); + if (typeName) { + this.seenTypes.set(originalType, node); + return this.renderTypeIdentifier(typeName); + } + } } /** @type {Record} */ @@ -892,6 +978,12 @@ export class TypeProcessor { return this.renderTypeIdentifier(typeName); } + const stringLiteralUnion = this.getStringLiteralUnionLiterals(type); + if (stringLiteralUnion && stringLiteralUnion.length > 0) { + this.seenTypes.set(type, node); + return this.renderTypeIdentifier(this.deriveTypeName(type) ?? this.checker.typeToString(type)); + } + if (this.checker.isTupleType(type) || type.getCallSignatures().length > 0) { return "JSObject"; } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 85d1da0de..a13540993 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -355,10 +355,37 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void +enum FeatureFlag: String { + case foo = "foo" + case bar = "bar" +} +extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} + @JSFunction func returnsFeatureFlag() throws(JSException) -> FeatureFlag " `; +exports[`ts2swift > snapshots Swift output for StringLiteralUnion.d.ts > StringLiteralUnion 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(BridgeJS) import JavaScriptKit + +@JSFunction func move(_ direction: Direction) throws(JSException) -> Void + +enum Direction: String { + case up = "up" + case down = "down" + case left = "left" + case right = "right" +} +extension Direction: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} +" +`; + exports[`ts2swift > snapshots Swift output for StringParameter.d.ts > StringParameter 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringLiteralUnion.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringLiteralUnion.d.ts new file mode 100644 index 000000000..2c01a23fa --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StringLiteralUnion.d.ts @@ -0,0 +1,3 @@ +export type Direction = "up" | "down" | "left" | "right"; + +export function move(direction: Direction): void; From 30cf39abf9687924b7523d17cfa27da976cc704b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 21:02:09 +0900 Subject: [PATCH 242/252] Merge pull request #652 from swiftwasm/katei/32f9-ts2swift-treat-c TS2Swift: treat callable exported consts as functions --- .../TS2Swift/JavaScript/src/processor.js | 20 ++++++++++++++++++- .../test/__snapshots__/ts2swift.test.js.snap | 16 +++++++++++++++ .../test/fixtures/CallableConst.d.ts | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/CallableConst.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 53216a78c..ed332dd3c 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -261,6 +261,7 @@ export class TypeProcessor { if (!isExported) return; const fromArg = this.renderDefaultJSImportFromArgument(); + const isConst = (node.declarationList.flags & ts.NodeFlags.Const) !== 0; for (const decl of node.declarationList.declarations) { if (!ts.isIdentifier(decl.name)) continue; @@ -270,13 +271,30 @@ export class TypeProcessor { const swiftVarName = this.renderIdentifier(swiftName); const type = this.checker.getTypeAtLocation(decl); - const swiftType = this.visitType(type, decl); /** @type {string[]} */ const args = []; const jsNameArg = this.renderOptionalJSNameArg(jsName, swiftName); if (jsNameArg) args.push(jsNameArg); if (fromArg) args.push(fromArg); + const callSignatures = type.getCallSignatures(); + + if (isConst && callSignatures.length > 0) { + const signature = callSignatures[0]; + const parameters = signature.getParameters(); + const parameterNameMap = this.buildParameterNameMap(parameters); + const params = this.renderParameters(parameters, decl); + const returnType = this.visitType(signature.getReturnType(), decl); + const effects = this.renderEffects({ isAsync: false }); + const annotation = this.renderMacroAnnotation("JSFunction", args); + + this.emitDocComment(decl, { indent: "", parameterNameMap }); + this.swiftLines.push(`${annotation} func ${swiftVarName}(${params}) ${effects} -> ${returnType}`); + this.swiftLines.push(""); + continue; + } + + const swiftType = this.visitType(type, decl); const annotation = this.renderMacroAnnotation("JSGetter", args); this.emitDocComment(decl, { indent: "" }); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 85d1da0de..223927700 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -48,6 +48,22 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = ` " `; +exports[`ts2swift > snapshots Swift output for CallableConst.d.ts > CallableConst 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(BridgeJS) import JavaScriptKit + +@JSFunction func fetch(_ url: String) throws(JSException) -> Response + +@JSClass struct Response { +} +" +`; + exports[`ts2swift > snapshots Swift output for Documentation.d.ts > Documentation 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/CallableConst.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/CallableConst.d.ts new file mode 100644 index 000000000..3df79d597 --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/CallableConst.d.ts @@ -0,0 +1,2 @@ +export interface Response {} +export const fetch: (url: string) => Response; From 9c092f6d79b225228832e117582e936d90ce2070 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 21:05:04 +0900 Subject: [PATCH 243/252] TS2Swift: emit static properties as static members (#653) --- .../Sources/TS2Swift/JavaScript/src/processor.js | 11 +++++++---- .../test/__snapshots__/ts2swift.test.js.snap | 16 ++++++++++++++++ .../JavaScript/test/fixtures/StaticProperty.d.ts | 3 +++ 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StaticProperty.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index ed332dd3c..8287a0561 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -654,7 +654,7 @@ export class TypeProcessor { /** * Visit a property declaration and extract metadata * @param {ts.PropertyDeclaration | ts.PropertySignature} node - * @returns {{ jsName: string, swiftName: string, type: string, isReadonly: boolean } | null} + * @returns {{ jsName: string, swiftName: string, type: string, isReadonly: boolean, isStatic: boolean } | null} */ visitPropertyDecl(node) { if (!node.name) return null; @@ -674,7 +674,8 @@ export class TypeProcessor { const type = this.checker.getTypeAtLocation(node) const swiftType = this.visitType(type, node); const isReadonly = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ReadonlyKeyword) ?? false; - return { jsName, swiftName, type: swiftType, isReadonly }; + const isStatic = node.modifiers?.some(m => m.kind === ts.SyntaxKind.StaticKeyword) ?? false; + return { jsName, swiftName, type: swiftType, isReadonly, isStatic }; } /** @@ -1011,6 +1012,7 @@ export class TypeProcessor { const type = property.type; const swiftName = this.renderIdentifier(property.swiftName); + const isStatic = property.isStatic; const needsJSGetterName = property.jsName !== property.swiftName; // Note: `from: .global` is only meaningful for top-level imports and constructors. // Instance member access always comes from the JS object itself. @@ -1020,10 +1022,11 @@ export class TypeProcessor { if (needsJSGetterName) getterArgs.push(`jsName: "${this.escapeForSwiftStringLiteral(property.jsName)}"`); if (fromArg) getterArgs.push(fromArg); const getterAnnotation = this.renderMacroAnnotation("JSGetter", getterArgs); + const staticKeyword = isStatic ? "static " : ""; // Always render getter this.emitDocComment(node, { indent: " " }); - this.swiftLines.push(` ${getterAnnotation} var ${swiftName}: ${type}`); + this.swiftLines.push(` ${getterAnnotation} ${staticKeyword}var ${swiftName}: ${type}`); // Render setter if not readonly if (!property.isReadonly) { @@ -1036,7 +1039,7 @@ export class TypeProcessor { if (needsJSNameField) setterArgs.push(`jsName: "${this.escapeForSwiftStringLiteral(property.jsName)}"`); if (fromArg) setterArgs.push(fromArg); const annotation = this.renderMacroAnnotation("JSSetter", setterArgs); - this.swiftLines.push(` ${annotation} func ${this.renderIdentifier(setterName)}(_ value: ${type}) ${this.renderEffects({ isAsync: false })}`); + this.swiftLines.push(` ${annotation} ${staticKeyword}func ${this.renderIdentifier(setterName)}(_ value: ${type}) ${this.renderEffects({ isAsync: false })}`); } } diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 223927700..a83014e8c 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -354,6 +354,22 @@ exports[`ts2swift > snapshots Swift output for RecordDictionary.d.ts > RecordDic " `; +exports[`ts2swift > snapshots Swift output for StaticProperty.d.ts > StaticProperty 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(BridgeJS) import JavaScriptKit + +@JSClass struct Library { + @JSGetter static var version: String + @JSSetter static func setVersion(_ value: String) throws(JSException) +} +" +`; + exports[`ts2swift > snapshots Swift output for StringEnum.d.ts > StringEnum 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StaticProperty.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StaticProperty.d.ts new file mode 100644 index 000000000..afef26b5c --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/StaticProperty.d.ts @@ -0,0 +1,3 @@ +export class Library { + static version: string; +} From 002ffd9e95e15b7e72b410fa4c3e38a22ce261fa Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 20:57:15 +0900 Subject: [PATCH 244/252] TS2Swift: skip enum types when emitting string literal unions --- .../BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js | 7 +++++-- .../JavaScript/test/__snapshots__/ts2swift.test.js.snap | 6 ------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index fd4873752..7d929486d 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -56,8 +56,6 @@ export class TypeProcessor { this.emittedStructuredTypeNames = new Set(); /** @type {Set} */ this.emittedStringLiteralUnionNames = new Set(); - /** @type {Set} */ - this.emittedStringLiteralUnionNames = new Set(); /** @type {Set} */ this.visitedDeclarationKeys = new Set(); @@ -324,6 +322,11 @@ export class TypeProcessor { */ getStringLiteralUnionLiterals(type) { if ((type.flags & ts.TypeFlags.Union) === 0) return null; + const symbol = type.getSymbol() ?? type.aliasSymbol; + // Skip enums so we don't double-generate real enum declarations. + if (symbol && (symbol.flags & ts.SymbolFlags.Enum) !== 0) { + return null; + } /** @type {ts.UnionType} */ // @ts-ignore const unionType = type; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index a13540993..9415728a2 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -355,12 +355,6 @@ extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} @JSFunction func takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void -enum FeatureFlag: String { - case foo = "foo" - case bar = "bar" -} -extension FeatureFlag: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum {} - @JSFunction func returnsFeatureFlag() throws(JSException) -> FeatureFlag " `; From b643c475a85329d492798a64382163a79bf3a913 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 18 Feb 2026 14:03:25 +0100 Subject: [PATCH 245/252] NFC: BridgeJS: Remove dead cleanup infrastructure --- Benchmarks/Sources/Generated/BridgeJS.swift | 45 +-- .../PlayBridgeJS/Generated/BridgeJS.swift | 27 +- .../Sources/BridgeJSCore/ExportSwift.swift | 7 +- .../Sources/BridgeJSLink/BridgeJSLink.swift | 52 +-- .../Sources/BridgeJSLink/JSGlueGen.swift | 318 ++++-------------- .../BridgeJSCodegenTests/ArrayTypes.swift | 9 +- .../DefaultParameters.swift | 18 +- .../EnumAssociatedValue.swift | 9 +- .../ImportedTypeInExportedInterface.swift | 9 +- .../BridgeJSCodegenTests/SwiftStruct.swift | 63 ++-- .../SwiftStructImports.swift | 9 +- .../BridgeJSCodegenTests/UnsafePointer.swift | 9 +- .../BridgeJSLinkTests/ArrayTypes.js | 114 +------ .../__Snapshots__/BridgeJSLinkTests/Async.js | 11 - .../BridgeJSLinkTests/DefaultParameters.js | 53 +-- .../BridgeJSLinkTests/DictionaryTypes.js | 28 -- .../BridgeJSLinkTests/EnumAssociatedValue.js | 252 ++++---------- .../BridgeJSLinkTests/EnumCase.js | 11 - .../BridgeJSLinkTests/EnumNamespace.Global.js | 11 - .../BridgeJSLinkTests/EnumNamespace.js | 11 - .../BridgeJSLinkTests/EnumRawType.js | 11 - .../BridgeJSLinkTests/GlobalGetter.js | 11 - .../BridgeJSLinkTests/GlobalThisImports.js | 11 - .../BridgeJSLinkTests/ImportArray.js | 12 - .../ImportedTypeInExportedInterface.js | 25 +- .../BridgeJSLinkTests/InvalidPropertyNames.js | 11 - .../BridgeJSLinkTests/JSClass.js | 11 - .../JSClassStaticFunctions.js | 11 - .../BridgeJSLinkTests/JSValue.js | 18 - .../BridgeJSLinkTests/MixedGlobal.js | 11 - .../BridgeJSLinkTests/MixedModules.js | 11 - .../BridgeJSLinkTests/MixedPrivate.js | 11 - .../BridgeJSLinkTests/Namespaces.Global.js | 11 - .../BridgeJSLinkTests/Namespaces.js | 11 - .../BridgeJSLinkTests/Optionals.js | 11 - .../BridgeJSLinkTests/PrimitiveParameters.js | 11 - .../BridgeJSLinkTests/PrimitiveReturn.js | 11 - .../BridgeJSLinkTests/PropertyTypes.js | 11 - .../BridgeJSLinkTests/Protocol.js | 29 +- .../StaticFunctions.Global.js | 20 +- .../BridgeJSLinkTests/StaticFunctions.js | 20 +- .../StaticProperties.Global.js | 11 - .../BridgeJSLinkTests/StaticProperties.js | 11 - .../BridgeJSLinkTests/StringParameter.js | 11 - .../BridgeJSLinkTests/StringReturn.js | 11 - .../BridgeJSLinkTests/SwiftClass.js | 11 - .../BridgeJSLinkTests/SwiftClosure.js | 43 +-- .../BridgeJSLinkTests/SwiftClosureImports.js | 11 - .../BridgeJSLinkTests/SwiftStruct.js | 71 +--- .../BridgeJSLinkTests/SwiftStructImports.js | 18 +- .../__Snapshots__/BridgeJSLinkTests/Throws.js | 11 - .../BridgeJSLinkTests/UnsafePointer.js | 21 +- .../VoidParameterVoidReturn.js | 11 - Plugins/PackageToJS/Templates/instantiate.js | 78 +++-- .../JavaScriptKit/BridgeJSIntrinsics.swift | 15 - .../Generated/BridgeJS.swift | 171 ++++------ 56 files changed, 348 insertions(+), 1512 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 6ec87dca8..65e57bdf9 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -132,10 +132,7 @@ extension SimpleStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -148,9 +145,9 @@ extension SimpleStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SimpleStruct") -fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -179,10 +176,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -195,9 +189,9 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -232,10 +226,7 @@ extension Person: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -248,9 +239,9 @@ extension Person: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -285,10 +276,7 @@ extension ComplexStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -301,9 +289,9 @@ extension ComplexStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ComplexStruct") -fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -330,10 +318,7 @@ extension Point: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -346,9 +331,9 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index 6e146dbc3..f2aaa9794 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -24,10 +24,7 @@ extension PlayBridgeJSOutput: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSOutput(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PlayBridgeJSOutput(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -40,9 +37,9 @@ extension PlayBridgeJSOutput: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSOutput") -fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -77,10 +74,7 @@ extension PlayBridgeJSDiagnostic: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSDiagnostic(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PlayBridgeJSDiagnostic(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -93,9 +87,9 @@ extension PlayBridgeJSDiagnostic: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSDiagnostic") -fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -122,10 +116,7 @@ extension PlayBridgeJSResult: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PlayBridgeJSResult(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PlayBridgeJSResult(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -138,9 +129,9 @@ extension PlayBridgeJSResult: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSResult") -fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 207f6ee69..525f6b73b 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -1243,10 +1243,7 @@ struct StructCodegen { printer.write( multilineString: """ \(accessControl)init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = \(lowerFunctionName)(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + \(lowerFunctionName)(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } """ @@ -1274,7 +1271,7 @@ struct StructCodegen { functionName: lowerFunctionName, signature: SwiftSignatureBuilder.buildABIFunctionSignature( abiParameters: [("objectId", .i32)], - returnType: .i32 + returnType: nil ) ) let liftExternDeclPrinter = CodeFragmentPrinter() diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 5bf17256d..61ffc7781 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -261,7 +261,6 @@ public struct BridgeJSLink { "let \(JSGlueVariableScope.reservedF32Stack) = [];", "let \(JSGlueVariableScope.reservedF64Stack) = [];", "let \(JSGlueVariableScope.reservedPointerStack) = [];", - "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];", "const \(JSGlueVariableScope.reservedEnumHelpers) = {};", "const \(JSGlueVariableScope.reservedStructHelpers) = {};", "", @@ -403,38 +402,13 @@ public struct BridgeJSLink { printer.write("return \(JSGlueVariableScope.reservedPointerStack).pop();") } printer.write("}") - printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {") - printer.indent { - printer.write("if (cleanupId === 0) { return; }") - printer.write("const index = (cleanupId | 0) - 1;") - printer.write("const cleanup = \(JSGlueVariableScope.reservedTmpStructCleanups)[index];") - printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups)[index] = null;") - printer.write("if (cleanup) { cleanup(); }") - printer.write( - "while (\(JSGlueVariableScope.reservedTmpStructCleanups).length > 0 && \(JSGlueVariableScope.reservedTmpStructCleanups)[\(JSGlueVariableScope.reservedTmpStructCleanups).length - 1] == null) {" - ) - printer.indent { - printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups).pop();") - } - printer.write("}") - } - printer.write("}") - if !allStructs.isEmpty { for structDef in allStructs { printer.write("bjs[\"swift_js_struct_lower_\(structDef.name)\"] = function(objectId) {") printer.indent { printer.write( - "const { cleanup: cleanup } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));" ) - printer.write("if (cleanup) {") - printer.indent { - printer.write( - "return \(JSGlueVariableScope.reservedTmpStructCleanups).push(cleanup);" - ) - } - printer.write("}") - printer.write("return 0;") } printer.write("}") @@ -956,14 +930,12 @@ public struct BridgeJSLink { for structDef in allStructs { let structPrinter = CodeFragmentPrinter() let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - let structCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs) _ = try fragment.printCode( [structDef.name], IntrinsicJSFragment.PrintCodeContext( scope: structScope, - printer: structPrinter, - cleanupCode: structCleanup + printer: structPrinter ) ) bodyPrinter.write(lines: structPrinter.lines) @@ -975,14 +947,12 @@ public struct BridgeJSLink { for enumDef in allAssocEnums { let enumPrinter = CodeFragmentPrinter() let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - let enumCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef) _ = try fragment.printCode( [enumDef.valuesName], IntrinsicJSFragment.PrintCodeContext( scope: enumScope, - printer: enumPrinter, - cleanupCode: enumCleanup + printer: enumPrinter ) ) bodyPrinter.write(lines: enumPrinter.lines) @@ -1227,7 +1197,6 @@ public struct BridgeJSLink { class ExportedThunkBuilder { var body: CodeFragmentPrinter - var cleanupCode: CodeFragmentPrinter var parameterForwardings: [String] = [] let effects: Effects let scope: JSGlueVariableScope @@ -1237,11 +1206,9 @@ public struct BridgeJSLink { self.effects = effects self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) self.body = CodeFragmentPrinter() - self.cleanupCode = CodeFragmentPrinter() self.context = IntrinsicJSFragment.PrintCodeContext( scope: scope, printer: body, - cleanupCode: cleanupCode, hasDirectAccessToSwiftClass: hasDirectAccessToSwiftClass ) } @@ -1312,10 +1279,9 @@ public struct BridgeJSLink { ] } - /// Renders the thunk body (body code, cleanup, exception handling, and optional return) into a printer. + /// Renders the thunk body (body code, exception handling, and optional return) into a printer. func renderFunctionBody(into printer: CodeFragmentPrinter, returnExpr: String?) { printer.write(contentsOf: body) - printer.write(contentsOf: cleanupCode) printer.write(lines: checkExceptionLines()) if let returnExpr = returnExpr { printer.write("return \(returnExpr);") @@ -1541,8 +1507,7 @@ public struct BridgeJSLink { let printer = CodeFragmentPrinter() let context = IntrinsicJSFragment.PrintCodeContext( scope: scope, - printer: printer, - cleanupCode: CodeFragmentPrinter() + printer: printer ) let enumValuesName = enumDefinition.valuesName @@ -2127,7 +2092,6 @@ extension BridgeJSLink { class ImportedThunkBuilder { let body: CodeFragmentPrinter let scope: JSGlueVariableScope - let cleanupCode: CodeFragmentPrinter let context: BridgeContext var parameterNames: [String] = [] var parameterForwardings: [String] = [] @@ -2136,12 +2100,10 @@ extension BridgeJSLink { init(context: BridgeContext = .importTS, intrinsicRegistry: JSIntrinsicRegistry) { self.body = CodeFragmentPrinter() self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) - self.cleanupCode = CodeFragmentPrinter() self.context = context self.printContext = IntrinsicJSFragment.PrintCodeContext( scope: scope, - printer: body, - cleanupCode: cleanupCode + printer: body ) } @@ -2680,7 +2642,6 @@ extension BridgeJSLink { getterPrinter.write("get \(property.name)() {") getterPrinter.indent { getterPrinter.write(contentsOf: getterThunkBuilder.body) - getterPrinter.write(contentsOf: getterThunkBuilder.cleanupCode) getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) if let returnExpr = getterReturnExpr { getterPrinter.write("return \(returnExpr);") @@ -2708,7 +2669,6 @@ extension BridgeJSLink { setterPrinter.write("set \(property.name)(value) {") setterPrinter.indent { setterPrinter.write(contentsOf: setterThunkBuilder.body) - setterPrinter.write(contentsOf: setterThunkBuilder.cleanupCode) setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) } setterPrinter.write("},") diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index da21a6e08..20903eef8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -28,7 +28,6 @@ final class JSGlueVariableScope { static let reservedF32Stack = "f32Stack" static let reservedF64Stack = "f64Stack" static let reservedPointerStack = "ptrStack" - static let reservedTmpStructCleanups = "tmpStructCleanups" static let reservedEnumHelpers = "enumHelpers" static let reservedStructHelpers = "structHelpers" static let reservedSwiftClosureRegistry = "swiftClosureRegistry" @@ -56,7 +55,6 @@ final class JSGlueVariableScope { reservedF32Stack, reservedF64Stack, reservedPointerStack, - reservedTmpStructCleanups, reservedEnumHelpers, reservedStructHelpers, reservedSwiftClosureRegistry, @@ -147,8 +145,6 @@ struct IntrinsicJSFragment: Sendable { var scope: JSGlueVariableScope /// The printer to print the main fragment code. var printer: CodeFragmentPrinter - /// The printer to print the code that is expected to be executed at the end of the caller of the fragment. - var cleanupCode: CodeFragmentPrinter /// Whether the fragment has direct access to the SwiftHeapObject classes. /// If false, the fragment needs to use `_exports[""]` to access the class. var hasDirectAccessToSwiftClass: Bool = true @@ -250,7 +246,7 @@ struct IntrinsicJSFragment: Sendable { static let stringLiftReturn = IntrinsicJSFragment( parameters: [], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let resultLabel = scope.variable("ret") printer.write("const \(resultLabel) = \(JSGlueVariableScope.reservedStorageToReturnString);") printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") @@ -260,7 +256,7 @@ struct IntrinsicJSFragment: Sendable { static let stringLiftParameter = IntrinsicJSFragment( parameters: ["objectId"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let objectId = arguments[0] let objectLabel = scope.variable("\(objectId)Object") // TODO: Implement "take" operation @@ -272,7 +268,7 @@ struct IntrinsicJSFragment: Sendable { static let stringLowerReturn = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) printer.write( "\(JSGlueVariableScope.reservedStorageToReturnBytes) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(arguments[0]));" ) @@ -289,7 +285,7 @@ struct IntrinsicJSFragment: Sendable { static let jsObjectLiftReturn = IntrinsicJSFragment( parameters: ["retId"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) // TODO: Implement "take" operation let resultLabel = scope.variable("ret") let retId = arguments[0] @@ -301,7 +297,7 @@ struct IntrinsicJSFragment: Sendable { static let jsObjectLiftRetainedObjectId = IntrinsicJSFragment( parameters: ["objectId"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let resultLabel = scope.variable("value") let objectId = arguments[0] printer.write( @@ -446,7 +442,7 @@ struct IntrinsicJSFragment: Sendable { static let jsValueLower = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let kindVar = scope.variable("\(value)Kind") let payload1Var = scope.variable("\(value)Payload1") @@ -572,7 +568,7 @@ struct IntrinsicJSFragment: Sendable { static let jsValueLift = IntrinsicJSFragment( parameters: [], printCode: { _, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let payload2 = scope.variable("jsValuePayload2") let payload1 = scope.variable("jsValuePayload1") let kind = scope.variable("jsValueKind") @@ -590,7 +586,7 @@ struct IntrinsicJSFragment: Sendable { static let jsValueLiftParameter = IntrinsicJSFragment( parameters: ["kind", "payload1", "payload2"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( @@ -635,14 +631,12 @@ struct IntrinsicJSFragment: Sendable { IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (printer, cleanup) = (context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] - let caseIdName = "\(value)CaseId" - let cleanupName = "\(value)Cleanup" + let caseIdName = scope.variable("\(value)CaseId") printer.write( - "const { caseId: \(caseIdName), cleanup: \(cleanupName) } = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lower(\(value));" + "const \(caseIdName) = \(JSGlueVariableScope.reservedEnumHelpers).\(enumBase).lower(\(value));" ) - cleanup.write("if (\(cleanupName)) { \(cleanupName)(); }") return [caseIdName] } ) @@ -806,7 +800,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(value) != null;") @@ -814,18 +808,13 @@ struct IntrinsicJSFragment: Sendable { switch wrappedType { case .swiftStruct(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName - let cleanupVar = scope.variable("\(value)Cleanup") - printer.write("let \(cleanupVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let resultVar = scope.variable("structResult") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" ) - printer.write("\(cleanupVar) = \(resultVar).cleanup;") } printer.write("}") - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") return [] case .string, .rawValueEnum(_, .string): @@ -846,65 +835,42 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("\(value)CaseId") - let cleanupVar = scope.variable("\(value)Cleanup") - printer.write("let \(caseIdVar), \(cleanupVar);") + printer.write("let \(caseIdVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let resultVar = scope.variable("enumResult") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) - printer.write("\(caseIdVar) = \(resultVar).caseId;") - printer.write("\(cleanupVar) = \(resultVar).cleanup;") } printer.write("}") - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return ["+\(isSomeVar)", "\(isSomeVar) ? \(caseIdVar) : 0"] case .rawValueEnum: // Raw value enums with optional - falls through to handle based on raw type return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] case .array(let elementType): - let cleanupArrayVar = scope.variable("\(value)Cleanups") - printer.write("const \(cleanupArrayVar) = [];") printer.write("if (\(isSomeVar)) {") try printer.indent { let arrayLowerFragment = try arrayLower(elementType: elementType) - let arrayCleanup = CodeFragmentPrinter() let _ = try arrayLowerFragment.printCode( [value], - context.with(\.cleanupCode, arrayCleanup) + context ) - if !arrayCleanup.lines.isEmpty { - for line in arrayCleanup.lines { - printer.write("\(cleanupArrayVar).push(() => { \(line) });") - } - } } printer.write("}") - cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") return [] case .dictionary(let valueType): - let cleanupArrayVar = scope.variable("\(value)Cleanups") - printer.write("const \(cleanupArrayVar) = [];") printer.write("if (\(isSomeVar)) {") try printer.indent { let dictLowerFragment = try dictionaryLower(valueType: valueType) - let dictCleanup = CodeFragmentPrinter() let _ = try dictLowerFragment.printCode( [value], - context.with(\.cleanupCode, dictCleanup) + context ) - if !dictCleanup.lines.isEmpty { - for line in dictCleanup.lines { - printer.write("\(cleanupArrayVar).push(() => { \(line) });") - } - } } printer.write("}") - cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") return [] default: @@ -1105,7 +1071,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let isSomeVar = scope.variable("isSome") let presenceExpr = kind.presenceCheck(value: value) @@ -1166,16 +1132,10 @@ struct IntrinsicJSFragment: Sendable { printer.write("if (\(isSomeVar)) {") try printer.indent { let arrayLowerFragment = try arrayLower(elementType: elementType) - let arrayCleanup = CodeFragmentPrinter() let _ = try arrayLowerFragment.printCode( [value], - context.with(\.cleanupCode, arrayCleanup) + context ) - if !arrayCleanup.lines.isEmpty { - for line in arrayCleanup.lines { - printer.write(line) - } - } } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) @@ -1214,11 +1174,10 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("cleanup") printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) printer.write("return \(caseIdVar);") } @@ -1227,14 +1186,11 @@ struct IntrinsicJSFragment: Sendable { printer.write("return -1;") } printer.write("}") - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") case .dictionary(let valueType): printer.write("if (\(isSomeVar)) {") try printer.indent { - let cleanupArrayVar = scope.variable("arrayCleanups") let entriesVar = scope.variable("entries") let entryVar = scope.variable("entry") - printer.write("const \(cleanupArrayVar) = [];") printer.write("const \(entriesVar) = Object.entries(\(value));") printer.write("for (const \(entryVar) of \(entriesVar)) {") try printer.indent { @@ -1243,40 +1199,19 @@ struct IntrinsicJSFragment: Sendable { printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") let keyFragment = try stackLowerFragment(elementType: .string) - let keyCleanup = CodeFragmentPrinter() let _ = try keyFragment.printCode( [keyVar], - context.with(\.cleanupCode, keyCleanup) + context ) - if !keyCleanup.lines.isEmpty { - printer.write("\(cleanupArrayVar).push(() => {") - printer.indent { - for line in keyCleanup.lines { - printer.write(line) - } - } - printer.write("});") - } let valueFragment = try stackLowerFragment(elementType: valueType) - let valueCleanup = CodeFragmentPrinter() let _ = try valueFragment.printCode( [valueVar], - context.with(\.cleanupCode, valueCleanup) + context ) - if !valueCleanup.lines.isEmpty { - printer.write("\(cleanupArrayVar).push(() => {") - printer.indent { - for line in valueCleanup.lines { - printer.write(line) - } - } - printer.write("});") - } } printer.write("}") scope.emitPushI32Parameter("\(entriesVar).length", printer: printer) - cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) @@ -1594,14 +1529,12 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("cleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") printer.write("return \(caseIdVar);") return [] } @@ -1662,15 +1595,10 @@ struct IntrinsicJSFragment: Sendable { for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter let caseScope = scope.makeChildScope() - let caseCleanup = CodeFragmentPrinter() - caseCleanup.indent() let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) _ = try fragment.printCode( ["value", enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, lowerPrinter).with( - \.cleanupCode, - caseCleanup - ) + context.with(\.scope, caseScope).with(\.printer, lowerPrinter) ) } @@ -1696,15 +1624,11 @@ struct IntrinsicJSFragment: Sendable { for enumCase in enumDefinition.cases { let caseName = enumCase.name.capitalizedFirstLetter let caseScope = scope.makeChildScope() - let caseCleanup = CodeFragmentPrinter() let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) _ = try fragment.printCode( [enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, liftPrinter).with( - \.cleanupCode, - caseCleanup - ) + context.with(\.scope, caseScope).with(\.printer, liftPrinter) ) } @@ -1783,7 +1707,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value", "enumName", "caseName"], printCode: { arguments, context in - let (printer, cleanup) = (context.printer, context.cleanupCode) + let printer = context.printer let enumName = arguments[1] let caseName = arguments[2] @@ -1791,8 +1715,7 @@ struct IntrinsicJSFragment: Sendable { try printer.indent { if enumCase.associatedValues.isEmpty { - printer.write("const cleanup = undefined;") - printer.write("return { caseId: \(enumName).Tag.\(caseName), cleanup };") + printer.write("return \(enumName).Tag.\(caseName);") } else { // Process associated values in reverse order (to match the order they'll be popped) let reversedValues = enumCase.associatedValues.enumerated().reversed() @@ -1806,14 +1729,7 @@ struct IntrinsicJSFragment: Sendable { _ = try fragment.printCode(["value.\(prop)"], context) } - if cleanup.lines.isEmpty { - printer.write("const cleanup = undefined;") - } else { - printer.write("const cleanup = () => {") - printer.write(contentsOf: cleanup) - printer.write("};") - } - printer.write("return { caseId: \(enumName).Tag.\(caseName), cleanup };") + printer.write("return \(enumName).Tag.\(caseName);") } } @@ -1882,7 +1798,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") @@ -1959,19 +1875,14 @@ struct IntrinsicJSFragment: Sendable { } case .swiftStruct(let structName): let structBase = structName.components(separatedBy: ".").last ?? structName - let nestedCleanupVar = scope.variable("nestedCleanup") - printer.write("let \(nestedCleanupVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let structResultVar = scope.variable("structResult") printer.write( - "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" ) - printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") case .swiftHeapObject: printer.write("if (\(isSomeVar)) {") printer.indent { @@ -2001,16 +1912,12 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let enumName): let base = enumName.components(separatedBy: ".").last ?? enumName let caseIdVar = scope.variable("enumCaseId") - let enumCleanupVar = scope.variable("enumCleanup") - printer.write("let \(caseIdVar), \(enumCleanupVar);") + printer.write("let \(caseIdVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let enumResultVar = scope.variable("enumResult") printer.write( - "const \(enumResultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) - printer.write("\(caseIdVar) = \(enumResultVar).caseId;") - printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") scope.emitPushI32Parameter(caseIdVar, printer: printer) } printer.write("} else {") @@ -2019,36 +1926,17 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") case .array(let elementType): - // Array cleanup references variables declared inside the if block, - // so capture cleanup into a variable declared at the outer scope. - let arrCleanupVar = scope.variable("arrCleanup") - printer.write("let \(arrCleanupVar);") printer.write("if (\(isSomeVar)) {") try printer.indent { - let localCleanup = CodeFragmentPrinter() let arrFragment = try arrayLower(elementType: elementType) _ = try arrFragment.printCode( [value], - context.with(\.cleanupCode, localCleanup) + context ) - let cleanupLines = localCleanup.lines.filter { - !$0.trimmingCharacters(in: .whitespaces).isEmpty - } - if !cleanupLines.isEmpty { - printer.write("\(arrCleanupVar) = () => {") - printer.indent { - for line in cleanupLines { - printer.write(line) - } - } - printer.write("};") - } } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if (\(arrCleanupVar)) { \(arrCleanupVar)(); }") default: scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } @@ -2117,13 +2005,11 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let printer = context.printer let value = arguments[0] - let cleanupVar = scope.variable("cleanup") printer.write( - "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } ) @@ -2133,13 +2019,11 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let printer = context.printer let value = arguments[0] - let cleanupVar = scope.variable("cleanup") printer.write( - "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" ) - cleanupCode.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } ) @@ -2166,33 +2050,20 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["arr"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let arr = arguments[0] - let cleanupArrayVar = scope.variable("arrayCleanups") - printer.write("const \(cleanupArrayVar) = [];") let elemVar = scope.variable("elem") printer.write("for (const \(elemVar) of \(arr)) {") try printer.indent { let elementFragment = try stackLowerFragment(elementType: elementType) - let elementCleanup = CodeFragmentPrinter() let _ = try elementFragment.printCode( [elemVar], - context.with(\.cleanupCode, elementCleanup) + context ) - if !elementCleanup.lines.isEmpty { - printer.write("\(cleanupArrayVar).push(() => {") - printer.indent { - for line in elementCleanup.lines { - printer.write(line) - } - } - printer.write("});") - } } printer.write("}") scope.emitPushI32Parameter("\(arr).length", printer: printer) - cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return [] } ) @@ -2203,11 +2074,9 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["dict"], printCode: { arguments, context in - let (scope, printer, cleanupCode) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let dict = arguments[0] - let cleanupArrayVar = scope.variable("arrayCleanups") - printer.write("const \(cleanupArrayVar) = [];") let entriesVar = scope.variable("entries") let entryVar = scope.variable("entry") printer.write("const \(entriesVar) = Object.entries(\(dict));") @@ -2218,40 +2087,19 @@ struct IntrinsicJSFragment: Sendable { printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") let keyFragment = try stackLowerFragment(elementType: .string) - let keyCleanup = CodeFragmentPrinter() let _ = try keyFragment.printCode( [keyVar], - context.with(\.cleanupCode, keyCleanup) + context ) - if !keyCleanup.lines.isEmpty { - printer.write("\(cleanupArrayVar).push(() => {") - printer.indent { - for line in keyCleanup.lines { - printer.write(line) - } - } - printer.write("});") - } let valueFragment = try stackLowerFragment(elementType: valueType) - let valueCleanup = CodeFragmentPrinter() let _ = try valueFragment.printCode( [valueVar], - context.with(\.cleanupCode, valueCleanup) + context ) - if !valueCleanup.lines.isEmpty { - printer.write("\(cleanupArrayVar).push(() => {") - printer.indent { - for line in valueCleanup.lines { - printer.write(line) - } - } - printer.write("});") - } } printer.write("}") scope.emitPushI32Parameter("\(entriesVar).length", printer: printer) - cleanupCode.write("for (const cleanup of \(cleanupArrayVar)) { cleanup(); }") return [] } ) @@ -2582,13 +2430,11 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let printer = context.printer let value = arguments[0] - let cleanupVar = scope.variable("structCleanup") printer.write( - "const { cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" ) - cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } ) @@ -2655,15 +2501,13 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let caseIdVar = scope.variable("caseId") - let cleanupVar = scope.variable("enumCleanup") printer.write( - "const { caseId: \(caseIdVar), cleanup: \(cleanupVar) } = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) scope.emitPushI32Parameter(caseIdVar, printer: printer) - cleanup.write("if (\(cleanupVar)) { \(cleanupVar)(); }") return [] } ) @@ -2772,22 +2616,13 @@ struct IntrinsicJSFragment: Sendable { let presenceExpr = kind.presenceCheck(value: value) printer.write("const \(isSomeVar) = \(presenceExpr) ? 1 : 0;") - // Cleanup is written inside the if block so retained id is in scope - let localCleanupWriter = CodeFragmentPrinter() printer.write("if (\(isSomeVar)) {") try printer.indent { let innerFragment = try stackLowerFragment(elementType: wrappedType) let _ = try innerFragment.printCode( [value], - context.with(\.cleanupCode, localCleanupWriter) + context ) - let localCleanupLines = localCleanupWriter.lines.filter { - !$0.trimmingCharacters(in: .whitespaces).isEmpty - } - if !localCleanupLines.isEmpty { - let localCleanupCode = localCleanupLines.joined(separator: " ") - printer.write("arrayCleanups.push(() => { \(localCleanupCode) });") - } } printer.write("} else {") printer.indent { @@ -2877,8 +2712,6 @@ struct IntrinsicJSFragment: Sendable { let (scope, printer) = (context.scope, context.printer) let lowerPrinter = CodeFragmentPrinter() let lowerScope = scope.makeChildScope() - let lowerCleanup = CodeFragmentPrinter() - lowerCleanup.indent() let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps { @@ -2886,22 +2719,13 @@ struct IntrinsicJSFragment: Sendable { let fieldValue = "value.\(property.name)" _ = try fragment.printCode( [fieldValue], - context.with(\.scope, lowerScope).with(\.printer, lowerPrinter).with(\.cleanupCode, lowerCleanup) + context.with(\.scope, lowerScope).with(\.printer, lowerPrinter) ) } for line in lowerPrinter.lines { printer.write(line) } - - if !lowerCleanup.lines.isEmpty { - printer.write("const cleanup = () => {") - printer.write(contentsOf: lowerCleanup) - printer.write("};") - printer.write("return { cleanup };") - } else { - printer.write("return { cleanup: undefined };") - } } private static func generateStructLiftCode( @@ -2944,12 +2768,8 @@ struct IntrinsicJSFragment: Sendable { "\(instanceVar).\(method.name) = function(\(paramList)) {" ) try printer.indent { - let methodScope = scope.makeChildScope() - let methodCleanup = CodeFragmentPrinter() - - let structCleanupVar = methodScope.variable("structCleanup") printer.write( - "const { cleanup: \(structCleanupVar) } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(this);" + "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(this);" ) var paramForwardings: [String] = [] @@ -2966,10 +2786,6 @@ struct IntrinsicJSFragment: Sendable { printer.write("const ret = \(callExpr);") } - // Cleanup - printer.write("if (\(structCleanupVar)) { \(structCleanupVar)(); }") - printer.write(contentsOf: methodCleanup) - // Lift return value if needed if method.returnType != .void { let liftFragment = try IntrinsicJSFragment.liftReturn(type: method.returnType) @@ -3021,7 +2837,7 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode) + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") @@ -3116,19 +2932,14 @@ struct IntrinsicJSFragment: Sendable { scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] } else if case .swiftStruct(let structName) = wrappedType { - let nestedCleanupVar = scope.variable("nestedCleanup") - printer.write("let \(nestedCleanupVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let structResultVar = scope.variable("structResult") printer.write( - "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(structName).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structName).lower(\(value));" ) - printer.write("\(nestedCleanupVar) = \(structResultVar).cleanup;") } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if (\(nestedCleanupVar)) { \(nestedCleanupVar)(); }") return [] } else if case .string = wrappedType { let idVar = scope.variable("id") @@ -3212,16 +3023,12 @@ struct IntrinsicJSFragment: Sendable { case .associatedValueEnum(let enumName): let base = enumName.components(separatedBy: ".").last ?? enumName let caseIdVar = scope.variable("enumCaseId") - let enumCleanupVar = scope.variable("enumCleanup") - printer.write("let \(caseIdVar), \(enumCleanupVar);") + printer.write("let \(caseIdVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - let enumResultVar = scope.variable("enumResult") printer.write( - "const \(enumResultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" + "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" ) - printer.write("\(caseIdVar) = \(enumResultVar).caseId;") - printer.write("\(enumCleanupVar) = \(enumResultVar).cleanup;") scope.emitPushI32Parameter(caseIdVar, printer: printer) } printer.write("} else {") @@ -3230,7 +3037,6 @@ struct IntrinsicJSFragment: Sendable { } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - cleanup.write("if (\(enumCleanupVar)) { \(enumCleanupVar)(); }") default: let wrappedFragment = try structFieldLowerFragment( field: ExportedProperty( @@ -3242,10 +3048,9 @@ struct IntrinsicJSFragment: Sendable { allStructs: allStructs ) let guardedPrinter = CodeFragmentPrinter() - let guardedCleanup = CodeFragmentPrinter() _ = try wrappedFragment.printCode( [value], - context.with(\.printer, guardedPrinter).with(\.cleanupCode, guardedCleanup) + context.with(\.printer, guardedPrinter) ) var loweredLines = guardedPrinter.lines var hoistedCleanupVar: String? @@ -3267,13 +3072,6 @@ struct IntrinsicJSFragment: Sendable { for line in loweredLines { printer.write(line) } - if !guardedCleanup.lines.isEmpty { - cleanup.write("if (\(isSomeVar)) {") - cleanup.indent { - cleanup.write(contentsOf: guardedCleanup) - } - cleanup.write("}") - } } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) @@ -3286,13 +3084,11 @@ struct IntrinsicJSFragment: Sendable { return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) + let printer = context.printer let value = arguments[0] - let structResultVar = scope.variable("structResult") printer.write( - "const \(structResultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(nestedName).lower(\(value));" ) - context.cleanupCode.write("if (\(structResultVar).cleanup) { \(structResultVar).cleanup(); }") return [] } ) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 3141139ca..12edb29e3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -57,10 +57,7 @@ extension Point: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -73,9 +70,9 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift index e8f367f1c..c905c4239 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift @@ -52,10 +52,7 @@ extension Config: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -68,9 +65,9 @@ extension Config: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -95,10 +92,7 @@ extension MathOperations: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -111,9 +105,9 @@ extension MathOperations: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 3d23c6bff..588fb1cbc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -413,10 +413,7 @@ extension Point: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -429,9 +426,9 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index 7fcc4d3c7..c142fbd04 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -15,10 +15,7 @@ extension FooContainer: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -31,9 +28,9 @@ extension FooContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index fb78c3fd0..29abcebca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -28,10 +28,7 @@ extension DataPoint: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -44,9 +41,9 @@ extension DataPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -90,10 +87,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -106,9 +100,9 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -143,10 +137,7 @@ extension Person: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -159,9 +150,9 @@ extension Person: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -188,10 +179,7 @@ extension Session: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -204,9 +192,9 @@ extension Session: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Session") -fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -239,10 +227,7 @@ extension Measurement: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Measurement(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Measurement(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -255,9 +240,9 @@ extension Measurement: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Measurement") -fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -280,10 +265,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -296,9 +278,9 @@ extension ConfigStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -404,10 +386,7 @@ extension Container: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Container(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Container(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -420,9 +399,9 @@ extension Container: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Container") -fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift index 089912afe..29386e65f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift @@ -11,10 +11,7 @@ extension Point: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -27,9 +24,9 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift index a4f372e9b..9385c0621 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift @@ -17,10 +17,7 @@ extension PointerFields: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -33,9 +30,9 @@ extension PointerFields: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 7db995321..e7bdf975b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -36,7 +36,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -47,7 +46,6 @@ export async function createInstantiator(options, swift) { lower: (value) => { f64Stack.push(value.x); f64Stack.push(value.y); - return { cleanup: undefined }; }, lift: () => { const f64 = f64Stack.pop(); @@ -122,22 +120,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_Point"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Point.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Point"] = function() { const value = structHelpers.Point.lift(); @@ -274,7 +258,6 @@ export async function createInstantiator(options, swift) { TestModule["bjs_importGetNumbers"] = function bjs_importGetNumbers() { try { let ret = imports.importGetNumbers(); - const arrayCleanups = []; for (const elem of ret) { f64Stack.push(elem); } @@ -293,7 +276,6 @@ export async function createInstantiator(options, swift) { } arrayResult.reverse(); let ret = imports.importTransformNumbers(arrayResult); - const arrayCleanups = []; for (const elem of ret) { f64Stack.push(elem); } @@ -312,7 +294,6 @@ export async function createInstantiator(options, swift) { } arrayResult.reverse(); let ret = imports.importProcessStrings(arrayResult); - const arrayCleanups = []; for (const elem of ret) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); @@ -334,7 +315,6 @@ export async function createInstantiator(options, swift) { } arrayResult.reverse(); let ret = imports.importProcessBooleans(arrayResult); - const arrayCleanups = []; for (const elem of ret) { i32Stack.push(elem ? 1 : 0); } @@ -396,7 +376,6 @@ export async function createInstantiator(options, swift) { const exports = { Item, processIntArray: function bjs_processIntArray(values) { - const arrayCleanups = []; for (const elem of values) { i32Stack.push((elem | 0)); } @@ -409,11 +388,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(int); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processStringArray: function bjs_processStringArray(values) { - const arrayCleanups = []; for (const elem of values) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); @@ -429,11 +406,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(string); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processDoubleArray: function bjs_processDoubleArray(values) { - const arrayCleanups = []; for (const elem of values) { f64Stack.push(elem); } @@ -446,11 +421,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(f64); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processBoolArray: function bjs_processBoolArray(values) { - const arrayCleanups = []; for (const elem of values) { i32Stack.push(elem ? 1 : 0); } @@ -463,16 +436,11 @@ export async function createInstantiator(options, swift) { arrayResult.push(bool); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processPointArray: function bjs_processPointArray(points) { - const arrayCleanups = []; for (const elem of points) { - const { cleanup: structCleanup } = structHelpers.Point.lower(elem); - arrayCleanups.push(() => { - if (structCleanup) { structCleanup(); } - }); + structHelpers.Point.lower(elem); } i32Stack.push(points.length); instance.exports.bjs_processPointArray(); @@ -483,11 +451,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(struct); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processDirectionArray: function bjs_processDirectionArray(directions) { - const arrayCleanups = []; for (const elem of directions) { i32Stack.push((elem | 0)); } @@ -500,11 +466,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(caseId); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processStatusArray: function bjs_processStatusArray(statuses) { - const arrayCleanups = []; for (const elem of statuses) { i32Stack.push((elem | 0)); } @@ -517,37 +481,28 @@ export async function createInstantiator(options, swift) { arrayResult.push(rawValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, sumIntArray: function bjs_sumIntArray(values) { - const arrayCleanups = []; for (const elem of values) { i32Stack.push((elem | 0)); } i32Stack.push(values.length); const ret = instance.exports.bjs_sumIntArray(); - for (const cleanup of arrayCleanups) { cleanup(); } return ret; }, findFirstPoint: function bjs_findFirstPoint(points, matching) { - const arrayCleanups = []; for (const elem of points) { - const { cleanup: structCleanup } = structHelpers.Point.lower(elem); - arrayCleanups.push(() => { - if (structCleanup) { structCleanup(); } - }); + structHelpers.Point.lower(elem); } i32Stack.push(points.length); const matchingBytes = textEncoder.encode(matching); const matchingId = swift.memory.retain(matchingBytes); instance.exports.bjs_findFirstPoint(matchingId, matchingBytes.length); const structValue = structHelpers.Point.lift(); - for (const cleanup of arrayCleanups) { cleanup(); } return structValue; }, processUnsafeRawPointerArray: function bjs_processUnsafeRawPointerArray(values) { - const arrayCleanups = []; for (const elem of values) { ptrStack.push((elem | 0)); } @@ -560,11 +515,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(pointer); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processUnsafeMutableRawPointerArray: function bjs_processUnsafeMutableRawPointerArray(values) { - const arrayCleanups = []; for (const elem of values) { ptrStack.push((elem | 0)); } @@ -577,11 +530,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(pointer); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOpaquePointerArray: function bjs_processOpaquePointerArray(values) { - const arrayCleanups = []; for (const elem of values) { ptrStack.push((elem | 0)); } @@ -594,11 +545,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(pointer); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalIntArray: function bjs_processOptionalIntArray(values) { - const arrayCleanups = []; for (const elem of values) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -624,11 +573,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalStringArray: function bjs_processOptionalStringArray(values) { - const arrayCleanups = []; for (const elem of values) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -658,19 +605,15 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalArray: function bjs_processOptionalArray(values) { const isSome = values != null; - const valuesCleanups = []; if (isSome) { - const arrayCleanups = []; for (const elem of values) { i32Stack.push((elem | 0)); } i32Stack.push(values.length); - valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } i32Stack.push(+isSome); instance.exports.bjs_processOptionalArray(); @@ -688,16 +631,13 @@ export async function createInstantiator(options, swift) { } else { optResult = null; } - for (const cleanup of valuesCleanups) { cleanup(); } return optResult; }, processOptionalPointArray: function bjs_processOptionalPointArray(points) { - const arrayCleanups = []; for (const elem of points) { const isSome = elem != null ? 1 : 0; if (isSome) { - const { cleanup: structCleanup } = structHelpers.Point.lower(elem); - arrayCleanups.push(() => { if (structCleanup) { structCleanup(); } }); + structHelpers.Point.lower(elem); } else { } i32Stack.push(isSome); @@ -718,11 +658,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalDirectionArray: function bjs_processOptionalDirectionArray(directions) { - const arrayCleanups = []; for (const elem of directions) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -748,11 +686,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalStatusArray: function bjs_processOptionalStatusArray(statuses) { - const arrayCleanups = []; for (const elem of statuses) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -778,20 +714,14 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processNestedIntArray: function bjs_processNestedIntArray(values) { - const arrayCleanups = []; for (const elem of values) { - const arrayCleanups1 = []; for (const elem1 of elem) { i32Stack.push((elem1 | 0)); } i32Stack.push(elem.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(values.length); instance.exports.bjs_processNestedIntArray(); @@ -808,13 +738,10 @@ export async function createInstantiator(options, swift) { arrayResult.push(arrayResult1); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processNestedStringArray: function bjs_processNestedStringArray(values) { - const arrayCleanups = []; for (const elem of values) { - const arrayCleanups1 = []; for (const elem1 of elem) { const bytes = textEncoder.encode(elem1); const id = swift.memory.retain(bytes); @@ -822,9 +749,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); } i32Stack.push(elem.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(values.length); instance.exports.bjs_processNestedStringArray(); @@ -841,23 +765,14 @@ export async function createInstantiator(options, swift) { arrayResult.push(arrayResult1); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processNestedPointArray: function bjs_processNestedPointArray(points) { - const arrayCleanups = []; for (const elem of points) { - const arrayCleanups1 = []; for (const elem1 of elem) { - const { cleanup: structCleanup } = structHelpers.Point.lower(elem1); - arrayCleanups1.push(() => { - if (structCleanup) { structCleanup(); } - }); + structHelpers.Point.lower(elem1); } i32Stack.push(elem.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(points.length); instance.exports.bjs_processNestedPointArray(); @@ -874,11 +789,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(arrayResult1); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processItemArray: function bjs_processItemArray(items) { - const arrayCleanups = []; for (const elem of items) { ptrStack.push(elem.pointer); } @@ -892,20 +805,14 @@ export async function createInstantiator(options, swift) { arrayResult.push(obj); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processNestedItemArray: function bjs_processNestedItemArray(items) { - const arrayCleanups = []; for (const elem of items) { - const arrayCleanups1 = []; for (const elem1 of elem) { ptrStack.push(elem1.pointer); } i32Stack.push(elem.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(items.length); instance.exports.bjs_processNestedItemArray(); @@ -923,11 +830,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(arrayResult1); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processJSObjectArray: function bjs_processJSObjectArray(objects) { - const arrayCleanups = []; for (const elem of objects) { const objId = swift.memory.retain(elem); i32Stack.push(objId); @@ -943,11 +848,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(obj); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalJSObjectArray: function bjs_processOptionalJSObjectArray(objects) { - const arrayCleanups = []; for (const elem of objects) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -976,21 +879,15 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processNestedJSObjectArray: function bjs_processNestedJSObjectArray(objects) { - const arrayCleanups = []; for (const elem of objects) { - const arrayCleanups1 = []; for (const elem1 of elem) { const objId = swift.memory.retain(elem1); i32Stack.push(objId); } i32Stack.push(elem.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(objects.length); instance.exports.bjs_processNestedJSObjectArray(); @@ -1009,7 +906,6 @@ export async function createInstantiator(options, swift) { arrayResult.push(arrayResult1); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, Direction: DirectionValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index bd57f0fd4..6e7e810ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index a89b07fc3..0538b8078 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -29,7 +29,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -44,7 +43,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.value | 0)); i32Stack.push(value.enabled ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const bool = i32Stack.pop() !== 0; @@ -58,21 +56,18 @@ export async function createInstantiator(options, swift) { return () => ({ lower: (value) => { f64Stack.push(value.baseValue); - return { cleanup: undefined }; }, lift: () => { const f64 = f64Stack.pop(); const instance1 = { baseValue: f64 }; instance1.add = function(a, b = 10.0) { - const { cleanup: structCleanup } = structHelpers.MathOperations.lower(this); + structHelpers.MathOperations.lower(this); const ret = instance.exports.bjs_MathOperations_add(a, b); - if (structCleanup) { structCleanup(); } return ret; }.bind(instance1); instance1.multiply = function(a, b) { - const { cleanup: structCleanup } = structHelpers.MathOperations.lower(this); + structHelpers.MathOperations.lower(this); const ret = instance.exports.bjs_MathOperations_multiply(a, b); - if (structCleanup) { structCleanup(); } return ret; }.bind(instance1); return instance1; @@ -144,33 +139,15 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_Config"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Config.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Config.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Config"] = function() { const value = structHelpers.Config.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_MathOperations"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.MathOperations.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.MathOperations.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_MathOperations"] = function() { const value = structHelpers.MathOperations.lift(); @@ -502,10 +479,8 @@ export async function createInstantiator(options, swift) { }, testOptionalStructDefault: function bjs_testOptionalStructDefault(point = null) { const isSome = point != null; - let pointCleanup; if (isSome) { - const structResult = structHelpers.Config.lower(point); - pointCleanup = structResult.cleanup; + structHelpers.Config.lower(point); } i32Stack.push(+isSome); instance.exports.bjs_testOptionalStructDefault(); @@ -516,15 +491,12 @@ export async function createInstantiator(options, swift) { } else { optResult = null; } - if (pointCleanup) { pointCleanup(); } return optResult; }, testOptionalStructWithValueDefault: function bjs_testOptionalStructWithValueDefault(point = { name: "default", value: 42, enabled: true }) { const isSome = point != null; - let pointCleanup; if (isSome) { - const structResult = structHelpers.Config.lower(point); - pointCleanup = structResult.cleanup; + structHelpers.Config.lower(point); } i32Stack.push(+isSome); instance.exports.bjs_testOptionalStructWithValueDefault(); @@ -535,11 +507,9 @@ export async function createInstantiator(options, swift) { } else { optResult = null; } - if (pointCleanup) { pointCleanup(); } return optResult; }, testIntArrayDefault: function bjs_testIntArrayDefault(values = [1, 2, 3]) { - const arrayCleanups = []; for (const elem of values) { i32Stack.push((elem | 0)); } @@ -552,11 +522,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(int); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, testStringArrayDefault: function bjs_testStringArrayDefault(names = ["a", "b", "c"]) { - const arrayCleanups = []; for (const elem of names) { const bytes = textEncoder.encode(elem); const id = swift.memory.retain(bytes); @@ -572,11 +540,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(string); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, testDoubleArrayDefault: function bjs_testDoubleArrayDefault(values = [1.5, 2.5, 3.5]) { - const arrayCleanups = []; for (const elem of values) { f64Stack.push(elem); } @@ -589,11 +555,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(f64); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, testBoolArrayDefault: function bjs_testBoolArrayDefault(flags = [true, false, true]) { - const arrayCleanups = []; for (const elem of flags) { i32Stack.push(elem ? 1 : 0); } @@ -606,11 +570,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(bool); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, testEmptyArrayDefault: function bjs_testEmptyArrayDefault(items = []) { - const arrayCleanups = []; for (const elem of items) { i32Stack.push((elem | 0)); } @@ -623,13 +585,11 @@ export async function createInstantiator(options, swift) { arrayResult.push(int); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, testMixedWithArrayDefault: function bjs_testMixedWithArrayDefault(name = "test", values = [10, 20, 30], enabled = true) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); - const arrayCleanups = []; for (const elem of values) { i32Stack.push((elem | 0)); } @@ -637,7 +597,6 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_testMixedWithArrayDefault(nameId, nameBytes.length, enabled); const ret = tmpRetString; tmpRetString = undefined; - for (const cleanup of arrayCleanups) { cleanup(); } return ret; }, Status: StatusValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index d42fd4b2b..efbd9b09e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -215,7 +204,6 @@ export async function createInstantiator(options, swift) { dictResult[string] = f64; } let ret = imports.importMirrorDictionary(dictResult); - const arrayCleanups = []; const entries = Object.entries(ret); for (const entry of entries) { const [key, value] = entry; @@ -280,7 +268,6 @@ export async function createInstantiator(options, swift) { const exports = { Box, mirrorDictionary: function bjs_mirrorDictionary(values) { - const arrayCleanups = []; const entries = Object.entries(values); for (const entry of entries) { const [key, value] = entry; @@ -299,14 +286,11 @@ export async function createInstantiator(options, swift) { const string = strStack.pop(); dictResult[string] = int; } - for (const cleanup of arrayCleanups) { cleanup(); } return dictResult; }, optionalDictionary: function bjs_optionalDictionary(values) { const isSome = values != null; - const valuesCleanups = []; if (isSome) { - const arrayCleanups = []; const entries = Object.entries(values); for (const entry of entries) { const [key, value] = entry; @@ -320,7 +304,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(id1); } i32Stack.push(entries.length); - valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } i32Stack.push(+isSome); instance.exports.bjs_optionalDictionary(); @@ -338,11 +321,9 @@ export async function createInstantiator(options, swift) { } else { optResult = null; } - for (const cleanup of valuesCleanups) { cleanup(); } return optResult; }, nestedDictionary: function bjs_nestedDictionary(values) { - const arrayCleanups = []; const entries = Object.entries(values); for (const entry of entries) { const [key, value] = entry; @@ -350,14 +331,10 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const arrayCleanups1 = []; for (const elem of value) { i32Stack.push((elem | 0)); } i32Stack.push(value.length); - arrayCleanups.push(() => { - for (const cleanup of arrayCleanups1) { cleanup(); } - }); } i32Stack.push(entries.length); instance.exports.bjs_nestedDictionary(); @@ -374,11 +351,9 @@ export async function createInstantiator(options, swift) { const string = strStack.pop(); dictResult[string] = arrayResult; } - for (const cleanup of arrayCleanups) { cleanup(); } return dictResult; }, boxDictionary: function bjs_boxDictionary(boxes) { - const arrayCleanups = []; const entries = Object.entries(boxes); for (const entry of entries) { const [key, value] = entry; @@ -398,11 +373,9 @@ export async function createInstantiator(options, swift) { const string = strStack.pop(); dictResult[string] = obj; } - for (const cleanup of arrayCleanups) { cleanup(); } return dictResult; }, optionalBoxDictionary: function bjs_optionalBoxDictionary(boxes) { - const arrayCleanups = []; const entries = Object.entries(boxes); for (const entry of entries) { const [key, value] = entry; @@ -435,7 +408,6 @@ export async function createInstantiator(options, swift) { const string = strStack.pop(); dictResult[string] = optValue; } - for (const cleanup of arrayCleanups) { cleanup(); } return dictResult; }, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 2d2c6924b..43cc9f964 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -104,7 +104,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -115,7 +114,6 @@ export async function createInstantiator(options, swift) { lower: (value) => { f64Stack.push(value.x); f64Stack.push(value.y); - return { cleanup: undefined }; }, lift: () => { const f64 = f64Stack.pop(); @@ -134,32 +132,26 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Success, cleanup }; + return APIResultValues.Tag.Success; } case APIResultValues.Tag.Failure: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; + return APIResultValues.Tag.Failure; } case APIResultValues.Tag.Flag: { i32Stack.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Flag, cleanup }; + return APIResultValues.Tag.Flag; } case APIResultValues.Tag.Rate: { f32Stack.push(Math.fround(value.param0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Rate, cleanup }; + return APIResultValues.Tag.Rate; } case APIResultValues.Tag.Precise: { f64Stack.push(value.param0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Precise, cleanup }; + return APIResultValues.Tag.Precise; } case APIResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Info, cleanup }; + return APIResultValues.Tag.Info; } default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } @@ -203,8 +195,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Success, cleanup }; + return ComplexResultValues.Tag.Success; } case ComplexResultValues.Tag.Error: { i32Stack.push((value.param1 | 0)); @@ -212,8 +203,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Error, cleanup }; + return ComplexResultValues.Tag.Error; } case ComplexResultValues.Tag.Status: { const bytes = textEncoder.encode(value.param2); @@ -222,15 +212,13 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.param1 | 0)); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Status, cleanup }; + return ComplexResultValues.Tag.Status; } case ComplexResultValues.Tag.Coordinates: { f64Stack.push(value.param2); f64Stack.push(value.param1); f64Stack.push(value.param0); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Coordinates, cleanup }; + return ComplexResultValues.Tag.Coordinates; } case ComplexResultValues.Tag.Comprehensive: { const bytes = textEncoder.encode(value.param8); @@ -251,12 +239,10 @@ export async function createInstantiator(options, swift) { i32Stack.push((value.param2 | 0)); i32Stack.push(value.param1 ? 1 : 0); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Comprehensive, cleanup }; + return ComplexResultValues.Tag.Comprehensive; } case ComplexResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: ComplexResultValues.Tag.Info, cleanup }; + return ComplexResultValues.Tag.Info; } default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); } @@ -313,8 +299,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Success, cleanup }; + return ResultValues.Tag.Success; } case ResultValues.Tag.Failure: { i32Stack.push((value.param1 | 0)); @@ -322,8 +307,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Failure, cleanup }; + return ResultValues.Tag.Failure; } case ResultValues.Tag.Status: { const bytes = textEncoder.encode(value.param2); @@ -332,8 +316,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(id); i32Stack.push((value.param1 | 0)); i32Stack.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Status, cleanup }; + return ResultValues.Tag.Status; } default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } @@ -371,8 +354,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: NetworkingResultValues.Tag.Success, cleanup }; + return NetworkingResultValues.Tag.Success; } case NetworkingResultValues.Tag.Failure: { i32Stack.push((value.param1 | 0)); @@ -380,8 +362,7 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: NetworkingResultValues.Tag.Failure, cleanup }; + return NetworkingResultValues.Tag.Failure; } default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); } @@ -421,8 +402,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = undefined; - return { caseId: APIOptionalResultValues.Tag.Success, cleanup }; + return APIOptionalResultValues.Tag.Success; } case APIOptionalResultValues.Tag.Failure: { const isSome = value.param1 != null; @@ -431,8 +411,7 @@ export async function createInstantiator(options, swift) { const isSome1 = value.param0 != null; i32Stack.push(isSome1 ? (value.param0 | 0) : 0); i32Stack.push(isSome1 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIOptionalResultValues.Tag.Failure, cleanup }; + return APIOptionalResultValues.Tag.Failure; } case APIOptionalResultValues.Tag.Status: { const isSome = value.param2 != null; @@ -453,8 +432,7 @@ export async function createInstantiator(options, swift) { const isSome2 = value.param0 != null; i32Stack.push(isSome2 ? (value.param0 ? 1 : 0) : 0); i32Stack.push(isSome2 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIOptionalResultValues.Tag.Status, cleanup }; + return APIOptionalResultValues.Tag.Status; } default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); } @@ -531,31 +509,26 @@ export async function createInstantiator(options, swift) { switch (enumTag) { case TypedPayloadResultValues.Tag.Precision: { f32Stack.push(Math.fround(value.param0)); - const cleanup = undefined; - return { caseId: TypedPayloadResultValues.Tag.Precision, cleanup }; + return TypedPayloadResultValues.Tag.Precision; } case TypedPayloadResultValues.Tag.Direction: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: TypedPayloadResultValues.Tag.Direction, cleanup }; + return TypedPayloadResultValues.Tag.Direction; } case TypedPayloadResultValues.Tag.OptPrecision: { const isSome = value.param0 != null; f32Stack.push(isSome ? Math.fround(value.param0) : 0.0); i32Stack.push(isSome ? 1 : 0); - const cleanup = undefined; - return { caseId: TypedPayloadResultValues.Tag.OptPrecision, cleanup }; + return TypedPayloadResultValues.Tag.OptPrecision; } case TypedPayloadResultValues.Tag.OptDirection: { const isSome = value.param0 != null; i32Stack.push(isSome ? (value.param0 | 0) : 0); i32Stack.push(isSome ? 1 : 0); - const cleanup = undefined; - return { caseId: TypedPayloadResultValues.Tag.OptDirection, cleanup }; + return TypedPayloadResultValues.Tag.OptDirection; } case TypedPayloadResultValues.Tag.Empty: { - const cleanup = undefined; - return { caseId: TypedPayloadResultValues.Tag.Empty, cleanup }; + return TypedPayloadResultValues.Tag.Empty; } default: throw new Error("Unknown TypedPayloadResultValues tag: " + String(enumTag)); } @@ -605,45 +578,32 @@ export async function createInstantiator(options, swift) { const enumTag = value.tag; switch (enumTag) { case AllTypesResultValues.Tag.StructPayload: { - const { cleanup: structCleanup } = structHelpers.Point.lower(value.param0); - const cleanup = () => { - if (structCleanup) { structCleanup(); } - }; - return { caseId: AllTypesResultValues.Tag.StructPayload, cleanup }; + structHelpers.Point.lower(value.param0); + return AllTypesResultValues.Tag.StructPayload; } case AllTypesResultValues.Tag.ClassPayload: { ptrStack.push(value.param0.pointer); - const cleanup = undefined; - return { caseId: AllTypesResultValues.Tag.ClassPayload, cleanup }; + return AllTypesResultValues.Tag.ClassPayload; } case AllTypesResultValues.Tag.JsObjectPayload: { const objId = swift.memory.retain(value.param0); i32Stack.push(objId); - const cleanup = undefined; - return { caseId: AllTypesResultValues.Tag.JsObjectPayload, cleanup }; + return AllTypesResultValues.Tag.JsObjectPayload; } case AllTypesResultValues.Tag.NestedEnum: { - const { caseId: caseId, cleanup: enumCleanup } = enumHelpers.APIResult.lower(value.param0); + const caseId = enumHelpers.APIResult.lower(value.param0); i32Stack.push(caseId); - const cleanup = () => { - if (enumCleanup) { enumCleanup(); } - }; - return { caseId: AllTypesResultValues.Tag.NestedEnum, cleanup }; + return AllTypesResultValues.Tag.NestedEnum; } case AllTypesResultValues.Tag.ArrayPayload: { - const arrayCleanups = []; for (const elem of value.param0) { i32Stack.push((elem | 0)); } i32Stack.push(value.param0.length); - const cleanup = () => { - for (const cleanup of arrayCleanups) { cleanup(); } - }; - return { caseId: AllTypesResultValues.Tag.ArrayPayload, cleanup }; + return AllTypesResultValues.Tag.ArrayPayload; } case AllTypesResultValues.Tag.Empty: { - const cleanup = undefined; - return { caseId: AllTypesResultValues.Tag.Empty, cleanup }; + return AllTypesResultValues.Tag.Empty; } default: throw new Error("Unknown AllTypesResultValues tag: " + String(enumTag)); } @@ -693,16 +653,11 @@ export async function createInstantiator(options, swift) { switch (enumTag) { case OptionalAllTypesResultValues.Tag.OptStruct: { const isSome = value.param0 != null; - let nestedCleanup; if (isSome) { - const structResult = structHelpers.Point.lower(value.param0); - nestedCleanup = structResult.cleanup; + structHelpers.Point.lower(value.param0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if (nestedCleanup) { nestedCleanup(); } - }; - return { caseId: OptionalAllTypesResultValues.Tag.OptStruct, cleanup }; + return OptionalAllTypesResultValues.Tag.OptStruct; } case OptionalAllTypesResultValues.Tag.OptClass: { const isSome = value.param0 != null; @@ -712,8 +667,7 @@ export async function createInstantiator(options, swift) { ptrStack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = undefined; - return { caseId: OptionalAllTypesResultValues.Tag.OptClass, cleanup }; + return OptionalAllTypesResultValues.Tag.OptClass; } case OptionalAllTypesResultValues.Tag.OptJSObject: { const isSome = value.param0 != null; @@ -726,48 +680,33 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = undefined; - return { caseId: OptionalAllTypesResultValues.Tag.OptJSObject, cleanup }; + return OptionalAllTypesResultValues.Tag.OptJSObject; } case OptionalAllTypesResultValues.Tag.OptNestedEnum: { const isSome = value.param0 != null; - let enumCaseId, enumCleanup; + let enumCaseId; if (isSome) { - const enumResult = enumHelpers.APIResult.lower(value.param0); - enumCaseId = enumResult.caseId; - enumCleanup = enumResult.cleanup; + enumCaseId = enumHelpers.APIResult.lower(value.param0); i32Stack.push(enumCaseId); } else { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if (enumCleanup) { enumCleanup(); } - }; - return { caseId: OptionalAllTypesResultValues.Tag.OptNestedEnum, cleanup }; + return OptionalAllTypesResultValues.Tag.OptNestedEnum; } case OptionalAllTypesResultValues.Tag.OptArray: { const isSome = value.param0 != null; - let arrCleanup; if (isSome) { - const arrayCleanups = []; for (const elem of value.param0) { i32Stack.push((elem | 0)); } i32Stack.push(value.param0.length); - arrCleanup = () => { - for (const cleanup of arrayCleanups) { cleanup(); } - }; } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if (arrCleanup) { arrCleanup(); } - }; - return { caseId: OptionalAllTypesResultValues.Tag.OptArray, cleanup }; + return OptionalAllTypesResultValues.Tag.OptArray; } case OptionalAllTypesResultValues.Tag.Empty: { - const cleanup = undefined; - return { caseId: OptionalAllTypesResultValues.Tag.Empty, cleanup }; + return OptionalAllTypesResultValues.Tag.Empty; } default: throw new Error("Unknown OptionalAllTypesResultValues tag: " + String(enumTag)); } @@ -910,22 +849,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_Point"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Point.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Point"] = function() { const value = structHelpers.Point.lift(); @@ -1107,9 +1032,8 @@ export async function createInstantiator(options, swift) { const exports = { User, handle: function bjs_handle(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); + const resultCaseId = enumHelpers.APIResult.lower(result); instance.exports.bjs_handle(resultCaseId); - if (resultCleanup) { resultCleanup(); } }, getResult: function bjs_getResult() { instance.exports.bjs_getResult(); @@ -1117,19 +1041,16 @@ export async function createInstantiator(options, swift) { return ret; }, roundtripAPIResult: function bjs_roundtripAPIResult(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.APIResult.lower(result); + const resultCaseId = enumHelpers.APIResult.lower(result); instance.exports.bjs_roundtripAPIResult(resultCaseId); const ret = enumHelpers.APIResult.lift(i32Stack.pop()); - if (resultCleanup) { resultCleanup(); } return ret; }, roundTripOptionalAPIResult: function bjs_roundTripOptionalAPIResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.APIResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.APIResult.lower(result); } instance.exports.bjs_roundTripOptionalAPIResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1140,13 +1061,11 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.APIResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, handleComplex: function bjs_handleComplex(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); + const resultCaseId = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_handleComplex(resultCaseId); - if (resultCleanup) { resultCleanup(); } }, getComplexResult: function bjs_getComplexResult() { instance.exports.bjs_getComplexResult(); @@ -1154,19 +1073,16 @@ export async function createInstantiator(options, swift) { return ret; }, roundtripComplexResult: function bjs_roundtripComplexResult(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.ComplexResult.lower(result); + const resultCaseId = enumHelpers.ComplexResult.lower(result); instance.exports.bjs_roundtripComplexResult(resultCaseId); const ret = enumHelpers.ComplexResult.lift(i32Stack.pop()); - if (resultCleanup) { resultCleanup(); } return ret; }, roundTripOptionalComplexResult: function bjs_roundTripOptionalComplexResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.ComplexResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.ComplexResult.lower(result); } instance.exports.bjs_roundTripOptionalComplexResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1177,16 +1093,13 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.ComplexResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, roundTripOptionalUtilitiesResult: function bjs_roundTripOptionalUtilitiesResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.Result.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.Result.lower(result); } instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1197,16 +1110,13 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.Result.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, roundTripOptionalNetworkingResult: function bjs_roundTripOptionalNetworkingResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.NetworkingResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.NetworkingResult.lower(result); } instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1217,16 +1127,13 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.NetworkingResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, roundTripOptionalAPIOptionalResult: function bjs_roundTripOptionalAPIOptionalResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.APIOptionalResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.APIOptionalResult.lower(result); } instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1237,23 +1144,18 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.APIOptionalResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, compareAPIResults: function bjs_compareAPIResults(result1, result2) { const isSome = result1 != null; - let result1CaseId, result1Cleanup; + let result1CaseId; if (isSome) { - const enumResult = enumHelpers.APIOptionalResult.lower(result1); - result1CaseId = enumResult.caseId; - result1Cleanup = enumResult.cleanup; + result1CaseId = enumHelpers.APIOptionalResult.lower(result1); } const isSome1 = result2 != null; - let result2CaseId, result2Cleanup; + let result2CaseId; if (isSome1) { - const enumResult1 = enumHelpers.APIOptionalResult.lower(result2); - result2CaseId = enumResult1.caseId; - result2Cleanup = enumResult1.cleanup; + result2CaseId = enumHelpers.APIOptionalResult.lower(result2); } instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); const tag = i32Stack.pop(); @@ -1264,24 +1166,19 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.APIOptionalResult.lift(tag); } - if (result1Cleanup) { result1Cleanup(); } - if (result2Cleanup) { result2Cleanup(); } return optResult; }, roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.TypedPayloadResult.lower(result); + const resultCaseId = enumHelpers.TypedPayloadResult.lower(result); instance.exports.bjs_roundTripTypedPayloadResult(resultCaseId); const ret = enumHelpers.TypedPayloadResult.lift(i32Stack.pop()); - if (resultCleanup) { resultCleanup(); } return ret; }, roundTripOptionalTypedPayloadResult: function bjs_roundTripOptionalTypedPayloadResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.TypedPayloadResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.TypedPayloadResult.lower(result); } instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1292,23 +1189,19 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.TypedPayloadResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.AllTypesResult.lower(result); + const resultCaseId = enumHelpers.AllTypesResult.lower(result); instance.exports.bjs_roundTripAllTypesResult(resultCaseId); const ret = enumHelpers.AllTypesResult.lift(i32Stack.pop()); - if (resultCleanup) { resultCleanup(); } return ret; }, roundTripOptionalAllTypesResult: function bjs_roundTripOptionalAllTypesResult(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.AllTypesResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.AllTypesResult.lower(result); } instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1319,23 +1212,19 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.AllTypesResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { - const { caseId: resultCaseId, cleanup: resultCleanup } = enumHelpers.OptionalAllTypesResult.lower(result); + const resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result); instance.exports.bjs_roundTripOptionalPayloadResult(resultCaseId); const ret = enumHelpers.OptionalAllTypesResult.lift(i32Stack.pop()); - if (resultCleanup) { resultCleanup(); } return ret; }, roundTripOptionalPayloadResultOpt: function bjs_roundTripOptionalPayloadResultOpt(result) { const isSome = result != null; - let resultCaseId, resultCleanup; + let resultCaseId; if (isSome) { - const enumResult = enumHelpers.OptionalAllTypesResult.lower(result); - resultCaseId = enumResult.caseId; - resultCleanup = enumResult.cleanup; + resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result); } instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, isSome ? resultCaseId : 0); const tag = i32Stack.pop(); @@ -1346,7 +1235,6 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.OptionalAllTypesResult.lift(tag); } - if (resultCleanup) { resultCleanup(); } return optResult; }, APIResult: APIResultValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 72d78dbe0..0ea2b0a53 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -47,7 +47,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -118,16 +117,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index ee93a950a..a5f97641c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -67,7 +67,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -138,16 +137,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 099ef0576..a30709cbb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -48,7 +48,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -119,16 +118,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index b1ee0538f..77d106b57 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -98,7 +98,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -170,16 +169,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index 6f6bf9531..21613733e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index 9d57a04d3..21296b88a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index 7c946a716..2a2fd3d50 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -207,7 +196,6 @@ export async function createInstantiator(options, swift) { } arrayResult.reverse(); let ret = imports.roundtrip(arrayResult); - const arrayCleanups = []; for (const elem of ret) { i32Stack.push((elem | 0)); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 5d724202b..92230667c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -49,7 +48,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -145,22 +143,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_FooContainer"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.FooContainer.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.FooContainer.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_FooContainer"] = function() { const value = structHelpers.FooContainer.lift(); @@ -295,7 +279,6 @@ export async function createInstantiator(options, swift) { return ret1; }, processFooArray: function bjs_processFooArray(foos) { - const arrayCleanups = []; for (const elem of foos) { const objId = swift.memory.retain(elem); i32Stack.push(objId); @@ -311,11 +294,9 @@ export async function createInstantiator(options, swift) { arrayResult.push(obj); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, processOptionalFooArray: function bjs_processOptionalFooArray(foos) { - const arrayCleanups = []; for (const elem of foos) { const isSome = elem != null ? 1 : 0; if (isSome) { @@ -344,14 +325,12 @@ export async function createInstantiator(options, swift) { arrayResult.push(optValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, roundtripFooContainer: function bjs_roundtripFooContainer(container) { - const { cleanup: cleanup } = structHelpers.FooContainer.lower(container); + structHelpers.FooContainer.lower(container); instance.exports.bjs_roundtripFooContainer(); const structValue = structHelpers.FooContainer.lift(); - if (cleanup) { cleanup(); } return structValue; }, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index 54a0f2018..eabfe8c13 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index a192a1a8b..d84c77d45 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index 1166d1f62..6912af0f3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 8151ea913..0a4d37845 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -184,16 +183,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -319,7 +308,6 @@ export async function createInstantiator(options, swift) { } arrayResult.reverse(); let ret = imports.jsEchoJSValueArray(arrayResult); - const arrayCleanups = []; for (const elem of ret) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); i32Stack.push(elemKind); @@ -478,7 +466,6 @@ export async function createInstantiator(options, swift) { return optResult; }, roundTripJSValueArray: function bjs_roundTripJSValueArray(values) { - const arrayCleanups = []; for (const elem of values) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); i32Stack.push(elemKind); @@ -497,14 +484,11 @@ export async function createInstantiator(options, swift) { arrayResult.push(jsValue); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, roundTripOptionalJSValueArray: function bjs_roundTripOptionalJSValueArray(values) { const isSome = values != null; - const valuesCleanups = []; if (isSome) { - const arrayCleanups = []; for (const elem of values) { const [elemKind, elemPayload1, elemPayload2] = __bjs_jsValueLower(elem); i32Stack.push(elemKind); @@ -512,7 +496,6 @@ export async function createInstantiator(options, swift) { f64Stack.push(elemPayload2); } i32Stack.push(values.length); - valuesCleanups.push(() => { for (const cleanup of arrayCleanups) { cleanup(); } }); } i32Stack.push(+isSome); instance.exports.bjs_roundTripOptionalJSValueArray(); @@ -533,7 +516,6 @@ export async function createInstantiator(options, swift) { } else { optResult = null; } - for (const cleanup of valuesCleanups) { cleanup(); } return optResult; }, }; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 900d9b19c..457661b6c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 9b5f9267e..6c0c5ad9c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index 1ab3809cc..a576e82b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index ea5902783..806697af2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index 5930b6914..1f5366828 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 4c0bd0d13..03a3cf565 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index 83c77397a..8999ae8b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index f1fda2cb7..c8372362d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index e7d80bb4d..dbdd030b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 58928211e..9043d19ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -47,7 +47,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -63,13 +62,11 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Success, cleanup }; + return ResultValues.Tag.Success; } case ResultValues.Tag.Failure: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: ResultValues.Tag.Failure, cleanup }; + return ResultValues.Tag.Failure; } default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); } @@ -155,16 +152,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -359,7 +346,7 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_result_get"] = function bjs_MyViewControllerDelegate_result_get(self) { try { let ret = swift.memory.getObject(self).result; - const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + const caseId = enumHelpers.Result.lower(ret); return caseId; } catch (error) { setException(error); @@ -378,7 +365,7 @@ export async function createInstantiator(options, swift) { let ret = swift.memory.getObject(self).optionalResult; const isSome = ret != null; if (isSome) { - const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + const caseId = enumHelpers.Result.lower(ret); return caseId; } else { return -1; @@ -558,7 +545,7 @@ export async function createInstantiator(options, swift) { TestModule["bjs_MyViewControllerDelegate_getResult"] = function bjs_MyViewControllerDelegate_getResult(self) { try { let ret = swift.memory.getObject(self).getResult(); - const { caseId: caseId, cleanup: cleanup } = enumHelpers.Result.lower(ret); + const caseId = enumHelpers.Result.lower(ret); return caseId; } catch (error) { setException(error); @@ -686,14 +673,12 @@ export async function createInstantiator(options, swift) { } constructor(delegates) { - const arrayCleanups = []; for (const elem of delegates) { const objId = swift.memory.retain(elem); i32Stack.push(objId); } i32Stack.push(delegates.length); const ret = instance.exports.bjs_DelegateManager_init(); - for (const cleanup of arrayCleanups) { cleanup(); } return DelegateManager.__construct(ret); } notifyAll() { @@ -713,14 +698,12 @@ export async function createInstantiator(options, swift) { return arrayResult; } set delegates(value) { - const arrayCleanups = []; for (const elem of value) { const objId = swift.memory.retain(elem); i32Stack.push(objId); } i32Stack.push(value.length); instance.exports.bjs_DelegateManager_delegates_set(this.pointer); - for (const cleanup of arrayCleanups) { cleanup(); } } } const ResultHelpers = __bjs_createResultValuesHelpers()(); @@ -731,7 +714,6 @@ export async function createInstantiator(options, swift) { MyViewController, DelegateManager, processDelegates: function bjs_processDelegates(delegates) { - const arrayCleanups = []; for (const elem of delegates) { const objId = swift.memory.retain(elem); i32Stack.push(objId); @@ -747,7 +729,6 @@ export async function createInstantiator(options, swift) { arrayResult.push(obj); } arrayResult.reverse(); - for (const cleanup of arrayCleanups) { cleanup(); } return arrayResult; }, Direction: DirectionValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 247374a3b..109a403b4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -34,7 +34,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -50,13 +49,11 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Success, cleanup }; + return APIResultValues.Tag.Success; } case APIResultValues.Tag.Failure: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; + return APIResultValues.Tag.Failure; } default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } @@ -142,16 +139,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -335,10 +322,9 @@ export async function createInstantiator(options, swift) { APIResult: { ...APIResultValues, roundtrip: function(value) { - const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); + const valueCaseId = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); const ret = enumHelpers.APIResult.lift(i32Stack.pop()); - if (valueCleanup) { valueCleanup(); } return ret; } }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index a3bfb8a24..1be36c28e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -34,7 +34,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -50,13 +49,11 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Success, cleanup }; + return APIResultValues.Tag.Success; } case APIResultValues.Tag.Failure: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; + return APIResultValues.Tag.Failure; } default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } @@ -142,16 +139,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -329,10 +316,9 @@ export async function createInstantiator(options, swift) { APIResult: { ...APIResultValues, roundtrip: function(value) { - const { caseId: valueCaseId, cleanup: valueCleanup } = enumHelpers.APIResult.lower(value); + const valueCaseId = enumHelpers.APIResult.lower(value); instance.exports.bjs_APIResult_static_roundtrip(valueCaseId); const ret = enumHelpers.APIResult.lift(i32Stack.pop()); - if (valueCleanup) { valueCleanup(); } return ret; } }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 05127cd14..12afbb82c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -28,7 +28,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -99,16 +98,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index 5e89f1bb4..e9c5d105c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -28,7 +28,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -99,16 +98,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index 0f92074d4..480f40f92 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index f86fce218..49f07b5ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 8f0552b64..cd6c9062b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 5fbde8c82..68bcfbe93 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -53,7 +53,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,32 +93,26 @@ export async function createInstantiator(options, swift) { const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Success, cleanup }; + return APIResultValues.Tag.Success; } case APIResultValues.Tag.Failure: { i32Stack.push((value.param0 | 0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Failure, cleanup }; + return APIResultValues.Tag.Failure; } case APIResultValues.Tag.Flag: { i32Stack.push(value.param0 ? 1 : 0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Flag, cleanup }; + return APIResultValues.Tag.Flag; } case APIResultValues.Tag.Rate: { f32Stack.push(Math.fround(value.param0)); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Rate, cleanup }; + return APIResultValues.Tag.Rate; } case APIResultValues.Tag.Precise: { f64Stack.push(value.param0); - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Precise, cleanup }; + return APIResultValues.Tag.Precise; } case APIResultValues.Tag.Info: { - const cleanup = undefined; - return { caseId: APIResultValues.Tag.Info, cleanup }; + return APIResultValues.Tag.Info; } default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } @@ -218,16 +211,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -403,7 +386,7 @@ export async function createInstantiator(options, swift) { const callback = swift.memory.getObject(callbackId); const enumValue = enumHelpers.APIResult.lift(param0); let ret = callback(enumValue); - const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(ret); + const caseId = enumHelpers.APIResult.lower(ret); return caseId; } catch (error) { setException(error); @@ -411,10 +394,9 @@ export async function createInstantiator(options, swift) { } bjs["make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { - const { caseId: param0CaseId, cleanup: param0Cleanup } = enumHelpers.APIResult.lower(param0); + const param0CaseId = enumHelpers.APIResult.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); const ret = enumHelpers.APIResult.lift(i32Stack.pop()); - if (param0Cleanup) { param0Cleanup(); } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -672,7 +654,7 @@ export async function createInstantiator(options, swift) { let ret = callback(param0IsSome ? enumValue : null); const isSome = ret != null; if (isSome) { - const { caseId: caseId, cleanup: cleanup } = enumHelpers.APIResult.lower(ret); + const caseId = enumHelpers.APIResult.lower(ret); return caseId; } else { return -1; @@ -684,11 +666,9 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO = function(param0) { const isSome = param0 != null; - let param0CaseId, param0Cleanup; + let param0CaseId; if (isSome) { - const enumResult = enumHelpers.APIResult.lower(param0); - param0CaseId = enumResult.caseId; - param0Cleanup = enumResult.cleanup; + param0CaseId = enumHelpers.APIResult.lower(param0); } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); const tag = i32Stack.pop(); @@ -699,7 +679,6 @@ export async function createInstantiator(options, swift) { } else { optResult = enumHelpers.APIResult.lift(tag); } - if (param0Cleanup) { param0Cleanup(); } if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 61347e817..b5efd2150 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -120,16 +119,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index 6f704013b..dbbbd6bc9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -28,7 +28,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -57,7 +56,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome1 ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -101,7 +99,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -126,7 +123,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(bytes.length); i32Stack.push(id); i32Stack.push((value.age | 0)); - const structResult = structHelpers.Address.lower(value.address); + structHelpers.Address.lower(value.address); const isSome = value.email != null; let id1; if (isSome) { @@ -139,10 +136,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - const cleanup = () => { - if (structResult.cleanup) { structResult.cleanup(); } - }; - return { cleanup }; }, lift: () => { const isSome = i32Stack.pop(); @@ -165,7 +158,6 @@ export async function createInstantiator(options, swift) { lower: (value) => { i32Stack.push((value.id | 0)); ptrStack.push(value.owner.pointer); - return { cleanup: undefined }; }, lift: () => { const ptr = ptrStack.pop(); @@ -187,7 +179,6 @@ export async function createInstantiator(options, swift) { f32Stack.push(0.0); } i32Stack.push(isSome ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -207,7 +198,6 @@ export async function createInstantiator(options, swift) { const __bjs_createConfigStructHelpers = () => { return () => ({ lower: (value) => { - return { cleanup: undefined }; }, lift: () => { return { }; @@ -234,7 +224,6 @@ export async function createInstantiator(options, swift) { i32Stack.push(0); } i32Stack.push(isSome ? 1 : 0); - return { cleanup: undefined }; }, lift: () => { const isSome = i32Stack.pop(); @@ -329,88 +318,50 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_DataPoint"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.DataPoint.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.DataPoint.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_DataPoint"] = function() { const value = structHelpers.DataPoint.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Address"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Address.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Address.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Address"] = function() { const value = structHelpers.Address.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Person"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Person.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Person.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Person"] = function() { const value = structHelpers.Person.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Session"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Session.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Session.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Session"] = function() { const value = structHelpers.Session.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Measurement"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Measurement.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Measurement.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Measurement"] = function() { const value = structHelpers.Measurement.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_ConfigStruct"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.ConfigStruct.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.ConfigStruct.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_ConfigStruct"] = function() { const value = structHelpers.ConfigStruct.lift(); return swift.memory.retain(value); } bjs["swift_js_struct_lower_Container"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Container.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Container.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Container"] = function() { const value = structHelpers.Container.lift(); @@ -609,17 +560,15 @@ export async function createInstantiator(options, swift) { const exports = { Greeter, roundtrip: function bjs_roundtrip(session) { - const { cleanup: cleanup } = structHelpers.Person.lower(session); + structHelpers.Person.lower(session); instance.exports.bjs_roundtrip(); const structValue = structHelpers.Person.lift(); - if (cleanup) { cleanup(); } return structValue; }, roundtripContainer: function bjs_roundtripContainer(container) { - const { cleanup: cleanup } = structHelpers.Container.lower(container); + structHelpers.Container.lower(container); instance.exports.bjs_roundtripContainer(); const structValue = structHelpers.Container.lift(); - if (cleanup) { cleanup(); } return structValue; }, Precision: PrecisionValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 4962e659b..cf64ab587 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -34,7 +33,6 @@ export async function createInstantiator(options, swift) { lower: (value) => { i32Stack.push((value.x | 0)); i32Stack.push((value.y | 0)); - return { cleanup: undefined }; }, lift: () => { const int = i32Stack.pop(); @@ -109,22 +107,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_Point"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.Point.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.Point.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_Point"] = function() { const value = structHelpers.Point.lift(); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 3726a48ae..2c415fc31 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -94,16 +93,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 7c3627d13..30c40a18c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -37,7 +36,6 @@ export async function createInstantiator(options, swift) { ptrStack.push((value.opaque | 0)); ptrStack.push((value.ptr | 0)); ptrStack.push((value.mutPtr | 0)); - return { cleanup: undefined }; }, lift: () => { const pointer = ptrStack.pop(); @@ -114,22 +112,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_struct_lower_PointerFields"] = function(objectId) { - const { cleanup: cleanup } = structHelpers.PointerFields.lower(swift.memory.getObject(objectId)); - if (cleanup) { - return tmpStructCleanups.push(cleanup); - } - return 0; + structHelpers.PointerFields.lower(swift.memory.getObject(objectId)); } bjs["swift_js_struct_lift_PointerFields"] = function() { const value = structHelpers.PointerFields.lift(); @@ -278,10 +262,9 @@ export async function createInstantiator(options, swift) { return ret; }, roundTripPointerFields: function bjs_roundTripPointerFields(value) { - const { cleanup: cleanup } = structHelpers.PointerFields.lower(value); + structHelpers.PointerFields.lower(value); instance.exports.bjs_roundTripPointerFields(); const structValue = structHelpers.PointerFields.lift(); - if (cleanup) { cleanup(); } return structValue; }, PointerFields: { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index e338c840d..f8737237e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -23,7 +23,6 @@ export async function createInstantiator(options, swift) { let f32Stack = []; let f64Stack = []; let ptrStack = []; - let tmpStructCleanups = []; const enumHelpers = {}; const structHelpers = {}; @@ -95,16 +94,6 @@ export async function createInstantiator(options, swift) { bjs["swift_js_pop_pointer"] = function() { return ptrStack.pop(); } - bjs["swift_js_struct_cleanup"] = function(cleanupId) { - if (cleanupId === 0) { return; } - const index = (cleanupId | 0) - 1; - const cleanup = tmpStructCleanups[index]; - tmpStructCleanups[index] = null; - if (cleanup) { cleanup(); } - while (tmpStructCleanups.length > 0 && tmpStructCleanups[tmpStructCleanups.length - 1] == null) { - tmpStructCleanups.pop(); - } - } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js index c9bc9efb4..fd183583b 100644 --- a/Plugins/PackageToJS/Templates/instantiate.js +++ b/Plugins/PackageToJS/Templates/instantiate.js @@ -1,5 +1,5 @@ // @ts-check -import { SwiftRuntime } from "./runtime.js" +import { SwiftRuntime } from "./runtime.js"; export const MODULE_PATH = "@PACKAGE_TO_JS_MODULE_PATH@"; /* #if USE_SHARED_MEMORY */ @@ -10,12 +10,12 @@ export const MEMORY_TYPE = { maximum: import.meta.PACKAGE_TO_JS_MEMORY_MAXIMUM, // @ts-expect-error Substituted by PackageToJS preprocessor shared: import.meta.PACKAGE_TO_JS_MEMORY_SHARED, -} +}; /* #endif */ /* #if HAS_BRIDGE */ // @ts-expect-error Substituted by PackageToJS preprocessor -import { createInstantiator } from "./bridge-js.js" +import { createInstantiator } from "./bridge-js.js"; /* #else */ /** * @param {import('./instantiate.d').InstantiateOptions} options @@ -30,7 +30,9 @@ async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { // Provide a default implementation for BridgeJS functions that are not // used at runtime without BridgeJS but required to instantiate the module. - const unexpectedBjsCall = () => { throw new Error("Unexpected call to BridgeJS function") } + const unexpectedBjsCall = () => { + throw new Error("Unexpected call to BridgeJS function"); + }; importObject["bjs"] = { swift_js_return_string: unexpectedBjsCall, swift_js_init_memory: unexpectedBjsCall, @@ -63,9 +65,8 @@ async function createInstantiator(options, swift) { swift_js_get_optional_heap_object_pointer: unexpectedBjsCall, swift_js_push_pointer: unexpectedBjsCall, swift_js_pop_pointer: unexpectedBjsCall, - swift_js_struct_cleanup: unexpectedBjsCall, swift_js_closure_unregister: unexpectedBjsCall, - } + }; }, /** @param {WebAssembly.Instance} instance */ setInstance: (instance) => {}, @@ -73,67 +74,65 @@ async function createInstantiator(options, swift) { createExports: (instance) => { return {}; }, - } + }; } /* #endif */ /** @type {import('./instantiate.d').instantiate} */ -export async function instantiate( - options -) { +export async function instantiate(options) { const result = await _instantiate(options); -/* #if IS_WASI */ + /* #if IS_WASI */ options.wasi.initialize(result.instance); -/* #endif */ + /* #endif */ result.swift.main(); return result; } /** @type {import('./instantiate.d').instantiateForThread} */ -export async function instantiateForThread( - tid, startArg, options -) { +export async function instantiateForThread(tid, startArg, options) { const result = await _instantiate(options); -/* #if IS_WASI */ + /* #if IS_WASI */ options.wasi.setInstance(result.instance); -/* #endif */ - result.swift.startThread(tid, startArg) + /* #endif */ + result.swift.startThread(tid, startArg); return result; } /** @type {import('./instantiate.d').instantiate} */ -async function _instantiate( - options -) { +async function _instantiate(options) { const _WebAssembly = options.WebAssembly || WebAssembly; const moduleSource = options.module; -/* #if IS_WASI */ + /* #if IS_WASI */ const { wasi } = options; -/* #endif */ + /* #endif */ const swift = new SwiftRuntime({ -/* #if USE_SHARED_MEMORY */ + /* #if USE_SHARED_MEMORY */ sharedMemory: true, threadChannel: options.threadChannel, -/* #endif */ + /* #endif */ }); const instantiator = await createInstantiator(options, swift); /** @type {WebAssembly.Imports} */ const importObject = { javascript_kit: swift.wasmImports, -/* #if IS_WASI */ + /* #if IS_WASI */ wasi_snapshot_preview1: wasi.wasiImport, -/* #if USE_SHARED_MEMORY */ + /* #if USE_SHARED_MEMORY */ env: { memory: options.memory, }, wasi: { "thread-spawn": (startArg) => { - return options.threadChannel.spawnThread(module, options.memory, startArg); - } - } -/* #endif */ -/* #endif */ + return options.threadChannel.spawnThread( + module, + options.memory, + startArg, + ); + }, + }, + /* #endif */ + /* #endif */ }; const importsContext = { getInstance: () => instance, @@ -149,9 +148,15 @@ async function _instantiate( if (moduleSource instanceof _WebAssembly.Module) { module = moduleSource; instance = await _WebAssembly.instantiate(module, importObject); - } else if (typeof Response === "function" && (moduleSource instanceof Response || moduleSource instanceof Promise)) { + } else if ( + typeof Response === "function" && + (moduleSource instanceof Response || moduleSource instanceof Promise) + ) { if (typeof _WebAssembly.instantiateStreaming === "function") { - const result = await _WebAssembly.instantiateStreaming(moduleSource, importObject); + const result = await _WebAssembly.instantiateStreaming( + moduleSource, + importObject, + ); module = result.module; instance = result.instance; } else { @@ -164,7 +169,8 @@ async function _instantiate( module = await _WebAssembly.compile(moduleSource); instance = await _WebAssembly.instantiate(module, importObject); } - instance = options.instrumentInstance?.(instance, { _swift: swift }) ?? instance; + instance = + options.instrumentInstance?.(instance, { _swift: swift }) ?? instance; swift.setInstance(instance); instantiator.setInstance(instance); @@ -174,5 +180,5 @@ async function _instantiate( instance, swift, exports, - } + }; } diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index 28bdaa6db..15b5be9ee 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -818,21 +818,6 @@ private func _swift_js_pop_f64_extern() -> Float64 { _swift_js_pop_f64_extern() } -// MARK: Struct bridging helpers (JS-side lowering/raising) - -#if arch(wasm32) -@_extern(wasm, module: "bjs", name: "swift_js_struct_cleanup") -private func _swift_js_struct_cleanup_extern(_ cleanupId: Int32) -#else -private func _swift_js_struct_cleanup_extern(_ cleanupId: Int32) { - _onlyAvailableOnWasm() -} -#endif - -@_spi(BridgeJS) @inline(never) public func _swift_js_struct_cleanup(_ cleanupId: Int32) { - _swift_js_struct_cleanup_extern(cleanupId) -} - // MARK: Wasm externs used by type lowering/lifting #if arch(wasm32) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 8c1d63854..253087c0d 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -2720,10 +2720,7 @@ extension Point: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Point(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -2736,9 +2733,9 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -2771,10 +2768,7 @@ extension PointerFields: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -2787,9 +2781,9 @@ extension PointerFields: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -2841,10 +2835,7 @@ extension DataPoint: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -2857,9 +2848,9 @@ extension DataPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -2897,10 +2888,7 @@ extension PublicPoint: _BridgedSwiftStruct { } public init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_PublicPoint(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_PublicPoint(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -2913,9 +2901,9 @@ extension PublicPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PublicPoint") -fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -2959,10 +2947,7 @@ extension Address: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -2975,9 +2960,9 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3014,10 +2999,7 @@ extension Contact: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Contact(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3030,9 +3012,9 @@ extension Contact: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Contact") -fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3071,10 +3053,7 @@ extension Config: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3087,9 +3066,9 @@ extension Config: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3120,10 +3099,7 @@ extension SessionData: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_SessionData(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3136,9 +3112,9 @@ extension SessionData: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SessionData") -fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3177,10 +3153,7 @@ extension ValidationReport: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_ValidationReport(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3193,9 +3166,9 @@ extension ValidationReport: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ValidationReport") -fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3246,10 +3219,7 @@ extension AdvancedConfig: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_AdvancedConfig(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_AdvancedConfig(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3262,9 +3232,9 @@ extension AdvancedConfig: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AdvancedConfig") -fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3303,10 +3273,7 @@ extension MeasurementConfig: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_MeasurementConfig(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3319,9 +3286,9 @@ extension MeasurementConfig: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig") -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3346,10 +3313,7 @@ extension MathOperations: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3362,9 +3326,9 @@ extension MathOperations: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3439,10 +3403,7 @@ extension CopyableCart: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_CopyableCart(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3455,9 +3416,9 @@ extension CopyableCart: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCart") -fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3495,10 +3456,7 @@ extension CopyableCartItem: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_CopyableCartItem(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3511,9 +3469,9 @@ extension CopyableCartItem: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCartItem") -fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3542,10 +3500,7 @@ extension CopyableNestedCart: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_CopyableNestedCart(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3558,9 +3513,9 @@ extension CopyableNestedCart: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableNestedCart") -fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3598,10 +3553,7 @@ extension ConfigStruct: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3614,9 +3566,9 @@ extension ConfigStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3711,10 +3663,7 @@ extension JSObjectContainer: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_JSObjectContainer(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_JSObjectContainer(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3727,9 +3676,9 @@ extension JSObjectContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSObjectContainer") -fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3760,10 +3709,7 @@ extension FooContainer: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_FooContainer(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3776,9 +3722,9 @@ extension FooContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif @@ -3805,10 +3751,7 @@ extension ArrayMembers: _BridgedSwiftStruct { } init(unsafelyCopying jsObject: JSObject) { - let __bjs_cleanupId = _bjs_struct_lower_ArrayMembers(jsObject.bridgeJSLowerParameter()) - defer { - _swift_js_struct_cleanup(__bjs_cleanupId) - } + _bjs_struct_lower_ArrayMembers(jsObject.bridgeJSLowerParameter()) self = Self.bridgeJSStackPop() } @@ -3821,9 +3764,9 @@ extension ArrayMembers: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ArrayMembers") -fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Int32 +fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Int32 { +fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif From dd164d2c1ef6f17ca149c986e7146239e08a103b Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 18 Feb 2026 23:28:00 +0900 Subject: [PATCH 246/252] TS2Swift: warn when exported declarations are skipped --- .../TS2Swift/JavaScript/src/processor.js | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js index 4f2883f59..9617a5261 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js @@ -57,6 +57,9 @@ export class TypeProcessor { /** @type {Set} */ this.emittedStringLiteralUnionNames = new Set(); + /** @type {Set} */ + this.warnedExportNodes = new Set(); + /** @type {Set} */ this.visitedDeclarationKeys = new Set(); @@ -192,6 +195,8 @@ export class TypeProcessor { this.visitEnumDeclaration(node); } else if (ts.isExportDeclaration(node)) { this.visitExportDeclaration(node); + } else if (ts.isExportAssignment(node)) { + this.visitExportAssignment(node); } } @@ -239,6 +244,7 @@ export class TypeProcessor { } } else { // export * as ns from "..." is not currently supported by BridgeJS imports. + this.warnExportSkip(node, "Skipping namespace re-export (export * as ns) which is not supported"); return; } @@ -254,6 +260,19 @@ export class TypeProcessor { this.visitNode(declaration); } } + + if (targetSymbols.length === 0) { + this.warnExportSkip(node, "Export declaration resolved to no symbols; nothing was generated"); + } + } + + /** + * Handle `export default foo;` style assignments. + * @param {ts.ExportAssignment} node + */ + visitExportAssignment(node) { + // BridgeJS does not currently model default export assignments (they may point to expressions). + this.warnExportSkip(node, "Skipping export assignment (export default ...) which is not supported"); } /** @@ -271,7 +290,10 @@ export class TypeProcessor { const isConst = (node.declarationList.flags & ts.NodeFlags.Const) !== 0; for (const decl of node.declarationList.declarations) { - if (!ts.isIdentifier(decl.name)) continue; + if (!ts.isIdentifier(decl.name)) { + this.warnExportSkip(decl, "Skipping exported variable with a non-identifier name"); + continue; + } const jsName = decl.name.text; const swiftName = this.swiftTypeName(jsName); @@ -399,7 +421,12 @@ export class TypeProcessor { */ visitEnumDeclaration(node) { const name = node.name?.text; - if (!name) return; + if (!name) { + if (this.isExported(node)) { + this.warnExportSkip(node, "Skipping exported enum without a name"); + } + return; + } this.emitEnumFromDeclaration(name, node, node); } @@ -532,7 +559,12 @@ export class TypeProcessor { * @private */ visitFunctionDeclaration(node) { - if (!node.name) return; + if (!node.name) { + if (this.isExported(node)) { + this.warnExportSkip(node, "Skipping exported function without a name"); + } + return; + } const jsName = node.name.text; const swiftName = this.swiftTypeName(jsName); const fromArg = this.renderDefaultJSImportFromArgument(); @@ -774,7 +806,12 @@ export class TypeProcessor { * @private */ visitClassDecl(node) { - if (!node.name) return; + if (!node.name) { + if (this.isExported(node)) { + this.warnExportSkip(node, "Skipping exported class without a name"); + } + return; + } const jsName = node.name.text; if (this.emittedStructuredTypeNames.has(jsName)) return; @@ -1244,6 +1281,28 @@ export class TypeProcessor { return parts.join(" "); } + /** + * @param {ts.Node} node + * @returns {boolean} + */ + isExported(node) { + const hasExportModifier = /** @type {ts.ModifierLike[] | undefined} */ (node.modifiers)?.some( + (m) => m.kind === ts.SyntaxKind.ExportKeyword + ) ?? false; + return hasExportModifier || ts.isExportAssignment(node); + } + + /** + * Emit a single warning per node when an exported declaration cannot be generated. + * @param {ts.Node} node + * @param {string} reason + */ + warnExportSkip(node, reason) { + if (this.warnedExportNodes.has(node)) return; + this.warnedExportNodes.add(node); + this.diagnosticEngine.print("warning", `${reason}. Swift binding not generated`, node); + } + /** * Render identifier with backticks if needed * @param {string} name From 1ad419b27c0e7ac0f28b19c53bb0b818fa0dcd77 Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Wed, 18 Feb 2026 14:59:26 +0100 Subject: [PATCH 247/252] NFC: BridgeJS: Refactor JSGlueGen with compositional optional handling and helper consolidation --- .../Sources/BridgeJSLink/BridgeJSLink.swift | 8 +- .../Sources/BridgeJSLink/JSGlueGen.swift | 2680 +++++++---------- .../BridgeJSSkeleton/BridgeJSSkeleton.swift | 1 - .../BridgeJSLinkTests/ArrayTypes.js | 27 +- .../BridgeJSLinkTests/DefaultParameters.js | 146 +- .../BridgeJSLinkTests/EnumAssociatedValue.js | 1349 ++++----- .../BridgeJSLinkTests/EnumRawType.js | 43 +- .../ImportedTypeInExportedInterface.js | 87 +- .../BridgeJSLinkTests/JSValue.js | 70 +- .../BridgeJSLinkTests/Optionals.js | 284 +- .../BridgeJSLinkTests/Protocol.js | 117 +- .../StaticFunctions.Global.js | 64 +- .../BridgeJSLinkTests/StaticFunctions.js | 64 +- .../StaticProperties.Global.js | 13 +- .../BridgeJSLinkTests/StaticProperties.js | 13 +- .../BridgeJSLinkTests/SwiftClass.js | 4 +- .../BridgeJSLinkTests/SwiftClosure.js | 232 +- .../BridgeJSLinkTests/SwiftStruct.js | 422 ++- .../BridgeJSLinkTests/SwiftStructImports.js | 26 +- .../BridgeJSLinkTests/UnsafePointer.js | 38 +- 20 files changed, 2714 insertions(+), 2974 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 61ffc7781..0afb287ab 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1048,7 +1048,7 @@ public struct BridgeJSLink { for skeleton in skeletons.compactMap(\.exported) { for enumDef in skeleton.enums where enumDef.enumType == .associatedValue { printer.write( - "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()();" + "const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers();" ) printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;") printer.nextLine() @@ -1064,7 +1064,7 @@ public struct BridgeJSLink { for skeleton in skeletons.compactMap(\.exported) { for structDef in skeleton.structs { printer.write( - "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()();" + "const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers();" ) printer.write( "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name) = \(structDef.name)Helpers;" @@ -1513,7 +1513,7 @@ public struct BridgeJSLink { switch enumDefinition.enumType { case .simple: - let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition) + let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition) _ = try fragment.printCode([enumValuesName], context) jsTopLevelLines.append(contentsOf: printer.lines) case .rawValue: @@ -1521,7 +1521,7 @@ public struct BridgeJSLink { throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType") } - let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition) + let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition) _ = try fragment.printCode([enumValuesName], context) jsTopLevelLines.append(contentsOf: printer.lines) case .associatedValue: diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 20903eef8..c6c37a8db 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -89,6 +89,12 @@ final class JSGlueVariableScope { func makeChildScope() -> JSGlueVariableScope { JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) } + + fileprivate func reserveNames(_ names: [String]) { + for name in names { + variables.insert(name) + } + } } extension JSGlueVariableScope { @@ -107,17 +113,7 @@ extension JSGlueVariableScope { printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));") } - // MARK: Return - - func emitPushI32Return(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedI32Stack).push(\(value));") - } - func emitPushF64Return(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedF64Stack).push(\(value));") - } - func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) { - printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));") - } + // MARK: Pop func popString() -> String { return "\(JSGlueVariableScope.reservedStringStack).pop()" } @@ -200,29 +196,21 @@ struct IntrinsicJSFragment: Sendable { } ) - /// NOTE: JavaScript engine itself converts booleans to integers when passing them to - /// Wasm functions, so we don't need to do anything here - static let boolLowerParameter = identity + // MARK: - Scalar Coercion Fragments + static let boolLiftReturn = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, _ in return ["\(arguments[0]) !== 0"] } ) - static let boolLiftParameter = IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, _ in - return ["\(arguments[0]) !== 0"] - } - ) + static let boolLiftParameter = boolLiftReturn static let boolLowerReturn = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, _ in return ["\(arguments[0]) ? 1 : 0"] } ) - - /// Convert signed Int32 to unsigned for UInt values static let uintLiftReturn = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, _ in @@ -231,6 +219,8 @@ struct IntrinsicJSFragment: Sendable { ) static let uintLiftParameter = uintLiftReturn + // MARK: - String Fragments + static let stringLowerParameter = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in @@ -260,7 +250,9 @@ struct IntrinsicJSFragment: Sendable { let objectId = arguments[0] let objectLabel = scope.variable("\(objectId)Object") // TODO: Implement "take" operation - printer.write("const \(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));") + printer.write( + "const \(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" + ) printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") return [objectLabel] } @@ -268,7 +260,7 @@ struct IntrinsicJSFragment: Sendable { static let stringLowerReturn = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) + let printer = context.printer printer.write( "\(JSGlueVariableScope.reservedStorageToReturnBytes) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(arguments[0]));" ) @@ -276,37 +268,32 @@ struct IntrinsicJSFragment: Sendable { } ) + // MARK: - JSObject Fragments + static let jsObjectLowerParameter = IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, _ in return ["swift.memory.retain(\(arguments[0]))"] } ) - static let jsObjectLiftReturn = IntrinsicJSFragment( - parameters: ["retId"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - // TODO: Implement "take" operation - let resultLabel = scope.variable("ret") - let retId = arguments[0] - printer.write("const \(resultLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(retId));") - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(retId));") - return [resultLabel] - } - ) - static let jsObjectLiftRetainedObjectId = IntrinsicJSFragment( - parameters: ["objectId"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let resultLabel = scope.variable("value") - let objectId = arguments[0] - printer.write( - "const \(resultLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") - return [resultLabel] - } - ) + private static func jsObjectTakeRetained(hint: String = "ret") -> IntrinsicJSFragment { + IntrinsicJSFragment( + parameters: ["objectId"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + // TODO: Implement "take" operation + let resultLabel = scope.variable(hint) + let objectId = arguments[0] + printer.write( + "const \(resultLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(objectId));" + ) + printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(objectId));") + return [resultLabel] + } + ) + } + static let jsObjectLiftReturn = jsObjectTakeRetained(hint: "ret") + static let jsObjectLiftRetainedObjectId = jsObjectTakeRetained(hint: "value") static let jsObjectLiftParameter = IntrinsicJSFragment( parameters: ["objectId"], printCode: { arguments, _ in @@ -320,6 +307,8 @@ struct IntrinsicJSFragment: Sendable { } ) + // MARK: - JSValue Fragments + private static let jsValueLowerHelperName = "__bjs_jsValueLower" private static let jsValueLiftHelperName = "__bjs_jsValueLift" @@ -387,13 +376,18 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(payload2Var) = \(value);") printer.write("break;") } - printer.write("case \"string\":") - printer.indent { - printer.write("\(kindVar) = 1;") - printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(payload2Var) = 0;") - printer.write("break;") + func emitRetainCase(_ caseName: String, kind: Int) { + printer.write("case \"\(caseName)\":") + printer.indent { + printer.write("\(kindVar) = \(kind);") + printer.write( + "\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" + ) + printer.write("\(payload2Var) = 0;") + printer.write("break;") + } } + emitRetainCase("string", kind: 1) printer.write("case \"undefined\":") printer.indent { printer.write("\(kindVar) = 5;") @@ -401,34 +395,10 @@ struct IntrinsicJSFragment: Sendable { printer.write("\(payload2Var) = 0;") printer.write("break;") } - printer.write("case \"object\":") - printer.indent { - printer.write("\(kindVar) = 3;") - printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(payload2Var) = 0;") - printer.write("break;") - } - printer.write("case \"function\":") - printer.indent { - printer.write("\(kindVar) = 3;") - printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(payload2Var) = 0;") - printer.write("break;") - } - printer.write("case \"symbol\":") - printer.indent { - printer.write("\(kindVar) = 7;") - printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(payload2Var) = 0;") - printer.write("break;") - } - printer.write("case \"bigint\":") - printer.indent { - printer.write("\(kindVar) = 8;") - printer.write("\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - printer.write("\(payload2Var) = 0;") - printer.write("break;") - } + emitRetainCase("object", kind: 3) + emitRetainCase("function", kind: 3) + emitRetainCase("symbol", kind: 7) + emitRetainCase("bigint", kind: 8) printer.write("default:") printer.indent { printer.write("throw new TypeError(\"Unsupported JSValue type\");") @@ -524,45 +494,20 @@ struct IntrinsicJSFragment: Sendable { } static func jsValueLowerReturn(context: BridgeContext) -> IntrinsicJSFragment { - switch context { - case .importTS: - // Return values from imported JS functions should be delivered to the Swift side - // via the parameter stacks that `_swift_js_pop_*` read from. - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let lowered = try jsValueLower.printCode(arguments, context) - let kindVar = lowered[0] - let payload1Var = lowered[1] - let payload2Var = lowered[2] - scope.emitPushI32Parameter(kindVar, printer: printer) - scope.emitPushI32Parameter(payload1Var, printer: printer) - scope.emitPushF64Parameter(payload2Var, printer: printer) - return [] - } - ) - case .exportSwift: - // Kept for symmetry, though JSValue return for export currently relies on Swift pushing - // to tmpRet stacks directly. - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let lowered = try jsValueLower.printCode( - arguments, - context - ) - let kindVar = lowered[0] - let payload1Var = lowered[1] - let payload2Var = lowered[2] - scope.emitPushI32Parameter(kindVar, printer: printer) - scope.emitPushI32Parameter(payload1Var, printer: printer) - scope.emitPushF64Parameter(payload2Var, printer: printer) - return [] - } - ) - } + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let lowered = try jsValueLower.printCode(arguments, context) + let kindVar = lowered[0] + let payload1Var = lowered[1] + let payload2Var = lowered[2] + scope.emitPushI32Parameter(kindVar, printer: printer) + scope.emitPushI32Parameter(payload1Var, printer: printer) + scope.emitPushF64Parameter(payload2Var, printer: printer) + return [] + } + ) } static let jsValueLift = IntrinsicJSFragment( @@ -596,12 +541,21 @@ struct IntrinsicJSFragment: Sendable { } ) + // MARK: - SwiftHeapObject Fragments + static let swiftHeapObjectLowerParameter = IntrinsicJSFragment( parameters: ["value"], - printCode: { arguments, context in + printCode: { arguments, _ in + return ["\(arguments[0]).pointer"] + } + ) + static let swiftHeapObjectLowerReturn = IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, _ in return ["\(arguments[0]).pointer"] } ) + static func swiftHeapObjectLiftReturn(_ name: String) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["value"], @@ -620,12 +574,8 @@ struct IntrinsicJSFragment: Sendable { } ) } - static let swiftHeapObjectLowerReturn = IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - return ["\(arguments[0]).pointer"] - } - ) + + // MARK: - Associated Enum Fragments static func associatedEnumLowerParameter(enumBase: String) -> IntrinsicJSFragment { IntrinsicJSFragment( @@ -656,407 +606,409 @@ struct IntrinsicJSFragment: Sendable { ) } - static func optionalLiftParameter(wrappedType: BridgeType, kind: JSOptionalKind) throws -> IntrinsicJSFragment { - if case .jsValue = wrappedType { + // MARK: - Optional Handling + + static func optionalLiftParameter( + wrappedType: BridgeType, + kind: JSOptionalKind, + context bridgeContext: BridgeContext = .importTS + ) throws -> IntrinsicJSFragment { + if wrappedType.isSingleParamScalar { + let coerce = wrappedType.liftCoerce return IntrinsicJSFragment( - parameters: ["isSome", "kind", "payload1", "payload2"], - printCode: { arguments, context in + parameters: ["isSome", "wrappedValue"], + printCode: { arguments, _ in let isSome = arguments[0] - let lifted = try jsValueLiftParameter.printCode( - [arguments[1], arguments[2], arguments[3]], - context - ) - let valueExpr = lifted.first ?? "undefined" - return ["\(isSome) ? \(valueExpr) : null"] + let wrappedValue = arguments[1] + let absenceLiteral = kind.absenceLiteral + if let coerce { + let coerced = coerce.replacingOccurrences(of: "$0", with: wrappedValue) + return ["\(isSome) ? \(coerced) : \(absenceLiteral)"] + } + return ["\(isSome) ? \(wrappedValue) : \(absenceLiteral)"] } ) } + let innerFragment = try liftParameter(type: wrappedType, context: bridgeContext) + return compositeOptionalLiftParameter( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment + ) + } + + private static func compositeOptionalLiftParameter( + wrappedType: BridgeType, + kind: JSOptionalKind, + innerFragment: IntrinsicJSFragment + ) -> IntrinsicJSFragment { + let isStackConvention = wrappedType.optionalConvention == .stackABI + let absenceLiteral = kind.absenceLiteral + + let outerParams: [String] + if isStackConvention { + outerParams = ["isSome"] + } else { + outerParams = ["isSome"] + innerFragment.parameters + } + return IntrinsicJSFragment( - parameters: ["isSome", "wrappedValue"], + parameters: outerParams, printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) let isSome = arguments[0] - let wrappedValue = arguments[1] - let resultExpr: String - let absenceLiteral = kind.absenceLiteral - - switch wrappedType { - case .int, .float, .double, .caseEnum: - resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" - case .bool: - resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : \(absenceLiteral)" - case .string: - let objectLabel = scope.variable("obj") - printer.write("let \(objectLabel);") - printer.write("if (\(isSome)) {") - printer.indent { - printer.write( - "\(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") - } - printer.write("}") - resultExpr = "\(isSome) ? \(objectLabel) : \(absenceLiteral)" - case .closure: - resultExpr = - "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" - case .swiftHeapObject(let name): - resultExpr = "\(isSome) ? _exports['\(name)'].__construct(\(wrappedValue)) : \(absenceLiteral)" - case .jsObject: - resultExpr = - "\(isSome) ? \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue)) : \(absenceLiteral)" - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - let objectLabel = scope.variable("obj") - printer.write("let \(objectLabel);") - printer.write("if (\(isSome)) {") - printer.indent { - printer.write( - "\(objectLabel) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(wrappedValue));" - ) - printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(wrappedValue));") - } - printer.write("}") - resultExpr = "\(isSome) ? \(objectLabel) : \(absenceLiteral)" - case .bool: - resultExpr = "\(isSome) ? \(wrappedValue) !== 0 : \(absenceLiteral)" - default: - resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" - } - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let enumVar = scope.variable("enumValue") - printer.write("let \(enumVar);") - printer.write("if (\(isSome)) {") - printer.indent { - printer.write( - "\(enumVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(wrappedValue));" - ) - } - printer.write("}") - resultExpr = "\(isSome) ? \(enumVar) : \(absenceLiteral)" - case .swiftStruct(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let structVar = scope.variable("structValue") - printer.write("let \(structVar);") + let innerArgs = isStackConvention ? [] : Array(arguments.dropFirst()) + + let bufferPrinter = CodeFragmentPrinter() + let innerResults = try innerFragment.printCode( + innerArgs, + context.with(\.printer, bufferPrinter) + ) + + let hasSideEffects = !bufferPrinter.lines.isEmpty + let innerExpr = innerResults.first ?? "undefined" + + if hasSideEffects { + let resultVar = scope.variable("optResult") + printer.write("let \(resultVar);") printer.write("if (\(isSome)) {") printer.indent { - printer.write( - "\(structVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" - ) - } - printer.write("} else {") - printer.indent { - printer.write("\(structVar) = \(absenceLiteral);") - } - printer.write("}") - resultExpr = structVar - case .array(let elementType): - let arrayVar = scope.variable("arrayValue") - printer.write("let \(arrayVar);") - printer.write("if (\(isSome)) {") - try printer.indent { - let arrayLiftFragment = try arrayLift(elementType: elementType) - let liftResults = try arrayLiftFragment.printCode([], context) - if let liftResult = liftResults.first { - printer.write("\(arrayVar) = \(liftResult);") + for line in bufferPrinter.lines { + printer.write(line) } + printer.write("\(resultVar) = \(innerExpr);") } printer.write("} else {") printer.indent { - printer.write("\(arrayVar) = \(absenceLiteral);") + printer.write("\(resultVar) = \(absenceLiteral);") } printer.write("}") - resultExpr = arrayVar - case .dictionary(let valueType): - let dictVar = scope.variable("dictValue") - printer.write("let \(dictVar);") - printer.write("if (\(isSome)) {") - try printer.indent { - let dictLiftFragment = try dictionaryLift(valueType: valueType) - let liftResults = try dictLiftFragment.printCode([], context) - if let liftResult = liftResults.first { - printer.write("\(dictVar) = \(liftResult);") - } - } - printer.write("} else {") - printer.indent { - printer.write("\(dictVar) = \(absenceLiteral);") + return [resultVar] + } else { + return ["\(isSome) ? \(innerExpr) : \(absenceLiteral)"] + } + } + ) + } + + static func optionalLowerParameter( + wrappedType: BridgeType, + kind: JSOptionalKind + ) throws -> IntrinsicJSFragment { + if wrappedType.isSingleParamScalar { + let wasmType = wrappedType.wasmParams[0].type + let coerce = wrappedType.lowerCoerce + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + let presenceExpr = kind.presenceCheck(value: value) + printer.write("const \(isSomeVar) = \(presenceExpr);") + let coerced: String + if let coerce { + coerced = coerce.replacingOccurrences(of: "$0", with: value) + } else { + coerced = value } - printer.write("}") - resultExpr = dictVar - default: - resultExpr = "\(isSome) ? \(wrappedValue) : \(absenceLiteral)" + return ["+\(isSomeVar)", "\(isSomeVar) ? \(coerced) : \(wasmType.jsZeroLiteral)"] } + ) + } - return [resultExpr] - } + let innerFragment = try lowerParameter(type: wrappedType) + return try compositeOptionalLowerParameter( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment ) } - static func optionalLowerParameter(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + private static func compositeOptionalLowerParameter( + wrappedType: BridgeType, + kind: JSOptionalKind, + innerFragment: IntrinsicJSFragment + ) throws -> IntrinsicJSFragment { + let isStackConvention = wrappedType.optionalConvention == .stackABI + return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) let value = arguments[0] + scope.reserveNames(arguments) let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(value) != null;") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") - switch wrappedType { - case .swiftStruct(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" - ) - } - printer.write("}") - printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") - return [] - case .string, .rawValueEnum(_, .string): - let bytesVar = scope.variable("\(value)Bytes") - let idVar = scope.variable("\(value)Id") + let ifBodyPrinter = CodeFragmentPrinter() + let innerResults = try innerFragment.printCode( + [value], + context.with(\.printer, ifBodyPrinter) + ) - printer.write("let \(idVar), \(bytesVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));") - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - } - printer.write("}") - return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0", "\(isSomeVar) ? \(bytesVar).length : 0"] - case .jsValue: - let lowered = try jsValueLower.printCode([value], context) - return ["+\(isSomeVar)"] + lowered - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let caseIdVar = scope.variable("\(value)CaseId") - - printer.write("let \(caseIdVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - } - printer.write("}") + let resultVars = innerResults.map { _ in scope.variable("result") } + assert( + isStackConvention || resultVars.count == wrappedType.wasmParams.count, + "Inner fragment result count (\(resultVars.count)) must match wasmParams count (\(wrappedType.wasmParams.count)) for \(wrappedType)" + ) + if !resultVars.isEmpty { + printer.write("let \(resultVars.joined(separator: ", "));") + } - return ["+\(isSomeVar)", "\(isSomeVar) ? \(caseIdVar) : 0"] - case .rawValueEnum: - // Raw value enums with optional - falls through to handle based on raw type - return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] - case .array(let elementType): - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let arrayLowerFragment = try arrayLower(elementType: elementType) - let _ = try arrayLowerFragment.printCode( - [value], - context - ) + printer.write("if (\(isSomeVar)) {") + printer.indent { + for line in ifBodyPrinter.lines { + printer.write(line) } - printer.write("}") - printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") - return [] - case .dictionary(let valueType): - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let dictLowerFragment = try dictionaryLower(valueType: valueType) - let _ = try dictLowerFragment.printCode( - [value], - context - ) + for (resultVar, innerResult) in zip(resultVars, innerResults) { + printer.write("\(resultVar) = \(innerResult);") } - printer.write("}") - printer.write("\(JSGlueVariableScope.reservedI32Stack).push(+\(isSomeVar));") - return [] - default: - switch wrappedType { - case .swiftHeapObject: - return ["+\(isSomeVar)", "\(isSomeVar) ? \(value).pointer : 0"] - case .swiftProtocol: - return [ - "+\(isSomeVar)", - "\(isSomeVar) ? \(JSGlueVariableScope.reservedSwift).memory.retain(\(value)) : 0", - ] - case .jsObject: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + } + + let hasPlaceholders = !isStackConvention && !wrappedType.wasmParams.isEmpty + if hasPlaceholders { + printer.write("} else {") + printer.indent { + for (resultVar, param) in zip(resultVars, wrappedType.wasmParams) { + printer.write("\(resultVar) = \(param.type.jsZeroLiteral);") } - printer.write("}") - return ["+\(isSomeVar)", "\(isSomeVar) ? \(idVar) : 0"] - default: - return ["+\(isSomeVar)", "\(isSomeVar) ? \(value) : 0"] } } + printer.write("}") + + if isStackConvention { + scope.emitPushI32Parameter("+\(isSomeVar)", printer: printer) + return [] + } else { + return ["+\(isSomeVar)"] + resultVars + } } ) } - static func optionalLiftReturn( - wrappedType: BridgeType, - kind: JSOptionalKind - ) -> IntrinsicJSFragment { - let absenceLiteral = kind.absenceLiteral + private static func optionalLiftReturnFromStorage(storage: String) -> IntrinsicJSFragment { + IntrinsicJSFragment( + parameters: [], + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) + let resultVar = scope.variable("optResult") + printer.write("const \(resultVar) = \(storage);") + printer.write("\(storage) = undefined;") + return [resultVar] + } + ) + } + + private static func optionalLiftReturnWithPresenceFlag( + wrappedType: BridgeType, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + let absenceLiteral = kind.absenceLiteral return IntrinsicJSFragment( parameters: [], - printCode: { arguments, context in + printCode: { _, context in let (scope, printer) = (context.scope, context.printer) + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(scope.popI32());") + + let innerFragment = try liftReturn(type: wrappedType) + + let innerPrinter = CodeFragmentPrinter() + let innerResults = try innerFragment.printCode([], context.with(\.printer, innerPrinter)) + let innerExpr = innerResults.first ?? "undefined" + + if innerPrinter.lines.isEmpty { + return ["\(isSomeVar) ? \(innerExpr) : \(absenceLiteral)"] + } + let resultVar = scope.variable("optResult") - switch wrappedType { - case .bool: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalBool);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = undefined;") - case .int, .uint: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = undefined;") - case .float: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = undefined;") - case .double: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = undefined;") - case .string: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") - case .jsObject, .swiftProtocol: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") - case .swiftHeapObject(let className): - let pointerVar = scope.variable("pointer") - printer.write( - "const \(pointerVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;") - let constructExpr = - context.hasDirectAccessToSwiftClass - ? "\(className).__construct(\(pointerVar))" - : "_exports['\(className)'].__construct(\(pointerVar))" + printer.write("let \(resultVar);") + printer.write("if (\(isSomeVar)) {") + printer.indent { + for line in innerPrinter.lines { + printer.write(line) + } + printer.write("\(resultVar) = \(innerExpr);") + } + printer.write("} else {") + printer.indent { + printer.write("\(resultVar) = \(absenceLiteral);") + } + printer.write("}") + return [resultVar] + } + ) + } + + private static func optionalLiftReturnAssociatedEnum( + fullName: String, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + let base = fullName.components(separatedBy: ".").last ?? fullName + let absenceLiteral = kind.absenceLiteral + return IntrinsicJSFragment( + parameters: [], + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) + let resultVar = scope.variable("optResult") + let tagVar = scope.variable("tag") + printer.write("const \(tagVar) = \(scope.popI32());") + printer.write( + "const \(resultVar) = \(tagVar) === -1 ? \(absenceLiteral) : \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(tagVar));" + ) + return [resultVar] + } + ) + } + + private static func optionalLiftReturnHeapObject( + className: String, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + let absenceLiteral = kind.absenceLiteral + return IntrinsicJSFragment( + parameters: [], + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) + let resultVar = scope.variable("optResult") + let pointerVar = scope.variable("pointer") + printer.write( + "const \(pointerVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);" + ) + printer.write( + "\(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject) = undefined;" + ) + let constructExpr = + context.hasDirectAccessToSwiftClass + ? "\(className).__construct(\(pointerVar))" + : "_exports['\(className)'].__construct(\(pointerVar))" + printer.write( + "const \(resultVar) = \(pointerVar) === null ? \(absenceLiteral) : \(constructExpr);" + ) + return [resultVar] + } + ) + } + + private static func optionalLiftReturnStruct( + fullName: String, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + let base = fullName.components(separatedBy: ".").last ?? fullName + let absenceLiteral = kind.absenceLiteral + return IntrinsicJSFragment( + parameters: [], + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) + let isSomeVar = scope.variable("isSome") + let resultVar = scope.variable("optResult") + printer.write("const \(isSomeVar) = \(scope.popI32());") + printer.write( + "const \(resultVar) = \(isSomeVar) ? \(JSGlueVariableScope.reservedStructHelpers).\(base).lift() : \(absenceLiteral);" + ) + return [resultVar] + } + ) + } + + static func optionalLiftReturn( + wrappedType: BridgeType, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + if let scalarKind = wrappedType.optionalScalarKind { + return optionalLiftReturnFromStorage(storage: scalarKind.storageName) + } + if case .sideChannelReturn(let mode) = wrappedType.optionalConvention, mode != .none { + return optionalLiftReturnFromStorage(storage: JSGlueVariableScope.reservedStorageToReturnString) + } + + if case .swiftHeapObject(let className) = wrappedType { + return optionalLiftReturnHeapObject(className: className, kind: kind) + } + + if case .swiftStruct(let fullName) = wrappedType { + return optionalLiftReturnStruct(fullName: fullName, kind: kind) + } + + if wrappedType.nilSentinel.hasSentinel, case .associatedValueEnum(let fullName) = wrappedType { + return optionalLiftReturnAssociatedEnum(fullName: fullName, kind: kind) + } + + return optionalLiftReturnWithPresenceFlag(wrappedType: wrappedType, kind: kind) + } + + private static func optionalLowerReturnToSideChannel( + mode: OptionalSideChannel, + kind: JSOptionalKind + ) -> IntrinsicJSFragment { + IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + let presenceExpr = kind.presenceCheck(value: value) + printer.write("const \(isSomeVar) = \(presenceExpr);") + + if mode == .storage { printer.write( - "const \(resultVar) = \(pointerVar) === null ? \(absenceLiteral) : \(constructExpr);" + "\(JSGlueVariableScope.reservedStorageToReturnString) = \(isSomeVar) ? \(value) : \(kind.absenceLiteral);" ) - case .caseEnum: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = undefined;") - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") - case .bool: - printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalBool);" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalBool) = undefined;") - case .float: - printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalFloat);" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = undefined;") - case .double: - printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalDouble);" - ) - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = undefined;") - default: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnOptionalInt);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = undefined;") - } - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let tagVar = scope.variable("tag") - printer.write("const \(tagVar) = \(scope.popI32());") - let isNullVar = scope.variable("isNull") - printer.write("const \(isNullVar) = (\(tagVar) === -1);") - printer.write("let \(resultVar);") - printer.write("if (\(isNullVar)) {") - printer.indent { - printer.write("\(resultVar) = \(absenceLiteral);") - } - printer.write("} else {") - printer.indent { - printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(tagVar));" - ) - } - printer.write("}") - case .swiftStruct(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32());") - printer.write("let \(resultVar);") + } else { + let idVar = scope.variable("id") + printer.write("let \(idVar) = 0;") printer.write("if (\(isSomeVar)) {") printer.indent { printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedStructHelpers).\(base).lift();" + "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" ) } - printer.write("} else {") - printer.indent { - printer.write("\(resultVar) = \(absenceLiteral);") - } - printer.write("}") - case .array(let elementType): - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32());") - printer.write("let \(resultVar);") - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let arrayLiftFragment = try arrayLift(elementType: elementType) - let liftResults = try arrayLiftFragment.printCode([], context) - if let liftResult = liftResults.first { - printer.write("\(resultVar) = \(liftResult);") - } - } - printer.write("} else {") - printer.indent { - printer.write("\(resultVar) = \(absenceLiteral);") - } printer.write("}") - case .dictionary(let valueType): - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32());") - printer.write("let \(resultVar);") - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let dictLiftFragment = try dictionaryLift(valueType: valueType) - let liftResults = try dictLiftFragment.printCode([], context) - if let liftResult = liftResults.first { - printer.write("\(resultVar) = \(liftResult);") - } - } - printer.write("} else {") - printer.indent { - printer.write("\(resultVar) = \(absenceLiteral);") - } - printer.write("}") - case .jsValue: - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(scope.popI32());") - printer.write("let \(resultVar);") - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let lifted = try jsValueLift.printCode([], context) - if let liftedValue = lifted.first { - printer.write("\(resultVar) = \(liftedValue);") - } - } - printer.write("} else {") - printer.indent { - printer.write("\(resultVar) = null;") + printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") + } + + return [] + } + ) + } + + private static func optionalLowerReturnWithPresenceFlag( + wrappedType: BridgeType, + kind: JSOptionalKind, + innerFragment: IntrinsicJSFragment + ) -> IntrinsicJSFragment { + IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + let presenceExpr = kind.presenceCheck(value: value) + printer.write("const \(isSomeVar) = \(presenceExpr);") + + let innerPrinter = CodeFragmentPrinter() + let innerResults = try innerFragment.printCode( + [value], + context.with(\.printer, innerPrinter) + ) + if !innerResults.isEmpty { + throw BridgeJSLinkError( + message: "Unsupported wrapped type for returning from JS function: \(wrappedType)" + ) + } + + printer.write("if (\(isSomeVar)) {") + printer.indent { + for line in innerPrinter.lines { + printer.write(line) } - printer.write("}") - default: - printer.write("const \(resultVar) = \(JSGlueVariableScope.reservedStorageToReturnString);") - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = undefined;") } - return [resultVar] + printer.write("}") + + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) + return [] } ) } @@ -1068,6 +1020,70 @@ struct IntrinsicJSFragment: Sendable { default: break } + if let scalarKind = wrappedType.optionalScalarKind, + !wrappedType.nilSentinel.hasSentinel, wrappedType.wasmParams.count == 1 + { + let wasmType = wrappedType.wasmParams[0].type + let funcName = scalarKind.funcName + let stackCoerce = wrappedType.stackLowerCoerce + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + let presenceExpr = kind.presenceCheck(value: value) + printer.write("const \(isSomeVar) = \(presenceExpr);") + var coerced: String + if let coerce = stackCoerce { + coerced = coerce.replacingOccurrences(of: "$0", with: value) + if coerced.contains("?") && !coerced.hasPrefix("(") { + coerced = "(\(coerced))" + } + } else { + coerced = value + } + printer.write( + "bjs[\"\(funcName)\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(coerced) : \(wasmType.jsZeroLiteral));" + ) + return [] + } + ) + } + + if case .sideChannelReturn(let mode) = wrappedType.optionalConvention { + if mode == .none { + throw BridgeJSLinkError( + message: "Unsupported wrapped type for returning from JS function: \(wrappedType)" + ) + } + return optionalLowerReturnToSideChannel(mode: mode, kind: kind) + } + + if wrappedType.nilSentinel.hasSentinel { + let innerFragment = try lowerReturn(type: wrappedType, context: .exportSwift) + return sentinelOptionalLowerReturn( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment + ) + } + + let innerFragment = try lowerReturn(type: wrappedType, context: .exportSwift) + return optionalLowerReturnWithPresenceFlag( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment + ) + } + + private static func sentinelOptionalLowerReturn( + wrappedType: BridgeType, + kind: JSOptionalKind, + innerFragment: IntrinsicJSFragment + ) -> IntrinsicJSFragment { + let sentinelLiteral = wrappedType.nilSentinel.jsLiteral + return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in @@ -1077,197 +1093,159 @@ struct IntrinsicJSFragment: Sendable { let presenceExpr = kind.presenceCheck(value: value) printer.write("const \(isSomeVar) = \(presenceExpr);") - switch wrappedType { - case .bool: - printer.write( - "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - case .int, .uint: - printer.write( - "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" - ) - case .caseEnum: - printer.write("return \(isSomeVar) ? (\(value) | 0) : -1;") - case .float: - printer.write( - "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - case .double: - printer.write( - "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" - ) - case .string: - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") - } - printer.write("} else {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = null;") - } - printer.write("}") - case .jsObject, .swiftProtocol: - let idVar = scope.variable("id") - printer.write("let \(idVar) = 0;") + let bufferPrinter = CodeFragmentPrinter() + let innerResults = try innerFragment.printCode( + [value], + context.with(\.printer, bufferPrinter) + ) + + let hasSideEffects = !bufferPrinter.lines.isEmpty + let innerExpr = innerResults.first + + if hasSideEffects { printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - } - printer.write("}") - printer.write("bjs[\"swift_js_return_optional_object\"](\(isSomeVar) ? 1 : 0, \(idVar));") - case .jsValue: - if value != "undefined" { - let lowered = try jsValueLower.printCode([value], context) - let kindVar = lowered[0] - let payload1Var = lowered[1] - let payload2Var = lowered[2] - scope.emitPushI32Parameter(kindVar, printer: printer) - scope.emitPushI32Parameter(payload1Var, printer: printer) - scope.emitPushF64Parameter(payload2Var, printer: printer) - } - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .swiftHeapObject: - printer.write("return \(isSomeVar) ? \(value).pointer : 0;") - case .array(let elementType): - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let arrayLowerFragment = try arrayLower(elementType: elementType) - let _ = try arrayLowerFragment.printCode( - [value], - context - ) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") + for line in bufferPrinter.lines { + printer.write(line) } - printer.write("} else {") - printer.indent { - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = null;") + if let expr = innerExpr { + printer.write("return \(expr);") } - printer.write("}") - default: - switch rawType { - case .bool: - printer.write( - "bjs[\"swift_js_return_optional_bool\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) ? 1 : 0) : 0);" - ) - case .float: - printer.write( - "bjs[\"swift_js_return_optional_float\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? Math.fround(\(value)) : 0.0);" - ) - case .double: - printer.write( - "bjs[\"swift_js_return_optional_double\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? \(value) : 0.0);" - ) - default: - printer.write( - "bjs[\"swift_js_return_optional_int\"](\(isSomeVar) ? 1 : 0, \(isSomeVar) ? (\(value) | 0) : 0);" - ) - } - } - case .associatedValueEnum(let fullName): - let base = fullName.components(separatedBy: ".").last ?? fullName - let caseIdVar = scope.variable("caseId") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - printer.write("return \(caseIdVar);") } printer.write("} else {") printer.indent { - printer.write("return -1;") + printer.write("return \(sentinelLiteral);") } printer.write("}") - case .dictionary(let valueType): - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let entriesVar = scope.variable("entries") - let entryVar = scope.variable("entry") - printer.write("const \(entriesVar) = Object.entries(\(value));") - printer.write("for (const \(entryVar) of \(entriesVar)) {") - try printer.indent { - let keyVar = scope.variable("key") - let valueVar = scope.variable("value") - printer.write("const [\(keyVar), \(valueVar)] = \(entryVar);") - - let keyFragment = try stackLowerFragment(elementType: .string) - let _ = try keyFragment.printCode( - [keyVar], - context - ) + } else if let expr = innerExpr { + printer.write("return \(isSomeVar) ? \(expr) : \(sentinelLiteral);") + } + + return [] + } + ) + } + + // MARK: - Protocol Support + + static func protocolPropertyOptionalToSideChannel(wrappedType: BridgeType) throws -> IntrinsicJSFragment { + if let scalarKind = wrappedType.optionalScalarKind { + let storage = scalarKind.storageName + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + context.printer.write("\(storage) = \(arguments[0]);") + return [] + } + ) + } + + if case .sideChannelReturn(let mode) = wrappedType.optionalConvention, + mode != .none + { + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let printer = context.printer + let value = arguments[0] - let valueFragment = try stackLowerFragment(elementType: valueType) - let _ = try valueFragment.printCode( - [valueVar], - context - ) - } - printer.write("}") - scope.emitPushI32Parameter("\(entriesVar).length", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - default: - throw BridgeJSLinkError( - message: "Unsupported wrapped type for returning from JS function: \(wrappedType)" - ) + printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") + + return [] } + ) + } - return [] - } + throw BridgeJSLinkError( + message: "Type \(wrappedType) does not use side channel for protocol property returns" ) } - // MARK: - Protocol Support + // MARK: - JS Glue Descriptor Helpers - static func protocolPropertyOptionalToSideChannel(wrappedType: BridgeType) throws -> IntrinsicJSFragment { - switch wrappedType { - case .string, .int, .float, .double, .jsObject, .swiftProtocol: - break - case .rawValueEnum(_, let rawType): - switch rawType { - case .string, .int, .float, .double: - break - default: - throw BridgeJSLinkError( - message: "Unsupported raw value enum type for protocol property side channel: \(rawType)" - ) - } - default: - throw BridgeJSLinkError( - message: "Type \(wrappedType) does not use side channel for protocol property returns" - ) + private static func popExpression(for wasmType: WasmCoreType, scope: JSGlueVariableScope) -> String { + switch wasmType { + case .i32: return scope.popI32() + case .f32: return scope.popF32() + case .f64: return scope.popF64() + case .pointer: return scope.popPointer() + case .i64: return scope.popI32() } + } - return IntrinsicJSFragment( + private static func emitPush( + for wasmType: WasmCoreType, + value: String, + scope: JSGlueVariableScope, + printer: CodeFragmentPrinter + ) { + switch wasmType { + case .i32: scope.emitPushI32Parameter(value, printer: printer) + case .f32: scope.emitPushF32Parameter(value, printer: printer) + case .f64: scope.emitPushF64Parameter(value, printer: printer) + case .pointer: scope.emitPushPointerParameter(value, printer: printer) + case .i64: scope.emitPushI32Parameter(value, printer: printer) + } + } + + @discardableResult + private static func emitOptionalPlaceholders( + for wrappedType: BridgeType, + scope: JSGlueVariableScope, + printer: CodeFragmentPrinter + ) -> Bool { + let params = wrappedType.wasmParams + if params.isEmpty { + return false + } + for param in params { + emitPush(for: param.type, value: param.type.jsZeroLiteral, scope: scope, printer: printer) + } + return true + } + + private static func stackOptionalLower( + wrappedType: BridgeType, + kind: JSOptionalKind, + innerFragment: IntrinsicJSFragment + ) -> IntrinsicJSFragment { + IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in - let printer = context.printer + let (scope, printer) = (context.scope, context.printer) let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") - switch wrappedType { - case .string, .rawValueEnum(_, .string): - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") - case .int, .rawValueEnum(_, .int): - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalInt) = \(value);") - case .float, .rawValueEnum(_, .float): - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalFloat) = \(value);") - case .double, .rawValueEnum(_, .double): - printer.write("\(JSGlueVariableScope.reservedStorageToReturnOptionalDouble) = \(value);") - case .jsObject, .swiftProtocol: - printer.write("\(JSGlueVariableScope.reservedStorageToReturnString) = \(value);") - default: - fatalError("Unsupported type in protocolPropertyOptionalToSideChannel: \(wrappedType)") + let ifBodyPrinter = CodeFragmentPrinter() + try ifBodyPrinter.indent { + let _ = try innerFragment.printCode( + [value], + context.with(\.printer, ifBodyPrinter) + ) } - + printer.write("if (\(isSomeVar)) {") + for line in ifBodyPrinter.lines { + printer.write(line) + } + let placeholderPrinter = CodeFragmentPrinter() + let hasPlaceholders = emitOptionalPlaceholders( + for: wrappedType, + scope: scope, + printer: placeholderPrinter + ) + if hasPlaceholders { + printer.write("} else {") + printer.indent { + for line in placeholderPrinter.lines { + printer.write(line) + } + } + printer.write("}") + } else { + printer.write("}") + } + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) return [] } ) @@ -1278,22 +1256,19 @@ struct IntrinsicJSFragment: Sendable { /// Returns a fragment that lowers a JS value to Wasm core values for parameters static func lowerParameter(type: BridgeType) throws -> IntrinsicJSFragment { switch type { - case .int, .uint, .float, .double, .bool, .unsafePointer: return .identity + case .bool, .int, .uint, .float, .double, .unsafePointer, .caseEnum: + return .identity + case .rawValueEnum(_, let rawType) where rawType != .string: + return .identity case .string: return .stringLowerParameter case .jsObject: return .jsObjectLowerParameter case .jsValue: return .jsValueLower - case .swiftHeapObject: - return .swiftHeapObjectLowerParameter + case .swiftHeapObject: return .swiftHeapObjectLowerParameter case .swiftProtocol: return .jsObjectLowerParameter case .void: return .void - case .nullable(let wrappedType, _): - return try .optionalLowerParameter(wrappedType: wrappedType) - case .caseEnum: return .identity - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: return .stringLowerParameter - default: return .identity - } + case .nullable(let wrappedType, let kind): + return try .optionalLowerParameter(wrappedType: wrappedType, kind: kind) + case .rawValueEnum(_, .string): return .stringLowerParameter case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLowerParameter(enumBase: base) @@ -1319,31 +1294,31 @@ struct IntrinsicJSFragment: Sendable { return try arrayLower(elementType: elementType) case .dictionary(let valueType): return try dictionaryLower(valueType: valueType) + default: + throw BridgeJSLinkError(message: "Unhandled type in lowerParameter: \(type)") } } /// Returns a fragment that lifts a Wasm core value to a JS value for return values static func liftReturn(type: BridgeType) throws -> IntrinsicJSFragment { switch type { - case .int, .float, .double: return .identity - case .uint: return .uintLiftReturn - case .bool: return .boolLiftReturn + case .bool, .rawValueEnum(_, .bool): + return .boolLiftReturn + case .uint: + return .uintLiftReturn + case .int, .float, .double, .unsafePointer, .caseEnum: + return .identity + case .rawValueEnum(_, let rawType) where rawType != .string && rawType != .bool: + return .identity case .string: return .stringLiftReturn case .jsObject: return .jsObjectLiftReturn case .jsValue: return .jsValueLift case .swiftHeapObject(let name): return .swiftHeapObjectLiftReturn(name) - case .unsafePointer: return .identity case .swiftProtocol: return .jsObjectLiftReturn case .void: return .void case .nullable(let wrappedType, let kind): return .optionalLiftReturn(wrappedType: wrappedType, kind: kind) - case .caseEnum: return .identity - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: return .stringLiftReturn - case .bool: return .boolLiftReturn - default: return .identity - } + case .rawValueEnum(_, .string): return .stringLiftReturn case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return .associatedEnumLiftReturn(enumBase: base) @@ -1366,6 +1341,8 @@ struct IntrinsicJSFragment: Sendable { return try arrayLift(elementType: elementType) case .dictionary(let valueType): return try dictionaryLift(valueType: valueType) + default: + throw BridgeJSLinkError(message: "Unhandled type in liftReturn: \(type)") } } @@ -1374,13 +1351,17 @@ struct IntrinsicJSFragment: Sendable { /// Returns a fragment that lifts Wasm core values to JS values for parameters static func liftParameter(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { - case .int, .float, .double: return .identity - case .uint: return .uintLiftParameter - case .bool: return .boolLiftParameter + case .bool, .rawValueEnum(_, .bool): + return .boolLiftParameter + case .uint: + return .uintLiftParameter + case .int, .float, .double, .unsafePointer, .caseEnum: + return .identity + case .rawValueEnum(_, let rawType) where rawType != .string && rawType != .bool: + return .identity case .string: return .stringLiftParameter case .jsObject: return .jsObjectLiftParameter case .jsValue: return .jsValueLiftParameter - case .unsafePointer: return .identity case .swiftHeapObject(let name): return .swiftHeapObjectLiftParameter(name) case .swiftProtocol: return .jsObjectLiftParameter @@ -1389,14 +1370,8 @@ struct IntrinsicJSFragment: Sendable { message: "Void can't appear in parameters of imported JS functions" ) case .nullable(let wrappedType, let kind): - return try .optionalLiftParameter(wrappedType: wrappedType, kind: kind) - case .caseEnum: return .identity - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: return .stringLiftParameter - case .bool: return .boolLiftParameter - default: return .identity - } + return try .optionalLiftParameter(wrappedType: wrappedType, kind: kind, context: context) + case .rawValueEnum(_, .string): return .stringLiftParameter case .associatedValueEnum(let fullName): switch context { case .importTS: @@ -1454,31 +1429,29 @@ struct IntrinsicJSFragment: Sendable { return try arrayLift(elementType: elementType) case .dictionary(let valueType): return try dictionaryLift(valueType: valueType) + default: + throw BridgeJSLinkError(message: "Unhandled type in liftParameter: \(type)") } } /// Returns a fragment that lowers a JS value to Wasm core values for return values static func lowerReturn(type: BridgeType, context: BridgeContext = .importTS) throws -> IntrinsicJSFragment { switch type { - case .int, .uint, .float, .double: return .identity - case .bool: return .boolLowerReturn + case .bool, .rawValueEnum(_, .bool): + return .boolLowerReturn + case .int, .uint, .float, .double, .unsafePointer, .caseEnum: + return .identity + case .rawValueEnum(_, let rawType) where rawType != .string && rawType != .bool: + return .identity case .string: return .stringLowerReturn case .jsObject: return .jsObjectLowerReturn case .jsValue: return .jsValueLowerReturn(context: context) - case .unsafePointer: return .identity - case .swiftHeapObject: - return .swiftHeapObjectLowerReturn + case .swiftHeapObject: return .swiftHeapObjectLowerReturn case .swiftProtocol: return .jsObjectLowerReturn case .void: return .void case .nullable(let wrappedType, let kind): return try .optionalLowerReturn(wrappedType: wrappedType, kind: kind) - case .caseEnum: return .identity - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: return .stringLowerReturn - case .bool: return .boolLowerReturn - default: return .identity - } + case .rawValueEnum(_, .string): return .stringLowerReturn case .associatedValueEnum(let fullName): switch context { case .importTS: @@ -1492,7 +1465,6 @@ struct IntrinsicJSFragment: Sendable { case .swiftStruct(let fullName): switch context { case .importTS: - // ImportTS expects Swift structs to come back as a retained JS object ID. return .jsObjectLowerReturn case .exportSwift: return swiftStructLowerReturn(fullName: fullName) @@ -1519,6 +1491,8 @@ struct IntrinsicJSFragment: Sendable { return try arrayLower(elementType: elementType) case .dictionary(let valueType): return try dictionaryLower(valueType: valueType) + default: + throw BridgeJSLinkError(message: "Unhandled type in lowerReturn: \(type)") } } @@ -1578,107 +1552,77 @@ struct IntrinsicJSFragment: Sendable { let (scope, printer) = (context.scope, context.printer) let enumName = arguments[0] - printer.write("const __bjs_create\(enumName)Helpers = () => {") - printer.indent() - printer.write( - "return () => ({" - ) - printer.indent() - - // Generate lower function - printer.write("lower: (value) => {") + printer.write("const __bjs_create\(enumName)Helpers = () => ({") try printer.indent { - printer.write("const enumTag = value.tag;") - printer.write("switch (enumTag) {") + printer.write("lower: (value) => {") try printer.indent { - let lowerPrinter = CodeFragmentPrinter() - for enumCase in enumDefinition.cases { - let caseName = enumCase.name.capitalizedFirstLetter - let caseScope = scope.makeChildScope() - let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase) - _ = try fragment.printCode( - ["value", enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, lowerPrinter) - ) - } + printer.write("const enumTag = value.tag;") + printer.write("switch (enumTag) {") + try printer.indent { + let lowerPrinter = CodeFragmentPrinter() + for enumCase in enumDefinition.cases { + let caseName = enumCase.name.capitalizedFirstLetter + let caseScope = scope.makeChildScope() + let fragment = IntrinsicJSFragment.associatedValuePushPayload( + enumCase: enumCase + ) + _ = try fragment.printCode( + ["value", enumName, caseName], + context.with(\.scope, caseScope).with(\.printer, lowerPrinter) + ) + } - for line in lowerPrinter.lines { - printer.write(line) - } + for line in lowerPrinter.lines { + printer.write(line) + } - printer.write("default: throw new Error(\"Unknown \(enumName) tag: \" + String(enumTag));") + printer.write( + "default: throw new Error(\"Unknown \(enumName) tag: \" + String(enumTag));" + ) + } + printer.write("}") } - printer.write("}") - } - printer.write("},") + printer.write("},") - // Generate lift function - printer.write( - "lift: (tag) => {" - ) - try printer.indent { - printer.write("tag = tag | 0;") - printer.write("switch (tag) {") + printer.write("lift: (tag) => {") try printer.indent { - let liftPrinter = CodeFragmentPrinter() - for enumCase in enumDefinition.cases { - let caseName = enumCase.name.capitalizedFirstLetter - let caseScope = scope.makeChildScope() + printer.write("tag = tag | 0;") + printer.write("switch (tag) {") + try printer.indent { + let liftPrinter = CodeFragmentPrinter() + for enumCase in enumDefinition.cases { + let caseName = enumCase.name.capitalizedFirstLetter + let caseScope = scope.makeChildScope() - let fragment = IntrinsicJSFragment.associatedValuePopPayload(enumCase: enumCase) - _ = try fragment.printCode( - [enumName, caseName], - context.with(\.scope, caseScope).with(\.printer, liftPrinter) - ) - } + let fragment = IntrinsicJSFragment.associatedValuePopPayload( + enumCase: enumCase + ) + _ = try fragment.printCode( + [enumName, caseName], + context.with(\.scope, caseScope).with(\.printer, liftPrinter) + ) + } - for line in liftPrinter.lines { - printer.write(line) - } + for line in liftPrinter.lines { + printer.write(line) + } - printer.write( - "default: throw new Error(\"Unknown \(enumName) tag returned from Swift: \" + String(tag));" - ) + printer.write( + "default: throw new Error(\"Unknown \(enumName) tag returned from Swift: \" + String(tag));" + ) + } + printer.write("}") } printer.write("}") } - printer.write("}") - printer.unindent() printer.write("});") - printer.unindent() - printer.write("};") - - return [] - } - ) - } - - static func simpleEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: ["enumName"], - printCode: { arguments, context in - let printer = context.printer - let enumName = arguments[0] - printer.write("const \(enumName) = {") - printer.indent { - for (index, enumCase) in enumDefinition.cases.enumerated() { - let caseName = enumCase.name.capitalizedFirstLetter - let value = enumCase.jsValue( - rawType: enumDefinition.rawType, - index: index - ) - printer.write("\(caseName): \(value),") - } - } - printer.write("};") - printer.nextLine() return [] } ) } - static func rawValueEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { + static func caseEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["enumName"], printCode: { arguments, context in @@ -1717,7 +1661,6 @@ struct IntrinsicJSFragment: Sendable { if enumCase.associatedValues.isEmpty { printer.write("return \(enumName).Tag.\(caseName);") } else { - // Process associated values in reverse order (to match the order they'll be popped) let reversedValues = enumCase.associatedValues.enumerated().reversed() for (associatedValueIndex, associatedValue) in reversedValues { @@ -1770,175 +1713,11 @@ struct IntrinsicJSFragment: Sendable { for line in casePrinter.lines { printer.write(line) } - printer.write( - "return { tag: \(enumName).Tag.\(caseName), \(fieldPairs.reversed().joined(separator: ", ")) };" - ) - } - printer.write("}") - } - - return [] - } - ) - } - - private static func associatedValuePushPayload(type: BridgeType) throws -> IntrinsicJSFragment { - switch type { - case .nullable(let wrappedType, let kind): - return associatedValueOptionalPushPayload(wrappedType: wrappedType, kind: kind) - default: - return try stackLowerFragment(elementType: type) - } - } - - private static func associatedValueOptionalPushPayload( - wrappedType: BridgeType, - kind: JSOptionalKind - ) -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let value = arguments[0] - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") - - switch wrappedType { - case .string: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let bytesVar = scope.variable("bytes") - printer.write( - "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) - scope.emitPushI32Parameter(idVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .int, .uint: - scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .bool: - scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) ? 1 : 0) : 0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .float: - scope.emitPushF32Parameter("\(isSomeVar) ? Math.fround(\(value)) : 0.0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .double: - scope.emitPushF64Parameter("\(isSomeVar) ? \(value) : 0.0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .caseEnum: - scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let bytesVar = scope.variable("bytes") - printer.write( - "let \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write( - "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" - ) - scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) - scope.emitPushI32Parameter(idVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .float: - scope.emitPushF32Parameter("\(isSomeVar) ? Math.fround(\(value)) : 0.0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .double: - scope.emitPushF64Parameter("\(isSomeVar) ? \(value) : 0.0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - default: - scope.emitPushI32Parameter("\(isSomeVar) ? (\(value) | 0) : 0", printer: printer) - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - } - case .swiftStruct(let structName): - let structBase = structName.components(separatedBy: ".").last ?? structName - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" - ) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .swiftHeapObject: - printer.write("if (\(isSomeVar)) {") - printer.indent { - scope.emitPushPointerParameter("\(value).pointer", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushPointerParameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .jsObject: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - scope.emitPushI32Parameter(idVar, printer: printer) - } - printer.write("} else {") - printer.indent { - printer.write("\(idVar) = undefined;") - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .associatedValueEnum(let enumName): - let base = enumName.components(separatedBy: ".").last ?? enumName - let caseIdVar = scope.variable("enumCaseId") - printer.write("let \(caseIdVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - scope.emitPushI32Parameter(caseIdVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - case .array(let elementType): - printer.write("if (\(isSomeVar)) {") - try printer.indent { - let arrFragment = try arrayLower(elementType: elementType) - _ = try arrFragment.printCode( - [value], - context + printer.write( + "return { tag: \(enumName).Tag.\(caseName), \(fieldPairs.reversed().joined(separator: ", ")) };" ) } printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - default: - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) } return [] @@ -1946,6 +1725,58 @@ struct IntrinsicJSFragment: Sendable { ) } + private static func associatedValuePushPayload(type: BridgeType) throws -> IntrinsicJSFragment { + switch type { + case .nullable(let wrappedType, let kind): + return try associatedValueOptionalPushPayload(wrappedType: wrappedType, kind: kind) + default: + return try stackLowerFragment(elementType: type) + } + } + + private static func associatedValueOptionalPushPayload( + wrappedType: BridgeType, + kind: JSOptionalKind + ) throws -> IntrinsicJSFragment { + if wrappedType.isSingleParamScalar { + let wasmType = wrappedType.wasmParams[0].type + let stackCoerce = wrappedType.stackLowerCoerce + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") + var coerced: String + if let coerce = stackCoerce { + coerced = coerce.replacingOccurrences(of: "$0", with: value) + if coerced.contains("?") && !coerced.hasPrefix("(") { + coerced = "(\(coerced))" + } + } else { + coerced = value + } + emitPush( + for: wasmType, + value: "\(isSomeVar) ? \(coerced) : \(wasmType.jsZeroLiteral)", + scope: scope, + printer: printer + ) + scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) + return [] + } + ) + } + + let innerFragment = try stackLowerFragment(elementType: wrappedType) + return stackOptionalLower( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment + ) + } + private static func associatedValuePopPayload(type: BridgeType) throws -> IntrinsicJSFragment { switch type { case .nullable(let wrappedType, let kind): @@ -2000,33 +1831,26 @@ struct IntrinsicJSFragment: Sendable { ) } - static func swiftStructLowerReturn(fullName: String) -> IntrinsicJSFragment { - let base = fullName.components(separatedBy: ".").last ?? fullName - return IntrinsicJSFragment( + private static func swiftStructLower(structBase: String) -> IntrinsicJSFragment { + IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in let printer = context.printer let value = arguments[0] printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(base).lower(\(value));" + "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" ) return [] } ) } + static func swiftStructLowerReturn(fullName: String) -> IntrinsicJSFragment { + swiftStructLower(structBase: fullName.components(separatedBy: ".").last ?? fullName) + } + static func swiftStructLowerParameter(structBase: String) -> IntrinsicJSFragment { - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let printer = context.printer - let value = arguments[0] - printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(structBase).lower(\(value));" - ) - return [] - } - ) + swiftStructLower(structBase: structBase) } static func swiftStructLiftReturn(structBase: String) -> IntrinsicJSFragment { @@ -2161,6 +1985,29 @@ struct IntrinsicJSFragment: Sendable { } private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + if case .nullable(let wrappedType, let kind) = elementType { + return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind) + } + if elementType.isSingleParamScalar { + let wasmType = elementType.wasmParams[0].type + let coerce = elementType.liftCoerce + let varHint = elementType.varHint + return IntrinsicJSFragment( + parameters: [], + printCode: { _, context in + let (scope, printer) = (context.scope, context.printer) + let popExpr = popExpression(for: wasmType, scope: scope) + let varName = scope.variable(varHint) + if let transform = coerce { + let inlined = transform.replacingOccurrences(of: "$0", with: popExpr) + printer.write("const \(varName) = \(inlined);") + } else { + printer.write("const \(varName) = \(popExpr);") + } + return [varName] + } + ) + } switch elementType { case .jsValue: return IntrinsicJSFragment( @@ -2191,44 +2038,14 @@ struct IntrinsicJSFragment: Sendable { return [strVar] } ) - case .bool: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let bVar = scope.variable("bool") - printer.write("const \(bVar) = \(scope.popI32()) !== 0;") - return [bVar] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let iVar = scope.variable("int") - printer.write("const \(iVar) = \(scope.popI32());") - return [iVar] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let fVar = scope.variable("f32") - printer.write("const \(fVar) = \(scope.popF32());") - return [fVar] - } - ) - case .double: + case .rawValueEnum(_, .string): return IntrinsicJSFragment( parameters: [], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) - let dVar = scope.variable("f64") - printer.write("const \(dVar) = \(scope.popF64());") - return [dVar] + let varName = scope.variable("rawValue") + printer.write("const \(varName) = \(scope.popString());") + return [varName] } ) case .swiftStruct(let fullName): @@ -2244,59 +2061,6 @@ struct IntrinsicJSFragment: Sendable { return [resultVar] } ) - case .caseEnum: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let varName = scope.variable("caseId") - printer.write("const \(varName) = \(scope.popI32());") - return [varName] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popString());") - return [varName] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popF32());") - return [varName] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popF64());") - return [varName] - } - ) - default: - return IntrinsicJSFragment( - parameters: [], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let varName = scope.variable("rawValue") - printer.write("const \(varName) = \(scope.popI32());") - return [varName] - } - ) - } case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( @@ -2305,7 +2069,7 @@ struct IntrinsicJSFragment: Sendable { let (scope, printer) = (context.scope, context.printer) let resultVar = scope.variable("enumValue") printer.write( - "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popI32()), );" + "const \(resultVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(scope.popI32()));" ) return [resultVar] } @@ -2330,7 +2094,9 @@ struct IntrinsicJSFragment: Sendable { let idVar = scope.variable("objId") let objVar = scope.variable("obj") printer.write("const \(idVar) = \(scope.popI32());") - printer.write("const \(objVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));") + printer.write( + "const \(objVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));" + ) printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));") return [objVar] } @@ -2339,24 +2105,34 @@ struct IntrinsicJSFragment: Sendable { return try arrayLift(elementType: innerElementType) case .dictionary(let valueType): return try dictionaryLift(valueType: valueType) - case .nullable(let wrappedType, let kind): - return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind) - case .unsafePointer: + default: + throw BridgeJSLinkError(message: "Unsupported array element type: \(elementType)") + } + } + + private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { + if case .nullable(let wrappedType, let kind) = elementType { + return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind) + } + if elementType.isSingleParamScalar { + let wasmType = elementType.wasmParams[0].type + let stackCoerce = elementType.stackLowerCoerce return IntrinsicJSFragment( - parameters: [], + parameters: ["value"], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) - let pVar = scope.variable("pointer") - printer.write("const \(pVar) = \(scope.popPointer());") - return [pVar] + let value = arguments[0] + let pushExpr: String + if let coerce = stackCoerce { + pushExpr = coerce.replacingOccurrences(of: "$0", with: value) + } else { + pushExpr = value + } + emitPush(for: wasmType, value: pushExpr, scope: scope, printer: printer) + return [] } ) - case .void, .closure, .namespaceEnum: - throw BridgeJSLinkError(message: "Unsupported array element type: \(elementType)") } - } - - private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment { switch elementType { case .jsValue: return IntrinsicJSFragment( @@ -2374,7 +2150,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .string: + case .string, .rawValueEnum(_, .string): return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in @@ -2382,49 +2158,17 @@ struct IntrinsicJSFragment: Sendable { let value = arguments[0] let bytesVar = scope.variable("bytes") let idVar = scope.variable("id") - printer.write("const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") + printer.write( + "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" + ) + printer.write( + "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" + ) scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) scope.emitPushI32Parameter(idVar, printer: printer) return [] } ) - case .bool: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushI32Parameter("\(arguments[0]) ? 1 : 0", printer: printer) - return [] - } - ) - case .int, .uint: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) - return [] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushF64Parameter("\(arguments[0])", printer: printer) - return [] - } - ) case .swiftStruct(let fullName): let structBase = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( @@ -2438,64 +2182,7 @@ struct IntrinsicJSFragment: Sendable { return [] } ) - case .caseEnum: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) - return [] - } - ) - case .rawValueEnum(_, let rawType): - switch rawType { - case .string: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let value = arguments[0] - let bytesVar = scope.variable("bytes") - let idVar = scope.variable("id") - printer.write( - "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write( - "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" - ) - scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) - scope.emitPushI32Parameter(idVar, printer: printer) - return [] - } - ) - case .float: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushF32Parameter("Math.fround(\(arguments[0]))", printer: printer) - return [] - } - ) - case .double: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushF64Parameter("\(arguments[0])", printer: printer) - return [] - } - ) - default: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushI32Parameter("(\(arguments[0]) | 0)", printer: printer) - return [] - } - ) - } + case .associatedValueEnum(let fullName): let base = fullName.components(separatedBy: ".").last ?? fullName return IntrinsicJSFragment( @@ -2506,64 +2193,40 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("caseId") printer.write( "const \(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - scope.emitPushI32Parameter(caseIdVar, printer: printer) - return [] - } - ) - case .swiftHeapObject: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - scope.emitPushPointerParameter("\(arguments[0]).pointer", printer: printer) - return [] - } - ) - case .jsObject: - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let value = arguments[0] - let idVar = scope.variable("objId") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - scope.emitPushI32Parameter(idVar, printer: printer) + ) + scope.emitPushI32Parameter(caseIdVar, printer: printer) return [] } ) - case .array(let innerElementType): - return try arrayLower(elementType: innerElementType) - case .dictionary(let valueType): - return try dictionaryLower(valueType: valueType) - case .nullable(let wrappedType, let kind): - return try optionalElementLowerFragment( - wrappedType: wrappedType, - kind: kind - ) - case .swiftProtocol: - // Same as jsObject but no cleanup — Swift's AnyProtocol wrapper releases via deinit + case .swiftHeapObject: return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) let value = arguments[0] - let idVar = scope.variable("objId") - printer.write("const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - scope.emitPushI32Parameter(idVar, printer: printer) + scope.emitPushPointerParameter("\(value).pointer", printer: printer) return [] } ) - case .unsafePointer: + case .jsObject, .swiftProtocol: return IntrinsicJSFragment( parameters: ["value"], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) - scope.emitPushPointerParameter("(\(arguments[0]) | 0)", printer: printer) + let value = arguments[0] + let idVar = scope.variable("objId") + printer.write( + "const \(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" + ) + scope.emitPushI32Parameter(idVar, printer: printer) return [] } ) - case .void, .closure, .namespaceEnum: + case .array(let innerElementType): + return try arrayLower(elementType: innerElementType) + case .dictionary(let valueType): + return try dictionaryLower(valueType: valueType) + default: throw BridgeJSLinkError(message: "Unsupported array element type for lowering: \(elementType)") } } @@ -2624,27 +2287,23 @@ struct IntrinsicJSFragment: Sendable { context ) } - printer.write("} else {") - printer.indent { - // Push placeholders so Swift can unconditionally pop value slots - switch wrappedType { - case .float: - scope.emitPushF32Parameter("0.0", printer: printer) - case .double: - scope.emitPushF64Parameter("0.0", printer: printer) - case .swiftStruct: - // No placeholder — Swift only pops struct fields when isSome=1 - break - case .string, .rawValueEnum(_, .string): - scope.emitPushI32Parameter("0", printer: printer) - scope.emitPushI32Parameter("0", printer: printer) - case .swiftHeapObject: - scope.emitPushPointerParameter("0", printer: printer) - default: - scope.emitPushI32Parameter("0", printer: printer) + let placeholderPrinter = CodeFragmentPrinter() + let hasPlaceholders = emitOptionalPlaceholders( + for: wrappedType, + scope: scope, + printer: placeholderPrinter + ) + if hasPlaceholders { + printer.write("} else {") + printer.indent { + for line in placeholderPrinter.lines { + printer.write(line) + } } + printer.write("}") + } else { + printer.write("}") } - printer.write("}") scope.emitPushI32Parameter(isSomeVar, printer: printer) return [] @@ -2652,6 +2311,8 @@ struct IntrinsicJSFragment: Sendable { ) } + // MARK: - Struct Helpers + static func structHelper(structDefinition: ExportedStruct, allStructs: [ExportedStruct]) -> IntrinsicJSFragment { return IntrinsicJSFragment( parameters: ["structName"], @@ -2661,49 +2322,36 @@ struct IntrinsicJSFragment: Sendable { let capturedStructDef = structDefinition let capturedAllStructs = allStructs - printer.write("const __bjs_create\(structName)Helpers = () => {") - printer.indent() - printer.write( - "return () => ({" - ) - printer.indent() - - printer.write("lower: (value) => {") + printer.write("const __bjs_create\(structName)Helpers = () => ({") try printer.indent { - try generateStructLowerCode( - structDef: capturedStructDef, - allStructs: capturedAllStructs, - context: context - ) - } - printer.write("},") + printer.write("lower: (value) => {") + try printer.indent { + try generateStructLowerCode( + structDef: capturedStructDef, + allStructs: capturedAllStructs, + context: context + ) + } + printer.write("},") - printer.write( - "lift: () => {" - ) - try printer.indent { - try generateStructLiftCode( - structDef: capturedStructDef, - allStructs: capturedAllStructs, - context: context, - attachMethods: true - ) + printer.write("lift: () => {") + try printer.indent { + try generateStructLiftCode( + structDef: capturedStructDef, + allStructs: capturedAllStructs, + context: context, + attachMethods: true + ) + } + printer.write("}") } - printer.write("}") - printer.unindent() printer.write("});") - printer.unindent() - printer.write("};") return [] } ) } - private static func findStruct(name: String, structs: [ExportedStruct]) -> ExportedStruct? { - return structs.first(where: { $0.swiftCallName == name || $0.name == name }) - } - private static func generateStructLowerCode( structDef: ExportedStruct, allStructs: [ExportedStruct], @@ -2715,7 +2363,11 @@ struct IntrinsicJSFragment: Sendable { let instanceProps = structDef.properties.filter { !$0.isStatic } for property in instanceProps { - let fragment = try structFieldLowerFragment(field: property, allStructs: allStructs) + let fragment = try structFieldLowerFragment( + type: property.type, + fieldName: property.name, + allStructs: allStructs + ) let fieldValue = "value.\(property.name)" _ = try fragment.printCode( [fieldValue], @@ -2734,7 +2386,7 @@ struct IntrinsicJSFragment: Sendable { context: IntrinsicJSFragment.PrintCodeContext, attachMethods: Bool = false ) throws { - let (scope, printer) = (context.scope, context.printer) + let printer = context.printer let liftScope = context.scope.makeChildScope() var fieldExpressions: [(name: String, expression: String)] = [] @@ -2806,10 +2458,11 @@ struct IntrinsicJSFragment: Sendable { } private static func structFieldLowerFragment( - field: ExportedProperty, + type: BridgeType, + fieldName: String, allStructs: [ExportedStruct] ) throws -> IntrinsicJSFragment { - switch field.type { + switch type { case .jsValue: preconditionFailure("Struct field of JSValue is not supported yet") case .jsObject: @@ -2822,7 +2475,9 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(idVar);") printer.write("if (\(value) != null) {") printer.indent { - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") + printer.write( + "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" + ) } printer.write("} else {") printer.indent { @@ -2834,251 +2489,46 @@ struct IntrinsicJSFragment: Sendable { } ) case .nullable(let wrappedType, let kind): - return IntrinsicJSFragment( - parameters: ["value"], - printCode: { arguments, context in - let (scope, printer) = (context.scope, context.printer) - let value = arguments[0] - let isSomeVar = scope.variable("isSome") - printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") - - if case .caseEnum = wrappedType { - printer.write("if (\(isSomeVar)) {") - printer.indent { - scope.emitPushI32Parameter("\(value) | 0", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - } else if case .rawValueEnum(_, let rawType) = wrappedType { - switch rawType { - case .string: - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let bytesVar = scope.variable("bytes") - printer.write( - "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write( - "\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));" - ) - scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) - scope.emitPushI32Parameter(idVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [idVar] - case .float: - printer.write("if (\(isSomeVar)) {") - printer.indent { - scope.emitPushF32Parameter("Math.fround(\(value))", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushF32Parameter("0.0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - case .double: - printer.write("if (\(isSomeVar)) {") - printer.indent { - scope.emitPushF64Parameter("\(value)", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushF64Parameter("0.0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - default: - printer.write("if (\(isSomeVar)) {") - printer.indent { - scope.emitPushI32Parameter("\(value) | 0", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - } - } else if case .swiftHeapObject = wrappedType { - let ptrVar = scope.variable("ptr") - printer.write("let \(ptrVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write("\(ptrVar) = \(value).pointer;") - scope.emitPushPointerParameter("\(ptrVar)", printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushPointerParameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - } else if case .swiftStruct(let structName) = wrappedType { - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(structName).lower(\(value));" - ) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [] - } else if case .string = wrappedType { - let idVar = scope.variable("id") - printer.write("let \(idVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - let bytesVar = scope.variable("bytes") - printer.write( - "const \(bytesVar) = \(JSGlueVariableScope.reservedTextEncoder).encode(\(value));" - ) - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(bytesVar));") - scope.emitPushI32Parameter("\(bytesVar).length", printer: printer) - scope.emitPushI32Parameter(idVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - scope.emitPushI32Parameter("0", printer: printer) + if wrappedType.isSingleParamScalar { + let wasmType = wrappedType.wasmParams[0].type + let stackCoerce = wrappedType.stackLowerCoerce + return IntrinsicJSFragment( + parameters: ["value"], + printCode: { arguments, context in + let (scope, printer) = (context.scope, context.printer) + let value = arguments[0] + let isSomeVar = scope.variable("isSome") + printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));") + let coerced: String + if let coerce = stackCoerce { + coerced = coerce.replacingOccurrences(of: "$0", with: value) + } else { + coerced = value } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [idVar] - } else if case .jsObject = wrappedType { - let idVar = scope.variable("id") - printer.write("let \(idVar);") printer.write("if (\(isSomeVar)) {") printer.indent { - printer.write("\(idVar) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));") - scope.emitPushI32Parameter(idVar, printer: printer) + emitPush(for: wasmType, value: coerced, scope: scope, printer: printer) } printer.write("} else {") printer.indent { - printer.write("\(idVar) = undefined;") - scope.emitPushI32Parameter("0", printer: printer) + emitPush(for: wasmType, value: wasmType.jsZeroLiteral, scope: scope, printer: printer) } printer.write("}") scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - return [idVar] - } else { - switch wrappedType { - case .int, .uint: - pushOptionalPrimitive( - value: value, - isSomeVar: isSomeVar, - stack: .i32Stack, - convert: "| 0", - zeroValue: "0", - printer: printer, - scope: scope - ) - case .bool: - pushOptionalPrimitive( - value: value, - isSomeVar: isSomeVar, - stack: .i32Stack, - convert: "? 1 : 0", - zeroValue: "0", - printer: printer, - scope: scope - ) - case .float: - pushOptionalPrimitive( - value: value, - isSomeVar: isSomeVar, - stack: .f32Stack, - convert: "Math.fround", - zeroValue: "0.0", - printer: printer, - scope: scope - ) - case .double: - pushOptionalPrimitive( - value: value, - isSomeVar: isSomeVar, - stack: .f64Stack, - convert: nil, - zeroValue: "0.0", - printer: printer, - scope: scope - ) - case .associatedValueEnum(let enumName): - let base = enumName.components(separatedBy: ".").last ?? enumName - let caseIdVar = scope.variable("enumCaseId") - printer.write("let \(caseIdVar);") - printer.write("if (\(isSomeVar)) {") - printer.indent { - printer.write( - "\(caseIdVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lower(\(value));" - ) - scope.emitPushI32Parameter(caseIdVar, printer: printer) - } - printer.write("} else {") - printer.indent { - scope.emitPushI32Parameter("0", printer: printer) - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - default: - let wrappedFragment = try structFieldLowerFragment( - field: ExportedProperty( - name: field.name, - type: wrappedType, - isReadonly: true, - isStatic: false - ), - allStructs: allStructs - ) - let guardedPrinter = CodeFragmentPrinter() - _ = try wrappedFragment.printCode( - [value], - context.with(\.printer, guardedPrinter) - ) - var loweredLines = guardedPrinter.lines - var hoistedCleanupVar: String? - if let first = loweredLines.first { - let trimmed = first.trimmingCharacters(in: .whitespaces) - if trimmed.hasPrefix("const "), - let namePart = trimmed.split(separator: " ").dropFirst().first, - trimmed.contains("= []") - { - hoistedCleanupVar = String(namePart) - loweredLines[0] = "\(hoistedCleanupVar!) = [];" - } - } - if let hoistedName = hoistedCleanupVar { - printer.write("let \(hoistedName);") - } - printer.write("if (\(isSomeVar)) {") - printer.indent { - for line in loweredLines { - printer.write(line) - } - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - } return [] } - } + ) + } + + let innerFragment = try structFieldLowerFragment( + type: wrappedType, + fieldName: fieldName, + allStructs: allStructs + ) + return stackOptionalLower( + wrappedType: wrappedType, + kind: kind, + innerFragment: innerFragment ) case .swiftStruct(let nestedName): return IntrinsicJSFragment( @@ -3098,61 +2548,17 @@ struct IntrinsicJSFragment: Sendable { parameters: ["value"], printCode: { arguments, context in context.printer.write( - "throw new Error(\"Unsupported struct field type for lowering: \(field.type)\");" + "throw new Error(\"Unsupported struct field type for lowering: \(type)\");" ) return [] } ) default: - return try stackLowerFragment(elementType: field.type) + return try stackLowerFragment(elementType: type) } } /// Helper to push optional primitive values to stack-based parameters - private static func pushOptionalPrimitive( - value: String, - isSomeVar: String, - stack: StackType, - convert: String?, - zeroValue: String, - printer: CodeFragmentPrinter, - scope: JSGlueVariableScope - ) { - let stackName: String - switch stack { - case .i32Stack: stackName = JSGlueVariableScope.reservedI32Stack - case .f32Stack: stackName = JSGlueVariableScope.reservedF32Stack - case .f64Stack: stackName = JSGlueVariableScope.reservedF64Stack - } - - printer.write("if (\(isSomeVar)) {") - printer.indent { - let converted: String - if let convert = convert { - if convert.starts(with: "Math.") { - converted = "\(convert)(\(value))" - } else { - converted = "\(value) \(convert)" - } - } else { - converted = value - } - printer.write("\(stackName).push(\(converted));") - } - printer.write("} else {") - printer.indent { - printer.write("\(stackName).push(\(zeroValue));") - } - printer.write("}") - scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer) - } - - private enum StackType { - case i32Stack - case f32Stack - case f64Stack - } - private static func structFieldLiftFragment( field: ExportedProperty, allStructs: [ExportedStruct] @@ -3177,7 +2583,7 @@ struct IntrinsicJSFragment: Sendable { let caseIdVar = scope.variable("enumCaseId") printer.write("const \(caseIdVar) = \(scope.popI32());") printer.write( - "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar), );" + "\(optVar) = \(JSGlueVariableScope.reservedEnumHelpers).\(base).lift(\(caseIdVar));" ) } else { let wrappedFragment = try structFieldLiftFragment( @@ -3255,3 +2661,221 @@ struct IntrinsicJSFragment: Sendable { } } } + +// MARK: - Local type helpers + +fileprivate extension WasmCoreType { + var jsZeroLiteral: String { + switch self { + case .f32, .f64: return "0.0" + case .i32, .i64, .pointer: return "0" + } + } +} + +private enum OptionalConvention: Equatable { + case stackABI + case inlineFlag + case sideChannelReturn(OptionalSideChannel) +} + +private enum OptionalSideChannel: Equatable { + case none + case storage + case retainedObject +} + +private enum NilSentinel: Equatable { + case none + case i32(Int32) + case pointer + + var jsLiteral: String { + switch self { + case .none: fatalError("No sentinel value for .none") + case .i32(let value): return "\(value)" + case .pointer: return "0" + } + } + + var hasSentinel: Bool { + self != .none + } +} + +private enum OptionalScalarKind: String { + case bool, int, float, double + + var storageName: String { "tmpRetOptional\(rawValue.prefix(1).uppercased())\(rawValue.dropFirst())" } + var funcName: String { "swift_js_return_optional_\(rawValue)" } +} + +private extension BridgeType { + var optionalConvention: OptionalConvention { + switch self { + case .bool: + return .inlineFlag + case .int, .uint: + return .sideChannelReturn(.none) + case .float: + return .sideChannelReturn(.none) + case .double: + return .sideChannelReturn(.none) + case .string: + return .sideChannelReturn(.storage) + case .jsObject: + return .sideChannelReturn(.retainedObject) + case .jsValue: + return .inlineFlag + case .swiftHeapObject: + return .inlineFlag + case .unsafePointer: + return .inlineFlag + case .swiftProtocol: + return .sideChannelReturn(.retainedObject) + case .caseEnum: + return .inlineFlag + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return .sideChannelReturn(.storage) + case .float, .double: + return .sideChannelReturn(.none) + case .bool: + return .inlineFlag + case .int, .int32, .int64, .uint, .uint32, .uint64: + return .sideChannelReturn(.none) + } + case .associatedValueEnum: + return .inlineFlag + case .closure: + return .inlineFlag + case .swiftStruct, .array, .dictionary, .void, .namespaceEnum: + return .stackABI + case .nullable(let wrapped, _): + return wrapped.optionalConvention + } + } + + var nilSentinel: NilSentinel { + switch self { + case .jsObject, .swiftProtocol: + return .i32(0) + case .swiftHeapObject: + return .pointer + case .caseEnum, .associatedValueEnum: + return .i32(-1) + case .nullable(let wrapped, _): + return wrapped.nilSentinel + default: + return .none + } + } + + var optionalScalarKind: OptionalScalarKind? { + switch self { + case .bool, .rawValueEnum(_, .bool): return .bool + case .int, .uint, .caseEnum, + .rawValueEnum(_, .int), .rawValueEnum(_, .int32), .rawValueEnum(_, .int64), + .rawValueEnum(_, .uint), .rawValueEnum(_, .uint32), .rawValueEnum(_, .uint64): + return .int + case .float, .rawValueEnum(_, .float): return .float + case .double, .rawValueEnum(_, .double): return .double + case .nullable(let wrapped, _): return wrapped.optionalScalarKind + default: return nil + } + } + + var wasmParams: [(name: String, type: WasmCoreType)] { + switch self { + case .bool, .int, .uint: + return [("value", .i32)] + case .float: + return [("value", .f32)] + case .double: + return [("value", .f64)] + case .string: + return [("bytes", .i32), ("length", .i32)] + case .jsObject: + return [("value", .i32)] + case .jsValue: + return [("kind", .i32), ("payload1", .i32), ("payload2", .f64)] + case .swiftHeapObject: + return [("pointer", .pointer)] + case .unsafePointer: + return [("pointer", .pointer)] + case .swiftProtocol: + return [("value", .i32)] + case .caseEnum: + return [("value", .i32)] + case .rawValueEnum(_, let rawType): + switch rawType { + case .string: + return [("bytes", .i32), ("length", .i32)] + case .float: + return [("value", .f32)] + case .double: + return [("value", .f64)] + case .bool, .int, .int32, .int64, .uint, .uint32, .uint64: + return [("value", .i32)] + } + case .associatedValueEnum: + return [("caseId", .i32)] + case .closure: + return [("funcRef", .i32)] + case .void, .namespaceEnum, .swiftStruct, .array, .dictionary: + return [] + case .nullable(let wrapped, _): + return wrapped.wasmParams + } + } + + var isSingleParamScalar: Bool { + switch self { + case .bool, .int, .uint, .float, .double, .unsafePointer, .caseEnum: return true + case .rawValueEnum(_, let rawType): return rawType != .string + default: return false + } + } + + var stackLowerCoerce: String? { + switch self { + case .bool, .rawValueEnum(_, .bool): return "$0 ? 1 : 0" + case .int, .uint, .unsafePointer, .caseEnum, + .rawValueEnum(_, .int), .rawValueEnum(_, .int32), .rawValueEnum(_, .int64), + .rawValueEnum(_, .uint), .rawValueEnum(_, .uint32), .rawValueEnum(_, .uint64): + return "($0 | 0)" + case .float, .rawValueEnum(_, .float): return "Math.fround($0)" + case .double, .rawValueEnum(_, .double): return nil + default: return nil + } + } + + var liftCoerce: String? { + switch self { + case .bool, .rawValueEnum(_, .bool): return "$0 !== 0" + case .uint: return "$0 >>> 0" + default: return nil + } + } + + var lowerCoerce: String? { + switch self { + case .bool, .rawValueEnum(_, .bool): return "$0 ? 1 : 0" + default: return nil + } + } + + var varHint: String { + switch self { + case .bool: return "bool" + case .int, .uint: return "int" + case .float: return "f32" + case .double: return "f64" + case .unsafePointer: return "pointer" + case .caseEnum: return "caseId" + case .rawValueEnum: return "rawValue" + default: return "value" + } + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index ba25b6ff9..dab5fae33 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -1208,7 +1208,6 @@ extension BridgeType { } extension WasmCoreType { - /// Returns a Swift statement that returns a placeholder value for this Wasm core type. public var swiftReturnPlaceholderStmt: String { switch self { case .i32: return "return 0" diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index e7bdf975b..b206b9a9f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -41,19 +41,17 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createPointHelpers = () => { - return () => ({ - lower: (value) => { - f64Stack.push(value.x); - f64Stack.push(value.y); - }, - lift: () => { - const f64 = f64Stack.pop(); - const f641 = f64Stack.pop(); - return { x: f641, y: f64 }; - } - }); - }; + const __bjs_createPointHelpers = () => ({ + lower: (value) => { + f64Stack.push(value.x); + f64Stack.push(value.y); + }, + lift: () => { + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + return { x: f641, y: f64 }; + } + }); return { /** @@ -370,7 +368,7 @@ export async function createInstantiator(options, swift) { } } - const PointHelpers = __bjs_createPointHelpers()(); + const PointHelpers = __bjs_createPointHelpers(); structHelpers.Point = PointHelpers; const exports = { @@ -638,7 +636,6 @@ export async function createInstantiator(options, swift) { const isSome = elem != null ? 1 : 0; if (isSome) { structHelpers.Point.lower(elem); - } else { } i32Stack.push(isSome); } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index 0538b8078..a865882ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -34,46 +34,42 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createConfigHelpers = () => { - return () => ({ - lower: (value) => { - const bytes = textEncoder.encode(value.name); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - i32Stack.push((value.value | 0)); - i32Stack.push(value.enabled ? 1 : 0); - }, - lift: () => { - const bool = i32Stack.pop() !== 0; - const int = i32Stack.pop(); - const string = strStack.pop(); - return { name: string, value: int, enabled: bool }; - } - }); - }; - const __bjs_createMathOperationsHelpers = () => { - return () => ({ - lower: (value) => { - f64Stack.push(value.baseValue); - }, - lift: () => { - const f64 = f64Stack.pop(); - const instance1 = { baseValue: f64 }; - instance1.add = function(a, b = 10.0) { - structHelpers.MathOperations.lower(this); - const ret = instance.exports.bjs_MathOperations_add(a, b); - return ret; - }.bind(instance1); - instance1.multiply = function(a, b) { - structHelpers.MathOperations.lower(this); - const ret = instance.exports.bjs_MathOperations_multiply(a, b); - return ret; - }.bind(instance1); - return instance1; - } - }); - }; + const __bjs_createConfigHelpers = () => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.name); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.value | 0)); + i32Stack.push(value.enabled ? 1 : 0); + }, + lift: () => { + const bool = i32Stack.pop() !== 0; + const int = i32Stack.pop(); + const string = strStack.pop(); + return { name: string, value: int, enabled: bool }; + } + }); + const __bjs_createMathOperationsHelpers = () => ({ + lower: (value) => { + f64Stack.push(value.baseValue); + }, + lift: () => { + const f64 = f64Stack.pop(); + const instance1 = { baseValue: f64 }; + instance1.add = function(a, b = 10.0) { + structHelpers.MathOperations.lower(this); + const ret = instance.exports.bjs_MathOperations_add(a, b); + return ret; + }.bind(instance1); + instance1.multiply = function(a, b) { + structHelpers.MathOperations.lower(this); + const ret = instance.exports.bjs_MathOperations_multiply(a, b); + return ret; + }.bind(instance1); + return instance1; + } + }); return { /** @@ -343,12 +339,17 @@ export async function createInstantiator(options, swift) { const nameBytes = textEncoder.encode(name); const nameId = swift.memory.retain(nameBytes); const isSome = tag != null; - let tagId, tagBytes; + let result, result1; if (isSome) { - tagBytes = textEncoder.encode(tag); - tagId = swift.memory.retain(tagBytes); + const tagBytes = textEncoder.encode(tag); + const tagId = swift.memory.retain(tagBytes); + result = tagId; + result1 = tagBytes.length; + } else { + result = 0; + result1 = 0; } - const ret = instance.exports.bjs_ConstructorDefaults_init(nameId, nameBytes.length, count, enabled, status, +isSome, isSome ? tagId : 0, isSome ? tagBytes.length : 0); + const ret = instance.exports.bjs_ConstructorDefaults_init(nameId, nameBytes.length, count, enabled, status, +isSome, result, result1); return ConstructorDefaults.__construct(ret); } get name() { @@ -391,18 +392,23 @@ export async function createInstantiator(options, swift) { } set tag(value) { const isSome = value != null; - let valueId, valueBytes; + let result, result1; if (isSome) { - valueBytes = textEncoder.encode(value); - valueId = swift.memory.retain(valueBytes); + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + result = valueId; + result1 = valueBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_ConstructorDefaults_tag_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + instance.exports.bjs_ConstructorDefaults_tag_set(this.pointer, +isSome, result, result1); } } - const ConfigHelpers = __bjs_createConfigHelpers()(); + const ConfigHelpers = __bjs_createConfigHelpers(); structHelpers.Config = ConfigHelpers; - const MathOperationsHelpers = __bjs_createMathOperationsHelpers()(); + const MathOperationsHelpers = __bjs_createMathOperationsHelpers(); structHelpers.MathOperations = MathOperationsHelpers; const exports = { @@ -435,24 +441,34 @@ export async function createInstantiator(options, swift) { }, testOptionalDefault: function bjs_testOptionalDefault(name = null) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_testOptionalDefault(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_testOptionalDefault(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, testOptionalStringDefault: function bjs_testOptionalStringDefault(greeting = "Hi") { const isSome = greeting != null; - let greetingId, greetingBytes; + let result, result1; if (isSome) { - greetingBytes = textEncoder.encode(greeting); - greetingId = swift.memory.retain(greetingBytes); + const greetingBytes = textEncoder.encode(greeting); + const greetingId = swift.memory.retain(greetingBytes); + result = greetingId; + result1 = greetingBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_testOptionalStringDefault(+isSome, isSome ? greetingId : 0, isSome ? greetingBytes.length : 0); + instance.exports.bjs_testOptionalStringDefault(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; @@ -485,12 +501,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(+isSome); instance.exports.bjs_testOptionalStructDefault(); const isSome1 = i32Stack.pop(); - let optResult; - if (isSome1) { - optResult = structHelpers.Config.lift(); - } else { - optResult = null; - } + const optResult = isSome1 ? structHelpers.Config.lift() : null; return optResult; }, testOptionalStructWithValueDefault: function bjs_testOptionalStructWithValueDefault(point = { name: "default", value: 42, enabled: true }) { @@ -501,12 +512,7 @@ export async function createInstantiator(options, swift) { i32Stack.push(+isSome); instance.exports.bjs_testOptionalStructWithValueDefault(); const isSome1 = i32Stack.pop(); - let optResult; - if (isSome1) { - optResult = structHelpers.Config.lift(); - } else { - optResult = null; - } + const optResult = isSome1 ? structHelpers.Config.lift() : null; return optResult; }, testIntArrayDefault: function bjs_testIntArrayDefault(values = [1, 2, 3]) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 43cc9f964..55967a6a3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -109,528 +109,640 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createPointHelpers = () => { - return () => ({ - lower: (value) => { - f64Stack.push(value.x); - f64Stack.push(value.y); - }, - lift: () => { - const f64 = f64Stack.pop(); - const f641 = f64Stack.pop(); - return { x: f641, y: f64 }; + const __bjs_createPointHelpers = () => ({ + lower: (value) => { + f64Stack.push(value.x); + f64Stack.push(value.y); + }, + lift: () => { + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + return { x: f641, y: f64 }; + } + }); + const __bjs_createAPIResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return APIResultValues.Tag.Success; + } + case APIResultValues.Tag.Failure: { + i32Stack.push((value.param0 | 0)); + return APIResultValues.Tag.Failure; + } + case APIResultValues.Tag.Flag: { + i32Stack.push(value.param0 ? 1 : 0); + return APIResultValues.Tag.Flag; + } + case APIResultValues.Tag.Rate: { + f32Stack.push(Math.fround(value.param0)); + return APIResultValues.Tag.Rate; + } + case APIResultValues.Tag.Precise: { + f64Stack.push(value.param0); + return APIResultValues.Tag.Precise; + } + case APIResultValues.Tag.Info: { + return APIResultValues.Tag.Info; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } - }); - }; - const __bjs_createAPIResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return APIResultValues.Tag.Success; - } - case APIResultValues.Tag.Failure: { - i32Stack.push((value.param0 | 0)); - return APIResultValues.Tag.Failure; - } - case APIResultValues.Tag.Flag: { - i32Stack.push(value.param0 ? 1 : 0); - return APIResultValues.Tag.Flag; - } - case APIResultValues.Tag.Rate: { - f32Stack.push(Math.fround(value.param0)); - return APIResultValues.Tag.Rate; - } - case APIResultValues.Tag.Precise: { - f64Stack.push(value.param0); - return APIResultValues.Tag.Precise; - } - case APIResultValues.Tag.Info: { - return APIResultValues.Tag.Info; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = i32Stack.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - case APIResultValues.Tag.Flag: { - const bool = i32Stack.pop() !== 0; - return { tag: APIResultValues.Tag.Flag, param0: bool }; - } - case APIResultValues.Tag.Rate: { - const f32 = f32Stack.pop(); - return { tag: APIResultValues.Tag.Rate, param0: f32 }; - } - case APIResultValues.Tag.Precise: { - const f64 = f64Stack.pop(); - return { tag: APIResultValues.Tag.Precise, param0: f64 }; - } - case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + case APIResultValues.Tag.Failure: { + const int = i32Stack.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + case APIResultValues.Tag.Flag: { + const bool = i32Stack.pop() !== 0; + return { tag: APIResultValues.Tag.Flag, param0: bool }; + } + case APIResultValues.Tag.Rate: { + const f32 = f32Stack.pop(); + return { tag: APIResultValues.Tag.Rate, param0: f32 }; + } + case APIResultValues.Tag.Precise: { + const f64 = f64Stack.pop(); + return { tag: APIResultValues.Tag.Precise, param0: f64 }; } + case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); } - }); - }; - const __bjs_createComplexResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ComplexResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return ComplexResultValues.Tag.Success; - } - case ComplexResultValues.Tag.Error: { - i32Stack.push((value.param1 | 0)); + } + }); + const __bjs_createComplexResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ComplexResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return ComplexResultValues.Tag.Success; + } + case ComplexResultValues.Tag.Error: { + i32Stack.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return ComplexResultValues.Tag.Error; + } + case ComplexResultValues.Tag.Status: { + const bytes = textEncoder.encode(value.param2); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.param1 | 0)); + i32Stack.push(value.param0 ? 1 : 0); + return ComplexResultValues.Tag.Status; + } + case ComplexResultValues.Tag.Coordinates: { + f64Stack.push(value.param2); + f64Stack.push(value.param1); + f64Stack.push(value.param0); + return ComplexResultValues.Tag.Coordinates; + } + case ComplexResultValues.Tag.Comprehensive: { + const bytes = textEncoder.encode(value.param8); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + const bytes1 = textEncoder.encode(value.param7); + const id1 = swift.memory.retain(bytes1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); + const bytes2 = textEncoder.encode(value.param6); + const id2 = swift.memory.retain(bytes2); + i32Stack.push(bytes2.length); + i32Stack.push(id2); + f64Stack.push(value.param5); + f64Stack.push(value.param4); + i32Stack.push((value.param3 | 0)); + i32Stack.push((value.param2 | 0)); + i32Stack.push(value.param1 ? 1 : 0); + i32Stack.push(value.param0 ? 1 : 0); + return ComplexResultValues.Tag.Comprehensive; + } + case ComplexResultValues.Tag.Info: { + return ComplexResultValues.Tag.Info; + } + default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case ComplexResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: ComplexResultValues.Tag.Success, param0: string }; + } + case ComplexResultValues.Tag.Error: { + const int = i32Stack.pop(); + const string = strStack.pop(); + return { tag: ComplexResultValues.Tag.Error, param0: string, param1: int }; + } + case ComplexResultValues.Tag.Status: { + const string = strStack.pop(); + const int = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; + return { tag: ComplexResultValues.Tag.Status, param0: bool, param1: int, param2: string }; + } + case ComplexResultValues.Tag.Coordinates: { + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + const f642 = f64Stack.pop(); + return { tag: ComplexResultValues.Tag.Coordinates, param0: f642, param1: f641, param2: f64 }; + } + case ComplexResultValues.Tag.Comprehensive: { + const string = strStack.pop(); + const string1 = strStack.pop(); + const string2 = strStack.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + const int = i32Stack.pop(); + const int1 = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; + const bool1 = i32Stack.pop() !== 0; + return { tag: ComplexResultValues.Tag.Comprehensive, param0: bool1, param1: bool, param2: int1, param3: int, param4: f641, param5: f64, param6: string2, param7: string1, param8: string }; + } + case ComplexResultValues.Tag.Info: return { tag: ComplexResultValues.Tag.Info }; + default: throw new Error("Unknown ComplexResultValues tag returned from Swift: " + String(tag)); + } + } + }); + const __bjs_createResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return ResultValues.Tag.Success; + } + case ResultValues.Tag.Failure: { + i32Stack.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return ResultValues.Tag.Failure; + } + case ResultValues.Tag.Status: { + const bytes = textEncoder.encode(value.param2); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.param1 | 0)); + i32Stack.push(value.param0 ? 1 : 0); + return ResultValues.Tag.Status; + } + default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case ResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: ResultValues.Tag.Success, param0: string }; + } + case ResultValues.Tag.Failure: { + const int = i32Stack.pop(); + const string = strStack.pop(); + return { tag: ResultValues.Tag.Failure, param0: string, param1: int }; + } + case ResultValues.Tag.Status: { + const string = strStack.pop(); + const int = i32Stack.pop(); + const bool = i32Stack.pop() !== 0; + return { tag: ResultValues.Tag.Status, param0: bool, param1: int, param2: string }; + } + default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + } + } + }); + const __bjs_createNetworkingResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case NetworkingResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return NetworkingResultValues.Tag.Success; + } + case NetworkingResultValues.Tag.Failure: { + i32Stack.push((value.param1 | 0)); + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return NetworkingResultValues.Tag.Failure; + } + default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case NetworkingResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: NetworkingResultValues.Tag.Success, param0: string }; + } + case NetworkingResultValues.Tag.Failure: { + const int = i32Stack.pop(); + const string = strStack.pop(); + return { tag: NetworkingResultValues.Tag.Failure, param0: string, param1: int }; + } + default: throw new Error("Unknown NetworkingResultValues tag returned from Swift: " + String(tag)); + } + } + }); + const __bjs_createAPIOptionalResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIOptionalResultValues.Tag.Success: { + const isSome = value.param0 != null; + if (isSome) { const bytes = textEncoder.encode(value.param0); const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - return ComplexResultValues.Tag.Error; + } else { + i32Stack.push(0); + i32Stack.push(0); } - case ComplexResultValues.Tag.Status: { + i32Stack.push(isSome ? 1 : 0); + return APIOptionalResultValues.Tag.Success; + } + case APIOptionalResultValues.Tag.Failure: { + const isSome = value.param1 != null; + i32Stack.push(isSome ? (value.param1 ? 1 : 0) : 0); + i32Stack.push(isSome ? 1 : 0); + const isSome1 = value.param0 != null; + i32Stack.push(isSome1 ? (value.param0 | 0) : 0); + i32Stack.push(isSome1 ? 1 : 0); + return APIOptionalResultValues.Tag.Failure; + } + case APIOptionalResultValues.Tag.Status: { + const isSome = value.param2 != null; + if (isSome) { const bytes = textEncoder.encode(value.param2); const id = swift.memory.retain(bytes); i32Stack.push(bytes.length); i32Stack.push(id); - i32Stack.push((value.param1 | 0)); - i32Stack.push(value.param0 ? 1 : 0); - return ComplexResultValues.Tag.Status; - } - case ComplexResultValues.Tag.Coordinates: { - f64Stack.push(value.param2); - f64Stack.push(value.param1); - f64Stack.push(value.param0); - return ComplexResultValues.Tag.Coordinates; - } - case ComplexResultValues.Tag.Comprehensive: { - const bytes = textEncoder.encode(value.param8); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - const bytes1 = textEncoder.encode(value.param7); - const id1 = swift.memory.retain(bytes1); - i32Stack.push(bytes1.length); - i32Stack.push(id1); - const bytes2 = textEncoder.encode(value.param6); - const id2 = swift.memory.retain(bytes2); - i32Stack.push(bytes2.length); - i32Stack.push(id2); - f64Stack.push(value.param5); - f64Stack.push(value.param4); - i32Stack.push((value.param3 | 0)); - i32Stack.push((value.param2 | 0)); - i32Stack.push(value.param1 ? 1 : 0); - i32Stack.push(value.param0 ? 1 : 0); - return ComplexResultValues.Tag.Comprehensive; - } - case ComplexResultValues.Tag.Info: { - return ComplexResultValues.Tag.Info; - } - default: throw new Error("Unknown ComplexResultValues tag: " + String(enumTag)); + } else { + i32Stack.push(0); + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + const isSome1 = value.param1 != null; + i32Stack.push(isSome1 ? (value.param1 | 0) : 0); + i32Stack.push(isSome1 ? 1 : 0); + const isSome2 = value.param0 != null; + i32Stack.push(isSome2 ? (value.param0 ? 1 : 0) : 0); + i32Stack.push(isSome2 ? 1 : 0); + return APIOptionalResultValues.Tag.Status; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case ComplexResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: ComplexResultValues.Tag.Success, param0: string }; - } - case ComplexResultValues.Tag.Error: { - const int = i32Stack.pop(); + default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case APIOptionalResultValues.Tag.Success: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const string = strStack.pop(); - return { tag: ComplexResultValues.Tag.Error, param0: string, param1: int }; + optional = string; + } else { + optional = null; } - case ComplexResultValues.Tag.Status: { - const string = strStack.pop(); - const int = i32Stack.pop(); + return { tag: APIOptionalResultValues.Tag.Success, param0: optional }; + } + case APIOptionalResultValues.Tag.Failure: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const bool = i32Stack.pop() !== 0; - return { tag: ComplexResultValues.Tag.Status, param0: bool, param1: int, param2: string }; - } - case ComplexResultValues.Tag.Coordinates: { - const f64 = f64Stack.pop(); - const f641 = f64Stack.pop(); - const f642 = f64Stack.pop(); - return { tag: ComplexResultValues.Tag.Coordinates, param0: f642, param1: f641, param2: f64 }; + optional = bool; + } else { + optional = null; } - case ComplexResultValues.Tag.Comprehensive: { - const string = strStack.pop(); - const string1 = strStack.pop(); - const string2 = strStack.pop(); - const f64 = f64Stack.pop(); - const f641 = f64Stack.pop(); + const isSome1 = i32Stack.pop(); + let optional1; + if (isSome1) { const int = i32Stack.pop(); - const int1 = i32Stack.pop(); - const bool = i32Stack.pop() !== 0; - const bool1 = i32Stack.pop() !== 0; - return { tag: ComplexResultValues.Tag.Comprehensive, param0: bool1, param1: bool, param2: int1, param3: int, param4: f641, param5: f64, param6: string2, param7: string1, param8: string }; - } - case ComplexResultValues.Tag.Info: return { tag: ComplexResultValues.Tag.Info }; - default: throw new Error("Unknown ComplexResultValues tag returned from Swift: " + String(tag)); - } - } - }); - }; - const __bjs_createResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return ResultValues.Tag.Success; - } - case ResultValues.Tag.Failure: { - i32Stack.push((value.param1 | 0)); - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return ResultValues.Tag.Failure; - } - case ResultValues.Tag.Status: { - const bytes = textEncoder.encode(value.param2); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - i32Stack.push((value.param1 | 0)); - i32Stack.push(value.param0 ? 1 : 0); - return ResultValues.Tag.Status; + optional1 = int; + } else { + optional1 = null; } - default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + return { tag: APIOptionalResultValues.Tag.Failure, param0: optional1, param1: optional }; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case ResultValues.Tag.Success: { + case APIOptionalResultValues.Tag.Status: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const string = strStack.pop(); - return { tag: ResultValues.Tag.Success, param0: string }; + optional = string; + } else { + optional = null; } - case ResultValues.Tag.Failure: { + const isSome1 = i32Stack.pop(); + let optional1; + if (isSome1) { const int = i32Stack.pop(); - const string = strStack.pop(); - return { tag: ResultValues.Tag.Failure, param0: string, param1: int }; + optional1 = int; + } else { + optional1 = null; } - case ResultValues.Tag.Status: { - const string = strStack.pop(); - const int = i32Stack.pop(); + const isSome2 = i32Stack.pop(); + let optional2; + if (isSome2) { const bool = i32Stack.pop() !== 0; - return { tag: ResultValues.Tag.Status, param0: bool, param1: int, param2: string }; + optional2 = bool; + } else { + optional2 = null; } - default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + return { tag: APIOptionalResultValues.Tag.Status, param0: optional2, param1: optional1, param2: optional }; } + default: throw new Error("Unknown APIOptionalResultValues tag returned from Swift: " + String(tag)); } - }); - }; - const __bjs_createNetworkingResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case NetworkingResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return NetworkingResultValues.Tag.Success; - } - case NetworkingResultValues.Tag.Failure: { - i32Stack.push((value.param1 | 0)); - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return NetworkingResultValues.Tag.Failure; - } - default: throw new Error("Unknown NetworkingResultValues tag: " + String(enumTag)); + } + }); + const __bjs_createTypedPayloadResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case TypedPayloadResultValues.Tag.Precision: { + f32Stack.push(Math.fround(value.param0)); + return TypedPayloadResultValues.Tag.Precision; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case NetworkingResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: NetworkingResultValues.Tag.Success, param0: string }; - } - case NetworkingResultValues.Tag.Failure: { - const int = i32Stack.pop(); - const string = strStack.pop(); - return { tag: NetworkingResultValues.Tag.Failure, param0: string, param1: int }; - } - default: throw new Error("Unknown NetworkingResultValues tag returned from Swift: " + String(tag)); + case TypedPayloadResultValues.Tag.Direction: { + i32Stack.push((value.param0 | 0)); + return TypedPayloadResultValues.Tag.Direction; } - } - }); - }; - const __bjs_createAPIOptionalResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIOptionalResultValues.Tag.Success: { - const isSome = value.param0 != null; - let id; - if (isSome) { - let bytes = textEncoder.encode(value.param0); - id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - } else { - i32Stack.push(0); - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - return APIOptionalResultValues.Tag.Success; - } - case APIOptionalResultValues.Tag.Failure: { - const isSome = value.param1 != null; - i32Stack.push(isSome ? (value.param1 ? 1 : 0) : 0); - i32Stack.push(isSome ? 1 : 0); - const isSome1 = value.param0 != null; - i32Stack.push(isSome1 ? (value.param0 | 0) : 0); - i32Stack.push(isSome1 ? 1 : 0); - return APIOptionalResultValues.Tag.Failure; - } - case APIOptionalResultValues.Tag.Status: { - const isSome = value.param2 != null; - let id; - if (isSome) { - let bytes = textEncoder.encode(value.param2); - id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - } else { - i32Stack.push(0); - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - const isSome1 = value.param1 != null; - i32Stack.push(isSome1 ? (value.param1 | 0) : 0); - i32Stack.push(isSome1 ? 1 : 0); - const isSome2 = value.param0 != null; - i32Stack.push(isSome2 ? (value.param0 ? 1 : 0) : 0); - i32Stack.push(isSome2 ? 1 : 0); - return APIOptionalResultValues.Tag.Status; - } - default: throw new Error("Unknown APIOptionalResultValues tag: " + String(enumTag)); - } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case APIOptionalResultValues.Tag.Success: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const string = strStack.pop(); - optional = string; - } else { - optional = null; - } - return { tag: APIOptionalResultValues.Tag.Success, param0: optional }; - } - case APIOptionalResultValues.Tag.Failure: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const bool = i32Stack.pop() !== 0; - optional = bool; - } else { - optional = null; - } - const isSome1 = i32Stack.pop(); - let optional1; - if (isSome1) { - const int = i32Stack.pop(); - optional1 = int; - } else { - optional1 = null; - } - return { tag: APIOptionalResultValues.Tag.Failure, param0: optional1, param1: optional }; - } - case APIOptionalResultValues.Tag.Status: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const string = strStack.pop(); - optional = string; - } else { - optional = null; - } - const isSome1 = i32Stack.pop(); - let optional1; - if (isSome1) { - const int = i32Stack.pop(); - optional1 = int; - } else { - optional1 = null; - } - const isSome2 = i32Stack.pop(); - let optional2; - if (isSome2) { - const bool = i32Stack.pop() !== 0; - optional2 = bool; - } else { - optional2 = null; - } - return { tag: APIOptionalResultValues.Tag.Status, param0: optional2, param1: optional1, param2: optional }; - } - default: throw new Error("Unknown APIOptionalResultValues tag returned from Swift: " + String(tag)); + case TypedPayloadResultValues.Tag.OptPrecision: { + const isSome = value.param0 != null; + f32Stack.push(isSome ? Math.fround(value.param0) : 0.0); + i32Stack.push(isSome ? 1 : 0); + return TypedPayloadResultValues.Tag.OptPrecision; + } + case TypedPayloadResultValues.Tag.OptDirection: { + const isSome = value.param0 != null; + i32Stack.push(isSome ? (value.param0 | 0) : 0); + i32Stack.push(isSome ? 1 : 0); + return TypedPayloadResultValues.Tag.OptDirection; + } + case TypedPayloadResultValues.Tag.Empty: { + return TypedPayloadResultValues.Tag.Empty; } + default: throw new Error("Unknown TypedPayloadResultValues tag: " + String(enumTag)); } - }); - }; - const __bjs_createTypedPayloadResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case TypedPayloadResultValues.Tag.Precision: { - f32Stack.push(Math.fround(value.param0)); - return TypedPayloadResultValues.Tag.Precision; - } - case TypedPayloadResultValues.Tag.Direction: { - i32Stack.push((value.param0 | 0)); - return TypedPayloadResultValues.Tag.Direction; - } - case TypedPayloadResultValues.Tag.OptPrecision: { - const isSome = value.param0 != null; - f32Stack.push(isSome ? Math.fround(value.param0) : 0.0); - i32Stack.push(isSome ? 1 : 0); - return TypedPayloadResultValues.Tag.OptPrecision; - } - case TypedPayloadResultValues.Tag.OptDirection: { - const isSome = value.param0 != null; - i32Stack.push(isSome ? (value.param0 | 0) : 0); - i32Stack.push(isSome ? 1 : 0); - return TypedPayloadResultValues.Tag.OptDirection; - } - case TypedPayloadResultValues.Tag.Empty: { - return TypedPayloadResultValues.Tag.Empty; - } - default: throw new Error("Unknown TypedPayloadResultValues tag: " + String(enumTag)); + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case TypedPayloadResultValues.Tag.Precision: { + const rawValue = f32Stack.pop(); + return { tag: TypedPayloadResultValues.Tag.Precision, param0: rawValue }; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case TypedPayloadResultValues.Tag.Precision: { + case TypedPayloadResultValues.Tag.Direction: { + const caseId = i32Stack.pop(); + return { tag: TypedPayloadResultValues.Tag.Direction, param0: caseId }; + } + case TypedPayloadResultValues.Tag.OptPrecision: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const rawValue = f32Stack.pop(); - return { tag: TypedPayloadResultValues.Tag.Precision, param0: rawValue }; + optional = rawValue; + } else { + optional = null; } - case TypedPayloadResultValues.Tag.Direction: { + return { tag: TypedPayloadResultValues.Tag.OptPrecision, param0: optional }; + } + case TypedPayloadResultValues.Tag.OptDirection: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const caseId = i32Stack.pop(); - return { tag: TypedPayloadResultValues.Tag.Direction, param0: caseId }; + optional = caseId; + } else { + optional = null; } - case TypedPayloadResultValues.Tag.OptPrecision: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const rawValue = f32Stack.pop(); - optional = rawValue; - } else { - optional = null; - } - return { tag: TypedPayloadResultValues.Tag.OptPrecision, param0: optional }; + return { tag: TypedPayloadResultValues.Tag.OptDirection, param0: optional }; + } + case TypedPayloadResultValues.Tag.Empty: return { tag: TypedPayloadResultValues.Tag.Empty }; + default: throw new Error("Unknown TypedPayloadResultValues tag returned from Swift: " + String(tag)); + } + } + }); + const __bjs_createAllTypesResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case AllTypesResultValues.Tag.StructPayload: { + structHelpers.Point.lower(value.param0); + return AllTypesResultValues.Tag.StructPayload; + } + case AllTypesResultValues.Tag.ClassPayload: { + ptrStack.push(value.param0.pointer); + return AllTypesResultValues.Tag.ClassPayload; + } + case AllTypesResultValues.Tag.JsObjectPayload: { + const objId = swift.memory.retain(value.param0); + i32Stack.push(objId); + return AllTypesResultValues.Tag.JsObjectPayload; + } + case AllTypesResultValues.Tag.NestedEnum: { + const caseId = enumHelpers.APIResult.lower(value.param0); + i32Stack.push(caseId); + return AllTypesResultValues.Tag.NestedEnum; + } + case AllTypesResultValues.Tag.ArrayPayload: { + for (const elem of value.param0) { + i32Stack.push((elem | 0)); } - case TypedPayloadResultValues.Tag.OptDirection: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const caseId = i32Stack.pop(); - optional = caseId; - } else { - optional = null; - } - return { tag: TypedPayloadResultValues.Tag.OptDirection, param0: optional }; + i32Stack.push(value.param0.length); + return AllTypesResultValues.Tag.ArrayPayload; + } + case AllTypesResultValues.Tag.Empty: { + return AllTypesResultValues.Tag.Empty; + } + default: throw new Error("Unknown AllTypesResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case AllTypesResultValues.Tag.StructPayload: { + const struct = structHelpers.Point.lift(); + return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct }; + } + case AllTypesResultValues.Tag.ClassPayload: { + const ptr = ptrStack.pop(); + const obj = _exports['User'].__construct(ptr); + return { tag: AllTypesResultValues.Tag.ClassPayload, param0: obj }; + } + case AllTypesResultValues.Tag.JsObjectPayload: { + const objId = i32Stack.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; + } + case AllTypesResultValues.Tag.NestedEnum: { + const enumValue = enumHelpers.APIResult.lift(i32Stack.pop()); + return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; + } + case AllTypesResultValues.Tag.ArrayPayload: { + const arrayLen = i32Stack.pop(); + const arrayResult = []; + for (let i = 0; i < arrayLen; i++) { + const int = i32Stack.pop(); + arrayResult.push(int); } - case TypedPayloadResultValues.Tag.Empty: return { tag: TypedPayloadResultValues.Tag.Empty }; - default: throw new Error("Unknown TypedPayloadResultValues tag returned from Swift: " + String(tag)); + arrayResult.reverse(); + return { tag: AllTypesResultValues.Tag.ArrayPayload, param0: arrayResult }; } + case AllTypesResultValues.Tag.Empty: return { tag: AllTypesResultValues.Tag.Empty }; + default: throw new Error("Unknown AllTypesResultValues tag returned from Swift: " + String(tag)); } - }); - }; - const __bjs_createAllTypesResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case AllTypesResultValues.Tag.StructPayload: { + } + }); + const __bjs_createOptionalAllTypesResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case OptionalAllTypesResultValues.Tag.OptStruct: { + const isSome = value.param0 != null; + if (isSome) { structHelpers.Point.lower(value.param0); - return AllTypesResultValues.Tag.StructPayload; } - case AllTypesResultValues.Tag.ClassPayload: { + i32Stack.push(isSome ? 1 : 0); + return OptionalAllTypesResultValues.Tag.OptStruct; + } + case OptionalAllTypesResultValues.Tag.OptClass: { + const isSome = value.param0 != null; + if (isSome) { ptrStack.push(value.param0.pointer); - return AllTypesResultValues.Tag.ClassPayload; + } else { + ptrStack.push(0); } - case AllTypesResultValues.Tag.JsObjectPayload: { + i32Stack.push(isSome ? 1 : 0); + return OptionalAllTypesResultValues.Tag.OptClass; + } + case OptionalAllTypesResultValues.Tag.OptJSObject: { + const isSome = value.param0 != null; + if (isSome) { const objId = swift.memory.retain(value.param0); i32Stack.push(objId); - return AllTypesResultValues.Tag.JsObjectPayload; + } else { + i32Stack.push(0); } - case AllTypesResultValues.Tag.NestedEnum: { + i32Stack.push(isSome ? 1 : 0); + return OptionalAllTypesResultValues.Tag.OptJSObject; + } + case OptionalAllTypesResultValues.Tag.OptNestedEnum: { + const isSome = value.param0 != null; + if (isSome) { const caseId = enumHelpers.APIResult.lower(value.param0); i32Stack.push(caseId); - return AllTypesResultValues.Tag.NestedEnum; + } else { + i32Stack.push(0); } - case AllTypesResultValues.Tag.ArrayPayload: { + i32Stack.push(isSome ? 1 : 0); + return OptionalAllTypesResultValues.Tag.OptNestedEnum; + } + case OptionalAllTypesResultValues.Tag.OptArray: { + const isSome = value.param0 != null; + if (isSome) { for (const elem of value.param0) { i32Stack.push((elem | 0)); } i32Stack.push(value.param0.length); - return AllTypesResultValues.Tag.ArrayPayload; } - case AllTypesResultValues.Tag.Empty: { - return AllTypesResultValues.Tag.Empty; - } - default: throw new Error("Unknown AllTypesResultValues tag: " + String(enumTag)); + i32Stack.push(isSome ? 1 : 0); + return OptionalAllTypesResultValues.Tag.OptArray; + } + case OptionalAllTypesResultValues.Tag.Empty: { + return OptionalAllTypesResultValues.Tag.Empty; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case AllTypesResultValues.Tag.StructPayload: { + default: throw new Error("Unknown OptionalAllTypesResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case OptionalAllTypesResultValues.Tag.OptStruct: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const struct = structHelpers.Point.lift(); - return { tag: AllTypesResultValues.Tag.StructPayload, param0: struct }; + optional = struct; + } else { + optional = null; } - case AllTypesResultValues.Tag.ClassPayload: { + return { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptClass: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const ptr = ptrStack.pop(); const obj = _exports['User'].__construct(ptr); - return { tag: AllTypesResultValues.Tag.ClassPayload, param0: obj }; + optional = obj; + } else { + optional = null; } - case AllTypesResultValues.Tag.JsObjectPayload: { + return { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptJSObject: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const objId = i32Stack.pop(); const obj = swift.memory.getObject(objId); swift.memory.release(objId); - return { tag: AllTypesResultValues.Tag.JsObjectPayload, param0: obj }; + optional = obj; + } else { + optional = null; } - case AllTypesResultValues.Tag.NestedEnum: { - const enumValue = enumHelpers.APIResult.lift(i32Stack.pop(), ); - return { tag: AllTypesResultValues.Tag.NestedEnum, param0: enumValue }; + return { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptNestedEnum: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const caseId = i32Stack.pop(); + optional = enumHelpers.APIResult.lift(caseId); + } else { + optional = null; } - case AllTypesResultValues.Tag.ArrayPayload: { + return { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: optional }; + } + case OptionalAllTypesResultValues.Tag.OptArray: { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const arrayLen = i32Stack.pop(); const arrayResult = []; for (let i = 0; i < arrayLen; i++) { @@ -638,152 +750,17 @@ export async function createInstantiator(options, swift) { arrayResult.push(int); } arrayResult.reverse(); - return { tag: AllTypesResultValues.Tag.ArrayPayload, param0: arrayResult }; - } - case AllTypesResultValues.Tag.Empty: return { tag: AllTypesResultValues.Tag.Empty }; - default: throw new Error("Unknown AllTypesResultValues tag returned from Swift: " + String(tag)); - } - } - }); - }; - const __bjs_createOptionalAllTypesResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case OptionalAllTypesResultValues.Tag.OptStruct: { - const isSome = value.param0 != null; - if (isSome) { - structHelpers.Point.lower(value.param0); - } - i32Stack.push(isSome ? 1 : 0); - return OptionalAllTypesResultValues.Tag.OptStruct; - } - case OptionalAllTypesResultValues.Tag.OptClass: { - const isSome = value.param0 != null; - if (isSome) { - ptrStack.push(value.param0.pointer); - } else { - ptrStack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - return OptionalAllTypesResultValues.Tag.OptClass; - } - case OptionalAllTypesResultValues.Tag.OptJSObject: { - const isSome = value.param0 != null; - let id; - if (isSome) { - id = swift.memory.retain(value.param0); - i32Stack.push(id); - } else { - id = undefined; - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - return OptionalAllTypesResultValues.Tag.OptJSObject; - } - case OptionalAllTypesResultValues.Tag.OptNestedEnum: { - const isSome = value.param0 != null; - let enumCaseId; - if (isSome) { - enumCaseId = enumHelpers.APIResult.lower(value.param0); - i32Stack.push(enumCaseId); - } else { - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - return OptionalAllTypesResultValues.Tag.OptNestedEnum; - } - case OptionalAllTypesResultValues.Tag.OptArray: { - const isSome = value.param0 != null; - if (isSome) { - for (const elem of value.param0) { - i32Stack.push((elem | 0)); - } - i32Stack.push(value.param0.length); - } - i32Stack.push(isSome ? 1 : 0); - return OptionalAllTypesResultValues.Tag.OptArray; - } - case OptionalAllTypesResultValues.Tag.Empty: { - return OptionalAllTypesResultValues.Tag.Empty; - } - default: throw new Error("Unknown OptionalAllTypesResultValues tag: " + String(enumTag)); - } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case OptionalAllTypesResultValues.Tag.OptStruct: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const struct = structHelpers.Point.lift(); - optional = struct; - } else { - optional = null; - } - return { tag: OptionalAllTypesResultValues.Tag.OptStruct, param0: optional }; - } - case OptionalAllTypesResultValues.Tag.OptClass: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const ptr = ptrStack.pop(); - const obj = _exports['User'].__construct(ptr); - optional = obj; - } else { - optional = null; - } - return { tag: OptionalAllTypesResultValues.Tag.OptClass, param0: optional }; - } - case OptionalAllTypesResultValues.Tag.OptJSObject: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const objId = i32Stack.pop(); - const obj = swift.memory.getObject(objId); - swift.memory.release(objId); - optional = obj; - } else { - optional = null; - } - return { tag: OptionalAllTypesResultValues.Tag.OptJSObject, param0: optional }; - } - case OptionalAllTypesResultValues.Tag.OptNestedEnum: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const caseId = i32Stack.pop(); - optional = enumHelpers.APIResult.lift(caseId); - } else { - optional = null; - } - return { tag: OptionalAllTypesResultValues.Tag.OptNestedEnum, param0: optional }; - } - case OptionalAllTypesResultValues.Tag.OptArray: { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const arrayLen = i32Stack.pop(); - const arrayResult = []; - for (let i = 0; i < arrayLen; i++) { - const int = i32Stack.pop(); - arrayResult.push(int); - } - arrayResult.reverse(); - optional = arrayResult; - } else { - optional = null; - } - return { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: optional }; + optional = arrayResult; + } else { + optional = null; } - case OptionalAllTypesResultValues.Tag.Empty: return { tag: OptionalAllTypesResultValues.Tag.Empty }; - default: throw new Error("Unknown OptionalAllTypesResultValues tag returned from Swift: " + String(tag)); + return { tag: OptionalAllTypesResultValues.Tag.OptArray, param0: optional }; } + case OptionalAllTypesResultValues.Tag.Empty: return { tag: OptionalAllTypesResultValues.Tag.Empty }; + default: throw new Error("Unknown OptionalAllTypesResultValues tag returned from Swift: " + String(tag)); } - }); - }; + } + }); return { /** @@ -1002,31 +979,31 @@ export async function createInstantiator(options, swift) { } } - const PointHelpers = __bjs_createPointHelpers()(); + const PointHelpers = __bjs_createPointHelpers(); structHelpers.Point = PointHelpers; - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers(); enumHelpers.APIResult = APIResultHelpers; - const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers()(); + const ComplexResultHelpers = __bjs_createComplexResultValuesHelpers(); enumHelpers.ComplexResult = ComplexResultHelpers; - const ResultHelpers = __bjs_createResultValuesHelpers()(); + const ResultHelpers = __bjs_createResultValuesHelpers(); enumHelpers.Result = ResultHelpers; - const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers()(); + const NetworkingResultHelpers = __bjs_createNetworkingResultValuesHelpers(); enumHelpers.NetworkingResult = NetworkingResultHelpers; - const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers()(); + const APIOptionalResultHelpers = __bjs_createAPIOptionalResultValuesHelpers(); enumHelpers.APIOptionalResult = APIOptionalResultHelpers; - const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers()(); + const TypedPayloadResultHelpers = __bjs_createTypedPayloadResultValuesHelpers(); enumHelpers.TypedPayloadResult = TypedPayloadResultHelpers; - const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers()(); + const AllTypesResultHelpers = __bjs_createAllTypesResultValuesHelpers(); enumHelpers.AllTypesResult = AllTypesResultHelpers; - const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers()(); + const OptionalAllTypesResultHelpers = __bjs_createOptionalAllTypesResultValuesHelpers(); enumHelpers.OptionalAllTypesResult = OptionalAllTypesResultHelpers; const exports = { @@ -1048,19 +1025,16 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalAPIResult: function bjs_roundTripOptionalAPIResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.APIResult.lower(result); - } - instance.exports.bjs_roundTripOptionalAPIResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.APIResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.APIResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalAPIResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.APIResult.lift(tag); return optResult; }, handleComplex: function bjs_handleComplex(result) { @@ -1080,92 +1054,80 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalComplexResult: function bjs_roundTripOptionalComplexResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.ComplexResult.lower(result); - } - instance.exports.bjs_roundTripOptionalComplexResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.ComplexResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.ComplexResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalComplexResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.ComplexResult.lift(tag); return optResult; }, roundTripOptionalUtilitiesResult: function bjs_roundTripOptionalUtilitiesResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.Result.lower(result); - } - instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.Result.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.Result.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalUtilitiesResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.Result.lift(tag); return optResult; }, roundTripOptionalNetworkingResult: function bjs_roundTripOptionalNetworkingResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.NetworkingResult.lower(result); - } - instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.NetworkingResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.NetworkingResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalNetworkingResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.NetworkingResult.lift(tag); return optResult; }, roundTripOptionalAPIOptionalResult: function bjs_roundTripOptionalAPIOptionalResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.APIOptionalResult.lower(result); - } - instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.APIOptionalResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.APIOptionalResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalAPIOptionalResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.APIOptionalResult.lift(tag); return optResult; }, compareAPIResults: function bjs_compareAPIResults(result1, result2) { const isSome = result1 != null; - let result1CaseId; + let result; if (isSome) { - result1CaseId = enumHelpers.APIOptionalResult.lower(result1); + const result1CaseId = enumHelpers.APIOptionalResult.lower(result1); + result = result1CaseId; + } else { + result = 0; } const isSome1 = result2 != null; - let result2CaseId; + let result3; if (isSome1) { - result2CaseId = enumHelpers.APIOptionalResult.lower(result2); - } - instance.exports.bjs_compareAPIResults(+isSome, isSome ? result1CaseId : 0, +isSome1, isSome1 ? result2CaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const result2CaseId = enumHelpers.APIOptionalResult.lower(result2); + result3 = result2CaseId; } else { - optResult = enumHelpers.APIOptionalResult.lift(tag); + result3 = 0; } + instance.exports.bjs_compareAPIResults(+isSome, result, +isSome1, result3); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.APIOptionalResult.lift(tag); return optResult; }, roundTripTypedPayloadResult: function bjs_roundTripTypedPayloadResult(result) { @@ -1176,19 +1138,16 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalTypedPayloadResult: function bjs_roundTripOptionalTypedPayloadResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.TypedPayloadResult.lower(result); - } - instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.TypedPayloadResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.TypedPayloadResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalTypedPayloadResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.TypedPayloadResult.lift(tag); return optResult; }, roundTripAllTypesResult: function bjs_roundTripAllTypesResult(result) { @@ -1199,19 +1158,16 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalAllTypesResult: function bjs_roundTripOptionalAllTypesResult(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.AllTypesResult.lower(result); - } - instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.AllTypesResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.AllTypesResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalAllTypesResult(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.AllTypesResult.lift(tag); return optResult; }, roundTripOptionalPayloadResult: function bjs_roundTripOptionalPayloadResult(result) { @@ -1222,19 +1178,16 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalPayloadResultOpt: function bjs_roundTripOptionalPayloadResultOpt(result) { const isSome = result != null; - let resultCaseId; + let result1; if (isSome) { - resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result); - } - instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, isSome ? resultCaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const resultCaseId = enumHelpers.OptionalAllTypesResult.lower(result); + result1 = resultCaseId; } else { - optResult = enumHelpers.OptionalAllTypesResult.lift(tag); + result1 = 0; } + instance.exports.bjs_roundTripOptionalPayloadResultOpt(+isSome, result1); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.OptionalAllTypesResult.lift(tag); return optResult; }, APIResult: APIResultValues, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 77d106b57..efd75f1fa 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -305,12 +305,17 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalTheme: function bjs_roundTripOptionalTheme(input) { const isSome = input != null; - let inputId, inputBytes; + let result, result1; if (isSome) { - inputBytes = textEncoder.encode(input); - inputId = swift.memory.retain(inputBytes); + const inputBytes = textEncoder.encode(input); + const inputId = swift.memory.retain(inputBytes); + result = inputId; + result1 = inputBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripOptionalTheme(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); + instance.exports.bjs_roundTripOptionalTheme(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; @@ -328,12 +333,17 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalTSTheme: function bjs_roundTripOptionalTSTheme(input) { const isSome = input != null; - let inputId, inputBytes; + let result, result1; if (isSome) { - inputBytes = textEncoder.encode(input); - inputId = swift.memory.retain(inputBytes); + const inputBytes = textEncoder.encode(input); + const inputId = swift.memory.retain(inputBytes); + result = inputId; + result1 = inputBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripOptionalTSTheme(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); + instance.exports.bjs_roundTripOptionalTSTheme(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; @@ -351,12 +361,17 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalFeatureFlag: function bjs_roundTripOptionalFeatureFlag(input) { const isSome = input != null; - let inputId, inputBytes; + let result, result1; if (isSome) { - inputBytes = textEncoder.encode(input); - inputId = swift.memory.retain(inputBytes); + const inputBytes = textEncoder.encode(input); + const inputId = swift.memory.retain(inputBytes); + result = inputId; + result1 = inputBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripOptionalFeatureFlag(+isSome, isSome ? inputId : 0, isSome ? inputBytes.length : 0); + instance.exports.bjs_roundTripOptionalFeatureFlag(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; @@ -468,7 +483,7 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalPrecision: function bjs_roundTripOptionalPrecision(input) { const isSome = input != null; - instance.exports.bjs_roundTripOptionalPrecision(+isSome, isSome ? input : 0); + instance.exports.bjs_roundTripOptionalPrecision(+isSome, isSome ? input : 0.0); const optResult = tmpRetOptionalFloat; tmpRetOptionalFloat = undefined; return optResult; @@ -482,7 +497,7 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalRatio: function bjs_roundTripOptionalRatio(input) { const isSome = input != null; - instance.exports.bjs_roundTripOptionalRatio(+isSome, isSome ? input : 0); + instance.exports.bjs_roundTripOptionalRatio(+isSome, isSome ? input : 0.0); const optResult = tmpRetOptionalDouble; tmpRetOptionalDouble = undefined; return optResult; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 92230667c..c0c9704ef 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -28,55 +28,56 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createFooContainerHelpers = () => { - return () => ({ - lower: (value) => { - let id; - if (value.foo != null) { - id = swift.memory.retain(value.foo); - } else { - id = undefined; - } - i32Stack.push(id !== undefined ? id : 0); - const isSome = value.optionalFoo != null; + const __bjs_createFooContainerHelpers = () => ({ + lower: (value) => { + let id; + if (value.foo != null) { + id = swift.memory.retain(value.foo); + } else { + id = undefined; + } + i32Stack.push(id !== undefined ? id : 0); + const isSome = value.optionalFoo != null; + if (isSome) { let id1; - if (isSome) { + if (value.optionalFoo != null) { id1 = swift.memory.retain(value.optionalFoo); - i32Stack.push(id1); } else { id1 = undefined; - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const objectId = i32Stack.pop(); - let value; - if (objectId !== 0) { - value = swift.memory.getObject(objectId); - swift.memory.release(objectId); - } else { - value = null; - } - optional = value; - } else { - optional = null; } - const objectId1 = i32Stack.pop(); - let value1; - if (objectId1 !== 0) { - value1 = swift.memory.getObject(objectId1); - swift.memory.release(objectId1); + i32Stack.push(id1 !== undefined ? id1 : 0); + } else { + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const objectId = i32Stack.pop(); + let value; + if (objectId !== 0) { + value = swift.memory.getObject(objectId); + swift.memory.release(objectId); } else { - value1 = null; + value = null; } - return { foo: value1, optionalFoo: optional }; - } - }); - }; + optional = value; + } else { + optional = null; + } + const objectId1 = i32Stack.pop(); + let value1; + if (objectId1 !== 0) { + value1 = swift.memory.getObject(objectId1); + swift.memory.release(objectId1); + } else { + value1 = null; + } + return { foo: value1, optionalFoo: optional }; + } + }); return { /** @@ -262,7 +263,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const FooContainerHelpers = __bjs_createFooContainerHelpers()(); + const FooContainerHelpers = __bjs_createFooContainerHelpers(); structHelpers.FooContainer = FooContainerHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 0a4d37845..8571bbd6c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -368,15 +368,35 @@ export async function createInstantiator(options, swift) { constructor(value, optionalValue) { const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); const isSome = optionalValue != null; - const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); - const ret = instance.exports.bjs_JSValueHolder_init(valueKind, valuePayload1, valuePayload2, +isSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2); + let result, result1, result2; + if (isSome) { + const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); + result = optionalValueKind; + result1 = optionalValuePayload1; + result2 = optionalValuePayload2; + } else { + result = 0; + result1 = 0; + result2 = 0.0; + } + const ret = instance.exports.bjs_JSValueHolder_init(valueKind, valuePayload1, valuePayload2, +isSome, result, result1, result2); return JSValueHolder.__construct(ret); } update(value, optionalValue) { const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); const isSome = optionalValue != null; - const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); - instance.exports.bjs_JSValueHolder_update(this.pointer, valueKind, valuePayload1, valuePayload2, +isSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2); + let result, result1, result2; + if (isSome) { + const [optionalValueKind, optionalValuePayload1, optionalValuePayload2] = __bjs_jsValueLower(optionalValue); + result = optionalValueKind; + result1 = optionalValuePayload1; + result2 = optionalValuePayload2; + } else { + result = 0; + result1 = 0; + result2 = 0.0; + } + instance.exports.bjs_JSValueHolder_update(this.pointer, valueKind, valuePayload1, valuePayload2, +isSome, result, result1, result2); } echo(value) { const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); @@ -389,8 +409,18 @@ export async function createInstantiator(options, swift) { } echoOptional(value) { const isSome = value != null; - const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); - instance.exports.bjs_JSValueHolder_echoOptional(this.pointer, +isSome, valueKind, valuePayload1, valuePayload2); + let result, result1, result2; + if (isSome) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + result = valueKind; + result1 = valuePayload1; + result2 = valuePayload2; + } else { + result = 0; + result1 = 0; + result2 = 0.0; + } + instance.exports.bjs_JSValueHolder_echoOptional(this.pointer, +isSome, result, result1, result2); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { @@ -433,8 +463,18 @@ export async function createInstantiator(options, swift) { } set optionalValue(value) { const isSome = value != null; - const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); - instance.exports.bjs_JSValueHolder_optionalValue_set(this.pointer, +isSome, valueKind, valuePayload1, valuePayload2); + let result, result1, result2; + if (isSome) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + result = valueKind; + result1 = valuePayload1; + result2 = valuePayload2; + } else { + result = 0; + result1 = 0; + result2 = 0.0; + } + instance.exports.bjs_JSValueHolder_optionalValue_set(this.pointer, +isSome, result, result1, result2); } } const exports = { @@ -450,8 +490,18 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalJSValue: function bjs_roundTripOptionalJSValue(value) { const isSome = value != null; - const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); - instance.exports.bjs_roundTripOptionalJSValue(+isSome, valueKind, valuePayload1, valuePayload2); + let result, result1, result2; + if (isSome) { + const [valueKind, valuePayload1, valuePayload2] = __bjs_jsValueLower(value); + result = valueKind; + result1 = valuePayload1; + result2 = valuePayload2; + } else { + result = 0; + result1 = 0; + result2 = 0.0; + } + instance.exports.bjs_roundTripOptionalJSValue(+isSome, result, result1, result2); const isSome1 = i32Stack.pop(); let optResult; if (isSome1) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index 03a3cf565..941d66ea9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -198,19 +198,25 @@ export async function createInstantiator(options, swift) { return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_WithOptionalJSClass_init"] = function bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullWrappedValue, valueOrUndefinedIsSome, valueOrUndefinedWrappedValue) { + TestModule["bjs_WithOptionalJSClass_init"] = function bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullObjectId, valueOrUndefinedIsSome, valueOrUndefinedObjectId) { try { - let obj; + let optResult; if (valueOrNullIsSome) { - obj = swift.memory.getObject(valueOrNullWrappedValue); - swift.memory.release(valueOrNullWrappedValue); + const valueOrNullObjectIdObject = swift.memory.getObject(valueOrNullObjectId); + swift.memory.release(valueOrNullObjectId); + optResult = valueOrNullObjectIdObject; + } else { + optResult = null; } - let obj1; + let optResult1; if (valueOrUndefinedIsSome) { - obj1 = swift.memory.getObject(valueOrUndefinedWrappedValue); - swift.memory.release(valueOrUndefinedWrappedValue); + const valueOrUndefinedObjectIdObject = swift.memory.getObject(valueOrUndefinedObjectId); + swift.memory.release(valueOrUndefinedObjectId); + optResult1 = valueOrUndefinedObjectIdObject; + } else { + optResult1 = undefined; } - return swift.memory.retain(new imports.WithOptionalJSClass(valueOrNullIsSome ? obj : null, valueOrUndefinedIsSome ? obj1 : undefined)); + return swift.memory.retain(new imports.WithOptionalJSClass(optResult, optResult1)); } catch (error) { setException(error); return 0 @@ -220,11 +226,7 @@ export async function createInstantiator(options, swift) { try { let ret = swift.memory.getObject(self).stringOrNull; const isSome = ret != null; - if (isSome) { - tmpRetString = ret; - } else { - tmpRetString = null; - } + tmpRetString = isSome ? ret : null; } catch (error) { setException(error); } @@ -233,11 +235,7 @@ export async function createInstantiator(options, swift) { try { let ret = swift.memory.getObject(self).stringOrUndefined; const isSome = ret !== undefined; - if (isSome) { - tmpRetString = ret; - } else { - tmpRetString = null; - } + tmpRetString = isSome ? ret : undefined; } catch (error) { setException(error); } @@ -296,26 +294,32 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_stringOrNull_set"] = function bjs_WithOptionalJSClass_stringOrNull_set(self, newValueIsSome, newValueWrappedValue) { + TestModule["bjs_WithOptionalJSClass_stringOrNull_set"] = function bjs_WithOptionalJSClass_stringOrNull_set(self, newValueIsSome, newValueObjectId) { try { - let obj; + let optResult; if (newValueIsSome) { - obj = swift.memory.getObject(newValueWrappedValue); - swift.memory.release(newValueWrappedValue); + const newValueObjectIdObject = swift.memory.getObject(newValueObjectId); + swift.memory.release(newValueObjectId); + optResult = newValueObjectIdObject; + } else { + optResult = null; } - swift.memory.getObject(self).stringOrNull = newValueIsSome ? obj : null; + swift.memory.getObject(self).stringOrNull = optResult; } catch (error) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_stringOrUndefined_set"] = function bjs_WithOptionalJSClass_stringOrUndefined_set(self, newValueIsSome, newValueWrappedValue) { + TestModule["bjs_WithOptionalJSClass_stringOrUndefined_set"] = function bjs_WithOptionalJSClass_stringOrUndefined_set(self, newValueIsSome, newValueObjectId) { try { - let obj; + let optResult; if (newValueIsSome) { - obj = swift.memory.getObject(newValueWrappedValue); - swift.memory.release(newValueWrappedValue); + const newValueObjectIdObject = swift.memory.getObject(newValueObjectId); + swift.memory.release(newValueObjectId); + optResult = newValueObjectIdObject; + } else { + optResult = undefined; } - swift.memory.getObject(self).stringOrUndefined = newValueIsSome ? obj : undefined; + swift.memory.getObject(self).stringOrUndefined = optResult; } catch (error) { setException(error); } @@ -362,38 +366,36 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_roundTripStringOrNull"] = function bjs_WithOptionalJSClass_roundTripStringOrNull(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_WithOptionalJSClass_roundTripStringOrNull"] = function bjs_WithOptionalJSClass_roundTripStringOrNull(self, valueIsSome, valueObjectId) { try { - let obj; + let optResult; if (valueIsSome) { - obj = swift.memory.getObject(valueWrappedValue); - swift.memory.release(valueWrappedValue); - } - let ret = swift.memory.getObject(self).roundTripStringOrNull(valueIsSome ? obj : null); - const isSome = ret != null; - if (isSome) { - tmpRetString = ret; + const valueObjectIdObject = swift.memory.getObject(valueObjectId); + swift.memory.release(valueObjectId); + optResult = valueObjectIdObject; } else { - tmpRetString = null; + optResult = null; } + let ret = swift.memory.getObject(self).roundTripStringOrNull(optResult); + const isSome = ret != null; + tmpRetString = isSome ? ret : null; } catch (error) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_roundTripStringOrUndefined"] = function bjs_WithOptionalJSClass_roundTripStringOrUndefined(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_WithOptionalJSClass_roundTripStringOrUndefined"] = function bjs_WithOptionalJSClass_roundTripStringOrUndefined(self, valueIsSome, valueObjectId) { try { - let obj; + let optResult; if (valueIsSome) { - obj = swift.memory.getObject(valueWrappedValue); - swift.memory.release(valueWrappedValue); - } - let ret = swift.memory.getObject(self).roundTripStringOrUndefined(valueIsSome ? obj : undefined); - const isSome = ret !== undefined; - if (isSome) { - tmpRetString = ret; + const valueObjectIdObject = swift.memory.getObject(valueObjectId); + swift.memory.release(valueObjectId); + optResult = valueObjectIdObject; } else { - tmpRetString = null; + optResult = undefined; } + let ret = swift.memory.getObject(self).roundTripStringOrUndefined(optResult); + const isSome = ret !== undefined; + tmpRetString = isSome ? ret : undefined; } catch (error) { setException(error); } @@ -500,12 +502,17 @@ export async function createInstantiator(options, swift) { constructor(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - const ret = instance.exports.bjs_Greeter_init(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + const ret = instance.exports.bjs_Greeter_init(+isSome, result, result1); return Greeter.__construct(ret); } greet() { @@ -516,12 +523,17 @@ export async function createInstantiator(options, swift) { } changeName(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_Greeter_changeName(this.pointer, +isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_Greeter_changeName(this.pointer, +isSome, result, result1); } get name() { instance.exports.bjs_Greeter_name_get(this.pointer); @@ -531,12 +543,17 @@ export async function createInstantiator(options, swift) { } set name(value) { const isSome = value != null; - let valueId, valueBytes; + let result, result1; if (isSome) { - valueBytes = textEncoder.encode(value); - valueId = swift.memory.retain(valueBytes); + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + result = valueId; + result1 = valueBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_Greeter_name_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + instance.exports.bjs_Greeter_name_set(this.pointer, +isSome, result, result1); } } class OptionalPropertyHolder extends SwiftHeapObject { @@ -556,12 +573,17 @@ export async function createInstantiator(options, swift) { } set optionalName(value) { const isSome = value != null; - let valueId, valueBytes; + let result, result1; if (isSome) { - valueBytes = textEncoder.encode(value); - valueId = swift.memory.retain(valueBytes); + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + result = valueId; + result1 = valueBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_OptionalPropertyHolder_optionalName_set(this.pointer, +isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + instance.exports.bjs_OptionalPropertyHolder_optionalName_set(this.pointer, +isSome, result, result1); } get optionalAge() { instance.exports.bjs_OptionalPropertyHolder_optionalAge_get(this.pointer); @@ -582,7 +604,13 @@ export async function createInstantiator(options, swift) { } set optionalGreeter(value) { const isSome = value != null; - instance.exports.bjs_OptionalPropertyHolder_optionalGreeter_set(this.pointer, +isSome, isSome ? value.pointer : 0); + let result; + if (isSome) { + result = value.pointer; + } else { + result = 0; + } + instance.exports.bjs_OptionalPropertyHolder_optionalGreeter_set(this.pointer, +isSome, result); } } const exports = { @@ -590,7 +618,13 @@ export async function createInstantiator(options, swift) { OptionalPropertyHolder, roundTripOptionalClass: function bjs_roundTripOptionalClass(value) { const isSome = value != null; - instance.exports.bjs_roundTripOptionalClass(+isSome, isSome ? value.pointer : 0); + let result; + if (isSome) { + result = value.pointer; + } else { + result = 0; + } + instance.exports.bjs_roundTripOptionalClass(+isSome, result); const pointer = tmpRetOptionalHeapObject; tmpRetOptionalHeapObject = undefined; const optResult = pointer === null ? null : Greeter.__construct(pointer); @@ -598,7 +632,13 @@ export async function createInstantiator(options, swift) { }, testOptionalPropertyRoundtrip: function bjs_testOptionalPropertyRoundtrip(holder) { const isSome = holder != null; - instance.exports.bjs_testOptionalPropertyRoundtrip(+isSome, isSome ? holder.pointer : 0); + let result; + if (isSome) { + result = holder.pointer; + } else { + result = 0; + } + instance.exports.bjs_testOptionalPropertyRoundtrip(+isSome, result); const pointer = tmpRetOptionalHeapObject; tmpRetOptionalHeapObject = undefined; const optResult = pointer === null ? null : OptionalPropertyHolder.__construct(pointer); @@ -606,12 +646,17 @@ export async function createInstantiator(options, swift) { }, roundTripString: function bjs_roundTripString(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripString(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripString(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; @@ -625,76 +670,96 @@ export async function createInstantiator(options, swift) { }, roundTripBool: function bjs_roundTripBool(flag) { const isSome = flag != null; - instance.exports.bjs_roundTripBool(+isSome, isSome ? flag : 0); + instance.exports.bjs_roundTripBool(+isSome, isSome ? flag ? 1 : 0 : 0); const optResult = tmpRetOptionalBool; tmpRetOptionalBool = undefined; return optResult; }, roundTripFloat: function bjs_roundTripFloat(number) { const isSome = number != null; - instance.exports.bjs_roundTripFloat(+isSome, isSome ? number : 0); + instance.exports.bjs_roundTripFloat(+isSome, isSome ? number : 0.0); const optResult = tmpRetOptionalFloat; tmpRetOptionalFloat = undefined; return optResult; }, roundTripDouble: function bjs_roundTripDouble(precision) { const isSome = precision != null; - instance.exports.bjs_roundTripDouble(+isSome, isSome ? precision : 0); + instance.exports.bjs_roundTripDouble(+isSome, isSome ? precision : 0.0); const optResult = tmpRetOptionalDouble; tmpRetOptionalDouble = undefined; return optResult; }, roundTripSyntax: function bjs_roundTripSyntax(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripSyntax(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, roundTripMixSyntax: function bjs_roundTripMixSyntax(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripMixSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripMixSyntax(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, roundTripSwiftSyntax: function bjs_roundTripSwiftSyntax(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripSwiftSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripSwiftSyntax(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, roundTripMixedSwiftSyntax: function bjs_roundTripMixedSwiftSyntax(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripMixedSwiftSyntax(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripMixedSwiftSyntax(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, roundTripWithSpaces: function bjs_roundTripWithSpaces(value) { const isSome = value != null; - instance.exports.bjs_roundTripWithSpaces(+isSome, isSome ? value : 0); + instance.exports.bjs_roundTripWithSpaces(+isSome, isSome ? value : 0.0); const optResult = tmpRetOptionalDouble; tmpRetOptionalDouble = undefined; return optResult; @@ -708,31 +773,46 @@ export async function createInstantiator(options, swift) { }, roundTripOptionalAlias: function bjs_roundTripOptionalAlias(name) { const isSome = name != null; - let nameId, nameBytes; + let result, result1; if (isSome) { - nameBytes = textEncoder.encode(name); - nameId = swift.memory.retain(nameBytes); + const nameBytes = textEncoder.encode(name); + const nameId = swift.memory.retain(nameBytes); + result = nameId; + result1 = nameBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_roundTripOptionalAlias(+isSome, isSome ? nameId : 0, isSome ? nameBytes.length : 0); + instance.exports.bjs_roundTripOptionalAlias(+isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; return optResult; }, testMixedOptionals: function bjs_testMixedOptionals(firstName, lastName, age, active) { const isSome = firstName != null; - let firstNameId, firstNameBytes; + let result, result1; if (isSome) { - firstNameBytes = textEncoder.encode(firstName); - firstNameId = swift.memory.retain(firstNameBytes); + const firstNameBytes = textEncoder.encode(firstName); + const firstNameId = swift.memory.retain(firstNameBytes); + result = firstNameId; + result1 = firstNameBytes.length; + } else { + result = 0; + result1 = 0; } const isSome1 = lastName != null; - let lastNameId, lastNameBytes; + let result2, result3; if (isSome1) { - lastNameBytes = textEncoder.encode(lastName); - lastNameId = swift.memory.retain(lastNameBytes); + const lastNameBytes = textEncoder.encode(lastName); + const lastNameId = swift.memory.retain(lastNameBytes); + result2 = lastNameId; + result3 = lastNameBytes.length; + } else { + result2 = 0; + result3 = 0; } const isSome2 = age != null; - instance.exports.bjs_testMixedOptionals(+isSome, isSome ? firstNameId : 0, isSome ? firstNameBytes.length : 0, +isSome1, isSome1 ? lastNameId : 0, isSome1 ? lastNameBytes.length : 0, +isSome2, isSome2 ? age : 0, active); + instance.exports.bjs_testMixedOptionals(+isSome, result, result1, +isSome1, result2, result3, +isSome2, isSome2 ? age : 0, active); const optResult = tmpRetString; tmpRetString = undefined; return optResult; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index 9043d19ef..6e95d2ddf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -52,41 +52,39 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case ResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return ResultValues.Tag.Success; - } - case ResultValues.Tag.Failure: { - i32Stack.push((value.param0 | 0)); - return ResultValues.Tag.Failure; - } - default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); - } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case ResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: ResultValues.Tag.Success, param0: string }; - } - case ResultValues.Tag.Failure: { - const int = i32Stack.pop(); - return { tag: ResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); + const __bjs_createResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case ResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return ResultValues.Tag.Success; + } + case ResultValues.Tag.Failure: { + i32Stack.push((value.param0 | 0)); + return ResultValues.Tag.Failure; + } + default: throw new Error("Unknown ResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case ResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: ResultValues.Tag.Success, param0: string }; + } + case ResultValues.Tag.Failure: { + const int = i32Stack.pop(); + return { tag: ResultValues.Tag.Failure, param0: int }; } + default: throw new Error("Unknown ResultValues tag returned from Swift: " + String(tag)); } - }); - }; + } + }); return { /** @@ -293,14 +291,17 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_optionalName_set"] = function bjs_MyViewControllerDelegate_optionalName_set(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_MyViewControllerDelegate_optionalName_set"] = function bjs_MyViewControllerDelegate_optionalName_set(self, valueIsSome, valueObjectId) { try { - let obj; + let optResult; if (valueIsSome) { - obj = swift.memory.getObject(valueWrappedValue); - swift.memory.release(valueWrappedValue); + const valueObjectIdObject = swift.memory.getObject(valueObjectId); + swift.memory.release(valueObjectId); + optResult = valueObjectIdObject; + } else { + optResult = null; } - swift.memory.getObject(self).optionalName = valueIsSome ? obj : null; + swift.memory.getObject(self).optionalName = optResult; } catch (error) { setException(error); } @@ -313,14 +314,17 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_set"] = function bjs_MyViewControllerDelegate_optionalRawEnum_set(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_set"] = function bjs_MyViewControllerDelegate_optionalRawEnum_set(self, valueIsSome, valueObjectId) { try { - let obj; + let optResult; if (valueIsSome) { - obj = swift.memory.getObject(valueWrappedValue); - swift.memory.release(valueWrappedValue); + const valueObjectIdObject = swift.memory.getObject(valueObjectId); + swift.memory.release(valueObjectId); + optResult = valueObjectIdObject; + } else { + optResult = null; } - swift.memory.getObject(self).optionalRawEnum = valueIsSome ? obj : null; + swift.memory.getObject(self).optionalRawEnum = optResult; } catch (error) { setException(error); } @@ -374,13 +378,16 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_optionalResult_set"] = function bjs_MyViewControllerDelegate_optionalResult_set(self, valueIsSome, valueWrappedValue) { + TestModule["bjs_MyViewControllerDelegate_optionalResult_set"] = function bjs_MyViewControllerDelegate_optionalResult_set(self, valueIsSome, valueCaseId) { try { - let enumValue; + let optResult; if (valueIsSome) { - enumValue = enumHelpers.Result.lift(valueWrappedValue); + const enumValue = enumHelpers.Result.lift(valueCaseId); + optResult = enumValue; + } else { + optResult = null; } - swift.memory.getObject(self).optionalResult = valueIsSome ? enumValue : null; + swift.memory.getObject(self).optionalResult = optResult; } catch (error) { setException(error); } @@ -405,7 +412,7 @@ export async function createInstantiator(options, swift) { try { let ret = swift.memory.getObject(self).directionOptional; const isSome = ret != null; - return isSome ? (ret | 0) : -1; + return isSome ? ret : -1; } catch (error) { setException(error); } @@ -509,9 +516,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_MyViewControllerDelegate_onOptionalHelperUpdated"] = function bjs_MyViewControllerDelegate_onOptionalHelperUpdated(self, helperIsSome, helperWrappedValue) { + TestModule["bjs_MyViewControllerDelegate_onOptionalHelperUpdated"] = function bjs_MyViewControllerDelegate_onOptionalHelperUpdated(self, helperIsSome, helperPointer) { try { - swift.memory.getObject(self).onOptionalHelperUpdated(helperIsSome ? _exports['Helper'].__construct(helperWrappedValue) : null); + swift.memory.getObject(self).onOptionalHelperUpdated(helperIsSome ? _exports['Helper'].__construct(helperPointer) : null); } catch (error) { setException(error); } @@ -664,7 +671,13 @@ export async function createInstantiator(options, swift) { } set secondDelegate(value) { const isSome = value != null; - instance.exports.bjs_MyViewController_secondDelegate_set(this.pointer, +isSome, isSome ? swift.memory.retain(value) : 0); + let result; + if (isSome) { + result = swift.memory.retain(value); + } else { + result = 0; + } + instance.exports.bjs_MyViewController_secondDelegate_set(this.pointer, +isSome, result); } } class DelegateManager extends SwiftHeapObject { @@ -706,7 +719,7 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_DelegateManager_delegates_set(this.pointer); } } - const ResultHelpers = __bjs_createResultValuesHelpers()(); + const ResultHelpers = __bjs_createResultValuesHelpers(); enumHelpers.Result = ResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index 109a403b4..0e8a5a7bb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -39,41 +39,39 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createAPIResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return APIResultValues.Tag.Success; - } - case APIResultValues.Tag.Failure: { - i32Stack.push((value.param0 | 0)); - return APIResultValues.Tag.Failure; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + const __bjs_createAPIResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return APIResultValues.Tag.Success; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = i32Stack.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + case APIResultValues.Tag.Failure: { + i32Stack.push((value.param0 | 0)); + return APIResultValues.Tag.Failure; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = i32Stack.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; } + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); } - }); - }; + } + }); return { /** @@ -301,7 +299,7 @@ export async function createInstantiator(options, swift) { return ret; } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers(); enumHelpers.APIResult = APIResultHelpers; if (typeof globalThis.Utils === 'undefined') { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 1be36c28e..2eea1f12f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -39,41 +39,39 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createAPIResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return APIResultValues.Tag.Success; - } - case APIResultValues.Tag.Failure: { - i32Stack.push((value.param0 | 0)); - return APIResultValues.Tag.Failure; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + const __bjs_createAPIResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return APIResultValues.Tag.Success; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = i32Stack.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + case APIResultValues.Tag.Failure: { + i32Stack.push((value.param0 | 0)); + return APIResultValues.Tag.Failure; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + } + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = i32Stack.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; } + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); } - }); - }; + } + }); return { /** @@ -301,7 +299,7 @@ export async function createInstantiator(options, swift) { return ret; } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers(); enumHelpers.APIResult = APIResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index 12afbb82c..16bf8ba0c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -303,12 +303,17 @@ export async function createInstantiator(options, swift) { } static set optionalProperty(value) { const isSome = value != null; - let valueId, valueBytes; + let result, result1; if (isSome) { - valueBytes = textEncoder.encode(value); - valueId = swift.memory.retain(valueBytes); + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + result = valueId; + result1 = valueBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, result, result1); } } if (typeof globalThis.PropertyNamespace === 'undefined') { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index e9c5d105c..ea6c448ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -303,12 +303,17 @@ export async function createInstantiator(options, swift) { } static set optionalProperty(value) { const isSome = value != null; - let valueId, valueBytes; + let result, result1; if (isSome) { - valueBytes = textEncoder.encode(value); - valueId = swift.memory.retain(valueBytes); + const valueBytes = textEncoder.encode(value); + const valueId = swift.memory.retain(valueBytes); + result = valueId; + result1 = valueBytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, isSome ? valueId : 0, isSome ? valueBytes.length : 0); + instance.exports.bjs_PropertyClass_static_optionalProperty_set(+isSome, result, result1); } } const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index cd6c9062b..a74d49327 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -211,9 +211,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_jsRoundTripOptionalGreeter"] = function bjs_jsRoundTripOptionalGreeter(greeterIsSome, greeterWrappedValue) { + TestModule["bjs_jsRoundTripOptionalGreeter"] = function bjs_jsRoundTripOptionalGreeter(greeterIsSome, greeterPointer) { try { - let ret = imports.jsRoundTripOptionalGreeter(greeterIsSome ? _exports['Greeter'].__construct(greeterWrappedValue) : null); + let ret = imports.jsRoundTripOptionalGreeter(greeterIsSome ? _exports['Greeter'].__construct(greeterPointer) : null); const isSome = ret != null; return isSome ? ret.pointer : 0; } catch (error) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 68bcfbe93..023a2fab0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -83,69 +83,67 @@ export async function createInstantiator(options, swift) { return swift.memory.retain(real); }; - const __bjs_createAPIResultValuesHelpers = () => { - return () => ({ - lower: (value) => { - const enumTag = value.tag; - switch (enumTag) { - case APIResultValues.Tag.Success: { - const bytes = textEncoder.encode(value.param0); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - return APIResultValues.Tag.Success; - } - case APIResultValues.Tag.Failure: { - i32Stack.push((value.param0 | 0)); - return APIResultValues.Tag.Failure; - } - case APIResultValues.Tag.Flag: { - i32Stack.push(value.param0 ? 1 : 0); - return APIResultValues.Tag.Flag; - } - case APIResultValues.Tag.Rate: { - f32Stack.push(Math.fround(value.param0)); - return APIResultValues.Tag.Rate; - } - case APIResultValues.Tag.Precise: { - f64Stack.push(value.param0); - return APIResultValues.Tag.Precise; - } - case APIResultValues.Tag.Info: { - return APIResultValues.Tag.Info; - } - default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); + const __bjs_createAPIResultValuesHelpers = () => ({ + lower: (value) => { + const enumTag = value.tag; + switch (enumTag) { + case APIResultValues.Tag.Success: { + const bytes = textEncoder.encode(value.param0); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + return APIResultValues.Tag.Success; } - }, - lift: (tag) => { - tag = tag | 0; - switch (tag) { - case APIResultValues.Tag.Success: { - const string = strStack.pop(); - return { tag: APIResultValues.Tag.Success, param0: string }; - } - case APIResultValues.Tag.Failure: { - const int = i32Stack.pop(); - return { tag: APIResultValues.Tag.Failure, param0: int }; - } - case APIResultValues.Tag.Flag: { - const bool = i32Stack.pop() !== 0; - return { tag: APIResultValues.Tag.Flag, param0: bool }; - } - case APIResultValues.Tag.Rate: { - const f32 = f32Stack.pop(); - return { tag: APIResultValues.Tag.Rate, param0: f32 }; - } - case APIResultValues.Tag.Precise: { - const f64 = f64Stack.pop(); - return { tag: APIResultValues.Tag.Precise, param0: f64 }; - } - case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; - default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + case APIResultValues.Tag.Failure: { + i32Stack.push((value.param0 | 0)); + return APIResultValues.Tag.Failure; + } + case APIResultValues.Tag.Flag: { + i32Stack.push(value.param0 ? 1 : 0); + return APIResultValues.Tag.Flag; + } + case APIResultValues.Tag.Rate: { + f32Stack.push(Math.fround(value.param0)); + return APIResultValues.Tag.Rate; } + case APIResultValues.Tag.Precise: { + f64Stack.push(value.param0); + return APIResultValues.Tag.Precise; + } + case APIResultValues.Tag.Info: { + return APIResultValues.Tag.Info; + } + default: throw new Error("Unknown APIResultValues tag: " + String(enumTag)); } - }); - }; + }, + lift: (tag) => { + tag = tag | 0; + switch (tag) { + case APIResultValues.Tag.Success: { + const string = strStack.pop(); + return { tag: APIResultValues.Tag.Success, param0: string }; + } + case APIResultValues.Tag.Failure: { + const int = i32Stack.pop(); + return { tag: APIResultValues.Tag.Failure, param0: int }; + } + case APIResultValues.Tag.Flag: { + const bool = i32Stack.pop() !== 0; + return { tag: APIResultValues.Tag.Flag, param0: bool }; + } + case APIResultValues.Tag.Rate: { + const f32 = f32Stack.pop(); + return { tag: APIResultValues.Tag.Rate, param0: f32 }; + } + case APIResultValues.Tag.Precise: { + const f64 = f64Stack.pop(); + return { tag: APIResultValues.Tag.Precise, param0: f64 }; + } + case APIResultValues.Tag.Info: return { tag: APIResultValues.Tag.Info }; + default: throw new Error("Unknown APIResultValues tag returned from Swift: " + String(tag)); + } + } + }); return { /** @@ -577,21 +575,20 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0WrappedValue) { + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0ObjectId) { try { const callback = swift.memory.getObject(callbackId); - let obj; + let optResult; if (param0IsSome) { - obj = swift.memory.getObject(param0WrappedValue); - swift.memory.release(param0WrappedValue); - } - let ret = callback(param0IsSome ? obj : null); - const isSome = ret != null; - if (isSome) { - tmpRetString = ret; + const param0ObjectIdObject = swift.memory.getObject(param0ObjectId); + swift.memory.release(param0ObjectId); + optResult = param0ObjectIdObject; } else { - tmpRetString = null; + optResult = null; } + let ret = callback(optResult); + const isSome = ret != null; + tmpRetString = isSome ? ret : null; } catch (error) { setException(error); } @@ -599,12 +596,17 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO = function(param0) { const isSome = param0 != null; - let param0Id, param0Bytes; + let result, result1; if (isSome) { - param0Bytes = textEncoder.encode(param0); - param0Id = swift.memory.retain(param0Bytes); + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + result = param0Id; + result1 = param0Bytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; if (tmpRetException) { @@ -617,10 +619,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(callbackId, param0IsSome, param0WrappedValue) { + bjs["invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(callbackId, param0IsSome, param0Pointer) { try { const callback = swift.memory.getObject(callbackId); - let ret = callback(param0IsSome ? _exports['Person'].__construct(param0WrappedValue) : null); + let ret = callback(param0IsSome ? _exports['Person'].__construct(param0Pointer) : null); const isSome = ret != null; return isSome ? ret.pointer : 0; } catch (error) { @@ -630,7 +632,13 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC = function(param0) { const isSome = param0 != null; - instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, isSome ? param0.pointer : 0); + let result; + if (isSome) { + result = param0.pointer; + } else { + result = 0; + } + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, result); const pointer = tmpRetOptionalHeapObject; tmpRetOptionalHeapObject = undefined; const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); @@ -644,14 +652,17 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC); } - bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(callbackId, param0IsSome, param0WrappedValue) { + bjs["invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(callbackId, param0IsSome, param0CaseId) { try { const callback = swift.memory.getObject(callbackId); - let enumValue; + let optResult; if (param0IsSome) { - enumValue = enumHelpers.APIResult.lift(param0WrappedValue); + const enumValue = enumHelpers.APIResult.lift(param0CaseId); + optResult = enumValue; + } else { + optResult = null; } - let ret = callback(param0IsSome ? enumValue : null); + let ret = callback(optResult); const isSome = ret != null; if (isSome) { const caseId = enumHelpers.APIResult.lower(ret); @@ -666,19 +677,16 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO = function(param0) { const isSome = param0 != null; - let param0CaseId; + let result; if (isSome) { - param0CaseId = enumHelpers.APIResult.lower(param0); - } - instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, isSome ? param0CaseId : 0); - const tag = i32Stack.pop(); - const isNull = (tag === -1); - let optResult; - if (isNull) { - optResult = null; + const param0CaseId = enumHelpers.APIResult.lower(param0); + result = param0CaseId; } else { - optResult = enumHelpers.APIResult.lift(tag); + result = 0; } + instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, result); + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.APIResult.lift(tag); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); @@ -694,7 +702,7 @@ export async function createInstantiator(options, swift) { const callback = swift.memory.getObject(callbackId); let ret = callback(param0IsSome ? param0WrappedValue : null); const isSome = ret != null; - return isSome ? (ret | 0) : -1; + return isSome ? ret : -1; } catch (error) { setException(error); } @@ -715,21 +723,20 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO); } - bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0WrappedValue) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0ObjectId) { try { const callback = swift.memory.getObject(callbackId); - let obj; + let optResult; if (param0IsSome) { - obj = swift.memory.getObject(param0WrappedValue); - swift.memory.release(param0WrappedValue); - } - let ret = callback(param0IsSome ? obj : null); - const isSome = ret != null; - if (isSome) { - tmpRetString = ret; + const param0ObjectIdObject = swift.memory.getObject(param0ObjectId); + swift.memory.release(param0ObjectId); + optResult = param0ObjectIdObject; } else { - tmpRetString = null; + optResult = null; } + let ret = callback(optResult); + const isSome = ret != null; + tmpRetString = isSome ? ret : null; } catch (error) { setException(error); } @@ -737,12 +744,17 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSqSS_SqSS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSS_SqSS = function(param0) { const isSome = param0 != null; - let param0Id, param0Bytes; + let result, result1; if (isSome) { - param0Bytes = textEncoder.encode(param0); - param0Id = swift.memory.retain(param0Bytes); + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + result = param0Id; + result1 = param0Bytes.length; + } else { + result = 0; + result1 = 0; } - instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, isSome ? param0Id : 0, isSome ? param0Bytes.length : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, result, result1); const optResult = tmpRetString; tmpRetString = undefined; if (tmpRetException) { @@ -768,7 +780,7 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSqSb_SqSb"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSb_SqSb = function(param0) { const isSome = param0 != null; - instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 ? 1 : 0 : 0); const optResult = tmpRetOptionalBool; tmpRetOptionalBool = undefined; if (tmpRetException) { @@ -794,7 +806,7 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSqSd_SqSd"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSd_SqSd = function(param0) { const isSome = param0 != null; - instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0.0); const optResult = tmpRetOptionalDouble; tmpRetOptionalDouble = undefined; if (tmpRetException) { @@ -820,7 +832,7 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuleSqSf_SqSf"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleSqSf_SqSf = function(param0) { const isSome = param0 != null; - instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0); + instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0.0); const optResult = tmpRetOptionalFloat; tmpRetOptionalFloat = undefined; if (tmpRetException) { @@ -935,7 +947,7 @@ export async function createInstantiator(options, swift) { return TestProcessor.__construct(ret); } } - const APIResultHelpers = __bjs_createAPIResultValuesHelpers()(); + const APIResultHelpers = __bjs_createAPIResultValuesHelpers(); enumHelpers.APIResult = APIResultHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index dbbbd6bc9..cc973e379 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -33,226 +33,214 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createDataPointHelpers = () => { - return () => ({ - lower: (value) => { - f64Stack.push(value.x); - f64Stack.push(value.y); - const bytes = textEncoder.encode(value.label); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - const isSome = value.optCount != null; - if (isSome) { - i32Stack.push(value.optCount | 0); - } else { - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - const isSome1 = value.optFlag != null; - if (isSome1) { - i32Stack.push(value.optFlag ? 1 : 0); - } else { - i32Stack.push(0); - } - i32Stack.push(isSome1 ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const bool = i32Stack.pop() !== 0; - optional = bool; - } else { - optional = null; - } - const isSome1 = i32Stack.pop(); - let optional1; - if (isSome1) { - const int = i32Stack.pop(); - optional1 = int; - } else { - optional1 = null; - } - const string = strStack.pop(); - const f64 = f64Stack.pop(); - const f641 = f64Stack.pop(); - return { x: f641, y: f64, label: string, optCount: optional1, optFlag: optional }; - } - }); - }; - const __bjs_createAddressHelpers = () => { - return () => ({ - lower: (value) => { - const bytes = textEncoder.encode(value.street); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - const bytes1 = textEncoder.encode(value.city); + const __bjs_createDataPointHelpers = () => ({ + lower: (value) => { + f64Stack.push(value.x); + f64Stack.push(value.y); + const bytes = textEncoder.encode(value.label); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + const isSome = value.optCount != null; + if (isSome) { + i32Stack.push((value.optCount | 0)); + } else { + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + const isSome1 = value.optFlag != null; + if (isSome1) { + i32Stack.push(value.optFlag ? 1 : 0); + } else { + i32Stack.push(0); + } + i32Stack.push(isSome1 ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const bool = i32Stack.pop() !== 0; + optional = bool; + } else { + optional = null; + } + const isSome1 = i32Stack.pop(); + let optional1; + if (isSome1) { + const int = i32Stack.pop(); + optional1 = int; + } else { + optional1 = null; + } + const string = strStack.pop(); + const f64 = f64Stack.pop(); + const f641 = f64Stack.pop(); + return { x: f641, y: f64, label: string, optCount: optional1, optFlag: optional }; + } + }); + const __bjs_createAddressHelpers = () => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.street); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + const bytes1 = textEncoder.encode(value.city); + const id1 = swift.memory.retain(bytes1); + i32Stack.push(bytes1.length); + i32Stack.push(id1); + const isSome = value.zipCode != null; + if (isSome) { + i32Stack.push((value.zipCode | 0)); + } else { + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const int = i32Stack.pop(); + optional = int; + } else { + optional = null; + } + const string = strStack.pop(); + const string1 = strStack.pop(); + return { street: string1, city: string, zipCode: optional }; + } + }); + const __bjs_createPersonHelpers = () => ({ + lower: (value) => { + const bytes = textEncoder.encode(value.name); + const id = swift.memory.retain(bytes); + i32Stack.push(bytes.length); + i32Stack.push(id); + i32Stack.push((value.age | 0)); + structHelpers.Address.lower(value.address); + const isSome = value.email != null; + if (isSome) { + const bytes1 = textEncoder.encode(value.email); const id1 = swift.memory.retain(bytes1); i32Stack.push(bytes1.length); i32Stack.push(id1); - const isSome = value.zipCode != null; - if (isSome) { - i32Stack.push(value.zipCode | 0); - } else { - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const int = i32Stack.pop(); - optional = int; - } else { - optional = null; - } + } else { + i32Stack.push(0); + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { const string = strStack.pop(); - const string1 = strStack.pop(); - return { street: string1, city: string, zipCode: optional }; - } - }); - }; - const __bjs_createPersonHelpers = () => { - return () => ({ - lower: (value) => { - const bytes = textEncoder.encode(value.name); - const id = swift.memory.retain(bytes); - i32Stack.push(bytes.length); - i32Stack.push(id); - i32Stack.push((value.age | 0)); - structHelpers.Address.lower(value.address); - const isSome = value.email != null; - let id1; - if (isSome) { - const bytes1 = textEncoder.encode(value.email); - id1 = swift.memory.retain(bytes1); - i32Stack.push(bytes1.length); - i32Stack.push(id1); - } else { - i32Stack.push(0); - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const string = strStack.pop(); - optional = string; - } else { - optional = null; - } - const struct = structHelpers.Address.lift(); - const int = i32Stack.pop(); - const string1 = strStack.pop(); - return { name: string1, age: int, address: struct, email: optional }; - } - }); - }; - const __bjs_createSessionHelpers = () => { - return () => ({ - lower: (value) => { - i32Stack.push((value.id | 0)); - ptrStack.push(value.owner.pointer); - }, - lift: () => { - const ptr = ptrStack.pop(); - const obj = _exports['Greeter'].__construct(ptr); - const int = i32Stack.pop(); - return { id: int, owner: obj }; - } - }); - }; - const __bjs_createMeasurementHelpers = () => { - return () => ({ - lower: (value) => { - f64Stack.push(value.value); - f32Stack.push(Math.fround(value.precision)); - const isSome = value.optionalPrecision != null; - if (isSome) { - f32Stack.push(Math.fround(value.optionalPrecision)); - } else { - f32Stack.push(0.0); - } - i32Stack.push(isSome ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const rawValue = f32Stack.pop(); - optional = rawValue; - } else { - optional = null; - } - const rawValue1 = f32Stack.pop(); - const f64 = f64Stack.pop(); - return { value: f64, precision: rawValue1, optionalPrecision: optional }; - } - }); - }; - const __bjs_createConfigStructHelpers = () => { - return () => ({ - lower: (value) => { - }, - lift: () => { - return { }; - } - }); - }; - const __bjs_createContainerHelpers = () => { - return () => ({ - lower: (value) => { - let id; - if (value.object != null) { - id = swift.memory.retain(value.object); - } else { - id = undefined; - } - i32Stack.push(id !== undefined ? id : 0); - const isSome = value.optionalObject != null; + optional = string; + } else { + optional = null; + } + const struct = structHelpers.Address.lift(); + const int = i32Stack.pop(); + const string1 = strStack.pop(); + return { name: string1, age: int, address: struct, email: optional }; + } + }); + const __bjs_createSessionHelpers = () => ({ + lower: (value) => { + i32Stack.push((value.id | 0)); + ptrStack.push(value.owner.pointer); + }, + lift: () => { + const ptr = ptrStack.pop(); + const obj = _exports['Greeter'].__construct(ptr); + const int = i32Stack.pop(); + return { id: int, owner: obj }; + } + }); + const __bjs_createMeasurementHelpers = () => ({ + lower: (value) => { + f64Stack.push(value.value); + f32Stack.push(Math.fround(value.precision)); + const isSome = value.optionalPrecision != null; + if (isSome) { + f32Stack.push(Math.fround(value.optionalPrecision)); + } else { + f32Stack.push(0.0); + } + i32Stack.push(isSome ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const rawValue = f32Stack.pop(); + optional = rawValue; + } else { + optional = null; + } + const rawValue1 = f32Stack.pop(); + const f64 = f64Stack.pop(); + return { value: f64, precision: rawValue1, optionalPrecision: optional }; + } + }); + const __bjs_createConfigStructHelpers = () => ({ + lower: (value) => { + }, + lift: () => { + return { }; + } + }); + const __bjs_createContainerHelpers = () => ({ + lower: (value) => { + let id; + if (value.object != null) { + id = swift.memory.retain(value.object); + } else { + id = undefined; + } + i32Stack.push(id !== undefined ? id : 0); + const isSome = value.optionalObject != null; + if (isSome) { let id1; - if (isSome) { + if (value.optionalObject != null) { id1 = swift.memory.retain(value.optionalObject); - i32Stack.push(id1); } else { id1 = undefined; - i32Stack.push(0); - } - i32Stack.push(isSome ? 1 : 0); - }, - lift: () => { - const isSome = i32Stack.pop(); - let optional; - if (isSome) { - const objectId = i32Stack.pop(); - let value; - if (objectId !== 0) { - value = swift.memory.getObject(objectId); - swift.memory.release(objectId); - } else { - value = null; - } - optional = value; - } else { - optional = null; } - const objectId1 = i32Stack.pop(); - let value1; - if (objectId1 !== 0) { - value1 = swift.memory.getObject(objectId1); - swift.memory.release(objectId1); + i32Stack.push(id1 !== undefined ? id1 : 0); + } else { + i32Stack.push(0); + } + i32Stack.push(isSome ? 1 : 0); + }, + lift: () => { + const isSome = i32Stack.pop(); + let optional; + if (isSome) { + const objectId = i32Stack.pop(); + let value; + if (objectId !== 0) { + value = swift.memory.getObject(objectId); + swift.memory.release(objectId); } else { - value1 = null; + value = null; } - return { object: value1, optionalObject: optional }; - } - }); - }; + optional = value; + } else { + optional = null; + } + const objectId1 = i32Stack.pop(); + let value1; + if (objectId1 !== 0) { + value1 = swift.memory.getObject(objectId1); + swift.memory.release(objectId1); + } else { + value1 = null; + } + return { object: value1, optionalObject: optional }; + } + }); return { /** @@ -536,25 +524,25 @@ export async function createInstantiator(options, swift) { instance.exports.bjs_Greeter_name_set(this.pointer, valueId, valueBytes.length); } } - const DataPointHelpers = __bjs_createDataPointHelpers()(); + const DataPointHelpers = __bjs_createDataPointHelpers(); structHelpers.DataPoint = DataPointHelpers; - const AddressHelpers = __bjs_createAddressHelpers()(); + const AddressHelpers = __bjs_createAddressHelpers(); structHelpers.Address = AddressHelpers; - const PersonHelpers = __bjs_createPersonHelpers()(); + const PersonHelpers = __bjs_createPersonHelpers(); structHelpers.Person = PersonHelpers; - const SessionHelpers = __bjs_createSessionHelpers()(); + const SessionHelpers = __bjs_createSessionHelpers(); structHelpers.Session = SessionHelpers; - const MeasurementHelpers = __bjs_createMeasurementHelpers()(); + const MeasurementHelpers = __bjs_createMeasurementHelpers(); structHelpers.Measurement = MeasurementHelpers; - const ConfigStructHelpers = __bjs_createConfigStructHelpers()(); + const ConfigStructHelpers = __bjs_createConfigStructHelpers(); structHelpers.ConfigStruct = ConfigStructHelpers; - const ContainerHelpers = __bjs_createContainerHelpers()(); + const ContainerHelpers = __bjs_createContainerHelpers(); structHelpers.Container = ContainerHelpers; const exports = { @@ -578,7 +566,7 @@ export async function createInstantiator(options, swift) { const labelId = swift.memory.retain(labelBytes); const isSome = optCount != null; const isSome1 = optFlag != null; - instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag : 0); + instance.exports.bjs_DataPoint_init(x, y, labelId, labelBytes.length, +isSome, isSome ? optCount : 0, +isSome1, isSome1 ? optFlag ? 1 : 0 : 0); const structValue = structHelpers.DataPoint.lift(); return structValue; }, diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index cf64ab587..d00b7450d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -28,19 +28,17 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createPointHelpers = () => { - return () => ({ - lower: (value) => { - i32Stack.push((value.x | 0)); - i32Stack.push((value.y | 0)); - }, - lift: () => { - const int = i32Stack.pop(); - const int1 = i32Stack.pop(); - return { x: int1, y: int }; - } - }); - }; + const __bjs_createPointHelpers = () => ({ + lower: (value) => { + i32Stack.push((value.x | 0)); + i32Stack.push((value.y | 0)); + }, + lift: () => { + const int = i32Stack.pop(); + const int1 = i32Stack.pop(); + return { x: int1, y: int }; + } + }); return { /** @@ -228,7 +226,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const PointHelpers = __bjs_createPointHelpers()(); + const PointHelpers = __bjs_createPointHelpers(); structHelpers.Point = PointHelpers; const exports = { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 30c40a18c..c141a7926 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -28,25 +28,23 @@ export async function createInstantiator(options, swift) { let _exports = null; let bjs = null; - const __bjs_createPointerFieldsHelpers = () => { - return () => ({ - lower: (value) => { - ptrStack.push((value.raw | 0)); - ptrStack.push((value.mutRaw | 0)); - ptrStack.push((value.opaque | 0)); - ptrStack.push((value.ptr | 0)); - ptrStack.push((value.mutPtr | 0)); - }, - lift: () => { - const pointer = ptrStack.pop(); - const pointer1 = ptrStack.pop(); - const pointer2 = ptrStack.pop(); - const pointer3 = ptrStack.pop(); - const pointer4 = ptrStack.pop(); - return { raw: pointer4, mutRaw: pointer3, opaque: pointer2, ptr: pointer1, mutPtr: pointer }; - } - }); - }; + const __bjs_createPointerFieldsHelpers = () => ({ + lower: (value) => { + ptrStack.push((value.raw | 0)); + ptrStack.push((value.mutRaw | 0)); + ptrStack.push((value.opaque | 0)); + ptrStack.push((value.ptr | 0)); + ptrStack.push((value.mutPtr | 0)); + }, + lift: () => { + const pointer = ptrStack.pop(); + const pointer1 = ptrStack.pop(); + const pointer2 = ptrStack.pop(); + const pointer3 = ptrStack.pop(); + const pointer4 = ptrStack.pop(); + return { raw: pointer4, mutRaw: pointer3, opaque: pointer2, ptr: pointer1, mutPtr: pointer }; + } + }); return { /** @@ -222,7 +220,7 @@ export async function createInstantiator(options, swift) { /** @param {WebAssembly.Instance} instance */ createExports: (instance) => { const js = swift.memory.heap; - const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers()(); + const PointerFieldsHelpers = __bjs_createPointerFieldsHelpers(); structHelpers.PointerFields = PointerFieldsHelpers; const exports = { From 017f1721628e880e8829efa5674efb8a035489b4 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 19 Feb 2026 12:44:21 +0900 Subject: [PATCH 248/252] TS2Swift tests: warn on export assignment --- .../test/__snapshots__/ts2swift.test.js.snap | 13 +++++++++++++ .../test/fixtures/ExportAssignment.d.ts | 2 ++ .../TS2Swift/JavaScript/test/ts2swift.test.js | 17 ++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ExportAssignment.d.ts diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap index 7f7a7de62..4122f4148 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap @@ -121,6 +121,19 @@ exports[`ts2swift > snapshots Swift output for Documentation.d.ts > Documentatio " `; +exports[`ts2swift > snapshots Swift output for ExportAssignment.d.ts > ExportAssignment 1`] = ` +"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// \`swift package bridge-js\`. + +@_spi(BridgeJS) import JavaScriptKit + +@JSGetter var foo: Double +" +`; + exports[`ts2swift > snapshots Swift output for Interface.d.ts > Interface 1`] = ` "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, // DO NOT EDIT. diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ExportAssignment.d.ts b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ExportAssignment.d.ts new file mode 100644 index 000000000..5f9543ecb --- /dev/null +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ExportAssignment.d.ts @@ -0,0 +1,2 @@ +export const foo: number; +export default foo; diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js index d0ccf220a..8882124ed 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js @@ -1,5 +1,5 @@ // @ts-check -import { describe, it, expect } from 'vitest'; +import { describe, it, expect, vi } from 'vitest'; import { readdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs'; import { fileURLToPath } from 'url'; import path from 'path'; @@ -50,4 +50,19 @@ describe('ts2swift', () => { rmSync(tmpDir, { recursive: true, force: true }); } }); + + it('emits a warning when export assignments cannot be generated', () => { + const dtsPath = path.join(inputsDir, 'ExportAssignment.d.ts'); + const stderrSpy = vi.spyOn(process.stderr, 'write').mockImplementation(() => true); + try { + run([dtsPath], { tsconfigPath, logLevel: 'warning' }); + const combined = stderrSpy.mock.calls.map(args => String(args[0])).join(''); + expect(combined).toMatch(/Skipping export assignment/); + // Only warn once for the export assignment node + const occurrences = (combined.match(/Skipping export assignment/g) || []).length; + expect(occurrences).toBe(1); + } finally { + stderrSpy.mockRestore(); + } + }); }); From 2a92246ec8d2e75bc9fea6abe48edc8497376d1e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 19 Feb 2026 12:48:20 +0900 Subject: [PATCH 249/252] [NFC] BridgeJS: Use consistent codegen helper for @_extern decl --- .../Sources/BridgeJSCore/ClosureCodegen.swift | 23 +- .../Sources/BridgeJSCore/ExportSwift.swift | 48 +---- .../Sources/BridgeJSCore/ImportTS.swift | 40 ++-- .../BridgeJSCodegenTests/Protocol.swift | 198 ++++++++++++++++++ .../Generated/BridgeJS.swift | 180 ++++++++++++++++ 5 files changed, 418 insertions(+), 71 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index cbec4ba31..59b889ec6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -46,17 +46,16 @@ public struct ClosureCodegen { // Generate extern declaration using CallJSEmission let externDecl = builder.renderImportDecl() - - let makeClosureExternDecl: DeclSyntax = """ - #if arch(wasm32) - @_extern(wasm, module: "bjs", name: "make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)") - fileprivate func make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 - #else - fileprivate func make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName)(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - fatalError("Only available on WebAssembly") - } - #endif - """ + let externABIName = "make_swift_closure_\(signature.moduleName)_\(signature.mangleName)" + let externDeclPrinter = CodeFragmentPrinter() + SwiftCodePattern.buildExternFunctionDecl( + printer: externDeclPrinter, + moduleName: "bjs", + abiName: externABIName, + functionName: externABIName, + signature: "(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32" + ) + let makeClosureExternDecl: DeclSyntax = "\(raw: externDeclPrinter.lines.joined(separator: "\n"))" let helperEnumDeclPrinter = CodeFragmentPrinter() helperEnumDeclPrinter.write("private enum \(helperName) {") @@ -98,7 +97,7 @@ public struct ClosureCodegen { extension JSTypedClosure where Signature == \(raw: swiftClosureType) { init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping \(raw: swiftClosureType)) { self.init( - makeClosure: make_swift_closure_\(raw: signature.moduleName)_\(raw: signature.mangleName), + makeClosure: \(raw: externABIName), body: body, fileID: fileID, line: line diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 525f6b73b..62ec2d3e6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -701,26 +701,12 @@ public class ExportSwift { ) let externDeclPrinter = CodeFragmentPrinter() - SwiftCodePattern.buildWasmConditionalCompilationDecls( + SwiftCodePattern.buildExternFunctionDecl( printer: externDeclPrinter, - wasmDecl: { printer in - SwiftCodePattern.buildExternFunctionDecl( - printer: printer, - moduleName: moduleName, - abiName: externFunctionName, - functionName: wrapFunctionName, - signature: funcSignature - ) - }, - elseDecl: { printer in - printer.write( - multilineString: """ - fileprivate func \(wrapFunctionName)\(funcSignature) { - fatalError("Only available on WebAssembly") - } - """ - ) - } + moduleName: moduleName, + abiName: externFunctionName, + functionName: wrapFunctionName, + signature: funcSignature ) let externDecl: DeclSyntax = "\(raw: externDeclPrinter.lines.joined(separator: "\n"))" return [extensionDecl, externDecl] @@ -1297,26 +1283,12 @@ struct StructCodegen { functionName: String, signature: String ) { - SwiftCodePattern.buildWasmConditionalCompilationDecls( + SwiftCodePattern.buildExternFunctionDecl( printer: printer, - wasmDecl: { printer in - SwiftCodePattern.buildExternFunctionDecl( - printer: printer, - moduleName: "bjs", - abiName: externName, - functionName: functionName, - signature: signature - ) - }, - elseDecl: { printer in - printer.write( - multilineString: """ - fileprivate func \(functionName)\(signature) { - fatalError("Only available on WebAssembly") - } - """ - ) - } + moduleName: "bjs", + abiName: externName, + functionName: functionName, + signature: signature ) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index 8eead20b7..ed5d5ff36 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -228,26 +228,12 @@ public struct ImportTS { ) let printer = CodeFragmentPrinter() - SwiftCodePattern.buildWasmConditionalCompilationDecls( + SwiftCodePattern.buildExternFunctionDecl( printer: printer, - wasmDecl: { printer in - SwiftCodePattern.buildExternFunctionDecl( - printer: printer, - moduleName: moduleName, - abiName: abiName, - functionName: abiName, - signature: signature - ) - }, - elseDecl: { printer in - printer.write( - multilineString: """ - fileprivate func \(abiName)\(signature) { - fatalError("Only available on WebAssembly") - } - """ - ) - } + moduleName: moduleName, + abiName: abiName, + functionName: abiName, + signature: signature ) return "\(raw: printer.lines.joined(separator: "\n"))" } @@ -658,8 +644,20 @@ enum SwiftCodePattern { functionName: String, signature: String ) { - printer.write(buildExternAttribute(moduleName: moduleName, abiName: abiName)) - printer.write("fileprivate func \(functionName)\(signature)") + buildWasmConditionalCompilationDecls( + printer: printer, + wasmDecl: { printer in + printer.write(buildExternAttribute(moduleName: moduleName, abiName: abiName)) + printer.write("fileprivate func \(functionName)\(signature)") + }, + elseDecl: { printer in + printer.write("fileprivate func \(functionName)\(signature) {") + printer.indent { + printer.write("fatalError(\"Only available on WebAssembly\")") + } + printer.write("}") + } + ) } /// Builds the standard @_expose and @_cdecl attributes for WebAssembly-exposed functions diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 65ff9e67c..56aeb71cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -217,104 +217,302 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto } } +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void +#else +fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void +#else +fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 +#else +fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void +#else +fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void +#else +fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void +#else +fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void +#else +fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 253087c0d..12ec21574 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -1689,95 +1689,275 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { } } +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void +#else +fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void +#else +fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void +#else +fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 +#else +fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void +#else +fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +#if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void +#else +fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { From aa961dc0e5769cbe845ae20387062f0cbb867665 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 19 Feb 2026 12:59:48 +0900 Subject: [PATCH 250/252] [NFC] BridgeJS: Work around extern inlining by adding an extra non-inlined layer of indirection --- Benchmarks/Sources/Generated/BridgeJS.swift | 154 +- .../PlayBridgeJS/Generated/BridgeJS.swift | 63 +- .../Sources/BridgeJSCore/ClosureCodegen.swift | 3 +- .../Sources/BridgeJSCore/ExportSwift.swift | 66 +- .../Sources/BridgeJSCore/ImportTS.swift | 44 +- .../BridgeJSCodegenTests/ArrayTypes.swift | 70 +- .../CrossFileFunctionTypes.ReverseOrder.swift | 16 +- .../CrossFileFunctionTypes.swift | 16 +- .../CrossFileSkipsEmptySkeletons.swift | 7 +- ...CrossFileTypeResolution.ReverseOrder.swift | 16 +- .../CrossFileTypeResolution.swift | 16 +- .../DefaultParameters.swift | 51 +- .../DictionaryTypes.swift | 14 +- .../EnumAssociatedValue.swift | 23 +- .../EnumNamespace.Global.swift | 23 +- .../BridgeJSCodegenTests/EnumNamespace.swift | 23 +- .../BridgeJSCodegenTests/EnumRawType.swift | 14 +- .../BridgeJSCodegenTests/GlobalGetter.swift | 14 +- .../GlobalThisImports.swift | 35 +- .../BridgeJSCodegenTests/ImportArray.swift | 14 +- .../ImportedTypeInExportedInterface.swift | 21 +- .../InvalidPropertyNames.swift | 154 +- .../BridgeJSCodegenTests/JSClass.swift | 63 +- .../JSClassStaticFunctions.swift | 49 +- .../BridgeJSCodegenTests/JSValue.swift | 21 +- .../BridgeJSCodegenTests/MixedGlobal.swift | 9 +- .../BridgeJSCodegenTests/MixedPrivate.swift | 9 +- .../Namespaces.Global.swift | 23 +- .../BridgeJSCodegenTests/Namespaces.swift | 23 +- .../BridgeJSCodegenTests/Optionals.swift | 189 +- .../PrimitiveParameters.swift | 7 +- .../PrimitiveReturn.swift | 14 +- .../BridgeJSCodegenTests/PropertyTypes.swift | 9 +- .../BridgeJSCodegenTests/Protocol.swift | 254 ++- .../StaticFunctions.Global.swift | 9 +- .../StaticFunctions.swift | 9 +- .../StaticProperties.Global.swift | 9 +- .../StaticProperties.swift | 9 +- .../StringParameter.swift | 14 +- .../BridgeJSCodegenTests/StringReturn.swift | 7 +- .../BridgeJSCodegenTests/SwiftClass.swift | 35 +- .../BridgeJSCodegenTests/SwiftClosure.swift | 296 ++- .../SwiftClosureImports.swift | 28 +- .../BridgeJSCodegenTests/SwiftStruct.swift | 107 +- .../SwiftStructImports.swift | 21 +- .../BridgeJSCodegenTests/UnsafePointer.swift | 14 +- .../VoidParameterVoidReturn.swift | 7 +- .../Generated/BridgeJS.swift | 23 +- .../Generated/BridgeJS.swift | 1680 ++++++++++++----- 49 files changed, 2676 insertions(+), 1119 deletions(-) diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 65e57bdf9..a19e2c53a 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -145,21 +145,27 @@ extension SimpleStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SimpleStruct") -fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_SimpleStruct_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_SimpleStruct_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_SimpleStruct(_ objectId: Int32) -> Void { + return _bjs_struct_lower_SimpleStruct_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SimpleStruct") -fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 +fileprivate func _bjs_struct_lift_SimpleStruct_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { +fileprivate func _bjs_struct_lift_SimpleStruct_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_SimpleStruct() -> Int32 { + return _bjs_struct_lift_SimpleStruct_extern() +} extension Address: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Address { @@ -189,21 +195,27 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Address_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") -fileprivate func _bjs_struct_lift_Address() -> Int32 +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Address() -> Int32 { + return _bjs_struct_lift_Address_extern() +} extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Person { @@ -239,21 +251,27 @@ extension Person: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Person_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Person_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Person_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Person") -fileprivate func _bjs_struct_lift_Person() -> Int32 +fileprivate func _bjs_struct_lift_Person_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Person() -> Int32 { +fileprivate func _bjs_struct_lift_Person_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Person() -> Int32 { + return _bjs_struct_lift_Person_extern() +} extension ComplexStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ComplexStruct { @@ -289,21 +307,27 @@ extension ComplexStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ComplexStruct") -fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_ComplexStruct_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_ComplexStruct_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_ComplexStruct(_ objectId: Int32) -> Void { + return _bjs_struct_lower_ComplexStruct_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ComplexStruct") -fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 +fileprivate func _bjs_struct_lift_ComplexStruct_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ComplexStruct_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_ComplexStruct() -> Int32 { + return _bjs_struct_lift_ComplexStruct_extern() +} extension Point: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Point { @@ -331,21 +355,27 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Point_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} @_expose(wasm, "bjs_run") @_cdecl("bjs_run") @@ -473,12 +503,15 @@ extension EnumRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_EnumRoundtrip_wrap") -fileprivate func _bjs_EnumRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_EnumRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_EnumRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_EnumRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_EnumRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_EnumRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_ComplexResultRoundtrip_init") @_cdecl("bjs_ComplexResultRoundtrip_init") @@ -607,12 +640,15 @@ extension ComplexResultRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_ComplexResultRoundtrip_wrap") -fileprivate func _bjs_ComplexResultRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ComplexResultRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ComplexResultRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ComplexResultRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ComplexResultRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ComplexResultRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_StringRoundtrip_init") @_cdecl("bjs_StringRoundtrip_init") @@ -664,12 +700,15 @@ extension StringRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_StringRoundtrip_wrap") -fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StringRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StringRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_StringRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_StringRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_OptionalReturnRoundtrip_init") @_cdecl("bjs_OptionalReturnRoundtrip_init") @@ -788,12 +827,15 @@ extension OptionalReturnRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_OptionalReturnRoundtrip_wrap") -fileprivate func _bjs_OptionalReturnRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalReturnRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalReturnRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalReturnRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_OptionalReturnRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_OptionalReturnRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_StructRoundtrip_init") @_cdecl("bjs_StructRoundtrip_init") @@ -952,12 +994,15 @@ extension StructRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_StructRoundtrip_wrap") -fileprivate func _bjs_StructRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StructRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StructRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StructRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_StructRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_StructRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_SimpleClass_init") @_cdecl("bjs_SimpleClass_init") @@ -1093,12 +1138,15 @@ extension SimpleClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_SimpleClass_wrap") -fileprivate func _bjs_SimpleClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SimpleClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SimpleClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SimpleClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_SimpleClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_SimpleClass_wrap_extern(pointer) +} @_expose(wasm, "bjs_AddressClass_init") @_cdecl("bjs_AddressClass_init") @@ -1192,12 +1240,15 @@ extension AddressClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_AddressClass_wrap") -fileprivate func _bjs_AddressClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_AddressClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_AddressClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_AddressClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_AddressClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_AddressClass_wrap_extern(pointer) +} @_expose(wasm, "bjs_ClassRoundtrip_init") @_cdecl("bjs_ClassRoundtrip_init") @@ -1292,12 +1343,15 @@ extension ClassRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_ClassRoundtrip_wrap") -fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ClassRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClassRoundtrip_wrap_extern(pointer) +} @_expose(wasm, "bjs_ArrayRoundtrip_init") @_cdecl("bjs_ArrayRoundtrip_init") @@ -1705,21 +1759,27 @@ extension ArrayRoundtrip: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_ArrayRoundtrip_wrap") -fileprivate func _bjs_ArrayRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ArrayRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ArrayRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ArrayRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ArrayRoundtrip_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ArrayRoundtrip_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop") -fileprivate func bjs_benchmarkHelperNoop() -> Void +fileprivate func bjs_benchmarkHelperNoop_extern() -> Void #else -fileprivate func bjs_benchmarkHelperNoop() -> Void { +fileprivate func bjs_benchmarkHelperNoop_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_benchmarkHelperNoop() -> Void { + return bjs_benchmarkHelperNoop_extern() +} func _$benchmarkHelperNoop() throws(JSException) -> Void { bjs_benchmarkHelperNoop() @@ -1730,12 +1790,15 @@ func _$benchmarkHelperNoop() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber") -fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void +fileprivate func bjs_benchmarkHelperNoopWithNumber_extern(_ n: Float64) -> Void #else -fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { +fileprivate func bjs_benchmarkHelperNoopWithNumber_extern(_ n: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void { + return bjs_benchmarkHelperNoopWithNumber_extern(n) +} func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { let nValue = n.bridgeJSLowerParameter() @@ -1747,12 +1810,15 @@ func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") -fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void +fileprivate func bjs_benchmarkRunner_extern(_ name: Int32, _ body: Int32) -> Void #else -fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { +fileprivate func bjs_benchmarkRunner_extern(_ name: Int32, _ body: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void { + return bjs_benchmarkRunner_extern(name, body) +} func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { let nameValue = name.bridgeJSLowerParameter() diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index f2aaa9794..88cdf900e 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -37,21 +37,27 @@ extension PlayBridgeJSOutput: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSOutput") -fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PlayBridgeJSOutput_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PlayBridgeJSOutput(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PlayBridgeJSOutput_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSOutput") -fileprivate func _bjs_struct_lift_PlayBridgeJSOutput() -> Int32 +fileprivate func _bjs_struct_lift_PlayBridgeJSOutput_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PlayBridgeJSOutput() -> Int32 { +fileprivate func _bjs_struct_lift_PlayBridgeJSOutput_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PlayBridgeJSOutput() -> Int32 { + return _bjs_struct_lift_PlayBridgeJSOutput_extern() +} extension PlayBridgeJSDiagnostic: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PlayBridgeJSDiagnostic { @@ -87,21 +93,27 @@ extension PlayBridgeJSDiagnostic: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSDiagnostic") -fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PlayBridgeJSDiagnostic(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PlayBridgeJSDiagnostic_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSDiagnostic") -fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic() -> Int32 +fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic() -> Int32 { +fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PlayBridgeJSDiagnostic() -> Int32 { + return _bjs_struct_lift_PlayBridgeJSDiagnostic_extern() +} extension PlayBridgeJSResult: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PlayBridgeJSResult { @@ -129,21 +141,27 @@ extension PlayBridgeJSResult: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PlayBridgeJSResult") -fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PlayBridgeJSResult_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PlayBridgeJSResult_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PlayBridgeJSResult(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PlayBridgeJSResult_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PlayBridgeJSResult") -fileprivate func _bjs_struct_lift_PlayBridgeJSResult() -> Int32 +fileprivate func _bjs_struct_lift_PlayBridgeJSResult_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PlayBridgeJSResult() -> Int32 { +fileprivate func _bjs_struct_lift_PlayBridgeJSResult_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PlayBridgeJSResult() -> Int32 { + return _bjs_struct_lift_PlayBridgeJSResult_extern() +} @_expose(wasm, "bjs_PlayBridgeJS_init") @_cdecl("bjs_PlayBridgeJS_init") @@ -199,21 +217,27 @@ extension PlayBridgeJS: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_PlayBridgeJS_wrap") -fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PlayBridgeJS_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PlayBridgeJS_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PlayBridgeJS_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PlayBridgeJS_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Swift") -fileprivate func bjs_createTS2Swift() -> Int32 +fileprivate func bjs_createTS2Swift_extern() -> Int32 #else -fileprivate func bjs_createTS2Swift() -> Int32 { +fileprivate func bjs_createTS2Swift_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_createTS2Swift() -> Int32 { + return bjs_createTS2Swift_extern() +} func _$createTS2Swift() throws(JSException) -> TS2Swift { let ret = bjs_createTS2Swift() @@ -225,12 +249,15 @@ func _$createTS2Swift() throws(JSException) -> TS2Swift { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Swift_convert") -fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 +fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ ts: Int32) -> Int32 #else -fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 { +fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ ts: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 { + return bjs_TS2Swift_convert_extern(self, ts) +} func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String { let selfValue = self.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 59b889ec6..d974fc16d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -53,7 +53,8 @@ public struct ClosureCodegen { moduleName: "bjs", abiName: externABIName, functionName: externABIName, - signature: "(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32" + signature: "(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32", + parameterNames: ["boxPtr", "file", "line"] ) let makeClosureExternDecl: DeclSyntax = "\(raw: externDeclPrinter.lines.joined(separator: "\n"))" diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 62ec2d3e6..2332918c1 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -695,18 +695,14 @@ public class ExportSwift { } """ // Build common function signature - let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: [("pointer", .pointer)], - returnType: .i32 - ) - let externDeclPrinter = CodeFragmentPrinter() SwiftCodePattern.buildExternFunctionDecl( printer: externDeclPrinter, moduleName: moduleName, abiName: externFunctionName, functionName: wrapFunctionName, - signature: funcSignature + abiParameters: [("pointer", .pointer)], + returnType: .i32 ) let externDecl: DeclSyntax = "\(raw: externDeclPrinter.lines.joined(separator: "\n"))" return [extensionDecl, externDecl] @@ -1251,24 +1247,22 @@ struct StructCodegen { let bridgedStructExtension: DeclSyntax = "\(raw: printer.lines.joined(separator: "\n"))" let lowerExternDeclPrinter = CodeFragmentPrinter() - Self.renderStructExtern( + SwiftCodePattern.buildExternFunctionDecl( printer: lowerExternDeclPrinter, - externName: lowerExternName, + moduleName: "bjs", + abiName: lowerExternName, functionName: lowerFunctionName, - signature: SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: [("objectId", .i32)], - returnType: nil - ) + abiParameters: [("objectId", .i32)], + returnType: nil ) let liftExternDeclPrinter = CodeFragmentPrinter() - Self.renderStructExtern( + SwiftCodePattern.buildExternFunctionDecl( printer: liftExternDeclPrinter, - externName: liftExternName, + moduleName: "bjs", + abiName: liftExternName, functionName: liftFunctionName, - signature: SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: [], - returnType: .i32 - ) + abiParameters: [], + returnType: .i32 ) return [ @@ -1277,21 +1271,6 @@ struct StructCodegen { ] } - private static func renderStructExtern( - printer: CodeFragmentPrinter, - externName: String, - functionName: String, - signature: String - ) { - SwiftCodePattern.buildExternFunctionDecl( - printer: printer, - moduleName: "bjs", - abiName: externName, - functionName: functionName, - signature: signature - ) - } - private func generateStructLiftCode(structDef: ExportedStruct) -> [String] { var lines: [String] = [] let instanceProps = structDef.properties.filter { !$0.isStatic } @@ -1357,17 +1336,14 @@ struct ProtocolCodegen { ) // Build extern declaration using helper function - let externSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: builder.abiParameterSignatures, - returnType: builder.abiReturnType - ) let externDeclPrinter = CodeFragmentPrinter() SwiftCodePattern.buildExternFunctionDecl( printer: externDeclPrinter, moduleName: moduleName, abiName: method.abiName, functionName: "_extern_\(method.name)", - signature: externSignature + abiParameters: builder.abiParameterSignatures, + returnType: builder.abiReturnType ) externDecls.append(DeclSyntax("\(raw: externDeclPrinter.lines.joined(separator: "\n"))")) let methodImplPrinter = CodeFragmentPrinter() @@ -1448,17 +1424,14 @@ struct ProtocolCodegen { try getterBuilder.liftReturnValue(returnType: property.type) // Build getter extern declaration using helper function - let getterExternSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: getterBuilder.abiParameterSignatures, - returnType: getterBuilder.abiReturnType - ) let getterExternDeclPrinter = CodeFragmentPrinter() SwiftCodePattern.buildExternFunctionDecl( printer: getterExternDeclPrinter, moduleName: moduleName, abiName: getterAbiName, functionName: getterAbiName, - signature: getterExternSignature + abiParameters: getterBuilder.abiParameterSignatures, + returnType: getterBuilder.abiReturnType ) let getterExternDecl = DeclSyntax("\(raw: getterExternDeclPrinter.lines.joined(separator: "\n"))") var externDecls: [DeclSyntax] = [getterExternDecl] @@ -1483,17 +1456,14 @@ struct ProtocolCodegen { try setterBuilder.call(returnType: .void) // Build setter extern declaration using helper function - let setterExternSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: setterBuilder.abiParameterSignatures, - returnType: setterBuilder.abiReturnType - ) let setterExternDeclPrinter = CodeFragmentPrinter() SwiftCodePattern.buildExternFunctionDecl( printer: setterExternDeclPrinter, moduleName: moduleName, abiName: setterAbiName, functionName: setterAbiName, - signature: setterExternSignature + abiParameters: setterBuilder.abiParameterSignatures, + returnType: setterBuilder.abiReturnType ) let setterExternDecl = DeclSyntax("\(raw: setterExternDeclPrinter.lines.joined(separator: "\n"))") externDecls.append(setterExternDecl) diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index ed5d5ff36..8f5ac511a 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -222,18 +222,14 @@ public struct ImportTS { } func renderImportDecl() -> DeclSyntax { - let signature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: abiParameterSignatures, - returnType: abiReturnType - ) - let printer = CodeFragmentPrinter() SwiftCodePattern.buildExternFunctionDecl( printer: printer, moduleName: moduleName, abiName: abiName, functionName: abiName, - signature: signature + abiParameters: abiParameterSignatures, + returnType: abiReturnType ) return "\(raw: printer.lines.joined(separator: "\n"))" } @@ -634,6 +630,27 @@ enum SwiftCodePattern { elseDecl(printer) printer.write("#endif") } + static func buildExternFunctionDecl( + printer: CodeFragmentPrinter, + moduleName: String, + abiName: String, + functionName: String, + abiParameters: [(name: String, type: WasmCoreType)], + returnType: WasmCoreType? + ) { + let signature = SwiftSignatureBuilder.buildABIFunctionSignature( + abiParameters: abiParameters, + returnType: returnType + ) + buildExternFunctionDecl( + printer: printer, + moduleName: moduleName, + abiName: abiName, + functionName: functionName, + signature: signature, + parameterNames: abiParameters.map { $0.name } + ) + } /// Builds the @_extern attribute for WebAssembly extern function declarations /// Builds an @_extern function declaration (no body, just the declaration) @@ -642,22 +659,31 @@ enum SwiftCodePattern { moduleName: String, abiName: String, functionName: String, - signature: String + signature: String, + parameterNames: [String], ) { + // NOTE: Due to a Swift compiler issue, we can't declare possibly inlined functions as @_extern + // https://github.com/swiftlang/swift/pull/87250 + let inModuleDeclName = "\(functionName)_extern" buildWasmConditionalCompilationDecls( printer: printer, wasmDecl: { printer in printer.write(buildExternAttribute(moduleName: moduleName, abiName: abiName)) - printer.write("fileprivate func \(functionName)\(signature)") + printer.write("fileprivate func \(inModuleDeclName)\(signature)") }, elseDecl: { printer in - printer.write("fileprivate func \(functionName)\(signature) {") + printer.write("fileprivate func \(inModuleDeclName)\(signature) {") printer.indent { printer.write("fatalError(\"Only available on WebAssembly\")") } printer.write("}") } ) + printer.write("@inline(never) fileprivate func \(functionName)\(signature) {") + printer.indent { + printer.write("return \(inModuleDeclName)(\(parameterNames.joined(separator: ", ")))") + } + printer.write("}") } /// Builds the standard @_expose and @_cdecl attributes for WebAssembly-exposed functions diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 12edb29e3..be884310b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -70,21 +70,27 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Point_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} @_expose(wasm, "bjs_processIntArray") @_cdecl("bjs_processIntArray") @@ -482,21 +488,27 @@ extension Item: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Item_wrap") -fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Item_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Item_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Item_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Item_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkArray") -fileprivate func bjs_checkArray(_ a: Int32) -> Void +fileprivate func bjs_checkArray_extern(_ a: Int32) -> Void #else -fileprivate func bjs_checkArray(_ a: Int32) -> Void { +fileprivate func bjs_checkArray_extern(_ a: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkArray(_ a: Int32) -> Void { + return bjs_checkArray_extern(a) +} func _$checkArray(_ a: JSObject) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() @@ -508,12 +520,15 @@ func _$checkArray(_ a: JSObject) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkArrayWithLength") -fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void +fileprivate func bjs_checkArrayWithLength_extern(_ a: Int32, _ b: Float64) -> Void #else -fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { +fileprivate func bjs_checkArrayWithLength_extern(_ a: Int32, _ b: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkArrayWithLength(_ a: Int32, _ b: Float64) -> Void { + return bjs_checkArrayWithLength_extern(a, b) +} func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() @@ -526,12 +541,15 @@ func _$checkArrayWithLength(_ a: JSObject, _ b: Double) throws(JSException) -> V #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importProcessNumbers") -fileprivate func bjs_importProcessNumbers() -> Void +fileprivate func bjs_importProcessNumbers_extern() -> Void #else -fileprivate func bjs_importProcessNumbers() -> Void { +fileprivate func bjs_importProcessNumbers_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importProcessNumbers() -> Void { + return bjs_importProcessNumbers_extern() +} func _$importProcessNumbers(_ values: [Double]) throws(JSException) -> Void { let _ = values.bridgeJSLowerParameter() @@ -543,12 +561,15 @@ func _$importProcessNumbers(_ values: [Double]) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importGetNumbers") -fileprivate func bjs_importGetNumbers() -> Void +fileprivate func bjs_importGetNumbers_extern() -> Void #else -fileprivate func bjs_importGetNumbers() -> Void { +fileprivate func bjs_importGetNumbers_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importGetNumbers() -> Void { + return bjs_importGetNumbers_extern() +} func _$importGetNumbers() throws(JSException) -> [Double] { bjs_importGetNumbers() @@ -560,12 +581,15 @@ func _$importGetNumbers() throws(JSException) -> [Double] { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importTransformNumbers") -fileprivate func bjs_importTransformNumbers() -> Void +fileprivate func bjs_importTransformNumbers_extern() -> Void #else -fileprivate func bjs_importTransformNumbers() -> Void { +fileprivate func bjs_importTransformNumbers_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importTransformNumbers() -> Void { + return bjs_importTransformNumbers_extern() +} func _$importTransformNumbers(_ values: [Double]) throws(JSException) -> [Double] { let _ = values.bridgeJSLowerParameter() @@ -578,12 +602,15 @@ func _$importTransformNumbers(_ values: [Double]) throws(JSException) -> [Double #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importProcessStrings") -fileprivate func bjs_importProcessStrings() -> Void +fileprivate func bjs_importProcessStrings_extern() -> Void #else -fileprivate func bjs_importProcessStrings() -> Void { +fileprivate func bjs_importProcessStrings_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importProcessStrings() -> Void { + return bjs_importProcessStrings_extern() +} func _$importProcessStrings(_ values: [String]) throws(JSException) -> [String] { let _ = values.bridgeJSLowerParameter() @@ -596,12 +623,15 @@ func _$importProcessStrings(_ values: [String]) throws(JSException) -> [String] #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importProcessBooleans") -fileprivate func bjs_importProcessBooleans() -> Void +fileprivate func bjs_importProcessBooleans_extern() -> Void #else -fileprivate func bjs_importProcessBooleans() -> Void { +fileprivate func bjs_importProcessBooleans_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importProcessBooleans() -> Void { + return bjs_importProcessBooleans_extern() +} func _$importProcessBooleans(_ values: [Bool]) throws(JSException) -> [Bool] { let _ = values.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift index 05437f540..4dda325bf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift @@ -60,12 +60,15 @@ extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") -fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_FunctionA_wrap_extern(pointer) +} @_expose(wasm, "bjs_FunctionB_init") @_cdecl("bjs_FunctionB_init") @@ -117,9 +120,12 @@ extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") -fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_FunctionB_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift index fa8e80cd8..fcf84a88f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift @@ -59,12 +59,15 @@ extension FunctionB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionB_wrap") -fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_FunctionB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_FunctionB_wrap_extern(pointer) +} @_expose(wasm, "bjs_FunctionA_init") @_cdecl("bjs_FunctionA_init") @@ -117,9 +120,12 @@ extension FunctionA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_FunctionA_wrap") -fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_FunctionA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_FunctionA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_FunctionA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_FunctionA_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift index 21e4e939a..48d06ee95 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileSkipsEmptySkeletons.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_fetchNumber") -fileprivate func bjs_fetchNumber() -> Int32 +fileprivate func bjs_fetchNumber_extern() -> Int32 #else -fileprivate func bjs_fetchNumber() -> Int32 { +fileprivate func bjs_fetchNumber_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_fetchNumber() -> Int32 { + return bjs_fetchNumber_extern() +} func _$fetchNumber() throws(JSException) -> Int { let ret = bjs_fetchNumber() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift index 8d697f8ba..2868156a4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift @@ -37,12 +37,15 @@ extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") -fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClassA_wrap_extern(pointer) +} @_expose(wasm, "bjs_ClassB_init") @_cdecl("bjs_ClassB_init") @@ -73,9 +76,12 @@ extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") -fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClassB_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift index 0a0396075..09070a16f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift @@ -27,12 +27,15 @@ extension ClassB: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassB_wrap") -fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ClassB_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClassB_wrap_extern(pointer) +} @_expose(wasm, "bjs_ClassA_linkedB_get") @_cdecl("bjs_ClassA_linkedB_get") @@ -73,9 +76,12 @@ extension ClassA: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ClassA_wrap") -fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClassA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClassA_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_ClassA_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClassA_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift index c905c4239..df4969fa6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift @@ -65,21 +65,27 @@ extension Config: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Config_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config") -fileprivate func _bjs_struct_lift_Config() -> Int32 +fileprivate func _bjs_struct_lift_Config_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Config() -> Int32 { +fileprivate func _bjs_struct_lift_Config_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Config() -> Int32 { + return _bjs_struct_lift_Config_extern() +} extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations { @@ -105,21 +111,27 @@ extension MathOperations: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { + return _bjs_struct_lower_MathOperations_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations") -fileprivate func _bjs_struct_lift_MathOperations() -> Int32 +fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { +fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { + return _bjs_struct_lift_MathOperations_extern() +} @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") @@ -424,12 +436,15 @@ extension DefaultGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_DefaultGreeter_wrap") -fileprivate func _bjs_DefaultGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_DefaultGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_DefaultGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_DefaultGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_DefaultGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_DefaultGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_EmptyGreeter_init") @_cdecl("bjs_EmptyGreeter_init") @@ -460,12 +475,15 @@ extension EmptyGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_EmptyGreeter_wrap") -fileprivate func _bjs_EmptyGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_EmptyGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_EmptyGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_EmptyGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_EmptyGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_EmptyGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") @@ -601,9 +619,12 @@ extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_ConstructorDefaults_wrap") -fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ConstructorDefaults_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift index 016a5f814..742619f39 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift @@ -71,21 +71,27 @@ extension Box: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Box_wrap") -fileprivate func _bjs_Box_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Box_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Box_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Box_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Box_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Box_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_importMirrorDictionary") -fileprivate func bjs_importMirrorDictionary() -> Void +fileprivate func bjs_importMirrorDictionary_extern() -> Void #else -fileprivate func bjs_importMirrorDictionary() -> Void { +fileprivate func bjs_importMirrorDictionary_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_importMirrorDictionary() -> Void { + return bjs_importMirrorDictionary_extern() +} func _$importMirrorDictionary(_ values: [String: Double]) throws(JSException) -> [String: Double] { let _ = values.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 588fb1cbc..838c55122 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -426,21 +426,27 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Point_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} @_expose(wasm, "bjs_handle") @_cdecl("bjs_handle") @@ -658,9 +664,12 @@ extension User: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_User_wrap") -fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_User_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_User_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_User_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_User_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift index b1b5e9c8c..47d1ff60a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift @@ -169,12 +169,15 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Converter_wrap_extern(pointer) +} @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") @@ -215,12 +218,15 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_HTTPServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") @@ -261,9 +267,12 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestServer_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift index b1b5e9c8c..47d1ff60a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift @@ -169,12 +169,15 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Converter_wrap_extern(pointer) +} @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") @@ -215,12 +218,15 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_HTTPServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") @@ -261,9 +267,12 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestServer_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift index 210361b3b..c3c3d5e7f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift @@ -453,12 +453,15 @@ public func _bjs_validateSession(_ session: Int32) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_takesFeatureFlag") -fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void +fileprivate func bjs_takesFeatureFlag_extern(_ flag: Int32) -> Void #else -fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void { +fileprivate func bjs_takesFeatureFlag_extern(_ flag: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_takesFeatureFlag(_ flag: Int32) -> Void { + return bjs_takesFeatureFlag_extern(flag) +} func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { let flagValue = flag.bridgeJSLowerParameter() @@ -470,12 +473,15 @@ func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_returnsFeatureFlag") -fileprivate func bjs_returnsFeatureFlag() -> Int32 +fileprivate func bjs_returnsFeatureFlag_extern() -> Int32 #else -fileprivate func bjs_returnsFeatureFlag() -> Int32 { +fileprivate func bjs_returnsFeatureFlag_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_returnsFeatureFlag() -> Int32 { + return bjs_returnsFeatureFlag_extern() +} func _$returnsFeatureFlag() throws(JSException) -> FeatureFlag { let ret = bjs_returnsFeatureFlag() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift index da3f1367b..b42f71563 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_console_get") -fileprivate func bjs_console_get() -> Int32 +fileprivate func bjs_console_get_extern() -> Int32 #else -fileprivate func bjs_console_get() -> Int32 { +fileprivate func bjs_console_get_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_console_get() -> Int32 { + return bjs_console_get_extern() +} func _$console_get() throws(JSException) -> JSConsole { let ret = bjs_console_get() @@ -17,12 +20,15 @@ func _$console_get() throws(JSException) -> JSConsole { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") -fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ message: Int32) -> Void #else -fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ message: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { + return bjs_JSConsole_log_extern(self, message) +} func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { let selfValue = self.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift index 56353b253..58d69eed1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_console_get") -fileprivate func bjs_console_get() -> Int32 +fileprivate func bjs_console_get_extern() -> Int32 #else -fileprivate func bjs_console_get() -> Int32 { +fileprivate func bjs_console_get_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_console_get() -> Int32 { + return bjs_console_get_extern() +} func _$console_get() throws(JSException) -> JSConsole { let ret = bjs_console_get() @@ -17,12 +20,15 @@ func _$console_get() throws(JSException) -> JSConsole { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_parseInt") -fileprivate func bjs_parseInt(_ string: Int32) -> Float64 +fileprivate func bjs_parseInt_extern(_ string: Int32) -> Float64 #else -fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { +fileprivate func bjs_parseInt_extern(_ string: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { + return bjs_parseInt_extern(string) +} func _$parseInt(_ string: String) throws(JSException) -> Double { let stringValue = string.bridgeJSLowerParameter() @@ -35,12 +41,15 @@ func _$parseInt(_ string: String) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") -fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ message: Int32) -> Void #else -fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ message: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ message: Int32) -> Void { + return bjs_JSConsole_log_extern(self, message) +} func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { let selfValue = self.bridgeJSLowerParameter() @@ -53,21 +62,27 @@ func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WebSocket_init") -fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 +fileprivate func bjs_WebSocket_init_extern(_ url: Int32) -> Int32 #else -fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 { +fileprivate func bjs_WebSocket_init_extern(_ url: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WebSocket_init(_ url: Int32) -> Int32 { + return bjs_WebSocket_init_extern(url) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WebSocket_close") -fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void +fileprivate func bjs_WebSocket_close_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void { +fileprivate func bjs_WebSocket_close_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WebSocket_close(_ self: Int32) -> Void { + return bjs_WebSocket_close_extern(self) +} func _$WebSocket_init(_ url: String) throws(JSException) -> JSObject { let urlValue = url.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift index 33b987c76..db1f136e7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_roundtrip") -fileprivate func bjs_roundtrip() -> Void +fileprivate func bjs_roundtrip_extern() -> Void #else -fileprivate func bjs_roundtrip() -> Void { +fileprivate func bjs_roundtrip_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_roundtrip() -> Void { + return bjs_roundtrip_extern() +} func _$roundtrip(_ items: [Int]) throws(JSException) -> [Int] { let _ = items.bridgeJSLowerParameter() @@ -18,12 +21,15 @@ func _$roundtrip(_ items: [Int]) throws(JSException) -> [Int] { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_logStrings") -fileprivate func bjs_logStrings() -> Void +fileprivate func bjs_logStrings_extern() -> Void #else -fileprivate func bjs_logStrings() -> Void { +fileprivate func bjs_logStrings_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_logStrings() -> Void { + return bjs_logStrings_extern() +} func _$logStrings(_ items: [String]) throws(JSException) -> Void { let _ = items.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index c142fbd04..c72cda7ed 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -28,21 +28,27 @@ extension FooContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { + return _bjs_struct_lower_FooContainer_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer") -fileprivate func _bjs_struct_lift_FooContainer() -> Int32 +fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { +fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { + return _bjs_struct_lift_FooContainer_extern() +} @_expose(wasm, "bjs_makeFoo") @_cdecl("bjs_makeFoo") @@ -120,12 +126,15 @@ public func _bjs_roundtripFooContainer() -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Foo_init") -fileprivate func bjs_Foo_init() -> Int32 +fileprivate func bjs_Foo_init_extern() -> Int32 #else -fileprivate func bjs_Foo_init() -> Int32 { +fileprivate func bjs_Foo_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Foo_init() -> Int32 { + return bjs_Foo_init_extern() +} func _$Foo_init() throws(JSException) -> JSObject { let ret = bjs_Foo_init() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift index 86e72bb53..2ff17ea24 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_createWeirdObject") -fileprivate func bjs_createWeirdObject() -> Int32 +fileprivate func bjs_createWeirdObject_extern() -> Int32 #else -fileprivate func bjs_createWeirdObject() -> Int32 { +fileprivate func bjs_createWeirdObject_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_createWeirdObject() -> Int32 { + return bjs_createWeirdObject_extern() +} func _$createWeirdObject() throws(JSException) -> WeirdNaming { let ret = bjs_createWeirdObject() @@ -17,12 +20,15 @@ func _$createWeirdObject() throws(JSException) -> WeirdNaming { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_createWeirdClass") -fileprivate func bjs_createWeirdClass() -> Int32 +fileprivate func bjs_createWeirdClass_extern() -> Int32 #else -fileprivate func bjs_createWeirdClass() -> Int32 { +fileprivate func bjs_createWeirdClass_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_createWeirdClass() -> Int32 { + return bjs_createWeirdClass_extern() +} func _$createWeirdClass() throws(JSException) -> _Weird { let ret = bjs_createWeirdClass() @@ -34,165 +40,219 @@ func _$createWeirdClass() throws(JSException) -> _Weird { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_normalProperty_get") -fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_normalProperty_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_normalProperty_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_normalProperty_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming_normalProperty_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_dashes_get") -fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 +fileprivate func bjs_WeirdNaming_property_with_dashes_get_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 { +fileprivate func bjs_WeirdNaming_property_with_dashes_get_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_property_with_dashes_get(_ self: Int32) -> Float64 { + return bjs_WeirdNaming_property_with_dashes_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__123invalidStart_get") -fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming__123invalidStart_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming__123invalidStart_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming__123invalidStart_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming__123invalidStart_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_spaces_get") -fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_property_with_spaces_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_property_with_spaces_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_property_with_spaces_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming_property_with_spaces_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__specialChar_get") -fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 +fileprivate func bjs_WeirdNaming__specialChar_get_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 { +fileprivate func bjs_WeirdNaming__specialChar_get_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming__specialChar_get(_ self: Int32) -> Float64 { + return bjs_WeirdNaming__specialChar_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_constructor_get") -fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_constructor_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_constructor_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_constructor_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming_constructor_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_for_get") -fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_for_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_for_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_for_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming_for_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_Any_get") -fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 +fileprivate func bjs_WeirdNaming_Any_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WeirdNaming_Any_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_Any_get(_ self: Int32) -> Int32 { + return bjs_WeirdNaming_Any_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_normalProperty_set") -fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming_normalProperty_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_dashes_set") -fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void +fileprivate func bjs_WeirdNaming_property_with_dashes_set_extern(_ self: Int32, _ newValue: Float64) -> Void #else -fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void { +fileprivate func bjs_WeirdNaming_property_with_dashes_set_extern(_ self: Int32, _ newValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_property_with_dashes_set(_ self: Int32, _ newValue: Float64) -> Void { + return bjs_WeirdNaming_property_with_dashes_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__123invalidStart_set") -fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming__123invalidStart_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming__123invalidStart_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming__123invalidStart_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming__123invalidStart_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_spaces_set") -fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming_property_with_spaces_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming__specialChar_set") -fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void +fileprivate func bjs_WeirdNaming__specialChar_set_extern(_ self: Int32, _ newValue: Float64) -> Void #else -fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void { +fileprivate func bjs_WeirdNaming__specialChar_set_extern(_ self: Int32, _ newValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming__specialChar_set(_ self: Int32, _ newValue: Float64) -> Void { + return bjs_WeirdNaming__specialChar_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_constructor_set") -fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming_constructor_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_for_set") -fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming_for_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_any_set") -fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_WeirdNaming_any_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_as") -fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void +fileprivate func bjs_WeirdNaming_as_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { +fileprivate func bjs_WeirdNaming_as_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_as(_ self: Int32) -> Void { + return bjs_WeirdNaming_as_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_try") -fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void +fileprivate func bjs_WeirdNaming_try_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void { +fileprivate func bjs_WeirdNaming_try_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WeirdNaming_try(_ self: Int32) -> Void { + return bjs_WeirdNaming_try_extern(self) +} func _$WeirdNaming_normalProperty_get(_ self: JSObject) throws(JSException) -> String { let selfValue = self.bridgeJSLowerParameter() @@ -356,21 +416,27 @@ func _$WeirdNaming_try(_ self: JSObject) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs__Weird_init") -fileprivate func bjs__Weird_init() -> Int32 +fileprivate func bjs__Weird_init_extern() -> Int32 #else -fileprivate func bjs__Weird_init() -> Int32 { +fileprivate func bjs__Weird_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs__Weird_init() -> Int32 { + return bjs__Weird_init_extern() +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs__Weird_method_with_dashes") -fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void +fileprivate func bjs__Weird_method_with_dashes_extern(_ self: Int32) -> Void #else -fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void { +fileprivate func bjs__Weird_method_with_dashes_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs__Weird_method_with_dashes(_ self: Int32) -> Void { + return bjs__Weird_method_with_dashes_extern(self) +} func _$_Weird_init() throws(JSException) -> JSObject { let ret = bjs__Weird_init() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift index 09e828fba..11a644759 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift @@ -1,11 +1,14 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_returnAnimatable") -fileprivate func bjs_returnAnimatable() -> Int32 +fileprivate func bjs_returnAnimatable_extern() -> Int32 #else -fileprivate func bjs_returnAnimatable() -> Int32 { +fileprivate func bjs_returnAnimatable_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_returnAnimatable() -> Int32 { + return bjs_returnAnimatable_extern() +} func _$returnAnimatable() throws(JSException) -> Animatable { let ret = bjs_returnAnimatable() @@ -17,57 +20,75 @@ func _$returnAnimatable() throws(JSException) -> Animatable { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_init") -fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 +fileprivate func bjs_Greeter_init_extern(_ name: Int32) -> Int32 #else -fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 { +fileprivate func bjs_Greeter_init_extern(_ name: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_init(_ name: Int32) -> Int32 { + return bjs_Greeter_init_extern(name) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_name_get") -fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 +fileprivate func bjs_Greeter_name_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Greeter_name_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_name_get(_ self: Int32) -> Int32 { + return bjs_Greeter_name_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_age_get") -fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 +fileprivate func bjs_Greeter_age_get_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { +fileprivate func bjs_Greeter_age_get_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_age_get(_ self: Int32) -> Float64 { + return bjs_Greeter_age_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_name_set") -fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_Greeter_name_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_greet") -fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 +fileprivate func bjs_Greeter_greet_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 { +fileprivate func bjs_Greeter_greet_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_greet(_ self: Int32) -> Int32 { + return bjs_Greeter_greet_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_changeName") -fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void +fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ name: Int32) -> Void #else -fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { +fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ name: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Greeter_changeName(_ self: Int32, _ name: Int32) -> Void { + return bjs_Greeter_changeName_extern(self, name) +} func _$Greeter_init(_ name: String) throws(JSException) -> JSObject { let nameValue = name.bridgeJSLowerParameter() @@ -125,21 +146,27 @@ func _$Greeter_changeName(_ self: JSObject, _ name: String) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Animatable_animate") -fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 +fileprivate func bjs_Animatable_animate_extern(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 #else -fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { +fileprivate func bjs_Animatable_animate_extern(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animatable_animate(_ self: Int32, _ keyframes: Int32, _ options: Int32) -> Int32 { + return bjs_Animatable_animate_extern(self, keyframes, options) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Animatable_getAnimations") -fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 +fileprivate func bjs_Animatable_getAnimations_extern(_ self: Int32, _ options: Int32) -> Int32 #else -fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { +fileprivate func bjs_Animatable_getAnimations_extern(_ self: Int32, _ options: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animatable_getAnimations(_ self: Int32, _ options: Int32) -> Int32 { + return bjs_Animatable_getAnimations_extern(self, options) +} func _$Animatable_animate(_ self: JSObject, _ keyframes: JSObject, _ options: JSObject) throws(JSException) -> JSObject { let selfValue = self.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift index 5e297f929..94dfd002b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift @@ -1,47 +1,62 @@ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static") -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 #else -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { +fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { + return bjs_StaticBox_create_static_extern(value) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static") -fileprivate func bjs_StaticBox_value_static() -> Float64 +fileprivate func bjs_StaticBox_value_static_extern() -> Float64 #else -fileprivate func bjs_StaticBox_value_static() -> Float64 { +fileprivate func bjs_StaticBox_value_static_extern() -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_value_static() -> Float64 { + return bjs_StaticBox_value_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static") -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 #else -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { +fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { + return bjs_StaticBox_makeDefault_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static") -fileprivate func bjs_StaticBox_dashed_static() -> Int32 +fileprivate func bjs_StaticBox_dashed_static_extern() -> Int32 #else -fileprivate func bjs_StaticBox_dashed_static() -> Int32 { +fileprivate func bjs_StaticBox_dashed_static_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_dashed_static() -> Int32 { + return bjs_StaticBox_dashed_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value") -fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 +fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { +fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { + return bjs_StaticBox_value_extern(self) +} func _$StaticBox_create(_ value: Double) throws(JSException) -> StaticBox { let valueValue = value.bridgeJSLowerParameter() @@ -87,21 +102,27 @@ func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithCtor_init") -fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 +fileprivate func bjs_WithCtor_init_extern(_ value: Float64) -> Int32 #else -fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 { +fileprivate func bjs_WithCtor_init_extern(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 { + return bjs_WithCtor_init_extern(value) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithCtor_create_static") -fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 +fileprivate func bjs_WithCtor_create_static_extern(_ value: Float64) -> Int32 #else -fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 { +fileprivate func bjs_WithCtor_create_static_extern(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 { + return bjs_WithCtor_create_static_extern(value) +} func _$WithCtor_init(_ value: Double) throws(JSException) -> JSObject { let valueValue = value.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index 41d04ebab..ba7fee7af 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -145,21 +145,27 @@ extension JSValueHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_JSValueHolder_wrap") -fileprivate func _bjs_JSValueHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_JSValueHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_JSValueHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_JSValueHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_JSValueHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_JSValueHolder_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_jsEchoJSValue") -fileprivate func bjs_jsEchoJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void +fileprivate func bjs_jsEchoJSValue_extern(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void #else -fileprivate func bjs_jsEchoJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { +fileprivate func bjs_jsEchoJSValue_extern(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsEchoJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + return bjs_jsEchoJSValue_extern(valueKind, valuePayload1, valuePayload2) +} func _$jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue { let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter() @@ -172,12 +178,15 @@ func _$jsEchoJSValue(_ value: JSValue) throws(JSException) -> JSValue { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_jsEchoJSValueArray") -fileprivate func bjs_jsEchoJSValueArray() -> Void +fileprivate func bjs_jsEchoJSValueArray_extern() -> Void #else -fileprivate func bjs_jsEchoJSValueArray() -> Void { +fileprivate func bjs_jsEchoJSValueArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsEchoJSValueArray() -> Void { + return bjs_jsEchoJSValueArray_extern() +} func _$jsEchoJSValueArray(_ values: [JSValue]) throws(JSException) -> [JSValue] { let _ = values.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift index 981e01be4..195a00fa1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift @@ -49,9 +49,12 @@ extension GlobalClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_GlobalClass_wrap") -fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_GlobalClass_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift index 1e9eae2bf..6112dd3e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift @@ -49,9 +49,12 @@ extension PrivateClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PrivateClass_wrap") -fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PrivateClass_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift index cb19c6854..c4db9f0fb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift @@ -60,12 +60,15 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") @@ -107,12 +110,15 @@ extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Converter_wrap_extern(pointer) +} @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") @@ -143,9 +149,12 @@ extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") -fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_UUID_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift index cb19c6854..c4db9f0fb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift @@ -60,12 +60,15 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") @@ -107,12 +110,15 @@ extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Converter_wrap_extern(pointer) +} @_expose(wasm, "bjs_UUID_uuidString") @_cdecl("bjs_UUID_uuidString") @@ -143,9 +149,12 @@ extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap") -fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_UUID_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift index 471d38a6c..eafbd3253 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift @@ -234,12 +234,15 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") @@ -333,237 +336,315 @@ extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_OptionalPropertyHolder_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_init") -fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullValue: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedValue: Int32) -> Int32 { + return bjs_WithOptionalJSClass_init_extern(valueOrNullIsSome, valueOrNullValue, valueOrUndefinedIsSome, valueOrUndefinedValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrNull_get") -fileprivate func bjs_WithOptionalJSClass_stringOrNull_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrNull_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrNull_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrNull_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrNull_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrNull_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrUndefined_get") -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrUndefined_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrNull_get") -fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_doubleOrNull_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_doubleOrNull_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrUndefined_get") -fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_doubleOrUndefined_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrNull_get") -fileprivate func bjs_WithOptionalJSClass_boolOrNull_get(_ self: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_boolOrNull_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_boolOrNull_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_boolOrNull_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_boolOrNull_get(_ self: Int32) -> Int32 { + return bjs_WithOptionalJSClass_boolOrNull_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrUndefined_get") -fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get(_ self: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get(_ self: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_get(_ self: Int32) -> Int32 { + return bjs_WithOptionalJSClass_boolOrUndefined_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrNull_get") -fileprivate func bjs_WithOptionalJSClass_intOrNull_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_intOrNull_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_intOrNull_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_intOrNull_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_intOrNull_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_intOrNull_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrUndefined_get") -fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get(_ self: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get(_ self: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_intOrUndefined_get(_ self: Int32) -> Void { + return bjs_WithOptionalJSClass_intOrUndefined_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrNull_set") -fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrNull_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrUndefined_set") -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrUndefined_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrNull_set") -fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void #else -fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { +fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_doubleOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { + return bjs_WithOptionalJSClass_doubleOrNull_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_doubleOrUndefined_set") -fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void #else -fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { +fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_doubleOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Float64) -> Void { + return bjs_WithOptionalJSClass_doubleOrUndefined_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrNull_set") -fileprivate func bjs_WithOptionalJSClass_boolOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_boolOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_boolOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_boolOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_boolOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_boolOrNull_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_boolOrUndefined_set") -fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_boolOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_boolOrUndefined_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrNull_set") -fileprivate func bjs_WithOptionalJSClass_intOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_intOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_intOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_intOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_intOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_intOrNull_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_intOrUndefined_set") -fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_intOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_intOrUndefined_set_extern(self, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrNull") -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripStringOrNull_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrUndefined") -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripDoubleOrNull") -fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { + return bjs_WithOptionalJSClass_roundTripDoubleOrNull_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripDoubleOrUndefined") -fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripDoubleOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { + return bjs_WithOptionalJSClass_roundTripDoubleOrUndefined_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripBoolOrNull") -fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { + return bjs_WithOptionalJSClass_roundTripBoolOrNull_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripBoolOrUndefined") -fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripBoolOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Int32 { + return bjs_WithOptionalJSClass_roundTripBoolOrUndefined_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripIntOrNull") -fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripIntOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripIntOrNull_extern(self, valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripIntOrUndefined") -fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripIntOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripIntOrUndefined_extern(self, valueIsSome, valueValue) +} func _$WithOptionalJSClass_init(_ valueOrNull: Optional, _ valueOrUndefined: JSUndefinedOr) throws(JSException) -> JSObject { let (valueOrNullIsSome, valueOrNullValue) = valueOrNull.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift index 763cf8ca4..3f9448a4b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift @@ -10,12 +10,15 @@ public func _bjs_check(_ a: Int32, _ b: Int32, _ c: Float32, _ d: Float64, _ e: #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_check") -fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void +fileprivate func bjs_check_extern(_ a: Float64, _ b: Int32) -> Void #else -fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { +fileprivate func bjs_check_extern(_ a: Float64, _ b: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_check(_ a: Float64, _ b: Int32) -> Void { + return bjs_check_extern(a, b) +} func _$check(_ a: Double, _ b: Bool) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift index 3bbb2809b..ace70a9c6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveReturn.swift @@ -55,12 +55,15 @@ public func _bjs_checkBool() -> Int32 { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkNumber") -fileprivate func bjs_checkNumber() -> Float64 +fileprivate func bjs_checkNumber_extern() -> Float64 #else -fileprivate func bjs_checkNumber() -> Float64 { +fileprivate func bjs_checkNumber_extern() -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkNumber() -> Float64 { + return bjs_checkNumber_extern() +} func _$checkNumber() throws(JSException) -> Double { let ret = bjs_checkNumber() @@ -72,12 +75,15 @@ func _$checkNumber() throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkBoolean") -fileprivate func bjs_checkBoolean() -> Int32 +fileprivate func bjs_checkBoolean_extern() -> Int32 #else -fileprivate func bjs_checkBoolean() -> Int32 { +fileprivate func bjs_checkBoolean_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkBoolean() -> Int32 { + return bjs_checkBoolean_extern() +} func _$checkBoolean() throws(JSException) -> Bool { let ret = bjs_checkBoolean() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift index b5b3c8d9e..de59f5166 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift @@ -336,9 +336,12 @@ extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyHolder_wrap") -fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PropertyHolder_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 56aeb71cc..785cb997a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -219,300 +219,399 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") -fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void +fileprivate func _extern_onSomethingHappened_extern(_ jsObject: Int32) -> Void #else -fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void { +fileprivate func _extern_onSomethingHappened_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void { + return _extern_onSomethingHappened_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") -fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void +fileprivate func _extern_onValueChanged_extern(_ jsObject: Int32, _ value: Int32) -> Void #else -fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void { +fileprivate func _extern_onValueChanged_extern(_ jsObject: Int32, _ value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ value: Int32) -> Void { + return _extern_onValueChanged_extern(jsObject, value) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") -fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 +fileprivate func _extern_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 #else -fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 { +fileprivate func _extern_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 { + return _extern_onCountUpdated_extern(jsObject, count) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") -fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void +fileprivate func _extern_onLabelUpdated_extern(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void #else -fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void { +fileprivate func _extern_onLabelUpdated_extern(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefix: Int32, _ suffix: Int32) -> Void { + return _extern_onLabelUpdated_extern(jsObject, prefix, suffix) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") -fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 +fileprivate func _extern_isCountEven_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_isCountEven_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 { + return _extern_isCountEven_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") -fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void +fileprivate func _extern_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void #else -fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { +fileprivate func _extern_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { + return _extern_onHelperUpdated_extern(jsObject, helper) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") -fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func _extern_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return _extern_createHelper_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") -fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void +fileprivate func _extern_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void #else -fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { +fileprivate func _extern_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { + return _extern_onOptionalHelperUpdated_extern(jsObject, helperIsSome, helperPointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") -fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func _extern_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return _extern_createOptionalHelper_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") -fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 +fileprivate func _extern_createEnum_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_createEnum_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 { + return _extern_createEnum_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") -fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void +fileprivate func _extern_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void #else -fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void { +fileprivate func _extern_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void { + return _extern_handleResult_extern(jsObject, result) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") -fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 +fileprivate func _extern_getResult_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_getResult_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 { + return _extern_getResult_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_get") -fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_eventCount_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_eventCount_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_eventCount_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_eventCount_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_eventCount_set") -fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_eventCount_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_eventCount_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_eventCount_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_eventCount_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_delegateName_get") -fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_delegateName_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_delegateName_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_delegateName_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_delegateName_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_get") -fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalName_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalName_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalName_get(_ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalName_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") -fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalName_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_get") -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get(_ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalRawEnum_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_get") -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_rawStringEnum_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_rawStringEnum_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_get") -fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_result_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_result_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_result_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_result_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_result_set") -fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_result_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_result_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_result_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_result_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_get") -fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_optionalResult_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_optionalResult_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalResult_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_optionalResult_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalResult_set") -fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalResult_set_extern(jsObject, newValueIsSome, newValueCaseId) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_get") -fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_direction_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_direction_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_direction_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_direction_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_direction_set") -fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_direction_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_direction_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_direction_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_direction_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_get") -fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_directionOptional_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_directionOptional_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_directionOptional_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_directionOptional_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_directionOptional_set") -fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_directionOptional_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_directionOptional_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_directionOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_directionOptional_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_get") -fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_priority_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_priority_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_priority_get(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_priority_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priority_set") -fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_priority_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_priority_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_priority_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_priority_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_get") -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_priorityOptional_get(_ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_priorityOptional_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_priorityOptional_set") -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_priorityOptional_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_MyViewControllerDelegate_priorityOptional_set_extern(jsObject, newValueIsSome, newValueValue) +} extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -658,12 +757,15 @@ extension Helper: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Helper_wrap") -fileprivate func _bjs_Helper_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Helper_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Helper_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Helper_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Helper_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Helper_wrap_extern(pointer) +} @_expose(wasm, "bjs_MyViewController_init") @_cdecl("bjs_MyViewController_init") @@ -798,12 +900,15 @@ extension MyViewController: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewController_wrap") -fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MyViewController_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MyViewController_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_MyViewController_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_MyViewController_wrap_extern(pointer) +} @_expose(wasm, "bjs_DelegateManager_init") @_cdecl("bjs_DelegateManager_init") @@ -865,9 +970,12 @@ extension DelegateManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_DelegateManager_wrap") -fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_DelegateManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_DelegateManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_DelegateManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_DelegateManager_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index 8ad34d283..b6d35a215 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -152,9 +152,12 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_MathUtils_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index 8ad34d283..b6d35a215 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -152,9 +152,12 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_MathUtils_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift index 6510fd89f..43b1861ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift @@ -327,9 +327,12 @@ extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") -fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PropertyClass_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift index 6510fd89f..43b1861ca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift @@ -327,9 +327,12 @@ extension PropertyClass: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PropertyClass_wrap") -fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_PropertyClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PropertyClass_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift index e9e3c2d89..427c2b576 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift @@ -21,12 +21,15 @@ public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkString") -fileprivate func bjs_checkString(_ a: Int32) -> Void +fileprivate func bjs_checkString_extern(_ a: Int32) -> Void #else -fileprivate func bjs_checkString(_ a: Int32) -> Void { +fileprivate func bjs_checkString_extern(_ a: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkString(_ a: Int32) -> Void { + return bjs_checkString_extern(a) +} func _$checkString(_ a: String) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() @@ -38,12 +41,15 @@ func _$checkString(_ a: String) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkStringWithLength") -fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void +fileprivate func bjs_checkStringWithLength_extern(_ a: Int32, _ b: Float64) -> Void #else -fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { +fileprivate func bjs_checkStringWithLength_extern(_ a: Int32, _ b: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkStringWithLength(_ a: Int32, _ b: Float64) -> Void { + return bjs_checkStringWithLength_extern(a, b) +} func _$checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { let aValue = a.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift index 9de24ef73..6a4cf795a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringReturn.swift @@ -11,12 +11,15 @@ public func _bjs_checkString() -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkString") -fileprivate func bjs_checkString() -> Int32 +fileprivate func bjs_checkString_extern() -> Int32 #else -fileprivate func bjs_checkString() -> Int32 { +fileprivate func bjs_checkString_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_checkString() -> Int32 { + return bjs_checkString_extern() +} func _$checkString() throws(JSException) -> String { let ret = bjs_checkString() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift index ca82b87c4..0e9434832 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift @@ -79,12 +79,15 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") @@ -104,12 +107,15 @@ extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PublicGreeter_wrap") -fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PublicGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") @@ -129,21 +135,27 @@ extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_PackageGreeter_wrap") -fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PackageGreeter_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_jsRoundTripGreeter") -fileprivate func bjs_jsRoundTripGreeter(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func bjs_jsRoundTripGreeter_extern(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func bjs_jsRoundTripGreeter(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func bjs_jsRoundTripGreeter_extern(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripGreeter(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return bjs_jsRoundTripGreeter_extern(greeter) +} func _$jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { let greeterPointer = greeter.bridgeJSLowerParameter() @@ -156,12 +168,15 @@ func _$jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_jsRoundTripOptionalGreeter") -fileprivate func bjs_jsRoundTripOptionalGreeter(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func bjs_jsRoundTripOptionalGreeter_extern(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func bjs_jsRoundTripOptionalGreeter(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func bjs_jsRoundTripOptionalGreeter_extern(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripOptionalGreeter(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return bjs_jsRoundTripOptionalGreeter_extern(greeterIsSome, greeterPointer) +} func _$jsRoundTripOptionalGreeter(_ greeter: Optional) throws(JSException) -> Optional { let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index 925ab5937..d4bdc4a58 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -1,20 +1,26 @@ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO") -fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO") -fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO { static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> HttpStatus { @@ -57,21 +63,27 @@ public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpSta #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO") -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModule5ThemeO_5ThemeO { static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Theme { @@ -114,21 +126,27 @@ public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPt #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC") -fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return invoke_js_callback_TestModule_10TestModule6PersonC_6PersonC_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule6PersonC_6PersonC") -fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModule6PersonC_6PersonC_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModule6PersonC_6PersonC { static func bridgeJSLift(_ callbackId: Int32) -> (Person) -> Person { @@ -171,21 +189,27 @@ public func _invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ box #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO") -fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModule9APIResultO_9APIResultO_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO") -fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModule9APIResultO_9APIResultO { static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> APIResult { @@ -228,21 +252,27 @@ public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO") -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModule9DirectionO_9DirectionO_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO") -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModule9DirectionO_9DirectionO { static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Direction { @@ -285,21 +315,27 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSS_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSS_SS") -fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSS_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSS_SS { static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { @@ -342,21 +378,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSb_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSb_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSb_Sb_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSb_Sb") -fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSb_Sb_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSb_Sb { static func bridgeJSLift(_ callbackId: Int32) -> (Bool) -> Bool { @@ -399,21 +441,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSd_Sd") -fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 +fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { + return invoke_js_callback_TestModule_10TestModuleSd_Sd_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSd_Sd") -fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSd_Sd_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSd_Sd { static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { @@ -456,21 +504,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSf_Sf") -fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf(_ callback: Int32, _ param0: Float32) -> Float32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf_extern(_ callback: Int32, _ param0: Float32) -> Float32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf(_ callback: Int32, _ param0: Float32) -> Float32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf_extern(_ callback: Int32, _ param0: Float32) -> Float32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSf_Sf(_ callback: Int32, _ param0: Float32) -> Float32 { + return invoke_js_callback_TestModule_10TestModuleSf_Sf_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSf_Sf") -fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSf_Sf_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSf_Sf { static func bridgeJSLift(_ callbackId: Int32) -> (Float) -> Float { @@ -513,21 +567,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSi_Si") -fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSi_Si_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSi_Si") -fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSi_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { @@ -570,21 +630,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO") -fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -627,21 +693,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10Htt #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") -fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -684,21 +756,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ b #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return invoke_js_callback_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(callback, param0IsSome, param0Pointer) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC") -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -741,21 +819,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(callback, param0IsSome, param0CaseId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO") -fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -798,21 +882,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIRes #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO") -fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -855,21 +945,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9Direct #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSS_SqSS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSS_SqSS") -fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSqSS_SqSS_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSqSS_SqSS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -912,21 +1008,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(_ boxPtr: Uns #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSb_SqSb") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSb_SqSb(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSqSb_SqSb_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSb_SqSb") -fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSqSb_SqSb_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSqSb_SqSb { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -969,21 +1071,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: Uns #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSd_SqSd") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSd_SqSd(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { + return invoke_js_callback_TestModule_10TestModuleSqSd_SqSd_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSd_SqSd") -fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSqSd_SqSd_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSqSd_SqSd { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -1026,21 +1134,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(_ boxPtr: Uns #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSf_SqSf") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSf_SqSf(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSqSf_SqSf_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSf_SqSf") -fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSqSf_SqSf_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSqSf_SqSf { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -1083,21 +1197,27 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: Uns #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSi_SqSi") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSi_SqSi(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSqSi_SqSi_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSqSi_SqSi") -fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSqSi_SqSi_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSqSi_SqSi { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -1490,12 +1610,15 @@ extension Person: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Person_wrap") -fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Person_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Person_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Person_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Person_wrap_extern(pointer) +} @_expose(wasm, "bjs_TestProcessor_init") @_cdecl("bjs_TestProcessor_init") @@ -1526,9 +1649,12 @@ extension TestProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_TestProcessor_wrap") -fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_TestProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestProcessor_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift index c42c3b36f..f87c8ecca 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift @@ -1,20 +1,26 @@ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSi_Si") -fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSi_Si_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuleSi_Si") -fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuleSi_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_10TestModuleSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { @@ -57,12 +63,15 @@ public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_applyInt") -fileprivate func bjs_applyInt(_ value: Int32, _ transform: Int32) -> Int32 +fileprivate func bjs_applyInt_extern(_ value: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_applyInt(_ value: Int32, _ transform: Int32) -> Int32 { +fileprivate func bjs_applyInt_extern(_ value: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_applyInt(_ value: Int32, _ transform: Int32) -> Int32 { + return bjs_applyInt_extern(value, transform) +} func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSException) -> Int { let valueValue = value.bridgeJSLowerParameter() @@ -79,12 +88,15 @@ func _$applyInt(_ value: Int, _ transform: @escaping (Int) -> Int) throws(JSExce #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_makeAdder") -fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 +fileprivate func bjs_makeAdder_extern(_ base: Int32) -> Int32 #else -fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 { +fileprivate func bjs_makeAdder_extern(_ base: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_makeAdder(_ base: Int32) -> Int32 { + return bjs_makeAdder_extern(base) +} func _$makeAdder(_ base: Int) throws(JSException) -> (Int) -> Int { let baseValue = base.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index 29abcebca..2adffc113 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -41,21 +41,27 @@ extension DataPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { + return _bjs_struct_lower_DataPoint_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint") -fileprivate func _bjs_struct_lift_DataPoint() -> Int32 +fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { +fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { + return _bjs_struct_lift_DataPoint_extern() +} @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") @@ -100,21 +106,27 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Address_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") -fileprivate func _bjs_struct_lift_Address() -> Int32 +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Address() -> Int32 { + return _bjs_struct_lift_Address_extern() +} extension Person: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Person { @@ -150,21 +162,27 @@ extension Person: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Person") -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Person_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Person_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Person(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Person_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Person") -fileprivate func _bjs_struct_lift_Person() -> Int32 +fileprivate func _bjs_struct_lift_Person_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Person() -> Int32 { +fileprivate func _bjs_struct_lift_Person_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Person() -> Int32 { + return _bjs_struct_lift_Person_extern() +} extension Session: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Session { @@ -192,21 +210,27 @@ extension Session: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Session") -fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Session_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Session_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Session(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Session_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Session") -fileprivate func _bjs_struct_lift_Session() -> Int32 +fileprivate func _bjs_struct_lift_Session_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Session() -> Int32 { +fileprivate func _bjs_struct_lift_Session_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Session() -> Int32 { + return _bjs_struct_lift_Session_extern() +} extension Measurement: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Measurement { @@ -240,21 +264,27 @@ extension Measurement: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Measurement") -fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Measurement_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Measurement_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Measurement(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Measurement_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Measurement") -fileprivate func _bjs_struct_lift_Measurement() -> Int32 +fileprivate func _bjs_struct_lift_Measurement_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Measurement() -> Int32 { +fileprivate func _bjs_struct_lift_Measurement_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Measurement() -> Int32 { + return _bjs_struct_lift_Measurement_extern() +} extension ConfigStruct: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ConfigStruct { @@ -278,21 +308,27 @@ extension ConfigStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { + return _bjs_struct_lower_ConfigStruct_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct") -fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 +fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { + return _bjs_struct_lift_ConfigStruct_extern() +} @_expose(wasm, "bjs_ConfigStruct_static_maxRetries_get") @_cdecl("bjs_ConfigStruct_static_maxRetries_get") @@ -399,21 +435,27 @@ extension Container: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Container") -fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Container_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Container_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Container(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Container_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Container") -fileprivate func _bjs_struct_lift_Container() -> Int32 +fileprivate func _bjs_struct_lift_Container_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Container() -> Int32 { +fileprivate func _bjs_struct_lift_Container_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Container() -> Int32 { + return _bjs_struct_lift_Container_extern() +} @_expose(wasm, "bjs_roundtrip") @_cdecl("bjs_roundtrip") @@ -498,9 +540,12 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift index 29386e65f..fe79f786c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStructImports.swift @@ -24,30 +24,39 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Point_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_translate") -fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 +fileprivate func bjs_translate_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 #else -fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { +fileprivate func bjs_translate_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_translate(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { + return bjs_translate_extern(point, dx, dy) +} func _$translate(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { let pointObjectId = point.bridgeJSLowerParameter() diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift index 9385c0621..b97729084 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift @@ -30,21 +30,27 @@ extension PointerFields: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PointerFields_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 +fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { +fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { + return _bjs_struct_lift_PointerFields_extern() +} @_expose(wasm, "bjs_PointerFields_init") @_cdecl("bjs_PointerFields_init") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift index 3fa9619f8..777cd1c3a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/VoidParameterVoidReturn.swift @@ -10,12 +10,15 @@ public func _bjs_check() -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_check") -fileprivate func bjs_check() -> Void +fileprivate func bjs_check_extern() -> Void #else -fileprivate func bjs_check() -> Void { +fileprivate func bjs_check_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_check() -> Void { + return bjs_check_extern() +} func _$check() throws(JSException) -> Void { bjs_check() diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift index 03fe0983a..b34b78bb0 100644 --- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift @@ -215,12 +215,15 @@ extension GlobalNetworking.API.TestHTTPServer: ConvertibleToJSValue, _BridgedSwi #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestHTTPServer_wrap") -fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestHTTPServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_TestInternalServer_init") @_cdecl("bjs_TestInternalServer_init") @@ -261,12 +264,15 @@ extension Internal.TestInternalServer: ConvertibleToJSValue, _BridgedSwiftHeapOb #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestInternalServer_wrap") -fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestInternalServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_PublicConverter_init") @_cdecl("bjs_PublicConverter_init") @@ -308,9 +314,12 @@ extension GlobalUtils.PublicConverter: ConvertibleToJSValue, _BridgedSwiftHeapOb #if arch(wasm32) @_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_PublicConverter_wrap") -fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } -#endif \ No newline at end of file +#endif +@inline(never) fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PublicConverter_wrap_extern(pointer) +} \ No newline at end of file diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index 12ec21574..8a775c150 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -9,21 +9,27 @@ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si { static func bridgeJSLift(_ callbackId: Int32) -> (HttpStatus) -> Int { @@ -66,21 +72,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10H #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> String { @@ -123,21 +135,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { static func bridgeJSLift(_ callbackId: Int32) -> (Theme) -> Bool { @@ -180,21 +198,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ callback: Int32, _ param0: UnsafeMutableRawPointer) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Greeter) -> String { @@ -237,21 +261,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7Gr #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC { static func bridgeJSLift(_ callbackId: Int32) -> (JSObject) -> JSObject { @@ -294,21 +324,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (APIResult) -> String { @@ -351,21 +387,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9AP #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> String { @@ -408,21 +450,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_Sb { static func bridgeJSLift(_ callbackId: Int32) -> (Direction) -> Bool { @@ -465,21 +513,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9Di #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0: Int32) -> UnsafeMutableRawPointer { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { static func bridgeJSLift(_ callbackId: Int32) -> (String) -> Greeter { @@ -522,21 +576,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { static func bridgeJSLift(_ callbackId: Int32) -> (String) -> String { @@ -579,21 +639,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd { static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { @@ -636,21 +702,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Float64) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(callback, param0, param1, param2) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { @@ -695,21 +767,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(callback, param0, param1, param2) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int, Int) -> Int { @@ -754,21 +832,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(callback, param0, param1) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int) -> Int { @@ -812,21 +896,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { @@ -869,21 +959,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(callback, param0) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Void { @@ -924,21 +1020,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -981,21 +1083,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(callback, param0IsSome, param0Pointer) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -1038,21 +1146,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ callback: Int32, _ param0IsSome: Int32, _ param0Pointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(callback, param0IsSome, param0Pointer) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> Optional { @@ -1095,21 +1209,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(callback, param0IsSome, param0CaseId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -1152,21 +1272,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -1209,21 +1335,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -1266,21 +1398,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Value: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(callback, param0IsSome, param0Value) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS { static func bridgeJSLift(_ callbackId: Int32) -> (Optional) -> String { @@ -1323,21 +1461,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ callback: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sb { static func bridgeJSLift(_ callbackId: Int32) -> () -> Bool { @@ -1379,21 +1523,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_S #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ callback: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ callback: Int32) -> UnsafeMutableRawPointer { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsy_Sq7GreeterC { static func bridgeJSLift(_ callbackId: Int32) -> () -> Optional { @@ -1435,21 +1585,27 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_S #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y_extern(boxPtr, file, line) +} private enum _BJS_Closure_20BridgeJSRuntimeTestsy_y { static func bridgeJSLift(_ callbackId: Int32) -> () -> Void { @@ -1691,273 +1847,363 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") -fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void +fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void #else -fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void { +fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void { + return _extern_increment_extern(jsObject, amount) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") -fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 +fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 { + return _extern_getValue_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") -fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void +fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void #else -fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void { +fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefix: Int32, _ labelSuffix: Int32) -> Void { + return _extern_setLabelElements_extern(jsObject, labelPrefix, labelSuffix) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") -fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 +fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 { + return _extern_getLabel_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") -fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 +fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 { + return _extern_isEven_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") -fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 +fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { + return _extern_processGreeter_extern(jsObject, greeter) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") -fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return _extern_createGreeter_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") -fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { + return _extern_processOptionalGreeter_extern(jsObject, greeterIsSome, greeterPointer) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") -fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return _extern_createOptionalGreeter_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") -fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void +fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void #else -fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + return _extern_handleAPIResult_extern(jsObject, resultIsSome, resultCaseId) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") -fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 +fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 { +fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 { + return _extern_getAPIResult_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_get") -fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_count_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_count_get(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_count_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_count_set") -fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_count_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_count_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_DataProcessor_count_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_name_get") -fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_name_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_name_get(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_name_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_get") -fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTag_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_optionalTag_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") -fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_optionalTag_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_get") -fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalCount_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalCount_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_optionalCount_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalCount_set") -fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalCount_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalCount_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_optionalCount_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_get") -fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_direction_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_direction_get(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_direction_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_direction_set") -fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_direction_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_direction_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") -fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_optionalTheme_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") -fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_optionalTheme_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") -fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void +fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void #else -fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void { +fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_httpStatus_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") -fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { +fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_httpStatus_set_extern(jsObject, newValueIsSome, newValueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") -fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_apiResult_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") -fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void #else -fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { +fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + return bjs_DataProcessor_apiResult_set_extern(jsObject, newValueIsSome, newValueCaseId) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") -fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_helper_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") -fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void +fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void #else -fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { + return bjs_DataProcessor_helper_set_extern(jsObject, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") -fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_optionalHelper_get_extern(jsObject) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") -fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void +fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void #else -fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { + return bjs_DataProcessor_optionalHelper_set_extern(jsObject, newValueIsSome, newValuePointer) +} extension Direction: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { @@ -2913,21 +3159,27 @@ extension Point: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Point") -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Point(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Point_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") -fileprivate func _bjs_struct_lift_Point() -> Int32 +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} extension PointerFields: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> PointerFields { @@ -2961,21 +3213,27 @@ extension PointerFields: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PointerFields") -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PointerFields_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PointerFields(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PointerFields_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PointerFields") -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 +fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { +fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PointerFields() -> Int32 { + return _bjs_struct_lift_PointerFields_extern() +} @_expose(wasm, "bjs_PointerFields_init") @_cdecl("bjs_PointerFields_init") @@ -3028,21 +3286,27 @@ extension DataPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_DataPoint") -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_DataPoint_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_DataPoint(_ objectId: Int32) -> Void { + return _bjs_struct_lower_DataPoint_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_DataPoint") -fileprivate func _bjs_struct_lift_DataPoint() -> Int32 +fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { +fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_DataPoint() -> Int32 { + return _bjs_struct_lift_DataPoint_extern() +} @_expose(wasm, "bjs_DataPoint_init") @_cdecl("bjs_DataPoint_init") @@ -3081,21 +3345,27 @@ extension PublicPoint: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_PublicPoint") -fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_PublicPoint_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_PublicPoint(_ objectId: Int32) -> Void { + return _bjs_struct_lower_PublicPoint_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_PublicPoint") -fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 +fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 { +fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_PublicPoint() -> Int32 { + return _bjs_struct_lift_PublicPoint_extern() +} @_expose(wasm, "bjs_PublicPoint_init") @_cdecl("bjs_PublicPoint_init") @@ -3140,21 +3410,27 @@ extension Address: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Address") -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Address_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Address(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Address_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Address") -fileprivate func _bjs_struct_lift_Address() -> Int32 +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Address() -> Int32 { +fileprivate func _bjs_struct_lift_Address_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Address() -> Int32 { + return _bjs_struct_lift_Address_extern() +} extension Contact: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Contact { @@ -3192,21 +3468,27 @@ extension Contact: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Contact") -fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Contact_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Contact(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Contact_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Contact") -fileprivate func _bjs_struct_lift_Contact() -> Int32 +fileprivate func _bjs_struct_lift_Contact_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Contact() -> Int32 { +fileprivate func _bjs_struct_lift_Contact_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Contact() -> Int32 { + return _bjs_struct_lift_Contact_extern() +} extension Config: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> Config { @@ -3246,21 +3528,27 @@ extension Config: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_Config") -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_Config_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_Config(_ objectId: Int32) -> Void { + return _bjs_struct_lower_Config_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Config") -fileprivate func _bjs_struct_lift_Config() -> Int32 +fileprivate func _bjs_struct_lift_Config_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Config() -> Int32 { +fileprivate func _bjs_struct_lift_Config_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_Config() -> Int32 { + return _bjs_struct_lift_Config_extern() +} extension SessionData: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> SessionData { @@ -3292,21 +3580,27 @@ extension SessionData: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_SessionData") -fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_SessionData_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_SessionData(_ objectId: Int32) -> Void { + return _bjs_struct_lower_SessionData_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_SessionData") -fileprivate func _bjs_struct_lift_SessionData() -> Int32 +fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_SessionData() -> Int32 { +fileprivate func _bjs_struct_lift_SessionData_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_SessionData() -> Int32 { + return _bjs_struct_lift_SessionData_extern() +} extension ValidationReport: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ValidationReport { @@ -3346,21 +3640,27 @@ extension ValidationReport: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ValidationReport") -fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_ValidationReport_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_ValidationReport(_ objectId: Int32) -> Void { + return _bjs_struct_lower_ValidationReport_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ValidationReport") -fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 +fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { +fileprivate func _bjs_struct_lift_ValidationReport_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_ValidationReport() -> Int32 { + return _bjs_struct_lift_ValidationReport_extern() +} extension AdvancedConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> AdvancedConfig { @@ -3412,21 +3712,27 @@ extension AdvancedConfig: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_AdvancedConfig") -fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_AdvancedConfig_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_AdvancedConfig(_ objectId: Int32) -> Void { + return _bjs_struct_lower_AdvancedConfig_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_AdvancedConfig") -fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 +fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { +fileprivate func _bjs_struct_lift_AdvancedConfig_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_AdvancedConfig() -> Int32 { + return _bjs_struct_lift_AdvancedConfig_extern() +} extension MeasurementConfig: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MeasurementConfig { @@ -3466,21 +3772,27 @@ extension MeasurementConfig: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MeasurementConfig") -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_MeasurementConfig_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_MeasurementConfig(_ objectId: Int32) -> Void { + return _bjs_struct_lower_MeasurementConfig_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MeasurementConfig") -fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 +fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { +fileprivate func _bjs_struct_lift_MeasurementConfig_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_MeasurementConfig() -> Int32 { + return _bjs_struct_lift_MeasurementConfig_extern() +} extension MathOperations: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> MathOperations { @@ -3506,21 +3818,27 @@ extension MathOperations: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_MathOperations") -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_MathOperations_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_MathOperations(_ objectId: Int32) -> Void { + return _bjs_struct_lower_MathOperations_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_MathOperations") -fileprivate func _bjs_struct_lift_MathOperations() -> Int32 +fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { +fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_MathOperations() -> Int32 { + return _bjs_struct_lift_MathOperations_extern() +} @_expose(wasm, "bjs_MathOperations_init") @_cdecl("bjs_MathOperations_init") @@ -3596,21 +3914,27 @@ extension CopyableCart: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCart") -fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_CopyableCart_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_CopyableCart(_ objectId: Int32) -> Void { + return _bjs_struct_lower_CopyableCart_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCart") -fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 +fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_CopyableCart() -> Int32 { + return _bjs_struct_lift_CopyableCart_extern() +} @_expose(wasm, "bjs_CopyableCart_static_fromJSObject") @_cdecl("bjs_CopyableCart_static_fromJSObject") @@ -3649,21 +3973,27 @@ extension CopyableCartItem: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableCartItem") -fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_CopyableCartItem_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_CopyableCartItem(_ objectId: Int32) -> Void { + return _bjs_struct_lower_CopyableCartItem_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableCartItem") -fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 +fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableCartItem_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_CopyableCartItem() -> Int32 { + return _bjs_struct_lift_CopyableCartItem_extern() +} extension CopyableNestedCart: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> CopyableNestedCart { @@ -3693,21 +4023,27 @@ extension CopyableNestedCart: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_CopyableNestedCart") -fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_CopyableNestedCart_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_CopyableNestedCart(_ objectId: Int32) -> Void { + return _bjs_struct_lower_CopyableNestedCart_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_CopyableNestedCart") -fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 +fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 { +fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_CopyableNestedCart() -> Int32 { + return _bjs_struct_lift_CopyableNestedCart_extern() +} @_expose(wasm, "bjs_CopyableNestedCart_static_fromJSObject") @_cdecl("bjs_CopyableNestedCart_static_fromJSObject") @@ -3746,21 +4082,27 @@ extension ConfigStruct: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ConfigStruct") -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_ConfigStruct_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_ConfigStruct(_ objectId: Int32) -> Void { + return _bjs_struct_lower_ConfigStruct_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ConfigStruct") -fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 +fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { +fileprivate func _bjs_struct_lift_ConfigStruct_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_ConfigStruct() -> Int32 { + return _bjs_struct_lift_ConfigStruct_extern() +} @_expose(wasm, "bjs_ConfigStruct_static_defaultConfig_get") @_cdecl("bjs_ConfigStruct_static_defaultConfig_get") @@ -3856,21 +4198,27 @@ extension JSObjectContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSObjectContainer") -fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_JSObjectContainer_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_JSObjectContainer(_ objectId: Int32) -> Void { + return _bjs_struct_lower_JSObjectContainer_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSObjectContainer") -fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 +fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 { +fileprivate func _bjs_struct_lift_JSObjectContainer_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_JSObjectContainer() -> Int32 { + return _bjs_struct_lift_JSObjectContainer_extern() +} extension FooContainer: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> FooContainer { @@ -3902,21 +4250,27 @@ extension FooContainer: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_FooContainer") -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_FooContainer_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_FooContainer(_ objectId: Int32) -> Void { + return _bjs_struct_lower_FooContainer_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_FooContainer") -fileprivate func _bjs_struct_lift_FooContainer() -> Int32 +fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { +fileprivate func _bjs_struct_lift_FooContainer_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_FooContainer() -> Int32 { + return _bjs_struct_lift_FooContainer_extern() +} extension ArrayMembers: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> ArrayMembers { @@ -3944,21 +4298,27 @@ extension ArrayMembers: _BridgedSwiftStruct { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lower_ArrayMembers") -fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void +fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void #else -fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void { +fileprivate func _bjs_struct_lower_ArrayMembers_extern(_ objectId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lower_ArrayMembers(_ objectId: Int32) -> Void { + return _bjs_struct_lower_ArrayMembers_extern(objectId) +} #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_ArrayMembers") -fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 +fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 { +fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_struct_lift_ArrayMembers() -> Int32 { + return _bjs_struct_lift_ArrayMembers_extern() +} @_expose(wasm, "bjs_ArrayMembers_sumValues") @_cdecl("bjs_ArrayMembers_sumValues") @@ -6387,12 +6747,15 @@ extension ClosureSupportExports: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportExports_wrap") -fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ClosureSupportExports_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ClosureSupportExports_wrap_extern(pointer) +} @_expose(wasm, "bjs_Greeter_init") @_cdecl("bjs_Greeter_init") @@ -6520,12 +6883,15 @@ extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Greeter_wrap") -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Greeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_Calculator_square") @_cdecl("bjs_Calculator_square") @@ -6567,12 +6933,15 @@ extension Calculator: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Calculator_wrap") -fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Calculator_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Calculator_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Calculator_wrap_extern(pointer) +} @_expose(wasm, "bjs_InternalGreeter_deinit") @_cdecl("bjs_InternalGreeter_deinit") @@ -6592,12 +6961,15 @@ extension InternalGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_InternalGreeter_wrap") -fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_InternalGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_InternalGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_InternalGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_PublicGreeter_deinit") @_cdecl("bjs_PublicGreeter_deinit") @@ -6617,12 +6989,15 @@ extension PublicGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PublicGreeter_wrap") -fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PublicGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PublicGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PublicGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_PackageGreeter_deinit") @_cdecl("bjs_PackageGreeter_deinit") @@ -6642,12 +7017,15 @@ extension PackageGreeter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PackageGreeter_wrap") -fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PackageGreeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PackageGreeter_wrap_extern(pointer) +} @_expose(wasm, "bjs_Converter_init") @_cdecl("bjs_Converter_init") @@ -6689,12 +7067,15 @@ extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap") -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Converter_wrap_extern(pointer) +} @_expose(wasm, "bjs_HTTPServer_init") @_cdecl("bjs_HTTPServer_init") @@ -6735,12 +7116,15 @@ extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObje #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap") -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_HTTPServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_TestServer_init") @_cdecl("bjs_TestServer_init") @@ -6781,12 +7165,15 @@ extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap") -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TestServer_wrap_extern(pointer) +} @_expose(wasm, "bjs_SimplePropertyHolder_init") @_cdecl("bjs_SimplePropertyHolder_init") @@ -6838,12 +7225,15 @@ extension SimplePropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SimplePropertyHolder_wrap") -fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_SimplePropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_SimplePropertyHolder_wrap_extern(pointer) +} @_expose(wasm, "bjs_PropertyHolder_init") @_cdecl("bjs_PropertyHolder_init") @@ -7161,12 +7551,15 @@ extension PropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_PropertyHolder_wrap") -fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_PropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_PropertyHolder_wrap_extern(pointer) +} @_expose(wasm, "bjs_MathUtils_static_add") @_cdecl("bjs_MathUtils_static_add") @@ -7208,12 +7601,15 @@ extension MathUtils: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MathUtils_wrap") -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_MathUtils_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_MathUtils_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_MathUtils_wrap_extern(pointer) +} @_expose(wasm, "bjs_ConstructorDefaults_init") @_cdecl("bjs_ConstructorDefaults_init") @@ -7360,12 +7756,15 @@ extension ConstructorDefaults: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ConstructorDefaults_wrap") -fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_ConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_ConstructorDefaults_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_ConstructorDefaults_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ConstructorDefaults_wrap_extern(pointer) +} @_expose(wasm, "bjs_StaticPropertyHolder_init") @_cdecl("bjs_StaticPropertyHolder_init") @@ -7607,12 +8006,15 @@ extension StaticPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticPropertyHolder_wrap") -fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_StaticPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_StaticPropertyHolder_wrap_extern(pointer) +} @_expose(wasm, "bjs_DataProcessorManager_init") @_cdecl("bjs_DataProcessorManager_init") @@ -7896,12 +8298,15 @@ extension DataProcessorManager: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessorManager_wrap") -fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_DataProcessorManager_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_DataProcessorManager_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_DataProcessorManager_wrap_extern(pointer) +} @_expose(wasm, "bjs_SwiftDataProcessor_init") @_cdecl("bjs_SwiftDataProcessor_init") @@ -8250,12 +8655,15 @@ extension SwiftDataProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftDataProcessor_wrap") -fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_SwiftDataProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_SwiftDataProcessor_wrap_extern(pointer) +} @_expose(wasm, "bjs_TextProcessor_init") @_cdecl("bjs_TextProcessor_init") @@ -8506,12 +8914,15 @@ extension TextProcessor: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TextProcessor_wrap") -fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_TextProcessor_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_TextProcessor_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_TextProcessor_wrap_extern(pointer) +} @_expose(wasm, "bjs_OptionalHolder_init") @_cdecl("bjs_OptionalHolder_init") @@ -8584,12 +8995,15 @@ extension OptionalHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalHolder_wrap") -fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_OptionalHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_OptionalHolder_wrap_extern(pointer) +} @_expose(wasm, "bjs_OptionalPropertyHolder_init") @_cdecl("bjs_OptionalPropertyHolder_init") @@ -8683,12 +9097,15 @@ extension OptionalPropertyHolder: ConvertibleToJSValue, _BridgedSwiftHeapObject #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalPropertyHolder_wrap") -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_OptionalPropertyHolder_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_OptionalPropertyHolder_wrap_extern(pointer) +} @_expose(wasm, "bjs_Container_init") @_cdecl("bjs_Container_init") @@ -8763,174 +9180,231 @@ extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Container_wrap") -fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_Container_wrap_extern(pointer) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyVoid_static") -fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void +fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void #else -fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void { +fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyVoid_static(_ callback: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyVoid_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyBool_static") -fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsApplyBool_static_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyBool_static(_ callback: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsApplyBool_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyInt_static") -fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsApplyInt_static_extern(_ value: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyInt_static(_ value: Int32, _ transform: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsApplyInt_static_extern(value, transform) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyDouble_static") -fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 +fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64 #else -fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 { +fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: Float64, _ transform: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static(_ value: Float64, _ transform: Int32) -> Float64 { + return bjs_ClosureSupportImports_jsApplyDouble_static_extern(value, transform) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyString_static") -fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ value: Int32, _ transform: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ value: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ value: Int32, _ transform: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ value: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ value: Int32, _ transform: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsApplyString_static_extern(value, transform) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyJSObject_static") -fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static(_ value: Int32, _ transform: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsApplyJSObject_static_extern(value, transform) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeIntToInt_static") -fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static(_ base: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(base) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeDoubleToDouble_static") -fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ base: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static(_ base: Float64) -> Int32 { + return bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(base) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeStringToString_static") -fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefix: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefix: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefix: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefix: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefix: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsMakeStringToString_static_extern(prefix) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTwice_static") -fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsCallTwice_static_extern(_ value: Int32, _ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTwice_static(_ value: Int32, _ callback: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsCallTwice_static_extern(value, callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallBinary_static") -fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsCallBinary_static_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallBinary_static(_ callback: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsCallBinary_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallTriple_static") -fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsCallTriple_static_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallTriple_static(_ callback: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsCallTriple_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallAfterRelease_static") -fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallAfterRelease_static(_ callback: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsCallAfterRelease_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsOptionalInvoke_static") -fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsOptionalInvoke_static(_ callbackIsSome: Int32, _ callbackFuncRef: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsOptionalInvoke_static_extern(callbackIsSome, callbackFuncRef) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsStoreClosure_static") -fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void +fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void #else -fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void { +fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsStoreClosure_static(_ callback: Int32) -> Void { + return bjs_ClosureSupportImports_jsStoreClosure_static_extern(callback) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsCallStoredClosure_static") -fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void +fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void #else -fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void { +fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsCallStoredClosure_static() -> Void { + return bjs_ClosureSupportImports_jsCallStoredClosure_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsHeapCount_static") -fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 +fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsHeapCount_static_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsHeapCount_static() -> Int32 { + return bjs_ClosureSupportImports_jsHeapCount_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_runJsClosureSupportTests_static") -fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void +fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void #else -fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void { +fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ClosureSupportImports_runJsClosureSupportTests_static() -> Void { + return bjs_ClosureSupportImports_runJsClosureSupportTests_static_extern() +} func _$ClosureSupportImports_jsApplyVoid(_ callback: JSTypedClosure<() -> Void>) throws(JSException) -> Void { let callbackFuncRef = callback.bridgeJSLowerParameter() @@ -9094,12 +9568,15 @@ func _$ClosureSupportImports_runJsClosureSupportTests() throws(JSException) -> V #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionary") -fileprivate func bjs_jsRoundTripDictionary() -> Void +fileprivate func bjs_jsRoundTripDictionary_extern() -> Void #else -fileprivate func bjs_jsRoundTripDictionary() -> Void { +fileprivate func bjs_jsRoundTripDictionary_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripDictionary() -> Void { + return bjs_jsRoundTripDictionary_extern() +} func _$jsRoundTripDictionary(_ values: [String: Int]) throws(JSException) -> [String: Int] { let _ = values.bridgeJSLowerParameter() @@ -9112,12 +9589,15 @@ func _$jsRoundTripDictionary(_ values: [String: Int]) throws(JSException) -> [St #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryBool") -fileprivate func bjs_jsRoundTripDictionaryBool() -> Void +fileprivate func bjs_jsRoundTripDictionaryBool_extern() -> Void #else -fileprivate func bjs_jsRoundTripDictionaryBool() -> Void { +fileprivate func bjs_jsRoundTripDictionaryBool_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripDictionaryBool() -> Void { + return bjs_jsRoundTripDictionaryBool_extern() +} func _$jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) -> [String: Bool] { let _ = values.bridgeJSLowerParameter() @@ -9130,12 +9610,15 @@ func _$jsRoundTripDictionaryBool(_ values: [String: Bool]) throws(JSException) - #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryDouble") -fileprivate func bjs_jsRoundTripDictionaryDouble() -> Void +fileprivate func bjs_jsRoundTripDictionaryDouble_extern() -> Void #else -fileprivate func bjs_jsRoundTripDictionaryDouble() -> Void { +fileprivate func bjs_jsRoundTripDictionaryDouble_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripDictionaryDouble() -> Void { + return bjs_jsRoundTripDictionaryDouble_extern() +} func _$jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSException) -> [String: Double] { let _ = values.bridgeJSLowerParameter() @@ -9148,12 +9631,15 @@ func _$jsRoundTripDictionaryDouble(_ values: [String: Double]) throws(JSExceptio #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryJSObject") -fileprivate func bjs_jsRoundTripDictionaryJSObject() -> Void +fileprivate func bjs_jsRoundTripDictionaryJSObject_extern() -> Void #else -fileprivate func bjs_jsRoundTripDictionaryJSObject() -> Void { +fileprivate func bjs_jsRoundTripDictionaryJSObject_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripDictionaryJSObject() -> Void { + return bjs_jsRoundTripDictionaryJSObject_extern() +} func _$jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSException) -> [String: JSObject] { let _ = values.bridgeJSLowerParameter() @@ -9166,12 +9652,15 @@ func _$jsRoundTripDictionaryJSObject(_ values: [String: JSObject]) throws(JSExce #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripDictionaryJSValue") -fileprivate func bjs_jsRoundTripDictionaryJSValue() -> Void +fileprivate func bjs_jsRoundTripDictionaryJSValue_extern() -> Void #else -fileprivate func bjs_jsRoundTripDictionaryJSValue() -> Void { +fileprivate func bjs_jsRoundTripDictionaryJSValue_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripDictionaryJSValue() -> Void { + return bjs_jsRoundTripDictionaryJSValue_extern() +} func _$jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSException) -> [String: JSValue] { let _ = values.bridgeJSLowerParameter() @@ -9184,12 +9673,15 @@ func _$jsRoundTripDictionaryJSValue(_ values: [String: JSValue]) throws(JSExcept #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNestedDictionary") -fileprivate func bjs_jsRoundTripNestedDictionary() -> Void +fileprivate func bjs_jsRoundTripNestedDictionary_extern() -> Void #else -fileprivate func bjs_jsRoundTripNestedDictionary() -> Void { +fileprivate func bjs_jsRoundTripNestedDictionary_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripNestedDictionary() -> Void { + return bjs_jsRoundTripNestedDictionary_extern() +} func _$jsRoundTripNestedDictionary(_ values: [String: [Double]]) throws(JSException) -> [String: [Double]] { let _ = values.bridgeJSLowerParameter() @@ -9202,12 +9694,15 @@ func _$jsRoundTripNestedDictionary(_ values: [String: [Double]]) throws(JSExcept #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalDictionary") -fileprivate func bjs_jsRoundTripOptionalDictionary(_ values: Int32) -> Void +fileprivate func bjs_jsRoundTripOptionalDictionary_extern(_ values: Int32) -> Void #else -fileprivate func bjs_jsRoundTripOptionalDictionary(_ values: Int32) -> Void { +fileprivate func bjs_jsRoundTripOptionalDictionary_extern(_ values: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripOptionalDictionary(_ values: Int32) -> Void { + return bjs_jsRoundTripOptionalDictionary_extern(values) +} func _$jsRoundTripOptionalDictionary(_ values: Optional<[String: String]>) throws(JSException) -> Optional<[String: String]> { let valuesIsSome = values.bridgeJSLowerParameter() @@ -9220,12 +9715,15 @@ func _$jsRoundTripOptionalDictionary(_ values: Optional<[String: String]>) throw #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripUndefinedDictionary") -fileprivate func bjs_jsRoundTripUndefinedDictionary(_ values: Int32) -> Void +fileprivate func bjs_jsRoundTripUndefinedDictionary_extern(_ values: Int32) -> Void #else -fileprivate func bjs_jsRoundTripUndefinedDictionary(_ values: Int32) -> Void { +fileprivate func bjs_jsRoundTripUndefinedDictionary_extern(_ values: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripUndefinedDictionary(_ values: Int32) -> Void { + return bjs_jsRoundTripUndefinedDictionary_extern(values) +} func _$jsRoundTripUndefinedDictionary(_ values: JSUndefinedOr<[String: Int]>) throws(JSException) -> JSUndefinedOr<[String: Int]> { let valuesIsSome = values.bridgeJSLowerParameter() @@ -9238,21 +9736,27 @@ func _$jsRoundTripUndefinedDictionary(_ values: JSUndefinedOr<[String: Int]>) th #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init") -fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 +fileprivate func bjs_Foo_init_extern(_ value: Int32) -> Int32 #else -fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 { +fileprivate func bjs_Foo_init_extern(_ value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Foo_init(_ value: Int32) -> Int32 { + return bjs_Foo_init_extern(value) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_value_get") -fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 +fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Foo_value_get(_ self: Int32) -> Int32 { + return bjs_Foo_value_get_extern(self) +} func _$Foo_init(_ value: String) throws(JSException) -> JSObject { let valueValue = value.bridgeJSLowerParameter() @@ -9274,12 +9778,15 @@ func _$Foo_value_get(_ self: JSObject) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_globalObject1_get") -fileprivate func bjs_globalObject1_get() -> Void +fileprivate func bjs_globalObject1_get_extern() -> Void #else -fileprivate func bjs_globalObject1_get() -> Void { +fileprivate func bjs_globalObject1_get_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_globalObject1_get() -> Void { + return bjs_globalObject1_get_extern() +} func _$globalObject1_get() throws(JSException) -> JSValue { bjs_globalObject1_get() @@ -9291,12 +9798,15 @@ func _$globalObject1_get() throws(JSException) -> JSValue { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripVoid") -fileprivate func bjs_jsRoundTripVoid() -> Void +fileprivate func bjs_jsRoundTripVoid_extern() -> Void #else -fileprivate func bjs_jsRoundTripVoid() -> Void { +fileprivate func bjs_jsRoundTripVoid_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripVoid() -> Void { + return bjs_jsRoundTripVoid_extern() +} func _$jsRoundTripVoid() throws(JSException) -> Void { bjs_jsRoundTripVoid() @@ -9307,12 +9817,15 @@ func _$jsRoundTripVoid() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumber") -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 +fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64 #else -fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { +fileprivate func bjs_jsRoundTripNumber_extern(_ v: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripNumber(_ v: Float64) -> Float64 { + return bjs_jsRoundTripNumber_extern(v) +} func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { let vValue = v.bridgeJSLowerParameter() @@ -9325,12 +9838,15 @@ func _$jsRoundTripNumber(_ v: Double) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBool") -fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 +fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32 #else -fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripBool_extern(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripBool(_ v: Int32) -> Int32 { + return bjs_jsRoundTripBool_extern(v) +} func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { let vValue = v.bridgeJSLowerParameter() @@ -9343,12 +9859,15 @@ func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") -fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 +fileprivate func bjs_jsRoundTripString_extern(_ v: Int32) -> Int32 #else -fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripString_extern(_ v: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripString(_ v: Int32) -> Int32 { + return bjs_jsRoundTripString_extern(v) +} func _$jsRoundTripString(_ v: String) throws(JSException) -> String { let vValue = v.bridgeJSLowerParameter() @@ -9361,12 +9880,15 @@ func _$jsRoundTripString(_ v: String) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValue") -fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void +fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void #else -fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { +fileprivate func bjs_jsRoundTripJSValue_extern(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { + return bjs_jsRoundTripJSValue_extern(vKind, vPayload1, vPayload2) +} func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue { let (vKind, vPayload1, vPayload2) = v.bridgeJSLowerParameter() @@ -9379,12 +9901,15 @@ func _$jsRoundTripJSValue(_ v: JSValue) throws(JSException) -> JSValue { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripJSValueArray") -fileprivate func bjs_jsRoundTripJSValueArray() -> Void +fileprivate func bjs_jsRoundTripJSValueArray_extern() -> Void #else -fileprivate func bjs_jsRoundTripJSValueArray() -> Void { +fileprivate func bjs_jsRoundTripJSValueArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripJSValueArray() -> Void { + return bjs_jsRoundTripJSValueArray_extern() +} func _$jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] { let _ = v.bridgeJSLowerParameter() @@ -9397,12 +9922,15 @@ func _$jsRoundTripJSValueArray(_ v: [JSValue]) throws(JSException) -> [JSValue] #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripOptionalJSValueArray") -fileprivate func bjs_jsRoundTripOptionalJSValueArray(_ v: Int32) -> Void +fileprivate func bjs_jsRoundTripOptionalJSValueArray_extern(_ v: Int32) -> Void #else -fileprivate func bjs_jsRoundTripOptionalJSValueArray(_ v: Int32) -> Void { +fileprivate func bjs_jsRoundTripOptionalJSValueArray_extern(_ v: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripOptionalJSValueArray(_ v: Int32) -> Void { + return bjs_jsRoundTripOptionalJSValueArray_extern(v) +} func _$jsRoundTripOptionalJSValueArray(_ v: Optional<[JSValue]>) throws(JSException) -> Optional<[JSValue]> { let vIsSome = v.bridgeJSLowerParameter() @@ -9415,12 +9943,15 @@ func _$jsRoundTripOptionalJSValueArray(_ v: Optional<[JSValue]>) throws(JSExcept #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrVoid") -fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void +fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void #else -fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { +fileprivate func bjs_jsThrowOrVoid_extern(_ shouldThrow: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsThrowOrVoid(_ shouldThrow: Int32) -> Void { + return bjs_jsThrowOrVoid_extern(shouldThrow) +} func _$jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() @@ -9432,12 +9963,15 @@ func _$jsThrowOrVoid(_ shouldThrow: Bool) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrNumber") -fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 +fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64 #else -fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { +fileprivate func bjs_jsThrowOrNumber_extern(_ shouldThrow: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsThrowOrNumber(_ shouldThrow: Int32) -> Float64 { + return bjs_jsThrowOrNumber_extern(shouldThrow) +} func _$jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() @@ -9450,12 +9984,15 @@ func _$jsThrowOrNumber(_ shouldThrow: Bool) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrBool") -fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 +fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32 #else -fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { +fileprivate func bjs_jsThrowOrBool_extern(_ shouldThrow: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsThrowOrBool(_ shouldThrow: Int32) -> Int32 { + return bjs_jsThrowOrBool_extern(shouldThrow) +} func _$jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() @@ -9468,12 +10005,15 @@ func _$jsThrowOrBool(_ shouldThrow: Bool) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsThrowOrString") -fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 +fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32 #else -fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { +fileprivate func bjs_jsThrowOrString_extern(_ shouldThrow: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsThrowOrString(_ shouldThrow: Int32) -> Int32 { + return bjs_jsThrowOrString_extern(shouldThrow) +} func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { let shouldThrowValue = shouldThrow.bridgeJSLowerParameter() @@ -9486,12 +10026,15 @@ func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripFeatureFlag") -fileprivate func bjs_jsRoundTripFeatureFlag(_ flag: Int32) -> Int32 +fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flag: Int32) -> Int32 #else -fileprivate func bjs_jsRoundTripFeatureFlag(_ flag: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flag: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripFeatureFlag(_ flag: Int32) -> Int32 { + return bjs_jsRoundTripFeatureFlag_extern(flag) +} func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag { let flagValue = flag.bridgeJSLowerParameter() @@ -9504,12 +10047,15 @@ func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Featur #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_runAsyncWorks") -fileprivate func bjs_runAsyncWorks() -> Int32 +fileprivate func bjs_runAsyncWorks_extern() -> Int32 #else -fileprivate func bjs_runAsyncWorks() -> Int32 { +fileprivate func bjs_runAsyncWorks_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_runAsyncWorks() -> Int32 { + return bjs_runAsyncWorks_extern() +} func _$runAsyncWorks() throws(JSException) -> JSPromise { let ret = bjs_runAsyncWorks() @@ -9521,12 +10067,15 @@ func _$runAsyncWorks() throws(JSException) -> JSPromise { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__jsWeirdFunction") -fileprivate func bjs__jsWeirdFunction() -> Float64 +fileprivate func bjs__jsWeirdFunction_extern() -> Float64 #else -fileprivate func bjs__jsWeirdFunction() -> Float64 { +fileprivate func bjs__jsWeirdFunction_extern() -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs__jsWeirdFunction() -> Float64 { + return bjs__jsWeirdFunction_extern() +} func _$_jsWeirdFunction() throws(JSException) -> Double { let ret = bjs__jsWeirdFunction() @@ -9538,12 +10087,15 @@ func _$_jsWeirdFunction() throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripNumberArray") -fileprivate func bjs_jsRoundTripNumberArray() -> Void +fileprivate func bjs_jsRoundTripNumberArray_extern() -> Void #else -fileprivate func bjs_jsRoundTripNumberArray() -> Void { +fileprivate func bjs_jsRoundTripNumberArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripNumberArray() -> Void { + return bjs_jsRoundTripNumberArray_extern() +} func _$jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double] { let _ = values.bridgeJSLowerParameter() @@ -9556,12 +10108,15 @@ func _$jsRoundTripNumberArray(_ values: [Double]) throws(JSException) -> [Double #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripStringArray") -fileprivate func bjs_jsRoundTripStringArray() -> Void +fileprivate func bjs_jsRoundTripStringArray_extern() -> Void #else -fileprivate func bjs_jsRoundTripStringArray() -> Void { +fileprivate func bjs_jsRoundTripStringArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripStringArray() -> Void { + return bjs_jsRoundTripStringArray_extern() +} func _$jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String] { let _ = values.bridgeJSLowerParameter() @@ -9574,12 +10129,15 @@ func _$jsRoundTripStringArray(_ values: [String]) throws(JSException) -> [String #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripBoolArray") -fileprivate func bjs_jsRoundTripBoolArray() -> Void +fileprivate func bjs_jsRoundTripBoolArray_extern() -> Void #else -fileprivate func bjs_jsRoundTripBoolArray() -> Void { +fileprivate func bjs_jsRoundTripBoolArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripBoolArray() -> Void { + return bjs_jsRoundTripBoolArray_extern() +} func _$jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] { let _ = values.bridgeJSLowerParameter() @@ -9592,12 +10150,15 @@ func _$jsRoundTripBoolArray(_ values: [Bool]) throws(JSException) -> [Bool] { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsSumNumberArray") -fileprivate func bjs_jsSumNumberArray() -> Float64 +fileprivate func bjs_jsSumNumberArray_extern() -> Float64 #else -fileprivate func bjs_jsSumNumberArray() -> Float64 { +fileprivate func bjs_jsSumNumberArray_extern() -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsSumNumberArray() -> Float64 { + return bjs_jsSumNumberArray_extern() +} func _$jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double { let _ = values.bridgeJSLowerParameter() @@ -9610,12 +10171,15 @@ func _$jsSumNumberArray(_ values: [Double]) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsCreateNumberArray") -fileprivate func bjs_jsCreateNumberArray() -> Void +fileprivate func bjs_jsCreateNumberArray_extern() -> Void #else -fileprivate func bjs_jsCreateNumberArray() -> Void { +fileprivate func bjs_jsCreateNumberArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsCreateNumberArray() -> Void { + return bjs_jsCreateNumberArray_extern() +} func _$jsCreateNumberArray() throws(JSException) -> [Double] { bjs_jsCreateNumberArray() @@ -9627,12 +10191,15 @@ func _$jsCreateNumberArray() throws(JSException) -> [Double] { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt") -fileprivate func bjs_parseInt(_ string: Int32) -> Float64 +fileprivate func bjs_parseInt_extern(_ string: Int32) -> Float64 #else -fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { +fileprivate func bjs_parseInt_extern(_ string: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_parseInt(_ string: Int32) -> Float64 { + return bjs_parseInt_extern(string) +} func _$parseInt(_ string: String) throws(JSException) -> Double { let stringValue = string.bridgeJSLowerParameter() @@ -9645,57 +10212,75 @@ func _$parseInt(_ string: String) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") -fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 +fileprivate func bjs_JsGreeter_init_extern(_ name: Int32, _ prefix: Int32) -> Int32 #else -fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_init_extern(_ name: Int32, _ prefix: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_init(_ name: Int32, _ prefix: Int32) -> Int32 { + return bjs_JsGreeter_init_extern(name, prefix) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get") -fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_name_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_name_get(_ self: Int32) -> Int32 { + return bjs_JsGreeter_name_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get") -fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32 { + return bjs_JsGreeter_prefix_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") -fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_JsGreeter_name_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet") -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 +fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_greet(_ self: Int32) -> Int32 { + return bjs_JsGreeter_greet_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") -fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void +fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ name: Int32) -> Void #else -fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { +fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ name: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void { + return bjs_JsGreeter_changeName_extern(self, name) +} func _$JsGreeter_init(_ name: String, _ prefix: String) throws(JSException) -> JSObject { let nameValue = name.bridgeJSLowerParameter() @@ -9754,21 +10339,27 @@ func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_init") -fileprivate func bjs__WeirdClass_init() -> Int32 +fileprivate func bjs__WeirdClass_init_extern() -> Int32 #else -fileprivate func bjs__WeirdClass_init() -> Int32 { +fileprivate func bjs__WeirdClass_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs__WeirdClass_init() -> Int32 { + return bjs__WeirdClass_init_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs__WeirdClass_method_with_dashes") -fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 +fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 { +fileprivate func bjs__WeirdClass_method_with_dashes_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs__WeirdClass_method_with_dashes(_ self: Int32) -> Int32 { + return bjs__WeirdClass_method_with_dashes_extern(self) +} func _$_WeirdClass_init() throws(JSException) -> JSObject { let ret = bjs__WeirdClass_init() @@ -9789,57 +10380,75 @@ func _$_WeirdClass_method_with_dashes(_ self: JSObject) throws(JSException) -> S #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_init") -fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 +fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32 #else -fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 { +fileprivate func bjs_StaticBox_init_extern(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_init(_ value: Float64) -> Int32 { + return bjs_StaticBox_init_extern(value) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_create_static") -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 +fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 #else -fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { +fileprivate func bjs_StaticBox_create_static_extern(_ value: Float64) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 { + return bjs_StaticBox_create_static_extern(value) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value_static") -fileprivate func bjs_StaticBox_value_static() -> Float64 +fileprivate func bjs_StaticBox_value_static_extern() -> Float64 #else -fileprivate func bjs_StaticBox_value_static() -> Float64 { +fileprivate func bjs_StaticBox_value_static_extern() -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_value_static() -> Float64 { + return bjs_StaticBox_value_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_makeDefault_static") -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 +fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 #else -fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { +fileprivate func bjs_StaticBox_makeDefault_static_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 { + return bjs_StaticBox_makeDefault_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_with_dashes_static") -fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 +fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32 #else -fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 { +fileprivate func bjs_StaticBox_with_dashes_static_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_with_dashes_static() -> Int32 { + return bjs_StaticBox_with_dashes_static_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StaticBox_value") -fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 +fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { +fileprivate func bjs_StaticBox_value_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_StaticBox_value(_ self: Int32) -> Float64 { + return bjs_StaticBox_value_extern(self) +} func _$StaticBox_init(_ value: Double) throws(JSException) -> JSObject { let valueValue = value.bridgeJSLowerParameter() @@ -9894,84 +10503,111 @@ func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init") -fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 +fileprivate func bjs_Animal_init_extern(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 #else -fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { +fileprivate func bjs_Animal_init_extern(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_init(_ name: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { + return bjs_Animal_init_extern(name, age, isCat) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_get") -fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 +fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Animal_name_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_name_get(_ self: Int32) -> Int32 { + return bjs_Animal_name_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_get") -fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 +fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64 #else -fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 { +fileprivate func bjs_Animal_age_get_extern(_ self: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_age_get(_ self: Int32) -> Float64 { + return bjs_Animal_age_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_get") -fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 +fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 { +fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_isCat_get(_ self: Int32) -> Int32 { + return bjs_Animal_isCat_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_set") -fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_Animal_name_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_age_set") -fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void +fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void #else -fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void { +fileprivate func bjs_Animal_age_set_extern(_ self: Int32, _ newValue: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_age_set(_ self: Int32, _ newValue: Float64) -> Void { + return bjs_Animal_age_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_isCat_set") -fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void +fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void { +fileprivate func bjs_Animal_isCat_set_extern(_ self: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_isCat_set(_ self: Int32, _ newValue: Int32) -> Void { + return bjs_Animal_isCat_set_extern(self, newValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_bark") -fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 +fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 { +fileprivate func bjs_Animal_bark_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_bark(_ self: Int32) -> Int32 { + return bjs_Animal_bark_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_getIsCat") -fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 +fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 { +fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_Animal_getIsCat(_ self: Int32) -> Int32 { + return bjs_Animal_getIsCat_extern(self) +} func _$Animal_init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) -> JSObject { let nameValue = name.bridgeJSLowerParameter() @@ -10058,12 +10694,15 @@ func _$Animal_getIsCat(_ self: JSObject) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripIntArray") -fileprivate func bjs_jsRoundTripIntArray() -> Void +fileprivate func bjs_jsRoundTripIntArray_extern() -> Void #else -fileprivate func bjs_jsRoundTripIntArray() -> Void { +fileprivate func bjs_jsRoundTripIntArray_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsRoundTripIntArray() -> Void { + return bjs_jsRoundTripIntArray_extern() +} func _$jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] { let _ = items.bridgeJSLowerParameter() @@ -10076,12 +10715,15 @@ func _$jsRoundTripIntArray(_ items: [Int]) throws(JSException) -> [Int] { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsArrayLength") -fileprivate func bjs_jsArrayLength() -> Int32 +fileprivate func bjs_jsArrayLength_extern() -> Int32 #else -fileprivate func bjs_jsArrayLength() -> Int32 { +fileprivate func bjs_jsArrayLength_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsArrayLength() -> Int32 { + return bjs_jsArrayLength_extern() +} func _$jsArrayLength(_ items: [Int]) throws(JSException) -> Int { let _ = items.bridgeJSLowerParameter() @@ -10094,12 +10736,15 @@ func _$jsArrayLength(_ items: [Int]) throws(JSException) -> Int { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_makeArrayHost") -fileprivate func bjs_makeArrayHost() -> Int32 +fileprivate func bjs_makeArrayHost_extern() -> Int32 #else -fileprivate func bjs_makeArrayHost() -> Int32 { +fileprivate func bjs_makeArrayHost_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_makeArrayHost() -> Int32 { + return bjs_makeArrayHost_extern() +} func _$makeArrayHost(_ numbers: [Int], _ labels: [String]) throws(JSException) -> ArrayHost { let _ = labels.bridgeJSLowerParameter() @@ -10113,75 +10758,99 @@ func _$makeArrayHost(_ numbers: [Int], _ labels: [String]) throws(JSException) - #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_init") -fileprivate func bjs_ArrayHost_init() -> Int32 +fileprivate func bjs_ArrayHost_init_extern() -> Int32 #else -fileprivate func bjs_ArrayHost_init() -> Int32 { +fileprivate func bjs_ArrayHost_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_init() -> Int32 { + return bjs_ArrayHost_init_extern() +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_numbers_get") -fileprivate func bjs_ArrayHost_numbers_get(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_numbers_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_numbers_get(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_numbers_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_numbers_get(_ self: Int32) -> Void { + return bjs_ArrayHost_numbers_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_labels_get") -fileprivate func bjs_ArrayHost_labels_get(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_labels_get_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_labels_get(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_labels_get_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_labels_get(_ self: Int32) -> Void { + return bjs_ArrayHost_labels_get_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_numbers_set") -fileprivate func bjs_ArrayHost_numbers_set(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_numbers_set_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_numbers_set(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_numbers_set_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_numbers_set(_ self: Int32) -> Void { + return bjs_ArrayHost_numbers_set_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_labels_set") -fileprivate func bjs_ArrayHost_labels_set(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_labels_set_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_labels_set(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_labels_set_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_labels_set(_ self: Int32) -> Void { + return bjs_ArrayHost_labels_set_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_concatNumbers") -fileprivate func bjs_ArrayHost_concatNumbers(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_concatNumbers_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_concatNumbers(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_concatNumbers_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_concatNumbers(_ self: Int32) -> Void { + return bjs_ArrayHost_concatNumbers_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_concatLabels") -fileprivate func bjs_ArrayHost_concatLabels(_ self: Int32) -> Void +fileprivate func bjs_ArrayHost_concatLabels_extern(_ self: Int32) -> Void #else -fileprivate func bjs_ArrayHost_concatLabels(_ self: Int32) -> Void { +fileprivate func bjs_ArrayHost_concatLabels_extern(_ self: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_concatLabels(_ self: Int32) -> Void { + return bjs_ArrayHost_concatLabels_extern(self) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayHost_firstLabel") -fileprivate func bjs_ArrayHost_firstLabel(_ self: Int32) -> Int32 +fileprivate func bjs_ArrayHost_firstLabel_extern(_ self: Int32) -> Int32 #else -fileprivate func bjs_ArrayHost_firstLabel(_ self: Int32) -> Int32 { +fileprivate func bjs_ArrayHost_firstLabel_extern(_ self: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_ArrayHost_firstLabel(_ self: Int32) -> Int32 { + return bjs_ArrayHost_firstLabel_extern(self) +} func _$ArrayHost_init(_ numbers: [Int], _ labels: [String]) throws(JSException) -> JSObject { let _ = labels.bridgeJSLowerParameter() @@ -10261,12 +10930,15 @@ func _$ArrayHost_firstLabel(_ self: JSObject, _ values: [String]) throws(JSExcep #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsTranslatePoint") -fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 +fileprivate func bjs_jsTranslatePoint_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 #else -fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { +fileprivate func bjs_jsTranslatePoint_extern(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsTranslatePoint(_ point: Int32, _ dx: Int32, _ dy: Int32) -> Int32 { + return bjs_jsTranslatePoint_extern(point, dx, dy) +} func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException) -> Point { let pointObjectId = point.bridgeJSLowerParameter() @@ -10281,12 +10953,15 @@ func _$jsTranslatePoint(_ point: Point, _ dx: Int, _ dy: Int) throws(JSException #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassInternal_init") -fileprivate func bjs_MyJSClassInternal_init() -> Int32 +fileprivate func bjs_MyJSClassInternal_init_extern() -> Int32 #else -fileprivate func bjs_MyJSClassInternal_init() -> Int32 { +fileprivate func bjs_MyJSClassInternal_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyJSClassInternal_init() -> Int32 { + return bjs_MyJSClassInternal_init_extern() +} func _$MyJSClassInternal_init() throws(JSException) -> JSObject { let ret = bjs_MyJSClassInternal_init() @@ -10298,12 +10973,15 @@ func _$MyJSClassInternal_init() throws(JSException) -> JSObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassPublic_init") -fileprivate func bjs_MyJSClassPublic_init() -> Int32 +fileprivate func bjs_MyJSClassPublic_init_extern() -> Int32 #else -fileprivate func bjs_MyJSClassPublic_init() -> Int32 { +fileprivate func bjs_MyJSClassPublic_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyJSClassPublic_init() -> Int32 { + return bjs_MyJSClassPublic_init_extern() +} func _$MyJSClassPublic_init() throws(JSException) -> JSObject { let ret = bjs_MyJSClassPublic_init() @@ -10315,12 +10993,15 @@ func _$MyJSClassPublic_init() throws(JSException) -> JSObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_MyJSClassPackage_init") -fileprivate func bjs_MyJSClassPackage_init() -> Int32 +fileprivate func bjs_MyJSClassPackage_init_extern() -> Int32 #else -fileprivate func bjs_MyJSClassPackage_init() -> Int32 { +fileprivate func bjs_MyJSClassPackage_init_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_MyJSClassPackage_init() -> Int32 { + return bjs_MyJSClassPackage_init_extern() +} func _$MyJSClassPackage_init() throws(JSException) -> JSObject { let ret = bjs_MyJSClassPackage_init() @@ -10332,12 +11013,15 @@ func _$MyJSClassPackage_init() throws(JSException) -> JSObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPackageAccess") -fileprivate func bjs_jsFunctionWithPackageAccess() -> Void +fileprivate func bjs_jsFunctionWithPackageAccess_extern() -> Void #else -fileprivate func bjs_jsFunctionWithPackageAccess() -> Void { +fileprivate func bjs_jsFunctionWithPackageAccess_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsFunctionWithPackageAccess() -> Void { + return bjs_jsFunctionWithPackageAccess_extern() +} func _$jsFunctionWithPackageAccess() throws(JSException) -> Void { bjs_jsFunctionWithPackageAccess() @@ -10348,12 +11032,15 @@ func _$jsFunctionWithPackageAccess() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPublicAccess") -fileprivate func bjs_jsFunctionWithPublicAccess() -> Void +fileprivate func bjs_jsFunctionWithPublicAccess_extern() -> Void #else -fileprivate func bjs_jsFunctionWithPublicAccess() -> Void { +fileprivate func bjs_jsFunctionWithPublicAccess_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsFunctionWithPublicAccess() -> Void { + return bjs_jsFunctionWithPublicAccess_extern() +} func _$jsFunctionWithPublicAccess() throws(JSException) -> Void { bjs_jsFunctionWithPublicAccess() @@ -10364,12 +11051,15 @@ func _$jsFunctionWithPublicAccess() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithInternalAccess") -fileprivate func bjs_jsFunctionWithInternalAccess() -> Void +fileprivate func bjs_jsFunctionWithInternalAccess_extern() -> Void #else -fileprivate func bjs_jsFunctionWithInternalAccess() -> Void { +fileprivate func bjs_jsFunctionWithInternalAccess_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsFunctionWithInternalAccess() -> Void { + return bjs_jsFunctionWithInternalAccess_extern() +} func _$jsFunctionWithInternalAccess() throws(JSException) -> Void { bjs_jsFunctionWithInternalAccess() @@ -10380,12 +11070,15 @@ func _$jsFunctionWithInternalAccess() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithFilePrivateAccess") -fileprivate func bjs_jsFunctionWithFilePrivateAccess() -> Void +fileprivate func bjs_jsFunctionWithFilePrivateAccess_extern() -> Void #else -fileprivate func bjs_jsFunctionWithFilePrivateAccess() -> Void { +fileprivate func bjs_jsFunctionWithFilePrivateAccess_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsFunctionWithFilePrivateAccess() -> Void { + return bjs_jsFunctionWithFilePrivateAccess_extern() +} func _$jsFunctionWithFilePrivateAccess() throws(JSException) -> Void { bjs_jsFunctionWithFilePrivateAccess() @@ -10396,12 +11089,15 @@ func _$jsFunctionWithFilePrivateAccess() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsFunctionWithPrivateAccess") -fileprivate func bjs_jsFunctionWithPrivateAccess() -> Void +fileprivate func bjs_jsFunctionWithPrivateAccess_extern() -> Void #else -fileprivate func bjs_jsFunctionWithPrivateAccess() -> Void { +fileprivate func bjs_jsFunctionWithPrivateAccess_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_jsFunctionWithPrivateAccess() -> Void { + return bjs_jsFunctionWithPrivateAccess_extern() +} func _$jsFunctionWithPrivateAccess() throws(JSException) -> Void { bjs_jsFunctionWithPrivateAccess() @@ -10412,48 +11108,63 @@ func _$jsFunctionWithPrivateAccess() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalNumberNull_static_extern(valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static_extern(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_static_extern(valueIsSome, valueValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameValue: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(nameIsSome, nameValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameValue: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameValue: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(nameIsSome, nameValue) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_runJsOptionalSupportTests_static") -fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static() -> Void +fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static_extern() -> Void #else -fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static() -> Void { +fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_OptionalSupportImports_runJsOptionalSupportTests_static() -> Void { + return bjs_OptionalSupportImports_runJsOptionalSupportTests_static_extern() +} func _$OptionalSupportImports_jsRoundTripOptionalNumberNull(_ value: Optional) throws(JSException) -> Optional { let (valueIsSome, valueValue) = value.bridgeJSLowerParameter() @@ -10500,12 +11211,15 @@ func _$OptionalSupportImports_runJsOptionalSupportTests() throws(JSException) -> #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_gc") -fileprivate func bjs_gc() -> Void +fileprivate func bjs_gc_extern() -> Void #else -fileprivate func bjs_gc() -> Void { +fileprivate func bjs_gc_extern() -> Void { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_gc() -> Void { + return bjs_gc_extern() +} func _$gc() throws(JSException) -> Void { bjs_gc() @@ -10516,21 +11230,27 @@ func _$gc() throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripGreeter_static") -fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static_extern(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static_extern(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_SwiftClassSupportImports_jsRoundTripGreeter_static(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return bjs_SwiftClassSupportImports_jsRoundTripGreeter_static_extern(greeter) +} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static") -fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static_extern(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer #else -fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { +fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static_extern(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif +@inline(never) fileprivate func bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static(_ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + return bjs_SwiftClassSupportImports_jsRoundTripOptionalGreeter_static_extern(greeterIsSome, greeterPointer) +} func _$SwiftClassSupportImports_jsRoundTripGreeter(_ greeter: Greeter) throws(JSException) -> Greeter { let greeterPointer = greeter.bridgeJSLowerParameter() From eace50e6b9f73f484d5ced76b60c99551352fc87 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 19 Feb 2026 13:25:38 +0900 Subject: [PATCH 251/252] TS2Swift: inject diagnostics for export assignment test --- .../Sources/TS2Swift/JavaScript/src/cli.js | 10 ++++---- .../TS2Swift/JavaScript/test/ts2swift.test.js | 23 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js index c7ac79051..17086e92e 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js @@ -97,13 +97,13 @@ Examples: /** * Run ts2swift for a single input file (programmatic API, no process I/O). * @param {string[]} filePaths - Paths to the .d.ts files - * @param {{ tsconfigPath: string, logLevel?: keyof typeof DiagnosticEngine.LEVELS, globalFiles?: string[] }} options + * @param {{ tsconfigPath: string, logLevel?: keyof typeof DiagnosticEngine.LEVELS, globalFiles?: string[], diagnosticEngine?: DiagnosticEngine }} options * @returns {string} Generated Swift source * @throws {Error} on parse/type-check errors (diagnostics are included in the message) */ export function run(filePaths, options) { - const { tsconfigPath, logLevel = 'info', globalFiles = [] } = options; - const diagnosticEngine = new DiagnosticEngine(logLevel); + const { tsconfigPath, logLevel = 'info', globalFiles = [], diagnosticEngine } = options; + const engine = diagnosticEngine ?? new DiagnosticEngine(logLevel); const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile); const configParseResult = ts.parseJsonConfigFileContent( @@ -164,7 +164,7 @@ export function run(filePaths, options) { const bodies = []; const globalFileSet = new Set(globalFiles); for (const inputPath of [...filePaths, ...globalFiles]) { - const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, { + const processor = new TypeProcessor(program.getTypeChecker(), engine, { defaultImportFromGlobal: globalFileSet.has(inputPath), }); const result = processor.processTypeDeclarations(program, inputPath); @@ -247,7 +247,7 @@ export function main(args) { let swiftOutput; try { - swiftOutput = run(filePaths, { tsconfigPath, logLevel, globalFiles }); + swiftOutput = run(filePaths, { tsconfigPath, logLevel, globalFiles, diagnosticEngine }); } catch (/** @type {unknown} */ err) { if (err instanceof Error) { diagnosticEngine.print("error", err.message); diff --git a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js index 8882124ed..4aefa19b5 100644 --- a/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js +++ b/Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js @@ -1,5 +1,5 @@ // @ts-check -import { describe, it, expect, vi } from 'vitest'; +import { describe, it, expect } from 'vitest'; import { readdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs'; import { fileURLToPath } from 'url'; import path from 'path'; @@ -53,16 +53,15 @@ describe('ts2swift', () => { it('emits a warning when export assignments cannot be generated', () => { const dtsPath = path.join(inputsDir, 'ExportAssignment.d.ts'); - const stderrSpy = vi.spyOn(process.stderr, 'write').mockImplementation(() => true); - try { - run([dtsPath], { tsconfigPath, logLevel: 'warning' }); - const combined = stderrSpy.mock.calls.map(args => String(args[0])).join(''); - expect(combined).toMatch(/Skipping export assignment/); - // Only warn once for the export assignment node - const occurrences = (combined.match(/Skipping export assignment/g) || []).length; - expect(occurrences).toBe(1); - } finally { - stderrSpy.mockRestore(); - } + /** @type {{ level: string, message: string }[]} */ + const diagnostics = []; + const diagnosticEngine = { + print: (level, message) => diagnostics.push({ level, message }), + }; + run([dtsPath], { tsconfigPath, logLevel: 'warning', diagnosticEngine }); + const messages = diagnostics.map((d) => d.message).join('\n'); + expect(messages).toMatch(/Skipping export assignment/); + const occurrences = (messages.match(/Skipping export assignment/g) || []).length; + expect(occurrences).toBe(1); }); }); From 834b59a1415b9238a2f8e801632e7dc62d9ec23b Mon Sep 17 00:00:00 2001 From: Krzysztof Rodak Date: Thu, 19 Feb 2026 10:41:48 +0100 Subject: [PATCH 252/252] BridgeJS: Register parameter names in scope instead of reserveNames --- Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift | 3 ++- Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 0afb287ab..3c7b197a4 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -1219,7 +1219,8 @@ public struct BridgeJSLink { loweringFragment.parameters.count == 1, "Lowering fragment should have exactly one parameter to lower" ) - let loweredValues = try loweringFragment.printCode([param.name], context) + let paramName = scope.variable(param.name) + let loweredValues = try loweringFragment.printCode([paramName], context) parameterForwardings.append(contentsOf: loweredValues) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index c6c37a8db..6f848eb05 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -90,11 +90,6 @@ final class JSGlueVariableScope { JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) } - fileprivate func reserveNames(_ names: [String]) { - for name in names { - variables.insert(name) - } - } } extension JSGlueVariableScope { @@ -738,7 +733,6 @@ struct IntrinsicJSFragment: Sendable { printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) let value = arguments[0] - scope.reserveNames(arguments) let isSomeVar = scope.variable("isSome") printer.write("const \(isSomeVar) = \(kind.presenceCheck(value: value));")

    • N%9OXk^B8efd`>u5Qbi2sq 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